Merge remote-tracking branch 'jonny/ft'

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

diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 4866b81c5beb1e691753f2eaeb4aca899b880ec3..77d11298f3de3c7648ff9d6fcc6351bf4e1d697b 100644 (file)
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -22,11 +22,9 @@
 
 #include <config.h>
 
-#include <string.h>
-
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <telepathy-glib/util.h>
 
@@ -37,8 +35,6 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-account-manager.h>
-#include <libempathy/empathy-connection-managers.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 enum {
@@ -57,46 +53,6 @@ typedef struct {
 G_DEFINE_TYPE (EmpathyImportDialog, empathy_import_dialog, GTK_TYPE_DIALOG)
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyImportDialog)
 
-EmpathyImportAccountData *
-empathy_import_account_data_new (const gchar *source)
-{
-  EmpathyImportAccountData *data;
-
-  g_return_val_if_fail (!EMP_STR_EMPTY (source), NULL);
-
-  data = g_slice_new0 (EmpathyImportAccountData);
-  data->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
-    (GDestroyNotify) tp_g_value_slice_free);
-  data->source = g_strdup (source);
-  data->protocol = NULL;
-  data->connection_manager = NULL;
-
-  return data;
-}
-
-void
-empathy_import_account_data_free (EmpathyImportAccountData *data)
-{
-  if (data == NULL)
-    return;
-  if (data->protocol != NULL)
-    g_free (data->protocol);
-  if (data->connection_manager != NULL)
-    g_free (data->connection_manager);
-  if (data->settings != NULL)
-    g_hash_table_destroy (data->settings);
-  if (data->source != NULL)
-    g_free (data->source);
-
-  g_slice_free (EmpathyImportAccountData, data);
-}
-
-gboolean
-empathy_import_dialog_accounts_to_import (void)
-{
-  return empathy_import_pidgin_accounts_to_import ();
-}
-
 static void
 import_dialog_add_import_widget (EmpathyImportDialog *self)
 {
@@ -105,14 +61,14 @@ import_dialog_add_import_widget (EmpathyImportDialog *self)
   GtkWidget *widget, *area;
 
   area = gtk_dialog_get_content_area (GTK_DIALOG (self));
-  
-  iw = empathy_import_widget_new ();
+
+  iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_ALL);
   widget = empathy_import_widget_get_widget (iw);
   gtk_box_pack_start (GTK_BOX (area), widget, FALSE, FALSE, 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);
 }
@@ -122,8 +78,8 @@ import_dialog_show_warning_message (EmpathyImportDialog *self)
 {
   GtkWidget *hbox, *vbox, *w;
 
-  vbox = gtk_vbox_new (FALSE, 12);
-  hbox = gtk_hbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 
   w = gtk_label_new (_("No accounts to import could be found. Empathy "
           "currently only supports importing accounts from Pidgin."));
@@ -211,7 +167,7 @@ do_constructed (GObject *obj)
   EmpathyImportDialogPriv *priv = GET_PRIV (self);
   gboolean have_accounts;
 
-  have_accounts = empathy_import_dialog_accounts_to_import ();
+  have_accounts = empathy_import_accounts_to_import ();
 
   if (!have_accounts)
     {
@@ -242,7 +198,6 @@ empathy_import_dialog_init (EmpathyImportDialog *self)
   gtk_container_set_border_width (GTK_CONTAINER (self), 5);
   gtk_window_set_title (GTK_WINDOW (self), _("Import Accounts"));
   gtk_window_set_modal (GTK_WINDOW (self), TRUE);
-  gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 }
 
 static void