Fix merge issues in EMAccountEditor.

3 files changed, 83 insertions, 63 deletions

diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 8237924e3c..c7e3218191 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -155,6 +155,18 @@ e_mail_shell_settings_init (EShell *shell)
 
 	e_shell_settings_install_property (
 		g_param_spec_boolean (
+			"mail-empty-junk-on-exit",
+			NULL,
+			NULL,
+			FALSE,
+			G_PARAM_READWRITE));
+
+	e_shell_settings_bind_to_gconf (
+		shell_settings, "mail-empty-junk-on-exit",
+		"/apps/evolution/mail/junk/empty_on_exit");
+
+	e_shell_settings_install_property (
+		g_param_spec_boolean (
 			"mail-empty-trash-on-exit",
 			NULL,
 			NULL,
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index fa450dc2ee..6b550b1a55 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -602,81 +602,91 @@ charset_menu_init (EMMailerPrefs *prefs)
 }
 
 static void
-trash_days_activate (GtkWidget *item, EMMailerPrefs *prefs)
+trash_days_changed (GtkComboBox *combo_box,
+                    EMMailerPrefs *prefs)
 {
-	gint days;
+	gint index;
+
+	index = gtk_combo_box_get_active (combo_box);
+	g_return_if_fail (index >= 0);
+	g_return_if_fail (index < G_N_ELEMENTS (empty_trash_frequency));
 
-	days = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "days"));
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/trash/empty_on_exit_days", days, NULL);
+	gconf_client_set_int (
+		prefs->gconf,
+		"/apps/evolution/mail/trash/empty_on_exit_days",
+		empty_trash_frequency[index].days, NULL);
 }
 
 static void
-emmp_empty_trash_init (EMMailerPrefs *prefs)
+emmp_empty_trash_init (EMMailerPrefs *prefs,
+                       GtkComboBox *combo_box)
 {
-	gint locked, days, hist = 0, i;
-	GtkWidget *menu, *item;
+	gint days, hist = 0, ii;
+	GtkTreeModel *model;
 
-	days = gconf_client_get_int(prefs->gconf, "/apps/evolution/mail/trash/empty_on_exit_days", NULL);
-	menu = gtk_menu_new();
-	for (i = 0; i < G_N_ELEMENTS (empty_trash_frequency); i++) {
-		if (days >= empty_trash_frequency[i].days)
-			hist = i;
+	days = gconf_client_get_int (
+		prefs->gconf,
+		"/apps/evolution/mail/trash/empty_on_exit_days", NULL);
 
-		item = gtk_menu_item_new_with_label (_(empty_trash_frequency[i].label));
-		g_object_set_data ((GObject *) item, "days", GINT_TO_POINTER (empty_trash_frequency[i].days));
-		g_signal_connect (item, "activate", G_CALLBACK (trash_days_activate), prefs);
+	model = gtk_combo_box_get_model (combo_box);
+	gtk_list_store_clear (GTK_LIST_STORE (model));
 
-		gtk_widget_show (item);
-		gtk_menu_shell_append((GtkMenuShell *)menu, item);
+	for (ii = 0; ii < G_N_ELEMENTS (empty_trash_frequency); ii++) {
+		if (days >= empty_trash_frequency[ii].days)
+			hist = ii;
+		gtk_combo_box_append_text (
+			combo_box, gettext (empty_trash_frequency[ii].label));
 	}
 
-	gtk_widget_show(menu);
-	gtk_option_menu_set_menu((GtkOptionMenu *)prefs->empty_trash_days, menu);
-	gtk_option_menu_set_history((GtkOptionMenu *)prefs->empty_trash_days, hist);
+	g_signal_connect (
+		combo_box, "changed",
+		G_CALLBACK (trash_days_changed), prefs);
 
-	locked = !gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/trash/empty_on_exit_days", NULL);
-	gtk_widget_set_sensitive ((GtkWidget *) prefs->empty_trash_days, !locked);
+	gtk_combo_box_set_active (combo_box, hist);
 }
 
 static void
-junk_days_activate (GtkWidget *item, EMMailerPrefs *prefs)
+junk_days_changed (GtkComboBox *combo_box,
+                   EMMailerPrefs *prefs)
 {
-	gint days;
+	gint index;
+
+	index = gtk_combo_box_get_active (combo_box);
+	g_return_if_fail (index >= 0);
+	g_return_if_fail (index < G_N_ELEMENTS (empty_trash_frequency));
 
-	days = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "days"));
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/junk/empty_on_exit_days", days, NULL);
+	gconf_client_set_int (
+		prefs->gconf,
+		"/apps/evolution/mail/junk/empty_on_exit_days",
+		empty_trash_frequency[index].days, NULL);
 }
 
 static void
-emmp_empty_junk_init (EMMailerPrefs *prefs)
+emmp_empty_junk_init (EMMailerPrefs *prefs,
+                      GtkComboBox *combo_box)
 {
-	gint locked, days, hist = 0, i;
-	GtkWidget *menu, *item;
-
-	toggle_button_init (prefs, prefs->empty_junk, FALSE,
-			    "/apps/evolution/mail/junk/empty_on_exit",
-			    G_CALLBACK (toggle_button_toggled));
+	gint days, hist = 0, ii;
+	GtkTreeModel *model;
 
-	days = gconf_client_get_int(prefs->gconf, "/apps/evolution/mail/junk/empty_on_exit_days", NULL);
-	menu = gtk_menu_new();
-	for (i = 0; i < G_N_ELEMENTS (empty_trash_frequency); i++) {
-		if (days >= empty_trash_frequency[i].days)
-			hist = i;
+	days = gconf_client_get_int (
+		prefs->gconf,
+		"/apps/evolution/mail/junk/empty_on_exit_days", NULL);
 
-		item = gtk_menu_item_new_with_label (_(empty_trash_frequency[i].label));
-		g_object_set_data ((GObject *) item, "days", GINT_TO_POINTER (empty_trash_frequency[i].days));
-		g_signal_connect (item, "activate", G_CALLBACK (junk_days_activate), prefs);
+	model = gtk_combo_box_get_model (combo_box);
+	gtk_list_store_clear (GTK_LIST_STORE (model));
 
-		gtk_widget_show (item);
-		gtk_menu_shell_append((GtkMenuShell *)menu, item);
+	for (ii = 0; ii < G_N_ELEMENTS (empty_trash_frequency); ii++) {
+		if (days >= empty_trash_frequency[ii].days)
+			hist = ii;
+		gtk_combo_box_append_text (
+			combo_box, gettext (empty_trash_frequency[ii].label));
 	}
 
-	gtk_widget_show(menu);
-	gtk_option_menu_set_menu((GtkOptionMenu *)prefs->empty_junk_days, menu);
-	gtk_option_menu_set_history((GtkOptionMenu *)prefs->empty_junk_days, hist);
+	g_signal_connect (
+		combo_box, "changed",
+		G_CALLBACK (junk_days_changed), prefs);
 
-	locked = !gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/junk/empty_on_exit_days", NULL);
-	gtk_widget_set_sensitive ((GtkWidget *) prefs->empty_junk_days, !locked);
+	gtk_combo_box_set_active (combo_box, hist);
 }
 
 static void
@@ -961,11 +971,11 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		G_OBJECT (shell_settings), "mail-empty-trash-on-exit",
 		G_OBJECT (widget), "active");
 
-	prefs->empty_trash_days = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuEmptyTrashDays"));
+	widget = glade_xml_get_widget (gui, "comboboxEmptyTrashDays");
 	e_mutual_binding_new (
 		G_OBJECT (shell_settings), "mail-empty-trash-on-exit",
-		G_OBJECT (prefs->empty_trash_days), "sensitive");
-	emmp_empty_trash_init (prefs);
+		G_OBJECT (widget), "sensitive");
+	emmp_empty_trash_init (prefs, GTK_COMBO_BOX (widget));
 
 	widget = glade_xml_get_widget (gui, "chkConfirmExpunge");
 	e_mutual_binding_new (
@@ -1164,9 +1174,16 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		G_OBJECT (shell_settings), "mail-check-for-junk",
 		G_OBJECT (widget), "active");
 
-	prefs->empty_junk = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "junk_empty_check"));
-	prefs->empty_junk_days = GTK_OPTION_MENU (glade_xml_get_widget (gui, "junk_empty_combo"));
-	emmp_empty_junk_init (prefs);
+	widget = glade_xml_get_widget (gui, "junk_empty_check");
+	e_mutual_binding_new (
+		G_OBJECT (shell_settings), "mail-empty-junk-on-exit",
+		G_OBJECT (widget), "active");
+
+	widget = glade_xml_get_widget (gui, "junk_empty_combobox");
+	e_mutual_binding_new (
+		G_OBJECT (shell_settings), "mail-empty-junk-on-exit",
+		G_OBJECT (widget), "sensitive");
+	emmp_empty_junk_init (prefs, GTK_COMBO_BOX (widget));
 
 	prefs->default_junk_plugin = GTK_COMBO_BOX (glade_xml_get_widget (gui, "default_junk_plugin"));
 	prefs->plugin_status = GTK_LABEL (glade_xml_get_widget (gui, "plugin_status"));
diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h
index b33e620392..e35c2085ab 100644
--- a/modules/mail/em-mailer-prefs.h
+++ b/modules/mail/em-mailer-prefs.h
@@ -71,11 +71,6 @@ struct _EMMailerPrefs {
 	GtkSpinButton *timeout;
 	GtkOptionMenu *charset;
 
-	/* Deleting Mail */
-	GtkToggleButton *empty_trash;
-	GtkComboBox *empty_trash_days;
-	GtkToggleButton *confirm_expunge;
-
 	/* HTML Mail tab */
 	GtkFontButton *font_variable;
 	GtkFontButton *font_fixed;
@@ -103,10 +98,6 @@ struct _EMMailerPrefs {
 	GtkTreeView *header_list;
 	GtkListStore *header_list_store;
 
-	/* Junk prefs */
-	GtkToggleButton *empty_junk;
-	GtkComboBox *empty_junk_days;
-
 	GtkToggleButton *sa_local_tests_only;
 	GtkToggleButton *sa_use_daemon;
 	GtkComboBox *default_junk_plugin;