Merge branch 'gnome-3-8'

[empathy.git] / src / empathy-import-dialog.c

diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index a16d3a6fb8195b3d3a415379e39ef8a15de34f31..5e6fa8d55d35499d22215f79fc032782f63dbf42 100644 (file)
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -20,22 +20,16 @@
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
+#include "empathy-import-dialog.h"
 
-#include <glib.h>
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
-
-#include "empathy-import-dialog.h"
-#include "empathy-import-pidgin.h"
 #include "empathy-import-widget.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-debug.h"
 
 enum {
   PROP_PARENT = 1,
@@ -66,13 +60,15 @@ import_dialog_add_import_widget (EmpathyImportDialog *self)
 
   iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_ALL, priv->cms);
   widget = empathy_import_widget_get_widget (iw);
-  gtk_box_pack_start (GTK_BOX (area), widget, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (area), widget, TRUE, TRUE, 0);
   gtk_widget_show (widget);
 
   priv->iw = iw;
 
-  gtk_dialog_add_buttons (GTK_DIALOG (self), GTK_STOCK_CANCEL,
-      GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+  gtk_dialog_add_buttons (GTK_DIALOG (self),
+      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+      _("_Import"), GTK_RESPONSE_OK,
+      NULL);
 }
 
 static void