[Telepathy-commits] [telepathy-salut/master] Rename signal names of StreamTubes and DBusTubes to avoid collisions when SalutTubeDBus and SalutTubeStream will implement TP_TYPE_SVC_CHANNEL

[Alban Crequy]

---
 src/salut-tubes-channel.c |    6 +++---
 src/tube-dbus.c           |    4 ++--
 src/tube-stream.c         |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index dfd29fd..ea3ff38 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -1270,8 +1270,8 @@ create_new_tube (SalutTubesChannel *self,
       add_yourself_in_dbus_names (self, tube_id);
     }
 
-  g_signal_connect (tube, "opened", G_CALLBACK (tube_opened_cb), self);
-  g_signal_connect (tube, "closed", G_CALLBACK (tube_closed_cb), self);
+  g_signal_connect (tube, "tube-opened", G_CALLBACK (tube_opened_cb), self);
+  g_signal_connect (tube, "tube-closed", G_CALLBACK (tube_closed_cb), self);
 
   if (muc_connection != NULL)
     g_object_unref (muc_connection);
@@ -2056,7 +2056,7 @@ salut_tubes_channel_offer_stream_tube (TpSvcChannelTypeTubes *iface,
       send_channel_iq_tubes (self);
     }
 
-  g_signal_connect (tube, "new-connection",
+  g_signal_connect (tube, "tube-new-connection",
       G_CALLBACK (stream_tube_new_connection_cb), self);
 
   tp_svc_channel_type_tubes_return_from_offer_stream_tube (context,
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index b1a16e7..645e76f 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -832,7 +832,7 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class)
   g_object_class_install_property (object_class, PROP_DBUS_NAMES, param_spec);
 
   signals[OPENED] =
-    g_signal_new ("opened",
+    g_signal_new ("tube-opened",
                   G_OBJECT_CLASS_TYPE (salut_tube_dbus_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
@@ -841,7 +841,7 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class)
                   G_TYPE_NONE, 0);
 
   signals[CLOSED] =
-    g_signal_new ("closed",
+    g_signal_new ("tube-closed",
                   G_OBJECT_CLASS_TYPE (salut_tube_dbus_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
diff --git a/src/tube-stream.c b/src/tube-stream.c
index b7fc31b..7874e44 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1346,7 +1346,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
   g_object_class_install_property (object_class, PROP_IQ_REQ, param_spec);
 
   signals[OPENED] =
-    g_signal_new ("opened",
+    g_signal_new ("tube-opened",
                   G_OBJECT_CLASS_TYPE (salut_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
@@ -1355,7 +1355,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
                   G_TYPE_NONE, 0);
 
   signals[NEW_CONNECTION] =
-    g_signal_new ("new-connection",
+    g_signal_new ("tube-new-connection",
                   G_OBJECT_CLASS_TYPE (salut_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
@@ -1364,7 +1364,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
                   G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[CLOSED] =
-    g_signal_new ("closed",
+    g_signal_new ("tube-closed",
                   G_OBJECT_CLASS_TYPE (salut_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-- 
1.5.6.5