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 /libempathy-gtk/empathy-log-window.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 'libempathy-gtk/empathy-log-window.c')
-rw-r--r-- | libempathy-gtk/empathy-log-window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 9f9dfcbc0..9094f6946 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -28,11 +28,11 @@ #include <glib/gi18n-lib.h> #include <telepathy-glib/proxy-subclass.h> #include <tp-account-widgets/tpaw-builder.h> +#include <tp-account-widgets/tpaw-camera-monitor.h> #include "action-chain-internal.h" #include "empathy-account-chooser.h" #include "empathy-call-utils.h" -#include "empathy-camera-monitor.h" #include "empathy-geometry.h" #include "empathy-gsettings.h" #include "empathy-images.h" @@ -90,7 +90,7 @@ struct _EmpathyLogWindowPriv EmpathyContact *selected_contact; EmpathyContact *events_contact; - EmpathyCameraMonitor *camera_monitor; + TpawCameraMonitor *camera_monitor; GBinding *button_video_binding; /* Used to cancel logger calls when no longer needed */ @@ -617,7 +617,7 @@ empathy_log_window_init (EmpathyLogWindow *self) self->priv->chain = _tpl_action_chain_new_async (NULL, NULL, NULL); - self->priv->camera_monitor = empathy_camera_monitor_dup_singleton (); + self->priv->camera_monitor = tpaw_camera_monitor_dup_singleton (); self->priv->log_manager = tpl_log_manager_dup_singleton (); |