individual-menu: remove link-contacts-activated signal

[empathy.git] / libempathy / empathy-tp-streamed-media.c

diff --git a/libempathy/empathy-tp-streamed-media.c b/libempathy/empathy-tp-streamed-media.c
index b79e4b6b5712748efded0f964cbeda8a954e4f0b..f245dcfd5899591b3245f80052560f792f96a678 100644 (file)
--- a/libempathy/empathy-tp-streamed-media.c
+++ b/libempathy/empathy-tp-streamed-media.c
@@ -20,6 +20,8 @@
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include <telepathy-glib/proxy-subclass.h>
@@ -30,7 +32,6 @@
 #include "empathy-tp-streamed-media.h"
 #include "empathy-tp-contact-factory.h"
 #include "empathy-utils.h"
-#include "empathy-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
@@ -262,7 +263,7 @@ tp_streamed_media_request_streams_for_capabilities (EmpathyTpStreamedMedia *call
       handle, stream_types, tp_streamed_media_request_streams_cb, NULL, NULL,
       G_OBJECT (call));
 
-  g_array_free (stream_types, TRUE);
+  g_array_unref (stream_types);
 }
 
 static void
@@ -566,7 +567,7 @@ empathy_tp_streamed_media_class_init (EmpathyTpStreamedMediaClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__UINT_STRING,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, G_TYPE_UINT, G_TYPE_STRING);
 
@@ -575,7 +576,7 @@ empathy_tp_streamed_media_class_init (EmpathyTpStreamedMediaClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__UINT_STRING,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, G_TYPE_UINT, G_TYPE_STRING);
 }