diff options
author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-29 23:20:24 +0800 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:06 +0800 |
commit | f6d827a6b1006858de979d6627598fa17098ee62 (patch) | |
tree | 8ac85d9a2035213aed5e9e194bfe1047ee3094c1 /src/empathy-camera-menu.c | |
parent | 6400b739ecdf0e14ad3cc1c6c7032a4eb486bb0e (diff) | |
download | gsoc2013-empathy-f6d827a6b1006858de979d6627598fa17098ee62.tar gsoc2013-empathy-f6d827a6b1006858de979d6627598fa17098ee62.tar.gz gsoc2013-empathy-f6d827a6b1006858de979d6627598fa17098ee62.tar.bz2 gsoc2013-empathy-f6d827a6b1006858de979d6627598fa17098ee62.tar.lz gsoc2013-empathy-f6d827a6b1006858de979d6627598fa17098ee62.tar.xz gsoc2013-empathy-f6d827a6b1006858de979d6627598fa17098ee62.tar.zst gsoc2013-empathy-f6d827a6b1006858de979d6627598fa17098ee62.zip |
camera-monitor: move from Empathy to tp-account-widgets
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'src/empathy-camera-menu.c')
-rw-r--r-- | src/empathy-camera-menu.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c index 8dc037bdb..cf18340c4 100644 --- a/src/empathy-camera-menu.c +++ b/src/empathy-camera-menu.c @@ -22,7 +22,8 @@ #include "config.h" #include "empathy-camera-menu.h" -#include "empathy-camera-monitor.h" +#include <tp-account-widgets/tpaw-camera-monitor.h> + #include "empathy-gsettings.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP @@ -51,7 +52,7 @@ struct _EmpathyCameraMenuPrivate /* Queue of GtkRadioActions. */ GQueue *cameras; - EmpathyCameraMonitor *camera_monitor; + TpawCameraMonitor *camera_monitor; GSettings *settings; }; @@ -200,7 +201,7 @@ empathy_camera_menu_update (EmpathyCameraMenu *self) static void empathy_camera_menu_add_camera (EmpathyCameraMenu *self, - EmpathyCamera *camera) + TpawCamera *camera) { GtkRadioAction *action; GSList *group; @@ -219,8 +220,8 @@ empathy_camera_menu_add_camera (EmpathyCameraMenu *self, } static void -empathy_camera_menu_camera_added_cb (EmpathyCameraMonitor *monitor, - EmpathyCamera *camera, +empathy_camera_menu_camera_added_cb (TpawCameraMonitor *monitor, + TpawCamera *camera, EmpathyCameraMenu *self) { empathy_camera_menu_add_camera (self, camera); @@ -228,8 +229,8 @@ empathy_camera_menu_camera_added_cb (EmpathyCameraMonitor *monitor, } static void -empathy_camera_menu_camera_removed_cb (EmpathyCameraMonitor *monitor, - EmpathyCamera *camera, +empathy_camera_menu_camera_removed_cb (TpawCameraMonitor *monitor, + TpawCamera *camera, EmpathyCameraMenu *self) { GList *l; @@ -303,11 +304,11 @@ empathy_camera_menu_get_cameras (EmpathyCameraMenu *self) { const GList *cameras; - cameras = empathy_camera_monitor_get_cameras (self->priv->camera_monitor); + cameras = tpaw_camera_monitor_get_cameras (self->priv->camera_monitor); for (; cameras != NULL; cameras = g_list_next (cameras)) { - EmpathyCamera *camera = cameras->data; + TpawCamera *camera = cameras->data; empathy_camera_menu_add_camera (self, camera); } @@ -346,7 +347,7 @@ empathy_camera_menu_constructed (GObject *obj) self->priv->anchor_action); g_object_unref (self->priv->anchor_action); - self->priv->camera_monitor = empathy_camera_monitor_new (); + self->priv->camera_monitor = tpaw_camera_monitor_new (); tp_g_signal_connect_object (self->priv->camera_monitor, "added", G_CALLBACK (empathy_camera_menu_camera_added_cb), self, 0); |