[telepathy-gabble/master] add gabble_search_channel_close as a public method

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Aug 24 08:12:46 PDT 2009


---
 src/search-channel.c |   16 +++++++++++-----
 src/search-channel.h |    2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/search-channel.c b/src/search-channel.c
index 645d95d..9a6c25a 100644
--- a/src/search-channel.c
+++ b/src/search-channel.c
@@ -1291,13 +1291,13 @@ gabble_search_channel_class_init (GabbleSearchChannelClass *klass)
 }
 
 /**
- * gabble_search_channel_close
+ * gabble_search_channel_close_async
  *
  * Implements D-Bus method Close
  * on interface org.freedesktop.Telepathy.Channel
  */
 static void
-gabble_search_channel_close (TpSvcChannel *iface,
+gabble_search_channel_close_async (TpSvcChannel *iface,
                              DBusGMethodInvocation *context)
 {
   GabbleSearchChannel *chan = GABBLE_SEARCH_CHANNEL (iface);
@@ -1313,9 +1313,9 @@ channel_iface_init (gpointer g_iface,
 {
   TpSvcChannelClass *klass = g_iface;
 
-#define IMPLEMENT(x) tp_svc_channel_implement_##x (\
-    klass, gabble_search_channel_##x)
-  IMPLEMENT(close);
+#define IMPLEMENT(x, suffix) tp_svc_channel_implement_##x (\
+    klass, gabble_search_channel_##x##suffix)
+  IMPLEMENT(close,_async);
 #undef IMPLEMENT
 }
 
@@ -1380,6 +1380,12 @@ gabble_search_channel_stop (GabbleSvcChannelTypeContactSearch *self,
     }
 }
 
+void
+gabble_search_channel_close (GabbleSearchChannel *self)
+{
+  ensure_closed (self);
+}
+
 static void
 contact_search_iface_init (gpointer g_iface,
                            gpointer iface_data)
diff --git a/src/search-channel.h b/src/search-channel.h
index f3474b9..562a6e6 100644
--- a/src/search-channel.h
+++ b/src/search-channel.h
@@ -58,6 +58,8 @@ GType gabble_search_channel_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_SEARCH_CHANNEL, \
                               GabbleSearchChannelClass))
 
+void gabble_search_channel_close (GabbleSearchChannel *chan);
+
 G_END_DECLS
 
 #endif /* #ifndef __GABBLE_SEARCH_CHANNEL_H__*/
-- 
1.5.6.5




More information about the telepathy-commits mailing list