empathy r1639 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Oct 17 12:48:18 2008
New Revision: 1639
URL: http://svn.gnome.org/viewvc/empathy?rev=1639&view=rev

Log:
There is no reason for import_dialog_add_account to fail.

Modified:
   trunk/src/empathy-import-dialog.c

Modified: trunk/src/empathy-import-dialog.c
==============================================================================
--- trunk/src/empathy-import-dialog.c	(original)
+++ trunk/src/empathy-import-dialog.c	Fri Oct 17 12:48:18 2008
@@ -101,7 +101,6 @@
   GtkWidget *treeview;
   GtkWidget *button_ok;
   GtkWidget *button_cancel;
-  gboolean not_imported;
   GList *accounts;
 } EmpathyImportDialog;
 
@@ -127,7 +126,7 @@
 
 static void import_dialog_add_setting (GHashTable *settings,
     gchar *key, gpointer value, EmpathyImportSettingType  type);
-static gboolean import_dialog_add_account (gchar *protocol_name,
+static void import_dialog_add_account (gchar *protocol_name,
     GHashTable *settings);
 static void import_dialog_pidgin_parse_setting (gchar *protocol,
     xmlNodePtr setting, GHashTable *settings);
@@ -148,7 +147,7 @@
     g_hash_table_destroy (data->settings);
 }
 
-static gboolean
+static void
 import_dialog_add_account (AccountData *data)
 {
   McAccount *account;
@@ -199,8 +198,6 @@
 
   g_free (display_name);
   g_object_unref (account);
-
-  return TRUE;
 }
 
 static void
@@ -424,8 +421,7 @@
       -1);
 
   if (to_import)
-    if (!import_dialog_add_account (data))
-      dialog->not_imported = TRUE;
+    import_dialog_add_account (data);
 
   import_dialog_account_data_free (data);
   return FALSE;