accounts_dialog_button_import_clicked_cb (GtkWidget *button,
EmpathyAccountsDialog *dialog)
{
- empathy_import_dialog_show (GTK_WINDOW (dialog->window));
+ empathy_import_dialog_show (GTK_WINDOW (dialog->window), TRUE);
}
static void
}
}
-static void
-accounts_dialog_accounts_to_import (EmpathyAccountsDialog *dialog)
-{
- GtkWidget *message;
- gint response;
- gboolean ask;
-
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_IMPORT_ASKED, &ask);
-
- if (ask)
- return;
-
- empathy_conf_set_bool (empathy_conf_get (),
- EMPATHY_PREFS_IMPORT_ASKED, TRUE);
-
- message = gtk_message_dialog_new (GTK_WINDOW (dialog->window),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO,
- _("Do you want to import accounts"
- " from Pidgin?"));
-
- response = gtk_dialog_run (GTK_DIALOG (message));
- gtk_widget_destroy (message);
-
- if (response == GTK_RESPONSE_YES)
- empathy_import_dialog_show (GTK_WINDOW (dialog->window));
-}
-
static void
accounts_dialog_destroy_cb (GtkWidget *widget,
EmpathyAccountsDialog *dialog)
GladeXML *glade;
gchar *filename;
GList *accounts, *l;
+ gboolean import;
+
if (dialog) {
gtk_window_present (GTK_WINDOW (dialog->window));
gtk_widget_show (dialog->window);
- if (empathy_import_dialog_accounts_to_import ())
- accounts_dialog_accounts_to_import (dialog);
+ empathy_conf_get_bool (empathy_conf_get (),
+ EMPATHY_PREFS_IMPORT_ASKED, &import);
+
+ if (!import) {
+ empathy_conf_set_bool (empathy_conf_get (),
+ EMPATHY_PREFS_IMPORT_ASKED, TRUE);
+ empathy_import_dialog_show (GTK_WINDOW (dialog->window),
+ FALSE);
+ }
return dialog->window;
}
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,
}
void
-empathy_import_dialog_show (GtkWindow *parent)
+empathy_import_dialog_show (GtkWindow *parent,
+ gboolean warning)
{
static EmpathyImportDialog *dialog = NULL;
GladeXML *glade;
{
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;