diff options
author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2008-10-17 20:47:48 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-10-17 20:47:48 +0800 |
commit | 34155dce06da98803049b7bea34c3d4501a479c4 (patch) | |
tree | d7d1807021859b89dff9a880d0610019ef5da03a /src/empathy-import-dialog.c | |
parent | 53b4129ff7bc11c8f3f2c2a608778840c1e9ba8a (diff) | |
download | gsoc2013-empathy-34155dce06da98803049b7bea34c3d4501a479c4.tar gsoc2013-empathy-34155dce06da98803049b7bea34c3d4501a479c4.tar.gz gsoc2013-empathy-34155dce06da98803049b7bea34c3d4501a479c4.tar.bz2 gsoc2013-empathy-34155dce06da98803049b7bea34c3d4501a479c4.tar.lz gsoc2013-empathy-34155dce06da98803049b7bea34c3d4501a479c4.tar.xz gsoc2013-empathy-34155dce06da98803049b7bea34c3d4501a479c4.tar.zst gsoc2013-empathy-34155dce06da98803049b7bea34c3d4501a479c4.zip |
Removed empathy_import_dialog_accounts_to_import to stop the accounts being parsed twice. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1630
Diffstat (limited to 'src/empathy-import-dialog.c')
-rw-r--r-- | src/empathy-import-dialog.c | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index 546109d87..35d77e8d5 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -416,21 +416,6 @@ FILENAME: return accounts; } -gboolean -empathy_import_dialog_accounts_to_import (void) -{ - GList *list; - gboolean out; - - list = import_dialog_pidgin_load (); - - out = (g_list_length (list) > 0); - - g_list_free (list); - - return out; -} - static gboolean import_dialog_tree_model_foreach (GtkTreeModel *model, GtkTreePath *path, @@ -669,7 +654,8 @@ import_dialog_set_up_account_list (EmpathyImportDialog *dialog) } void -empathy_import_dialog_show (GtkWindow *parent) +empathy_import_dialog_show (GtkWindow *parent, + gboolean warning) { static EmpathyImportDialog *dialog = NULL; GladeXML *glade; @@ -689,13 +675,19 @@ empathy_import_dialog_show (GtkWindow *parent) { GtkWidget *message; - message = gtk_message_dialog_new (parent, - GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, - _("No accounts to import could be found. Empathy currently only " - "supports importing accounts from Pidgin.")); + if (warning) + { + message = gtk_message_dialog_new (parent, + GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("No accounts to import could be found. Empathy currently only " + "supports importing accounts from Pidgin.")); + + gtk_dialog_run (GTK_DIALOG (message)); + gtk_widget_destroy (message); + } + else + DEBUG ("No accounts to import; closing dialog silently."); - gtk_dialog_run (GTK_DIALOG (message)); - gtk_widget_destroy (message); import_dialog_free (dialog); dialog = NULL; return; |