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-new-call-dialog.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-new-call-dialog.c')
-rw-r--r-- | libempathy-gtk/empathy-new-call-dialog.c | 6 |
1 files changed, 3 insertions, 3 deletions
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)); |