Use Yes and No for enabling and disabling addons

Incidentally this implicitly corrects the Clear History
dialog which used to display Enable and Disable buttons.

diff --git a/midori/main.c b/midori/main.c
index 043f86ec43c18e34692f79cfec8af2ba11fb4efc..e15adf848a65610704ad6d326f4d111ea791d878 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -72,8 +72,6 @@ stock_items_init (void)
         { STOCK_BOOKMARKS,      N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY },
         { STOCK_BOOKMARK_ADD,   N_("_Add Bookmark"), 0, 0, GTK_STOCK_ADD },
         { STOCK_CONSOLE,        N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING },
-        { STOCK_DISABLE,        N_("_Disable"), 0, 0, GTK_STOCK_NO },
-        { STOCK_ENABLE,         N_("_Enable"), 0, 0, GTK_STOCK_YES },
         { STOCK_EXTENSIONS,     N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT },
         { STOCK_HISTORY,        N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING },
         { STOCK_HOMEPAGE,       N_("_Homepage"), 0, 0, GTK_STOCK_HOME },

diff --git a/midori/midori-addons.c b/midori/midori-addons.c
index 38a6e9fae48408ea457d68cbd7d669178dc43151..c94ed1a140527fa0048486f76d3efa177472e929 100644 (file)
--- a/midori/midori-addons.c
+++ b/midori/midori-addons.c
@@ -1039,7 +1039,8 @@ midori_addons_get_toolbar (MidoriAddons* addons)
         gtk_widget_show (GTK_WIDGET (toolitem));
 
         /* enable button */
-        toolitem = gtk_tool_button_new_from_stock (STOCK_ENABLE);
+        toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_YES);
+        gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Enable"));
         g_signal_connect (toolitem, "clicked",
             G_CALLBACK (midori_addons_button_status_clicked_cb), addons);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
@@ -1047,7 +1048,8 @@ midori_addons_get_toolbar (MidoriAddons* addons)
         gtk_widget_show (GTK_WIDGET (toolitem));
 
         /* disable button */
-        toolitem = gtk_tool_button_new_from_stock (STOCK_DISABLE);
+        toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_NO);
+        gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Disable"));
         g_signal_connect (toolitem, "clicked",
             G_CALLBACK (midori_addons_button_status_clicked_cb), addons);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);

diff --git a/midori/midori-stock.h b/midori/midori-stock.h
index 04db4cbe41450712e05e69c0edb5aa655162310e..305e0cca3521262477436b1f1cd3dfee59f1175f 100644 (file)
--- a/midori/midori-stock.h
+++ b/midori/midori-stock.h
@@ -22,8 +22,6 @@
 #define STOCK_BOOKMARK           "stock_bookmark"
 #define STOCK_BOOKMARKS          "vcard"
 #define STOCK_CONSOLE            "terminal"
-#define STOCK_DISABLE            GTK_STOCK_NO
-#define STOCK_ENABLE             GTK_STOCK_YES
 #define STOCK_EXTENSION          "extension"
 #define STOCK_EXTENSIONS         "extension"
 #define STOCK_HISTORY            "document-open-recent"