talons

commit 2328d40cf23a5a6c50417bc266e42c5b2b3a90bc
parent 455254fe241f14694c85d56c6c7c3e931b8da30f
Author: Charles Lehner <cel@celehner.com>
Date:   Wed, 15 Jul 2015 21:57:32 -0400

ManageSieve: remove Activate button

A filter can be activated by selecting its radio button in the list,
so the activate button is not needed.

Bug #3469 progress

Diffstat:
M
src/plugins/managesieve/sieve_manager.c
 | 
21
+--------------------

1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
@@ -67,7 +67,6 @@ typedef struct {
 } CommandDataGetScript;
 
 static void account_changed(GtkWidget *widget, SieveManagerPage *page);
-static void filter_activate(GtkWidget *widget, SieveManagerPage *page);
 void sieve_manager_close(GtkWidget *widget, SieveManagerPage *page);
 static void filter_set_active(SieveManagerPage *page, gchar *filter_name);
 gboolean filter_find_by_name (GtkTreeModel *model, GtkTreeIter *iter,
@@ -290,17 +289,6 @@ static void sieve_set_active_filter(SieveManagerPage *page, gchar *filter_name)
 			(sieve_session_data_cb_fn)filter_activated, cmd_data);
 }
 
-/*
- * activate button clicked
- */
-static void filter_activate(GtkWidget *widget, SieveManagerPage *page)
-{
-	gchar *filter_name = filters_list_get_selected_filter(page->filters_list);
-	if (!filter_name)
-		return;
-	sieve_set_active_filter(page, filter_name);
-}
-
 static void filter_deleted(SieveSession *session, const gchar *err_msg,
 		CommandDataName *cmd_data)
 {
@@ -666,7 +654,7 @@ static SieveManagerPage *sieve_manager_page_new()
 
 	if (!geometry.min_height) {
 		geometry.min_width = 350;
-		geometry.min_height = 300;
+		geometry.min_height = 280;
 	}
 
 	gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
@@ -764,13 +752,6 @@ static SieveManagerPage *sieve_manager_page_new()
 	g_signal_connect (G_OBJECT(btn), "clicked",
 			G_CALLBACK (filter_rename), page);
 
-
-	/* activate */
-	btn = gtk_button_new_with_label("Activate");
-	gtk_box_pack_start (GTK_BOX (vbox_buttons), btn, FALSE, FALSE, 4);
-	g_signal_connect (G_OBJECT(btn), "clicked",
-			G_CALLBACK (filter_activate), page);
-
 	/* refresh */
 	btn = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
 	gtk_box_pack_start (GTK_BOX (vbox_allbuttons), btn, FALSE, FALSE, 4);