[Telepathy-commits] [telepathy-gabble/master] Rename signal names of StreamTubes and DBusTubes to avoid collisions when GabbleTubeDBus and GabbleTubeStream will implement TP_TYPE_SVC_CHANNEL

[Alban Crequy]

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

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index d3a5772..059aeeb 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -807,7 +807,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_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 (gabble_tube_dbus_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
@@ -816,7 +816,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
                   G_TYPE_NONE, 0);
 
   signals[CLOSED] =
-    g_signal_new ("closed",
+    g_signal_new ("tube-closed",
                   G_OBJECT_CLASS_TYPE (gabble_tube_dbus_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 852130a..4491397 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1185,7 +1185,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
       param_spec);
 
   signals[OPENED] =
-    g_signal_new ("opened",
+    g_signal_new ("tube-opened",
                   G_OBJECT_CLASS_TYPE (gabble_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
@@ -1194,7 +1194,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_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 (gabble_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
@@ -1203,7 +1203,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_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 (gabble_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 8c9495d..4587a0c 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -522,8 +522,8 @@ create_new_tube (GabbleTubesChannel *self,
     }
 #endif
 
-  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);
 
   return tube;
 }
@@ -1836,7 +1836,7 @@ gabble_tubes_channel_offer_stream_tube (TpSvcChannelTypeTubes *iface,
         }
     }
 
-  g_signal_connect (tube, "new-connection",
+  g_signal_connect (tube, "tube-new-connection",
       G_CALLBACK (stream_unix_tube_new_connection_cb), self);
 
   tp_svc_channel_type_tubes_return_from_offer_stream_tube (context,
-- 
1.5.6.5