[Telepathy-commits] [telepathy-mission-control/master] Rename PENDING status to NO_PROXY

[Alberto Mardegan]

This better describes what the status is about.
---
 src/mcd-channel.c    |    2 +-
 src/mcd-channel.h    |    2 +-
 src/mcd-connection.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 886827d..9ca3a3a 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -695,7 +695,7 @@ mcd_channel_class_init (McdChannelClass * klass)
 							_("Channel status"),
 							_("Channel status that indicates the state of channel"),
 							MCD_TYPE_CHANNEL_STATUS,
-							MCD_CHANNEL_PENDING,
+							MCD_CHANNEL_NO_PROXY,
 							G_PARAM_READWRITE));
     g_object_class_install_property (object_class, PROP_CHANNEL_TYPE,
 				     g_param_spec_string ("channel-type",
diff --git a/src/mcd-channel.h b/src/mcd-channel.h
index e165343..3dcb90f 100644
--- a/src/mcd-channel.h
+++ b/src/mcd-channel.h
@@ -49,7 +49,7 @@ typedef enum
 {
     MCD_CHANNEL_UNDISPATCHED, /* used for channels created in the NewChannel
                                  signal before the connection is ready */
-    MCD_CHANNEL_PENDING,     /* Telepathy channel is not yet created */
+    MCD_CHANNEL_NO_PROXY,     /* Telepathy channel is not yet created */
     MCD_CHANNEL_DISPATCHING, /* Telepathy channel is created and waiting dispatch */
     MCD_CHANNEL_DISPATCHED,  /* Channel has been dispatched to handler */
     MCD_CHANNEL_FAILED,      /* Channel could not be dispached to handler, dying */
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index e32934e..c0d6961 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -698,7 +698,7 @@ on_capabilities_timeout (McdConnection *connection)
 
 	list_curr = list;
 	list = list->next;
-        if (mcd_channel_get_status (channel) == MCD_CHANNEL_PENDING &&
+        if (mcd_channel_get_status (channel) == MCD_CHANNEL_NO_PROXY &&
             on_channel_capabilities_timeout (channel, connection))
 	{
             mcd_mission_abort ((McdMission *)channel);
@@ -2079,7 +2079,7 @@ mcd_connection_request_channel (McdConnection *connection,
 			       TRUE, /* outgoing */
 			       req->requestor_serial,
 			       req->requestor_client_id);
-    mcd_channel_set_status (channel, MCD_CHANNEL_PENDING);
+    mcd_channel_set_status (channel, MCD_CHANNEL_NO_PROXY);
 
     /* We do not add the channel in connection until tp_channel is created */
     g_object_set_data (G_OBJECT (channel), "temporary_connection", connection);
-- 
1.5.6.5