aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2007-07-15 06:32:34 +0800
committerChristian Persch <chpe@src.gnome.org>2007-07-15 06:32:34 +0800
commit635f43e25f3e7708cd73623cf69070a0e1a3e213 (patch)
treee3113735eef2ae323172aba44fd10e59f31ccac3
parenta6348fb84c37377a1c3a61f9f973c2d099d0ca73 (diff)
downloadgsoc2013-epiphany-635f43e25f3e7708cd73623cf69070a0e1a3e213.tar
gsoc2013-epiphany-635f43e25f3e7708cd73623cf69070a0e1a3e213.tar.gz
gsoc2013-epiphany-635f43e25f3e7708cd73623cf69070a0e1a3e213.tar.bz2
gsoc2013-epiphany-635f43e25f3e7708cd73623cf69070a0e1a3e213.tar.lz
gsoc2013-epiphany-635f43e25f3e7708cd73623cf69070a0e1a3e213.tar.xz
gsoc2013-epiphany-635f43e25f3e7708cd73623cf69070a0e1a3e213.tar.zst
gsoc2013-epiphany-635f43e25f3e7708cd73623cf69070a0e1a3e213.zip
Use the right icon name. Bug #385872.
2007-07-15 Christian Persch <chpe@gnome.org> * data/chrome/about.xhtml: * data/epiphany.desktop.in.in: * data/icons/16x16/apps/Makefile.am: * data/icons/22x22/apps/Makefile.am: * data/icons/32x32/apps/Makefile.am: * lib/ephy-stock-icons.h: Use the right icon name. Bug #385872. svn path=/trunk/; revision=7160
-rw-r--r--ChangeLog11
-rw-r--r--data/epiphany.desktop.in.in2
-rw-r--r--data/icons/16x16/apps/Makefile.am4
-rw-r--r--data/icons/16x16/apps/gnome-web-browser.png (renamed from data/icons/16x16/apps/epiphany.png)bin982 -> 982 bytes
-rw-r--r--data/icons/16x16/apps/gnome-web-browser.svg (renamed from data/icons/16x16/apps/epiphany.svg)0
-rw-r--r--data/icons/22x22/apps/Makefile.am4
-rw-r--r--data/icons/22x22/apps/gnome-web-browser.png (renamed from data/icons/22x22/apps/epiphany.png)bin1585 -> 1585 bytes
-rw-r--r--data/icons/22x22/apps/gnome-web-browser.svg (renamed from data/icons/22x22/apps/epiphany.svg)0
-rw-r--r--data/icons/24x24/apps/gnome-web-browser.png (renamed from data/icons/24x24/apps/epiphany.png)bin1601 -> 1601 bytes
-rw-r--r--data/icons/32x32/apps/Makefile.am4
-rw-r--r--data/icons/32x32/apps/gnome-web-browser.png (renamed from data/icons/32x32/apps/epiphany.png)bin2645 -> 2645 bytes
-rw-r--r--data/icons/32x32/apps/gnome-web-browser.svg (renamed from data/icons/32x32/apps/epiphany.svg)0
-rw-r--r--lib/ephy-stock-icons.h2
13 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 8003e8a54..aefa1fc00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2007-07-15 Christian Persch <chpe@gnome.org>
+ * data/chrome/about.xhtml:
+ * data/epiphany.desktop.in.in:
+ * data/icons/16x16/apps/Makefile.am:
+ * data/icons/22x22/apps/Makefile.am:
+ * data/icons/32x32/apps/Makefile.am:
+ * lib/ephy-stock-icons.h:
+
+ Use the right icon name. Bug #385872.
+
+2007-07-15 Christian Persch <chpe@gnome.org>
+
* src/popup-commands.c: (background_download_completed):
Load the appearance capplet. Doesn't seem to work yet, see bug
diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in.in
index 5d182194a..e1f3897d4 100644
--- a/data/epiphany.desktop.in.in
+++ b/data/epiphany.desktop.in.in
@@ -7,7 +7,7 @@ Exec=epiphany %U
StartupNotify=true
Terminal=false
Type=Application
-Icon=epiphany
+Icon=gnome-web-browser
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=epiphany
X-GNOME-Bugzilla-Component=General
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
index 8200331c5..4995cf3e5 100644
--- a/data/icons/16x16/apps/Makefile.am
+++ b/data/icons/16x16/apps/Makefile.am
@@ -5,10 +5,10 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- epiphany.png
+ gnome-web-browser.png
noinst_DATA = \
- epiphany.svg
+ gnome-web-browser.svg
EXTRA_DIST = \
$(icons_DATA) \
diff --git a/data/icons/16x16/apps/epiphany.png b/data/icons/16x16/apps/gnome-web-browser.png
index 12191acf2..12191acf2 100644
--- a/data/icons/16x16/apps/epiphany.png
+++ b/data/icons/16x16/apps/gnome-web-browser.png
Binary files differ
diff --git a/data/icons/16x16/apps/epiphany.svg b/data/icons/16x16/apps/gnome-web-browser.svg
index 5e05ecc98..5e05ecc98 100644
--- a/data/icons/16x16/apps/epiphany.svg
+++ b/data/icons/16x16/apps/gnome-web-browser.svg
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
index 093da0bb8..9f65c874d 100644
--- a/data/icons/22x22/apps/Makefile.am
+++ b/data/icons/22x22/apps/Makefile.am
@@ -5,10 +5,10 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- epiphany.png
+ gnome-web-browser.png
noinst_DATA = \
- epiphany.svg
+ gnome-web-browser.svg
EXTRA_DIST = \
$(icons_DATA) \
diff --git a/data/icons/22x22/apps/epiphany.png b/data/icons/22x22/apps/gnome-web-browser.png
index edfaa2f17..edfaa2f17 100644
--- a/data/icons/22x22/apps/epiphany.png
+++ b/data/icons/22x22/apps/gnome-web-browser.png
Binary files differ
diff --git a/data/icons/22x22/apps/epiphany.svg b/data/icons/22x22/apps/gnome-web-browser.svg
index 7008463fa..7008463fa 100644
--- a/data/icons/22x22/apps/epiphany.svg
+++ b/data/icons/22x22/apps/gnome-web-browser.svg
diff --git a/data/icons/24x24/apps/epiphany.png b/data/icons/24x24/apps/gnome-web-browser.png
index c25adec96..c25adec96 100644
--- a/data/icons/24x24/apps/epiphany.png
+++ b/data/icons/24x24/apps/gnome-web-browser.png
Binary files differ
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
index 515a03676..3d7e73a35 100644
--- a/data/icons/32x32/apps/Makefile.am
+++ b/data/icons/32x32/apps/Makefile.am
@@ -5,10 +5,10 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
- epiphany.png
+ gnome-web-browser.png
noinst_DATA = \
- epiphany.svg
+ gnome-web-browser.svg
EXTRA_DIST = \
$(icons_DATA) \
diff --git a/data/icons/32x32/apps/epiphany.png b/data/icons/32x32/apps/gnome-web-browser.png
index 442e5c42d..442e5c42d 100644
--- a/data/icons/32x32/apps/epiphany.png
+++ b/data/icons/32x32/apps/gnome-web-browser.png
Binary files differ
diff --git a/data/icons/32x32/apps/epiphany.svg b/data/icons/32x32/apps/gnome-web-browser.svg
index 979e3b85c..979e3b85c 100644
--- a/data/icons/32x32/apps/epiphany.svg
+++ b/data/icons/32x32/apps/gnome-web-browser.svg
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index 3dadcc66d..cecd6ab93 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -23,7 +23,7 @@
G_BEGIN_DECLS
-#define EPHY_STOCK_EPHY "epiphany"
+#define EPHY_STOCK_EPHY "gnome-web-browser"
/* Custom Epiphany named icons */
#define EPHY_STOCK_POPUPS "popup-hidden"