[telepathy-mission-control/master] Inline mcd_dispatcher_append_client_caps now that it's a one-liner

Simon McVittie simon.mcvittie at collabora.co.uk
Tue Sep 22 07:04:30 PDT 2009


---
 src/mcd-dispatcher.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 3d80db7..0e9997a 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1837,14 +1837,6 @@ mcd_client_set_filters (McdClientProxy *client,
 }
 
 static void
-mcd_dispatcher_append_client_caps (McdDispatcher *self,
-                                   McdClientProxy *client,
-                                   GPtrArray *vas)
-{
-    g_ptr_array_add (vas, _mcd_client_proxy_dup_handler_capabilities (client));
-}
-
-static void
 mcd_dispatcher_release_startup_lock (McdDispatcher *self)
 {
     if (self->priv->startup_completed)
@@ -1941,7 +1933,7 @@ mcd_dispatcher_update_client_caps (McdDispatcher *self,
     }
 
     vas = g_ptr_array_sized_new (1);
-    mcd_dispatcher_append_client_caps (self, client, vas);
+    g_ptr_array_add (vas, _mcd_client_proxy_dup_handler_capabilities (client));
 
     g_hash_table_iter_init (&iter, self->priv->connections);
 
@@ -3626,7 +3618,8 @@ _mcd_dispatcher_dup_client_caps (McdDispatcher *self)
 
     while (g_hash_table_iter_next (&iter, NULL, &p))
     {
-        mcd_dispatcher_append_client_caps (self, p, vas);
+        g_ptr_array_add (vas,
+                         _mcd_client_proxy_dup_handler_capabilities (p));
     }
 
     return vas;
-- 
1.5.6.5




More information about the telepathy-commits mailing list