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

[empathy.git] / libempathy-gtk / empathy-avatar-chooser.c

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 4c58a1aa58094aeae7338edd0dbe279d1a3cadb0..e145d3ffce377b733c5eb6819dbfa39f74e398ef 100644 (file)
--- 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 "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 */
 
 
 #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"
 #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;
   GtkFileFilter *filter;
 #ifdef HAVE_CHEESE
   GtkWidget *picture_button;

-  EmpathyCameraMonitor *monitor;
+  TpawCameraMonitor *monitor;

 #endif
 
   if (self->priv->chooser_dialog != NULL)
 #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 */
       _("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);
 
   g_object_set_data_full (G_OBJECT (picture_button),
       "monitor", monitor, g_object_unref);