Remove old stock icons

2006-12-08  Luca Ferretti <elle.uca@libero.it>

	* data/art/Makefile.am:
	* data/art/epiphany-bookmarks.png:
	* data/art/epiphany-download.png:
	* data/art/epiphany-entry.png:
	* data/art/epiphany-history.png:
	* data/art/epiphany-popup-hidden.png:
	* data/art/epiphany-popup-hidden.svg:

	Remove old stock icons

	* data/icons/16x16/actions/download.png:
	* data/icons/16x16/actions/epiphany-download.png:
	* data/icons/22x22/actions/download.png:
	* data/icons/22x22/actions/epiphany-download.png:
	* data/icons/24x24/actions/Makefile.am:
	* data/icons/24x24/actions/download.png:
	* data/icons/24x24/actions/epiphany-download.png:
	* data/icons/24x24/actions/location-entry.png:
	* data/icons/24x24/actions/web-bookmarks.png:
	* data/icons/24x24/actions/web-history.png:
	* data/icons/32x32/actions/download.png:
	* data/icons/32x32/actions/epiphany-download.png:
	* data/icons/scalable/actions/download.svg:
	* data/icons/scalable/actions/epiphany-download.svg:

	Move old stock icons here and rename "epiphany-download"
	to "download"

	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):

	Use gtk_icon_source_set_icon_name for EPHY_STOCK*

	* lib/ephy-stock-icons.h:

	Update named icons to installed icons.

	* src/ephy-main.c: (main):

	Call gtk_icon_theme_append_search_path to add custom Ephy
	directory for themed icons.

	This should complete the icon theme support to Epiphany.
	Of course there is still some work to do, as well as
	provide fresh icons at all sizes and define the names.

17 files changed, 67 insertions, 241 deletions

diff --git a/ChangeLog b/ChangeLog
index deed1a445..ba4bd4d5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2006-12-08  Luca Ferretti <elle.uca@libero.it>
+
+	* data/art/Makefile.am:
+	* data/art/epiphany-bookmarks.png:
+	* data/art/epiphany-download.png:
+	* data/art/epiphany-entry.png:
+	* data/art/epiphany-history.png:
+	* data/art/epiphany-popup-hidden.png:
+	* data/art/epiphany-popup-hidden.svg:
+
+	Remove old stock icons
+	
+	* data/icons/16x16/actions/download.png:
+	* data/icons/16x16/actions/epiphany-download.png:
+	* data/icons/22x22/actions/download.png:
+	* data/icons/22x22/actions/epiphany-download.png:
+	* data/icons/24x24/actions/Makefile.am:
+	* data/icons/24x24/actions/download.png:
+	* data/icons/24x24/actions/epiphany-download.png:
+	* data/icons/24x24/actions/location-entry.png:
+	* data/icons/24x24/actions/web-bookmarks.png:
+	* data/icons/24x24/actions/web-history.png:
+	* data/icons/32x32/actions/download.png:
+	* data/icons/32x32/actions/epiphany-download.png:
+	* data/icons/scalable/actions/download.svg:
+	* data/icons/scalable/actions/epiphany-download.svg:
+
+	Move old stock icons here and rename "epiphany-download"
+	to "download"
+
+	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
+
+	Use gtk_icon_source_set_icon_name for EPHY_STOCK*
+	
+	* lib/ephy-stock-icons.h:
+
+	Update named icons to installed icons.
+	
+	* src/ephy-main.c: (main):
+
+	Call gtk_icon_theme_append_search_path to add custom Ephy
+	directory for themed icons.
+
+	This should complete the icon theme support to Epiphany.
+	Of course there is still some work to do, as well as
+	provide fresh icons at all sizes and define the names.
+
 2006-12-08  Luca Ferretti  <elle.uca@libero.it>
 
 	* data/icons/.cvsignore:
diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index 1e4af4dc8..e2bcb8ddb 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -1,9 +1,4 @@
-art_DATA = \
-	epiphany-entry.png \
-	epiphany-download.png \
-	epiphany-history.png	\
-	epiphany-popup-hidden.png \
-	epiphany-bookmarks.png
+art_DATA = 
 
 appicon_DATA = epiphany-bookmarks.png
 appicondir = $(datadir)/icons/hicolor/48x48/apps
diff --git a/data/art/epiphany-download.png b/data/art/epiphany-download.png
deleted file mode 100644
index cf1945ca5..000000000
--- a/data/art/epiphany-download.png
+++ /dev/null
diff --git a/data/art/epiphany-popup-hidden.png b/data/art/epiphany-popup-hidden.png
deleted file mode 100644
index b990f90da..000000000
--- a/data/art/epiphany-popup-hidden.png
+++ /dev/null
diff --git a/data/art/epiphany-popup-hidden.svg b/data/art/epiphany-popup-hidden.svg
deleted file mode 100644
index 8e89f653b..000000000
--- a/data/art/epiphany-popup-hidden.svg
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-<svg
-   version="1.0"
-   x="0"
-   y="0"
-   width="528.2800pt"
-   height="490.8900pt"
-   id="svg602"
-   xml:space="preserve"
-   sodipodi:version="0.33"
-   sodipodi:docname="popup-blocker.svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xml="http://www.w3.org/XML/1998/namespace"
-   xmlns:xlink="http://www.w3.org/1999/xlink">
-  <sodipodi:namedview
-     id="base" />
-  <defs
-     id="defs604">
-    <linearGradient
-       id="linearGradient715">
-      <stop
-         style="stop-color:#990000;stop-opacity:1;"
-         offset="0"
-         id="stop716" />
-      <stop
-         style="stop-color:#df421e;stop-opacity:1;"
-         offset="1"
-         id="stop717" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient705">
-      <stop
-         style="stop-color:#00003a;stop-opacity:1;"
-         offset="0"
-         id="stop706" />
-      <stop
-         style="stop-color:#00008f;stop-opacity:1;"
-         offset="1"
-         id="stop707" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient702">
-      <stop
-         style="stop-color:#1782c2;stop-opacity:1;"
-         offset="0"
-         id="stop703" />
-      <stop
-         style="stop-color:#454fb7;stop-opacity:1;"
-         offset="1"
-         id="stop704" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient699">
-      <stop
-         style="stop-color:#4b6983;stop-opacity:1;"
-         offset="0"
-         id="stop700" />
-      <stop
-         style="stop-color:#7590ae;stop-opacity:1;"
-         offset="1"
-         id="stop701" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient695">
-      <stop
-         style="stop-color:#174d87;stop-opacity:1;"
-         offset="0"
-         id="stop696" />
-      <stop
-         style="stop-color:#454f8a;stop-opacity:1;"
-         offset="1"
-         id="stop697" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient685">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="0"
-         id="stop686" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop687" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient611">
-      <stop
-         style="stop-color:#b8b7b5;stop-opacity:1;"
-         offset="0"
-         id="stop612" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop613" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient607">
-      <stop
-         style="stop-color:#8f8f8f;stop-opacity:1;"
-         offset="0"
-         id="stop608" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop609" />
-    </linearGradient>
-    <linearGradient
-       x1="1.11229956"
-       y1="0.03124872"
-       x2="-0.18181817"
-       y2="0.69531250"
-       id="linearGradient610"
-       xlink:href="#linearGradient611" />
-    <linearGradient
-       x1="1.00444412"
-       y1="5.80643155e-2"
-       x2="2.7020219e-8"
-       y2="1.08387113"
-       id="linearGradient614"
-       xlink:href="#linearGradient705" />
-    <linearGradient
-       x1="-0.10190773"
-       y1="0.89680094"
-       x2="1.14012647"
-       y2="-0.21290262"
-       id="linearGradient684"
-       xlink:href="#linearGradient611" />
-    <radialGradient
-       id="radialGradient688"
-       xlink:href="#linearGradient715" />
-    <radialGradient
-       cx="1.22481334"
-       cy="0.05469547"
-       r="1.98268783"
-       fx="1.22481334"
-       fy="0.05469547"
-       id="radialGradient690"
-       xlink:href="#linearGradient611" />
-    <linearGradient
-       x1="0.99999976"
-       y1="0.21093579"
-       x2="0.99999988"
-       y2="0.22656254"
-       id="linearGradient698"
-       xlink:href="#linearGradient699"
-       spreadMethod="reflect" />
-    <linearGradient
-       x1="0.48942447"
-       y1="-0.09708764"
-       x2="0.06760809"
-       y2="1.80522752"
-       id="linearGradient714"
-       xlink:href="#linearGradient715" />
-  </defs>
-  <rect
-     width="550.7690"
-     height="452.4174"
-     x="14.21332"
-     y="15.14543"
-     style="font-size:12;fill:url(#linearGradient698);fill-rule:evenodd;stroke:#314e6c;stroke-width:10.625;stroke-opacity:1;"
-     id="rect605" />
-  <rect
-     width="488.4797"
-     height="337.6739"
-     x="43.71883"
-     y="100.3835"
-     style="font-size:12;fill:url(#linearGradient610);fill-rule:evenodd;stroke:#314e6c;stroke-width:5.1125;stroke-opacity:1;"
-     id="rect606" />
-  <rect
-     width="49.49750"
-     height="49.49746"
-     x="485.3400"
-     y="32.88261"
-     style="font-size:12;fill:url(#radialGradient690);fill-rule:evenodd;stroke:url(#linearGradient684);stroke-width:3.71875;"
-     id="rect691" />
-  <rect
-     width="49.49750"
-     height="49.49746"
-     x="421.7003"
-     y="32.88258"
-     style="font-size:12;fill:url(#radialGradient690);fill-rule:evenodd;stroke:url(#linearGradient684);stroke-width:3.71875;"
-     id="rect692" />
-  <rect
-     width="49.49750"
-     height="49.49746"
-     x="358.0607"
-     y="32.88255"
-     style="font-size:12;fill:url(#radialGradient690);fill-rule:evenodd;stroke:url(#linearGradient684);stroke-width:3.71875;"
-     id="rect693" />
-  <rect
-     width="49.49750"
-     height="49.49746"
-     x="46.93361"
-     y="32.88252"
-     style="font-size:12;fill:url(#radialGradient690);fill-rule:evenodd;stroke:url(#linearGradient684);stroke-width:3.71875;"
-     id="rect694" />
-  <path
-     d="M 584.5339 539.1726 C 493.7369 629.9696 346.5259 629.9696 255.7288 539.1725 C 164.9318 448.3755 164.9317 301.1644 255.7288 210.3674 C 346.5258 119.5703 493.7369 119.5703 584.5339 210.3674 C 675.3310 301.1644 675.3310 448.3755 584.5339 539.1726 z "
-     style="font-size:12.000;fill:url(#linearGradient714);fill-rule:evenodd;stroke:#000000;stroke-width:9.637834;"
-     id="path648" />
-  <g
-     transform="matrix(1.047217,0,0,1.047217,-1127.623,-286.0443)"
-     style="font-size:12;stroke:#df421e;stroke-opacity:1;"
-     id="g711">
-    <path
-       d="M 1348.416 714.203 C 1300.301 666.0883 1307.851 580.5294 1365.278 523.1027 C 1422.705 465.6754 1508.264 458.1261 1556.378 506.2408 L 1348.416 714.203 z "
-       style="fill:#ffffff;fill-rule:evenodd;stroke-width:5.57963;stroke:#df421e;stroke-opacity:1;"
-       id="path647" />
-    <path
-       d="M 1394.786 760.5729 C 1442.901 808.6876 1528.46 801.138 1585.886 743.7113 C 1643.314 686.2841 1650.863 600.7254 1602.748 552.6107 L 1394.786 760.5729 z "
-       style="fill:#ffffff;fill-rule:evenodd;stroke-width:5.57963;stroke:#df421e;stroke-opacity:1;"
-       id="path679" />
-  </g>
-</svg>
diff --git a/data/icons/16x16/actions/epiphany-download.png b/data/icons/16x16/actions/download.png
index 5c05bca34..5c05bca34 100644
--- a/data/icons/16x16/actions/epiphany-download.png
+++ b/data/icons/16x16/actions/download.png
diff --git a/data/icons/22x22/actions/epiphany-download.png b/data/icons/22x22/actions/download.png
index c4e1d2e83..c4e1d2e83 100644
--- a/data/icons/22x22/actions/epiphany-download.png
+++ b/data/icons/22x22/actions/download.png
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
index c478fd031..17ade18ab 100644
--- a/data/icons/24x24/actions/Makefile.am
+++ b/data/icons/24x24/actions/Makefile.am
@@ -4,14 +4,16 @@ context = actions
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = \
-	epiphany-download.png
+icons_DATA =			\
+	download.png		\
+	web-bookmarks.png	\
+	web-history.png		\
+	location-entry.png
 
-
-EXTRA_DIST =                            \
+EXTRA_DIST =			\
 	$(icons_DATA)
 
-MAINTAINERCLEANFILES =                  \
+MAINTAINERCLEANFILES =		\
 	Makefile.in
 
 install-data-local: install-iconsDATA
@@ -19,4 +21,4 @@ install-data-local: install-iconsDATA
 		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
 	fi
 
-uninstall-am: uninstall-iconsDATA 
\ No newline at end of file
+uninstall-am: uninstall-iconsDATA 
diff --git a/data/icons/24x24/actions/epiphany-download.png b/data/icons/24x24/actions/download.png
index bdb776d69..bdb776d69 100644
--- a/data/icons/24x24/actions/epiphany-download.png
+++ b/data/icons/24x24/actions/download.png
diff --git a/data/art/epiphany-entry.png b/data/icons/24x24/actions/location-entry.png
index 65bbabb67..65bbabb67 100644
--- a/data/art/epiphany-entry.png
+++ b/data/icons/24x24/actions/location-entry.png
diff --git a/data/art/epiphany-bookmarks.png b/data/icons/24x24/actions/web-bookmarks.png
index 389152ef3..389152ef3 100644
--- a/data/art/epiphany-bookmarks.png
+++ b/data/icons/24x24/actions/web-bookmarks.png
diff --git a/data/art/epiphany-history.png b/data/icons/24x24/actions/web-history.png
index ea81e486e..ea81e486e 100644
--- a/data/art/epiphany-history.png
+++ b/data/icons/24x24/actions/web-history.png
diff --git a/data/icons/32x32/actions/epiphany-download.png b/data/icons/32x32/actions/download.png
index 258e76617..258e76617 100644
--- a/data/icons/32x32/actions/epiphany-download.png
+++ b/data/icons/32x32/actions/download.png
diff --git a/data/icons/scalable/actions/epiphany-download.svg b/data/icons/scalable/actions/download.svg
index 45801460b..45801460b 100644
--- a/data/icons/scalable/actions/epiphany-download.svg
+++ b/data/icons/scalable/actions/download.svg
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 2314054cc..c303b7c74 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -65,14 +65,8 @@ ephy_stock_icons_init (void)
 
 	for (i = 0; i < (int) G_N_ELEMENTS (items); i++)
 	{
-		char *fn;
-
 		icon_source = gtk_icon_source_new ();
-
-		fn = g_strconcat (items[i].stock_id, ".png", NULL);
 		gtk_icon_source_set_icon_name (icon_source, items[i].stock_id);
-		gtk_icon_source_set_filename (icon_source, ephy_file (fn));
-		g_free (fn);
 
 		icon_set = gtk_icon_set_new ();
 		gtk_icon_set_add_source (icon_set, icon_source);
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index d58401e49..5658e68db 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -23,11 +23,11 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_STOCK_POPUPS	   "epiphany-popup-hidden"
-#define EPHY_STOCK_HISTORY         "epiphany-history"
-#define EPHY_STOCK_BOOKMARKS       "epiphany-bookmarks"
-#define EPHY_STOCK_ENTRY	   "epiphany-entry"
-#define EPHY_STOCK_DOWNLOAD	   "epiphany-download"
+#define EPHY_STOCK_POPUPS	   "popup-hidden"
+#define EPHY_STOCK_HISTORY         "web-history"
+#define EPHY_STOCK_BOOKMARKS       "web-bookmarks"
+#define EPHY_STOCK_ENTRY	   "location-entry"
+#define EPHY_STOCK_DOWNLOAD	   "download"
 
 #define STOCK_NEW_TAB              "tab-new"
 #define STOCK_NEW_WINDOW           "window-new"
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 396942b8f..42280b9ef 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -520,6 +520,12 @@ main (int argc,
 				      GNOME_PARAM_APP_DATADIR, DATADIR,
 				      NULL);
 
+	/* GtkIconTheme will then look in Ephy custom hicolor dir
+	 * for icons as well as the standard search paths
+	 */
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+					   DATADIR "/epiphany/icons");
+
 	/* libgnome keeps a reference to the global program, so drop
 	 * our reference here, to simplify cleanup on the many exit paths.
 	 */