Updating branch refs/heads/master
to 1e49e9f95c6420364e47d8db9157a2a39a78130f (commit)
from 2cf3c2f5b00f5694cc308d54c31857ddfbc77d8e (commit)
commit 1e49e9f95c6420364e47d8db9157a2a39a78130f
Author: Christian Dywan <[email protected]>
Date: Tue Oct 5 21:36:48 2010 +0200
Don't use a custom stock icon for Cookie Manager
Due to the change of the stock icon names in GTK+ 2.22 the
stock item trick doesn't work anymore. Using the authentication
icon directly is good enough.
extensions/cookie-manager/cookie-manager-page.c | 2 +-
extensions/cookie-manager/main.c | 23 +----------------------
2 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/extensions/cookie-manager/cookie-manager-page.c
b/extensions/cookie-manager/cookie-manager-page.c
index a67d7df..b6ab1c5 100644
--- a/extensions/cookie-manager/cookie-manager-page.c
+++ b/extensions/cookie-manager/cookie-manager-page.c
@@ -85,7 +85,7 @@ static const gchar
*cookie_manager_page_get_label(MidoriViewable *viewable)
static const gchar *cookie_manager_page_get_stock_id(MidoriViewable *viewable)
{
- return STOCK_COOKIE_MANAGER;
+ return GTK_STOCK_DIALOG_AUTHENTICATION;
}
diff --git a/extensions/cookie-manager/main.c b/extensions/cookie-manager/main.c
index 39d058e..81391db 100644
--- a/extensions/cookie-manager/main.c
+++ b/extensions/cookie-manager/main.c
@@ -31,28 +31,7 @@ static void cm_activate_cb(MidoriExtension *extension,
MidoriApp *app, gpointer
MidoriExtension *extension_init(void)
{
- MidoriExtension *extension;
- GtkIconFactory *factory;
- GtkIconSource *icon_source;
- GtkIconSet *icon_set;
- static GtkStockItem items[] =
- {
- { STOCK_COOKIE_MANAGER, N_("_Cookie Manager"), 0, 0, NULL }
- };
-
- factory = gtk_icon_factory_new();
- gtk_stock_add(items, G_N_ELEMENTS(items));
- icon_set = gtk_icon_set_new();
- icon_source = gtk_icon_source_new();
- gtk_icon_source_set_icon_name(icon_source,
GTK_STOCK_DIALOG_AUTHENTICATION);
- gtk_icon_set_add_source(icon_set, icon_source);
- gtk_icon_source_free(icon_source);
- gtk_icon_factory_add(factory, STOCK_COOKIE_MANAGER, icon_set);
- gtk_icon_set_unref(icon_set);
- gtk_icon_factory_add_default(factory);
- g_object_unref(factory);
-
- extension = g_object_new(MIDORI_TYPE_EXTENSION,
+ MidoriExtension *extension = g_object_new(MIDORI_TYPE_EXTENSION,
"name", _("Cookie Manager"),
"description", _("List, view and delete cookies"),
"version", "0.2",
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
