[telepathy-mission-control/master] McdClientProxy: rename ready to unique-name-known

Simon McVittie simon.mcvittie at collabora.co.uk
Tue Sep 22 09:21:41 PDT 2009


That's what it actually means, at the moment.
---
 src/mcd-client.c     |   15 ++++++++-------
 src/mcd-dispatcher.c |    7 +++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/mcd-client.c b/src/mcd-client.c
index ee379fd..74b2a4c 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -50,7 +50,7 @@ enum
 
 enum
 {
-    S_READY,
+    S_UNIQUE_NAME_KNOWN,
     N_SIGNALS
 };
 
@@ -540,7 +540,7 @@ mcd_client_proxy_emit_ready (McdClientProxy *self)
 
     self->priv->ready = TRUE;
 
-    g_signal_emit (self, signals[S_READY], 0);
+    g_signal_emit (self, signals[S_UNIQUE_NAME_KNOWN], 0);
 }
 
 gboolean
@@ -800,11 +800,12 @@ _mcd_client_proxy_class_init (McdClientProxyClass *klass)
     object_class->finalize = mcd_client_proxy_finalize;
     object_class->set_property = mcd_client_proxy_set_property;
 
-    signals[S_READY] = g_signal_new ("ready", G_OBJECT_CLASS_TYPE (klass),
-                                     G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-                                     0, NULL, NULL,
-                                     g_cclosure_marshal_VOID__VOID,
-                                     G_TYPE_NONE, 0);
+    signals[S_UNIQUE_NAME_KNOWN] = g_signal_new ("unique-name-known",
+        G_OBJECT_CLASS_TYPE (klass),
+        G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+        0, NULL, NULL,
+        g_cclosure_marshal_VOID__VOID,
+        G_TYPE_NONE, 0);
 
     g_object_class_install_property (object_class, PROP_ACTIVATABLE,
         g_param_spec_boolean ("activatable", "Activatable?",
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 90deadd..6d130d3 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1854,9 +1854,8 @@ handler_get_all_cb (TpProxy *proxy,
 
     unique_name = _mcd_client_proxy_get_unique_name (client_proxy);
 
-    /* This function is only called in response to the McdClientProxy
-     * signalling ready, which means it knows whether it has a unique name
-     * (is running) or not */
+    /* This function is only called in (indirect) response to the
+     * McdClientProxy signalling unique-name-known */
     g_assert (unique_name != NULL);
 
     if (unique_name[0] == '\0')
@@ -2095,7 +2094,7 @@ mcd_dispatcher_add_client (McdDispatcher *self,
 
     g_hash_table_insert (priv->clients, g_strdup (name), client);
 
-    g_signal_connect (client, "ready",
+    g_signal_connect (client, "unique-name-known",
                       G_CALLBACK (mcd_client_start_introspection),
                       self);
 }
-- 
1.5.6.5




More information about the telepathy-commits mailing list