[Telepathy-commits] [telepathy-gabble/master] GabbleChannelManager: explicitly have RequestChannel in the API.

[Simon McVittie]

For some channel factories we want RequestChannel to have different semantics
regarding parameters accepted, etc., for backwards compatibility (in particular
media channels).

20080730141607-53eee-f90f3cd0168901249cd49455fa720960083b894f.gz
---
 src/channel-manager.c |    8 ++++----
 src/channel-manager.h |    5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/channel-manager.c b/src/channel-manager.c
index bc9d640..1f158df 100644
--- a/src/channel-manager.c
+++ b/src/channel-manager.c
@@ -387,13 +387,13 @@ gabble_channel_manager_create_channel (GabbleChannelManager *manager,
 
 
 gboolean
-gabble_channel_manager_ensure_channel (GabbleChannelManager *manager,
-                                       gpointer request_token,
-                                       GHashTable *request_properties)
+gabble_channel_manager_request_channel (GabbleChannelManager *manager,
+                                        gpointer request_token,
+                                        GHashTable *request_properties)
 {
   GabbleChannelManagerIface *iface = GABBLE_CHANNEL_MANAGER_GET_INTERFACE (
       manager);
-  GabbleChannelManagerRequestFunc method = iface->ensure_channel;
+  GabbleChannelManagerRequestFunc method = iface->request_channel;
 
   /* A missing implementation is equivalent to one that always returns FALSE,
    * meaning "can't do that, ask someone else" */
diff --git a/src/channel-manager.h b/src/channel-manager.h
index 1c7c037..53408cf 100644
--- a/src/channel-manager.h
+++ b/src/channel-manager.h
@@ -65,7 +65,7 @@ typedef gboolean (*GabbleChannelManagerRequestFunc) (
 gboolean gabble_channel_manager_create_channel (GabbleChannelManager *manager,
     gpointer request_token, GHashTable *request_properties);
 
-gboolean gabble_channel_manager_ensure_channel (GabbleChannelManager *manager,
+gboolean gabble_channel_manager_request_channel (GabbleChannelManager *manager,
     gpointer request_token, GHashTable *request_properties);
 
 
@@ -75,7 +75,8 @@ struct _GabbleChannelManagerIface {
     GabbleChannelManagerForeachChannelFunc foreach_channel;
 
     GabbleChannelManagerRequestFunc create_channel;
-    GabbleChannelManagerRequestFunc ensure_channel;
+    GabbleChannelManagerRequestFunc request_channel;
+    /* in principle we could have EnsureChannel here too */
 
     GCallback _future[8];
 };
-- 
1.5.6.5