Center the 'smiley images' inside the menu items

[empathy.git] / libempathy-gtk / empathy-new-call-dialog.c

diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index c8538b5cf9743dcde1726a3340c7e1dbceec5dbd..e981be279e02a009e17e3c030d3b16e6c680d8b1 100644 (file)
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -18,30 +18,20 @@
  * Authors: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
+#include "config.h"
+#include "empathy-new-call-dialog.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
+#include "empathy-call-utils.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
-
-#include "empathy-new-call-dialog.h"
-#include "empathy-account-chooser.h"
-#include "empathy-call-utils.h"
+#include "empathy-debug.h"
 
 static EmpathyNewCallDialog *dialog_singleton = NULL;
 
@@ -53,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
@@ -94,7 +84,7 @@ empathy_new_call_dialog_response (GtkDialog *dialog,
   g_assert (contact != NULL);
 
   empathy_call_new_with_streams (empathy_contact_get_id (contact),
-      empathy_contact_get_account (contact), TRUE,
+      empathy_contact_get_account (contact),
       response_id == RESPONSE_VIDEO, empathy_get_current_action_time ());
 
   g_object_unref (individual);
@@ -192,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));