empathy r1626 - trunk/src

[xclaesse svn gnome org]

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

Log:
Ask whether to import if there are accounts to import on loading the account editor, but only once. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

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

Modified: trunk/src/empathy-accounts-dialog.c
==============================================================================
--- trunk/src/empathy-accounts-dialog.c	(original)
+++ trunk/src/empathy-accounts-dialog.c	Fri Oct 17 12:47:35 2008
@@ -44,6 +44,7 @@
 #include <libempathy-gtk/empathy-account-widget.h>
 #include <libempathy-gtk/empathy-account-widget-irc.h>
 #include <libempathy-gtk/empathy-account-widget-sip.h>
+#include <libempathy-gtk/empathy-conf.h>
 
 #include "empathy-accounts-dialog.h"
 #include "empathy-import-dialog.h"
@@ -1020,6 +1021,36 @@
 }
 
 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)
 {
@@ -1177,6 +1208,9 @@
 
 	gtk_widget_show (dialog->window);
 
+	if (empathy_import_dialog_accounts_to_import ())
+		accounts_dialog_accounts_to_import (dialog);
+
 	return dialog->window;
 }