Copy the lock icons from g-i-t 2.16 into epiphany, since the new ones in

2007-07-09  Christian Persch  <chpe@gnome.org>

	* 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

21 files changed, 49 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index f1af8f727..1d63ba1c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-09  Christian Persch  <chpe@gnome.org>
+
+	* 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).
+
 2007-07-03  Jaap Haitsma  <jaap@haitsma.org>
 
         * lib/egg/update-toolbareditor-from-libegg: removed
diff --git a/configure.ac b/configure.ac
index 0a7b78398..3e7668997 100644
--- a/configure.ac
+++ b/configure.ac
@@ -674,6 +674,8 @@ data/icons/24x24/status/Makefile
 data/icons/32x32/Makefile
 data/icons/32x32/actions/Makefile
 data/icons/32x32/status/Makefile
+data/icons/48x48/Makefile
+data/icons/48x48/status/Makefile
 data/icons/scalable/Makefile
 data/icons/scalable/actions/Makefile
 data/icons/scalable/status/Makefile
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index cd87d487c..c0083e54f 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -5,6 +5,10 @@ context = status
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
+	lock-broken.png		\
+        lock-insecure.png	\
+	lock-secure.png		\
+	lock-secure-checked.png	\
 	popup-hidden.png
 
 noinst_DATA = \
diff --git a/data/icons/16x16/status/lock-broken.png b/data/icons/16x16/status/lock-broken.png
new file mode 100644
index 000000000..b0268917d
--- /dev/null
+++ b/data/icons/16x16/status/lock-broken.png
diff --git a/data/icons/16x16/status/lock-insecure.png b/data/icons/16x16/status/lock-insecure.png
new file mode 100644
index 000000000..5bc6cd62b
--- /dev/null
+++ b/data/icons/16x16/status/lock-insecure.png
diff --git a/data/icons/16x16/status/lock-secure-checked.png b/data/icons/16x16/status/lock-secure-checked.png
new file mode 100644
index 000000000..437f79750
--- /dev/null
+++ b/data/icons/16x16/status/lock-secure-checked.png
diff --git a/data/icons/16x16/status/lock-secure.png b/data/icons/16x16/status/lock-secure.png
new file mode 100644
index 000000000..33091eb85
--- /dev/null
+++ b/data/icons/16x16/status/lock-secure.png
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
index 03bb8d76e..cad15b17f 100644
--- a/data/icons/24x24/status/Makefile.am
+++ b/data/icons/24x24/status/Makefile.am
@@ -4,6 +4,10 @@ context = status
 
 iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
+	lock-broken.png		\
+        lock-insecure.png	\
+	lock-secure.png		\
+	lock-secure-checked.png	\
 	popup-hidden.png
 
 EXTRA_DIST = \
diff --git a/data/icons/24x24/status/lock-broken.png b/data/icons/24x24/status/lock-broken.png
new file mode 100644
index 000000000..097cd417d
--- /dev/null
+++ b/data/icons/24x24/status/lock-broken.png
diff --git a/data/icons/24x24/status/lock-insecure.png b/data/icons/24x24/status/lock-insecure.png
new file mode 100644
index 000000000..f2e05a425
--- /dev/null
+++ b/data/icons/24x24/status/lock-insecure.png
diff --git a/data/icons/24x24/status/lock-secure-checked.png b/data/icons/24x24/status/lock-secure-checked.png
new file mode 100644
index 000000000..92b7d1c75
--- /dev/null
+++ b/data/icons/24x24/status/lock-secure-checked.png
diff --git a/data/icons/24x24/status/lock-secure.png b/data/icons/24x24/status/lock-secure.png
new file mode 100644
index 000000000..41d2ba9ac
--- /dev/null
+++ b/data/icons/24x24/status/lock-secure.png
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
new file mode 100644
index 000000000..c2b486dae
--- /dev/null
+++ b/data/icons/48x48/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = \
+	status
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
new file mode 100644
index 000000000..147e7cfcf
--- /dev/null
+++ b/data/icons/48x48/status/Makefile.am
@@ -0,0 +1,15 @@
+themedir = $(pkgdatadir)/icons/hicolor
+size = 48x48
+context = status
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	lock-broken.png		\
+        lock-insecure.png	\
+	lock-secure.png		\
+	lock-secure-checked.png
+
+EXTRA_DIST = \
+	$(icons_DATA)
+
diff --git a/data/icons/48x48/status/lock-broken.png b/data/icons/48x48/status/lock-broken.png
new file mode 100644
index 000000000..4c9f14569
--- /dev/null
+++ b/data/icons/48x48/status/lock-broken.png
diff --git a/data/icons/48x48/status/lock-insecure.png b/data/icons/48x48/status/lock-insecure.png
new file mode 100644
index 000000000..1f0190541
--- /dev/null
+++ b/data/icons/48x48/status/lock-insecure.png
diff --git a/data/icons/48x48/status/lock-secure-checked.png b/data/icons/48x48/status/lock-secure-checked.png
new file mode 100644
index 000000000..246e615ac
--- /dev/null
+++ b/data/icons/48x48/status/lock-secure-checked.png
diff --git a/data/icons/48x48/status/lock-secure.png b/data/icons/48x48/status/lock-secure.png
new file mode 100644
index 000000000..f24ae3a60
--- /dev/null
+++ b/data/icons/48x48/status/lock-secure.png
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index cd6b881bc..ce006dcd4 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -3,4 +3,5 @@ SUBDIRS = \
 	22x22	\
 	24x24	\
 	32x32	\
+	48x48	\
 	scalable
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