camera-monitor: move from Empathy to tp-account-widgets

https://bugzilla.gnome.org/show_bug.cgi?id=699492

4 files changed, 12 insertions, 12 deletions

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 4c58a1aa5..e145d3ffc 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -24,12 +24,12 @@
 #include "empathy-avatar-chooser.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
 
 #ifdef HAVE_CHEESE
 #include <cheese-avatar-chooser.h>
 #endif /* HAVE_CHEESE */
 
-#include "empathy-camera-monitor.h"
 #include "empathy-gsettings.h"
 #include "empathy-images.h"
 #include "empathy-ui-utils.h"
@@ -1011,7 +1011,7 @@ avatar_chooser_clicked_cb (GtkWidget *button,
   GtkFileFilter *filter;
 #ifdef HAVE_CHEESE
   GtkWidget *picture_button;
-  EmpathyCameraMonitor *monitor;
+  TpawCameraMonitor *monitor;
 #endif
 
   if (self->priv->chooser_dialog != NULL)
@@ -1032,7 +1032,7 @@ avatar_chooser_clicked_cb (GtkWidget *button,
       _("Take a picture..."), EMPATHY_AVATAR_CHOOSER_RESPONSE_WEBCAM);
 
   /* Button is sensitive only if there is one camera connected */
-  monitor = empathy_camera_monitor_dup_singleton ();
+  monitor = tpaw_camera_monitor_dup_singleton ();
 
   g_object_set_data_full (G_OBJECT (picture_button),
       "monitor", monitor, g_object_unref);
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 51b954819..9d3e91d04 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -24,10 +24,10 @@
 #include "empathy-individual-menu.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
 
 #include "empathy-account-selector-dialog.h"
 #include "empathy-call-utils.h"
-#include "empathy-camera-monitor.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-gtk-enum-types.h"
 #include "empathy-images.h"
@@ -1411,7 +1411,7 @@ empathy_individual_video_call_menu_item_new (FolksIndividual *individual)
 {
   GtkWidget *item;
   GtkWidget *image;
-  EmpathyCameraMonitor *monitor;
+  TpawCameraMonitor *monitor;
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
@@ -1428,7 +1428,7 @@ empathy_individual_video_call_menu_item_new (FolksIndividual *individual)
   /* Only follow available cameras if the contact can do Video calls */
   if (gtk_widget_get_sensitive (item))
     {
-      monitor = empathy_camera_monitor_dup_singleton ();
+      monitor = tpaw_camera_monitor_dup_singleton ();
       g_object_set_data_full (G_OBJECT (item),
           "monitor", monitor, g_object_unref);
       g_object_bind_property (monitor, "available", item, "sensitive",
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 ();
 
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 7dda2f9e8..d96d0bb5b 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -22,9 +22,9 @@
 #include "empathy-new-call-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
 
 #include "empathy-call-utils.h"
-#include "empathy-camera-monitor.h"
 #include "empathy-contact-chooser.h"
 #include "empathy-images.h"
 #include "empathy-ui-utils.h"
@@ -43,7 +43,7 @@ struct _EmpathyNewCallDialogPriv {
   GtkWidget *button_audio;
   GtkWidget *button_video;
 
-  EmpathyCameraMonitor *monitor;
+  TpawCameraMonitor *monitor;
 };
 
 /* Re-use the accept and ok Gtk response so we are sure they won't be used
@@ -182,7 +182,7 @@ empathy_new_call_dialog_init (EmpathyNewCallDialog *self)
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_NEW_CALL_DIALOG, EmpathyNewCallDialogPriv);
 
-  self->priv->monitor = empathy_camera_monitor_dup_singleton ();
+  self->priv->monitor = tpaw_camera_monitor_dup_singleton ();
 
   content = gtk_dialog_get_content_area (GTK_DIALOG (self));