[Telepathy-commits] [telepathy-gabble/master] merge gabble_tube_dbus_listen to tube_dbus_open

[Guillaume Desmottes]

---
 src/tube-dbus.c |   12 ++----------
 src/tube-dbus.h |    2 --
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index f4ab3f8..0d76f16 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -407,8 +407,8 @@ create_dbus_server (GabbleTubeDBus *self,
   return TRUE;
 }
 
-void
-gabble_tube_dbus_listen (GabbleTubeDBus *self)
+static void
+tube_dbus_open (GabbleTubeDBus *self)
 {
   GabbleTubeDBusPrivate *priv = GABBLE_TUBE_DBUS_GET_PRIVATE (self);
 
@@ -417,14 +417,6 @@ gabble_tube_dbus_listen (GabbleTubeDBus *self)
 
   if (!create_dbus_server (self, NULL))
     do_close (self);
-}
-
-static void
-tube_dbus_open (GabbleTubeDBus *self)
-{
-  GabbleTubeDBusPrivate *priv = GABBLE_TUBE_DBUS_GET_PRIVATE (self);
-
-  gabble_tube_dbus_listen (self);
 
   if (priv->dbus_srv != NULL)
     {
diff --git a/src/tube-dbus.h b/src/tube-dbus.h
index cdcc177..97dca87 100644
--- a/src/tube-dbus.h
+++ b/src/tube-dbus.h
@@ -76,8 +76,6 @@ gboolean gabble_tube_dbus_handle_in_names (GabbleTubeDBus *tube,
 
 gboolean gabble_tube_dbus_offer (GabbleTubeDBus *tube, GError **error);
 
-void gabble_tube_dbus_listen (GabbleTubeDBus *self);
-
 /* Only extern for the benefit of tests/test-dtube-unique-names.c */
 gchar *_gabble_generate_dbus_unique_name (const gchar *nick);
 
-- 
1.5.6.5