[Telepathy-commits] [telepathy-gabble/master] gadget-manager: remove gabble_olpc_gadget_manager_{request, create, ensure}_channel and use gabble_olpc_gadget_manager_handle_request directly

[Guillaume Desmottes]

---
 src/olpc-gadget-manager.c |   37 +++----------------------------------
 1 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/src/olpc-gadget-manager.c b/src/olpc-gadget-manager.c
index e638b59..02fb5c8 100644
--- a/src/olpc-gadget-manager.c
+++ b/src/olpc-gadget-manager.c
@@ -475,37 +475,6 @@ gabble_olpc_gadget_manager_handle_request (TpChannelManager *manager,
   return TRUE;
 }
 
-
-static gboolean
-gabble_olpc_gadget_manager_create_channel (TpChannelManager *manager,
-                                        gpointer request_token,
-                                        GHashTable *request_properties)
-{
-  return gabble_olpc_gadget_manager_handle_request (manager, request_token,
-      request_properties);
-}
-
-
-static gboolean
-gabble_olpc_gadget_manager_request_channel (TpChannelManager *manager,
-                                         gpointer request_token,
-                                         GHashTable *request_properties)
-{
-  return gabble_olpc_gadget_manager_handle_request (manager, request_token,
-      request_properties);
-}
-
-
-static gboolean
-gabble_olpc_gadget_manager_ensure_channel (TpChannelManager *manager,
-                                        gpointer request_token,
-                                        GHashTable *request_properties)
-{
-  return gabble_olpc_gadget_manager_handle_request (manager, request_token,
-      request_properties);
-}
-
-
 static void
 channel_manager_iface_init (gpointer g_iface,
                             gpointer iface_data)
@@ -514,9 +483,9 @@ channel_manager_iface_init (gpointer g_iface,
 
   iface->foreach_channel = gabble_olpc_gadget_manager_foreach_channel;
   iface->foreach_channel_class = gabble_olpc_gadget_manager_foreach_channel_class;
-  iface->request_channel = gabble_olpc_gadget_manager_request_channel;
-  iface->create_channel = gabble_olpc_gadget_manager_create_channel;
-  iface->ensure_channel = gabble_olpc_gadget_manager_ensure_channel;
+  iface->request_channel = gabble_olpc_gadget_manager_handle_request;
+  iface->create_channel = gabble_olpc_gadget_manager_handle_request;
+  iface->ensure_channel = gabble_olpc_gadget_manager_handle_request;
 }
 
 static gboolean
-- 
1.5.6.5