** Fix for bug #256899 by Chaya

2007-11-22  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #256899 by Chaya

	* mail-config.glade:
	* em-account-prefs.h: (struct _EMAccountPrefs):
	* em-account-prefs.c: (account_delete_clicked),
	(account_able_clicked), (account_able_toggled),
	(account_cursor_change), (em_account_prefs_construct):
	Remove "Disable/Enable" button from Mail Accounts preferences.


svn path=/trunk/; revision=34562

4 files changed, 11 insertions, 52 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e32c4959fc..6f53b7da30 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-22  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #256899 by Chaya
+
+	* mail-config.glade:
+	* em-account-prefs.h: (struct _EMAccountPrefs):
+	* em-account-prefs.c: (account_delete_clicked),
+	(account_able_clicked), (account_able_toggled),
+	(account_cursor_change), (em_account_prefs_construct):
+	Remove "Disable/Enable" button from Mail Accounts preferences.
+
 2007-11-20  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #480514
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index dc9f71aaf4..2558e733bd 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -270,7 +270,6 @@ account_delete_clicked (GtkButton *button, gpointer user_data)
 			gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_edit), FALSE);
 			gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_delete), FALSE);
 			gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_default), FALSE);
-			gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_able), FALSE);
 		}
 	}
 }
@@ -317,29 +316,6 @@ account_able_changed(EAccount *account)
 }
 
 static void
-account_able_clicked (GtkButton *button, gpointer user_data)
-{
-	EMAccountPrefs *prefs = user_data;
-	GtkTreeSelection *selection;
-	EAccount *account;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	selection = gtk_tree_view_get_selection (prefs->table);
-	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-		gtk_tree_model_get (model, &iter, 3, &account, -1);
-		account->enabled = !account->enabled;
-		gtk_list_store_set ((GtkListStore *) model, &iter, 0, account->enabled, -1);
-
-		gtk_button_set_label (prefs->mail_able, account->enabled ? _("Di_sable") : _("E_nable"));
-
-		/* let the rest of the application know it changed */
-		e_account_list_change (mail_config_get_accounts(), account);
-		account_able_changed (account);
-	}
-}
-
-static void
 account_able_toggled (GtkCellRendererToggle *renderer, char *arg1, gpointer user_data)
 {
 	EMAccountPrefs *prefs = user_data;
@@ -375,9 +351,6 @@ account_able_toggled (GtkCellRendererToggle *renderer, char *arg1, gpointer user
 		account_able_changed (account);
 		gtk_list_store_set ((GtkListStore *) model, &iter, 0, account->enabled, -1);
 
-		if (gtk_tree_selection_iter_is_selected (selection, &iter))
-			gtk_button_set_label (prefs->mail_able, account->enabled ? _("Di_sable") : _("E_nable"));
-
 		/* let the rest of the application know it changed */
 	}
 
@@ -408,10 +381,6 @@ account_cursor_change (GtkTreeSelection *selection, EMAccountPrefs *prefs)
 		if (state) {
 			gtk_tree_model_get (model, &iter, 3, &account, -1);
 			url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
-			if (account->source && account->enabled)
-				gtk_button_set_label (prefs->mail_able, _("Di_sable"));
-			else
-				gtk_button_set_label (prefs->mail_able, _("E_nable"));
 		} else {
 			gtk_widget_grab_focus (GTK_WIDGET (prefs->mail_add));
 		}
@@ -429,8 +398,6 @@ account_cursor_change (GtkTreeSelection *selection, EMAccountPrefs *prefs)
 		gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_default), FALSE);
 	else
 		gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_default), state);
-
-	gtk_widget_set_sensitive (GTK_WIDGET (prefs->mail_able), state);
 }
 
 static void
@@ -597,9 +564,6 @@ em_account_prefs_construct (EMAccountPrefs *prefs)
 	prefs->mail_default = GTK_BUTTON (glade_xml_get_widget (gui, "cmdAccountDefault"));
 	g_signal_connect (prefs->mail_default, "clicked", G_CALLBACK (account_default_clicked), prefs);
 
-	prefs->mail_able = GTK_BUTTON (glade_xml_get_widget (gui, "cmdAccountAble"));
-	g_signal_connect (prefs->mail_able, "clicked", G_CALLBACK (account_able_clicked), prefs);
-
 	g_signal_connect (gtk_tree_view_get_selection (prefs->table),
 			  "changed", G_CALLBACK (account_cursor_change), prefs);
 	g_signal_connect (prefs->table, "row-activated", G_CALLBACK (account_double_click), prefs);
diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h
index e3fc4c65e4..57d71fcfb9 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -67,7 +67,6 @@ struct _EMAccountPrefs {
 	GtkButton *mail_edit;
 	GtkButton *mail_delete;
 	GtkButton *mail_default;
-	GtkButton *mail_able;
 
 	guint destroyed : 1;
 	guint changed : 1;
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index ab14af42e2..65bcf786e5 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -4504,21 +4504,6 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 		  <property name="focus_on_click">True</property>
 		</widget>
 	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="cmdAccountAble">
-		  <property name="width_request">89</property>
-		  <property name="height_request">36</property>
-		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">E_nable</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>