[Xfce4-commits] <xfce4-battery-plugin:master> Rename the icon files

[Florian Rivoal]

Updating branch refs/heads/master
         to 997016cdac826834593c45ae5222c215e824e691 (commit)
       from 67335eaf19954d17160ce7f87e1a2ea01b6d4733 (commit)

commit 997016cdac826834593c45ae5222c215e824e691
Author: Florian Rivoal <frivoal at xfce.org>
Date:   Mon Jan 3 22:09:25 2011 +0900

    Rename the icon files
    
    Change the name from battery.* xfce4-battery-plugin.*, and move them
    from devices to apps.

 icons/16x16/Makefile.am                            |    4 ++--
 .../{battery.png => xfce4-battery-plugin.png}      |  Bin 873 -> 873 bytes
 icons/22x22/Makefile.am                            |    4 ++--
 .../{battery.png => xfce4-battery-plugin.png}      |  Bin 1059 -> 1059 bytes
 icons/24x24/Makefile.am                            |    4 ++--
 .../{battery.png => xfce4-battery-plugin.png}      |  Bin 1695 -> 1695 bytes
 icons/32x32/Makefile.am                            |    4 ++--
 .../{battery.png => xfce4-battery-plugin.png}      |  Bin 1421 -> 1421 bytes
 icons/scalable/Makefile.am                         |    4 ++--
 .../{battery.svg => xfce4-battery-plugin.svg}      |    0
 panel-plugin/battmon.desktop.in.in                 |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index cf8644a..434bf5f 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,6 +1,6 @@
-iconsdir = $(datadir)/icons/hicolor/16x16/devices
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
 icons_DATA =								\
-	battery.png
+	xfce4-battery-plugin.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
diff --git a/icons/16x16/battery.png b/icons/16x16/xfce4-battery-plugin.png
similarity index 100%
rename from icons/16x16/battery.png
rename to icons/16x16/xfce4-battery-plugin.png
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index 6e9a2f4..ee1fa11 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -1,6 +1,6 @@
-iconsdir = $(datadir)/icons/hicolor/22x22/devices
+iconsdir = $(datadir)/icons/hicolor/22x22/apps
 icons_DATA =								\
-	battery.png
+	xfce4-battery-plugin.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
diff --git a/icons/22x22/battery.png b/icons/22x22/xfce4-battery-plugin.png
similarity index 100%
rename from icons/22x22/battery.png
rename to icons/22x22/xfce4-battery-plugin.png
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index c0b5950..de16561 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -1,6 +1,6 @@
-iconsdir = $(datadir)/icons/hicolor/24x24/devices
+iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA =								\
-	battery.png
+	xfce4-battery-plugin.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
diff --git a/icons/24x24/battery.png b/icons/24x24/xfce4-battery-plugin.png
similarity index 100%
rename from icons/24x24/battery.png
rename to icons/24x24/xfce4-battery-plugin.png
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index 0da7690..643938c 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -1,6 +1,6 @@
-iconsdir = $(datadir)/icons/hicolor/32x32/devices
+iconsdir = $(datadir)/icons/hicolor/32x32/apps
 icons_DATA =								\
-	battery.png
+	xfce4-battery-plugin.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
diff --git a/icons/32x32/battery.png b/icons/32x32/xfce4-battery-plugin.png
similarity index 100%
rename from icons/32x32/battery.png
rename to icons/32x32/xfce4-battery-plugin.png
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 648f58b..dfcd828 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,6 +1,6 @@
-iconsdir = $(datadir)/icons/hicolor/scalable/devices
+iconsdir = $(datadir)/icons/hicolor/scalable/apps
 icons_DATA =								\
-	battery.svg
+	xfce4-battery-plugin.svg
 
 EXTRA_DIST =								\
 	$(icons_DATA)
diff --git a/icons/scalable/battery.svg b/icons/scalable/xfce4-battery-plugin.svg
similarity index 100%
rename from icons/scalable/battery.svg
rename to icons/scalable/xfce4-battery-plugin.svg
diff --git a/panel-plugin/battmon.desktop.in.in b/panel-plugin/battmon.desktop.in.in
index 901f8c5..cae3fae 100644
--- a/panel-plugin/battmon.desktop.in.in
+++ b/panel-plugin/battmon.desktop.in.in
@@ -3,5 +3,5 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Battery Monitor
 _Comment=Show and monitor the battery status
-Icon=battery
+Icon=xfce4-battery-plugin
 X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-battery-plugin