[telepathy-mission-control/master] mcd-misc: rename all functions to start with an underscore

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Apr 15 05:38:09 PDT 2009


We don't install mcd-misc.h, so to be consistent, all its functions should
be private to the library.
---
 src/mcd-account.c    |    6 +++---
 src/mcd-dispatcher.c |    4 ++--
 src/mcd-manager.c    |    6 +++---
 src/mcd-misc.c       |   16 ++++++++--------
 src/mcd-misc.h       |   12 ++++++------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 5ec4b3d..2fcd9d6 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -229,7 +229,7 @@ mcd_account_loaded (McdAccount *account)
     account->priv->loaded = TRUE;
 
     /* invoke all the callbacks */
-    mcd_object_ready (account, account_ready_quark, NULL);
+    _mcd_object_ready (account, account_ready_quark, NULL);
     _mcd_account_maybe_autoconnect (account);
 }
 
@@ -432,8 +432,8 @@ _mcd_account_load_real (McdAccount *account, McdAccountLoadCb callback,
     if (account->priv->loaded)
         callback (account, NULL, user_data);
     else
-        mcd_object_call_when_ready (account, account_ready_quark,
-                                    (McdReadyCb)callback, user_data);
+        _mcd_object_call_when_ready (account, account_ready_quark,
+                                     (McdReadyCb)callback, user_data);
 }
 
 static void
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index b971bf8..d1058b6 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -3283,7 +3283,7 @@ get_handled_channels_cb (TpProxy *proxy, const GValue *v_channels,
     else
         g_warning ("%s: Got error: %s", G_STRFUNC, error->message);
 
-    mcd_object_ready (proxy, client_ready_quark, error);
+    _mcd_object_ready (proxy, client_ready_quark, error);
 }
 
 static void
@@ -3303,7 +3303,7 @@ mcd_client_call_when_got_handled_channels (McdClient *client,
                 (client->proxy, -1, MC_IFACE_CLIENT_HANDLER, "HandledChannels",
                  get_handled_channels_cb, client, NULL, NULL);
         }
-        mcd_object_call_on_struct_when_ready
+        _mcd_object_call_on_struct_when_ready
             (client->proxy, client, client_ready_quark, callback, user_data);
     }
 }
diff --git a/src/mcd-manager.c b/src/mcd-manager.c
index ef0f769..d8e0a72 100644
--- a/src/mcd-manager.c
+++ b/src/mcd-manager.c
@@ -89,7 +89,7 @@ on_manager_ready (TpConnectionManager *tp_conn_mgr, const GError *error,
     priv = manager->priv;
     DEBUG ("manager %s is ready", priv->name);
     priv->ready = TRUE;
-    mcd_object_ready (manager, readiness_quark, error);
+    _mcd_object_ready (manager, readiness_quark, error);
 }
 
 static gint
@@ -536,7 +536,7 @@ mcd_manager_call_when_ready (McdManager *manager, McdManagerReadyCb callback,
     if (manager->priv->ready)
         callback (manager, NULL, user_data);
     else
-        mcd_object_call_when_ready (manager, readiness_quark,
-                                    (McdReadyCb)callback, user_data);
+        _mcd_object_call_when_ready (manager, readiness_quark,
+                                     (McdReadyCb)callback, user_data);
 }
 
diff --git a/src/mcd-misc.c b/src/mcd-misc.c
index 49a8ecb..a9d0bb0 100644
--- a/src/mcd-misc.c
+++ b/src/mcd-misc.c
@@ -189,17 +189,17 @@ mcd_ready_data_free (McdReadyData *rd)
 }
 
 void
-mcd_object_call_when_ready (gpointer object, GQuark quark, McdReadyCb callback,
-                            gpointer user_data)
+_mcd_object_call_when_ready (gpointer object, GQuark quark, McdReadyCb callback,
+                             gpointer user_data)
 {
-    mcd_object_call_on_struct_when_ready (object, object, quark, callback,
-                                          user_data);
+    _mcd_object_call_on_struct_when_ready (object, object, quark, callback,
+                                           user_data);
 }
 
 void
-mcd_object_call_on_struct_when_ready (gpointer object, gpointer strukt,
-                                      GQuark quark, McdReadyCb callback,
-                                      gpointer user_data)
+_mcd_object_call_on_struct_when_ready (gpointer object, gpointer strukt,
+                                       GQuark quark, McdReadyCb callback,
+                                       gpointer user_data)
 {
     McdReadyData *rd;
     McdReadyCbData *cb;
@@ -225,7 +225,7 @@ mcd_object_call_on_struct_when_ready (gpointer object, gpointer strukt,
 }
 
 void
-mcd_object_ready (gpointer object, GQuark quark, const GError *error)
+_mcd_object_ready (gpointer object, GQuark quark, const GError *error)
 {
     McdReadyData *rd;
 
diff --git a/src/mcd-misc.h b/src/mcd-misc.h
index 281bad5..05ae439 100644
--- a/src/mcd-misc.h
+++ b/src/mcd-misc.h
@@ -45,12 +45,12 @@ gchar *_mcd_build_error_string (const GError *error);
 
 typedef void (*McdReadyCb) (gpointer object, const GError *error,
                             gpointer user_data);
-void mcd_object_call_when_ready (gpointer object, GQuark quark,
-                                 McdReadyCb callback, gpointer user_data);
-void mcd_object_call_on_struct_when_ready (gpointer object, gpointer strukt,
-                                           GQuark quark, McdReadyCb callback,
-                                           gpointer user_data);
-void mcd_object_ready (gpointer object, GQuark quark, const GError *error);
+void _mcd_object_call_when_ready (gpointer object, GQuark quark,
+                                  McdReadyCb callback, gpointer user_data);
+void _mcd_object_call_on_struct_when_ready (gpointer object, gpointer strukt,
+                                            GQuark quark, McdReadyCb callback,
+                                            gpointer user_data);
+void _mcd_object_ready (gpointer object, GQuark quark, const GError *error);
 
 /* not exported */
 #define MC_ARRAY_TYPE_OBJECT (_mcd_type_dbus_ao ())
-- 
1.5.6.5




More information about the telepathy-commits mailing list