[Telepathy-commits] [telepathy-gabble/master] bytestream-socks5: don't redefine signals

[Guillaume Desmottes]

---
 src/bytestream-socks5.c |   32 ++------------------------------
 1 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/bytestream-socks5.c b/src/bytestream-socks5.c
index ce2c647..4e25cc7 100644
--- a/src/bytestream-socks5.c
+++ b/src/bytestream-socks5.c
@@ -62,16 +62,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleBytestreamSocks5, gabble_bytestream_socks5,
     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_BYTESTREAM_IFACE,
       bytestream_iface_init));
 
-/* signals */
-enum
-{
-  DATA_RECEIVED,
-  STATE_CHANGED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
 /* properties */
 enum
 {
@@ -323,7 +313,7 @@ gabble_bytestream_socks5_set_property (GObject *object,
         if (priv->bytestream_state != g_value_get_uint (value))
             {
               priv->bytestream_state = g_value_get_uint (value);
-              g_signal_emit (object, signals[STATE_CHANGED], 0,
+              g_signal_emit_by_name (object, "state-changed",
                   priv->bytestream_state);
             }
         break;
@@ -418,24 +408,6 @@ gabble_bytestream_socks5_class_init (
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_STREAM_INIT_ID,
       param_spec);
-
-  signals[DATA_RECEIVED] =
-    g_signal_new ("data-received",
-                  G_OBJECT_CLASS_TYPE (gabble_bytestream_socks5_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_socks5_class),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-                  0,
-                  NULL, NULL,
-                  gabble_marshal_VOID__UINT,
-                  G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
 static void
@@ -801,7 +773,7 @@ socks5_handle_received_data (GabbleBytestreamSocks5 *self,
 
       case SOCKS5_STATE_CONNECTED:
         /* We are connected, everything we receive now is data */
-        g_signal_emit (G_OBJECT (self), signals[DATA_RECEIVED], 0,
+        g_signal_emit_by_name (G_OBJECT (self), "data-received",
             priv->peer_handle, string);
 
         return string->len;
-- 
1.5.6.5