From fd93a2dd527de9acb39746d109e218d9215ba4e2 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 9 Jul 2007 16:37:50 +0000 Subject: Copy the lock icons from g-i-t 2.16 into epiphany, since the new ones in 2007-07-09 Christian Persch * configure.ac: * data/icons/16x16/status/Makefile.am: * data/icons/24x24/status/Makefile.am: * data/icons/48x48/Makefile.am: * data/icons/48x48/status/Makefile.am: * data/icons/Makefile.am: * lib/ephy-stock-icons.c: (ephy_stock_icons_init): * lib/ephy-stock-icons.h: Copy the lock icons from g-i-t 2.16 into epiphany, since the new ones in g-i-t are broken (see bug #348350 comment 93 ff). svn path=/trunk/; revision=7119 --- lib/ephy-stock-icons.c | 8 ++++---- lib/ephy-stock-icons.h | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index 37f931832..481d8ab39 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -44,9 +44,6 @@ ephy_stock_icons_init (void) STOCK_SEND_MAIL, STOCK_ADD_BOOKMARK, STOCK_PRINT_SETUP, - STOCK_LOCK_INSECURE, - STOCK_LOCK_SECURE, - STOCK_LOCK_BROKEN, }; static const GtkStockItem items[] = @@ -56,7 +53,10 @@ ephy_stock_icons_init (void) { EPHY_STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL }, { EPHY_STOCK_BOOKMARKS, N_("Bookmarks"), 0, 0, NULL }, { EPHY_STOCK_ENTRY, N_("Address Entry"), 0, 0, NULL }, - { EPHY_STOCK_DOWNLOAD, N_("_Download"), 0, 0, NULL } + { EPHY_STOCK_DOWNLOAD, N_("_Download"), 0, 0, NULL }, + { STOCK_LOCK_INSECURE }, + { STOCK_LOCK_SECURE }, + { STOCK_LOCK_BROKEN } }; factory = gtk_icon_factory_new (); diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 133a92e26..4dc3daa89 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -32,6 +32,9 @@ G_BEGIN_DECLS #define EPHY_STOCK_BOOKMARKS "bookmark-view" #define EPHY_STOCK_ENTRY "location-entry" #define EPHY_STOCK_DOWNLOAD "download" +#define STOCK_LOCK_INSECURE "lock-insecure" +#define STOCK_LOCK_SECURE "lock-secure" +#define STOCK_LOCK_BROKEN "lock-broken" /* Named icons defined in fd.o Icon Naming Spec */ #define STOCK_NEW_TAB "tab-new" @@ -40,11 +43,6 @@ G_BEGIN_DECLS #define STOCK_ADD_BOOKMARK "bookmark-new" #define STOCK_PRINT_SETUP "document-page-setup" -/* Deprecated named icons from g-i-t */ -#define STOCK_LOCK_INSECURE "stock_lock-open" -#define STOCK_LOCK_SECURE "stock_lock" -#define STOCK_LOCK_BROKEN "stock_lock-broken" - void ephy_stock_icons_init (void); G_END_DECLS -- cgit