[Telepathy-commits] [telepathy-gabble/master] bytestream-multiple: signals are not defined in bytestream-iface

[Guillaume Desmottes]

---
 src/bytestream-multiple.c |   42 ++----------------------------------------
 1 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/src/bytestream-multiple.c b/src/bytestream-multiple.c
index 7ab143d..7eee670 100644
--- a/src/bytestream-multiple.c
+++ b/src/bytestream-multiple.c
@@ -45,17 +45,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleBytestreamMultiple, gabble_bytestream_multiple,
     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_BYTESTREAM_IFACE,
       bytestream_iface_init));
 
-/* signals */
-enum
-{
-  DATA_RECEIVED,
-  STATE_CHANGED,
-  CONNECTION_ERROR,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
 /* properties */
 enum
 {
@@ -224,7 +213,7 @@ gabble_bytestream_multiple_set_property (GObject *object,
         if (priv->state != g_value_get_uint (value))
           {
             priv->state = g_value_get_uint (value);
-            g_signal_emit (object, signals[STATE_CHANGED], 0, priv->state);
+            g_signal_emit_by_name (object, "state-changed", priv->state);
           }
         break;
       case PROP_FACTORY:
@@ -330,33 +319,6 @@ gabble_bytestream_multiple_class_init (
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_FACTORY,
       param_spec);
-
-  signals[DATA_RECEIVED] =
-    g_signal_new ("data-received",
-                  G_OBJECT_CLASS_TYPE (gabble_bytestream_multiple_class),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__UINT_POINTER,
-                  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_POINTER);
-
-  signals[STATE_CHANGED] =
-    g_signal_new ("state-changed",
-                  G_OBJECT_CLASS_TYPE (gabble_bytestream_multiple_class),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-                  0,
-                  NULL, NULL,
-                  gabble_marshal_VOID__UINT,
-                  G_TYPE_NONE, 1, G_TYPE_UINT);
-
-  signals[CONNECTION_ERROR] =
-    g_signal_new ("connection-error",
-                  G_OBJECT_CLASS_TYPE (gabble_bytestream_multiple_class),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-                  0,
-                  NULL, NULL,
-                  gabble_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
 }
 
 /*
@@ -507,7 +469,7 @@ bytestream_data_received_cb (GabbleBytestreamIface *bytestream,
   GabbleBytestreamMultiple *self = GABBLE_BYTESTREAM_MULTIPLE (user_data);
 
   /* Just forward the data */
-  g_signal_emit (G_OBJECT (self), signals[DATA_RECEIVED], 0, sender, str);
+  g_signal_emit_by_name (G_OBJECT (self), "data-received", sender, str);
 }
 
 static void
-- 
1.5.6.5