[Telepathy-commits] [telepathy-mission-control/master] Rename one channel status

[Alberto Mardegan]

A channel without a proxy is a channel request.
---
 src/mcd-channel.c    |    4 ++--
 src/mcd-channel.h    |    2 +-
 src/mcd-connection.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index c756862..8ece97a 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -719,7 +719,7 @@ mcd_channel_class_init (McdChannelClass * klass)
 							_("Channel status"),
 							_("Channel status that indicates the state of channel"),
 							MCD_TYPE_CHANNEL_STATUS,
-							MCD_CHANNEL_NO_PROXY,
+							MCD_CHANNEL_REQUEST,
 							G_PARAM_READWRITE));
     g_object_class_install_property (object_class, PROP_CHANNEL_TYPE,
 				     g_param_spec_string ("channel-type",
@@ -1264,7 +1264,7 @@ mcd_channel_new_request (GHashTable *properties, guint64 user_time,
     g_object_set_data_full ((GObject *)channel, CD_REQUEST,
                             crd, (GDestroyNotify)channel_request_data_free);
 
-    mcd_channel_set_status (channel, MCD_CHANNEL_NO_PROXY);
+    mcd_channel_set_status (channel, MCD_CHANNEL_REQUEST);
 
     return channel;
 }
diff --git a/src/mcd-channel.h b/src/mcd-channel.h
index fad51fb..feb84af 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_NO_PROXY,     /* Telepathy channel is not yet created */
+    MCD_CHANNEL_REQUEST,      /* 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 creation failed, or channel could not
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index be402f9..8e38ccd 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_NO_PROXY &&
+        if (mcd_channel_get_status (channel) == MCD_CHANNEL_REQUEST &&
             on_channel_capabilities_timeout (channel, connection))
 	{
             mcd_mission_abort ((McdMission *)channel);
-- 
1.5.6.5