aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/cheese-camera-device-monitor.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-09-28 19:41:11 +0800
committerXavier Claessens <xclaesse@gmail.com>2011-09-28 20:03:54 +0800
commit7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400 (patch)
tree9a6a63fef4f7c6eadd7c67a807b85068e7f45986 /libempathy/cheese-camera-device-monitor.c
parent843f210c3bf26f6ecc93f90000e366ebc8296cc3 (diff)
downloadgsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.gz
gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.zst
gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.zip
Use g_cclosure_marshal_generic for all signals
No more ugly marshallers \o/
Diffstat (limited to 'libempathy/cheese-camera-device-monitor.c')
-rw-r--r--libempathy/cheese-camera-device-monitor.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c
index 85c6a0aa4..78b40fb70 100644
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/libempathy/cheese-camera-device-monitor.c
@@ -43,7 +43,6 @@
#endif
#include "cheese-camera-device-monitor.h"
-#include "empathy-marshal.h"
/**
* SECTION:cheese-camera-device-monitor
@@ -360,7 +359,7 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, added),
NULL, NULL,
- _empathy_marshal_VOID__STRING_STRING_STRING_INT,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
/**
@@ -375,7 +374,7 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, removed),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, 1, G_TYPE_STRING);
g_type_class_add_private (klass, sizeof (CheeseCameraDeviceMonitorPrivate));