[gnome-power-manager] Use the ac-adapter icon from the icon-naming-specification



commit 3d266599713c9db5881c6fec644f6aa467528723
Author: Richard Hughes <richard hughsie com>
Date:   Wed Mar 31 10:53:13 2010 +0100

    Use the ac-adapter icon from the icon-naming-specification

 data/icons/16x16/status/Makefile.am                |    2 +-
 .../status/{gpm-ac-adapter.png => ac-adapter.png}  |  Bin 719 -> 719 bytes
 data/icons/22x22/status/Makefile.am                |    2 +-
 .../status/{gpm-ac-adapter.png => ac-adapter.png}  |  Bin 1168 -> 1168 bytes
 data/icons/24x24/status/Makefile.am                |    2 +-
 .../status/{gpm-ac-adapter.png => ac-adapter.png}  |  Bin 1170 -> 1170 bytes
 data/icons/32x32/status/Makefile.am                |    2 +-
 .../status/{gpm-ac-adapter.png => ac-adapter.png}  |  Bin 1977 -> 1977 bytes
 data/icons/48x48/status/Makefile.am                |    2 +-
 .../status/{gpm-ac-adapter.png => ac-adapter.png}  |  Bin 3155 -> 3155 bytes
 data/icons/scalable/status/Makefile.am             |    2 +-
 .../status/{gpm-ac-adapter.svg => ac-adapter.svg}  |    0
 docs/icon-naming.txt                               |    2 +-
 src/gpm-upower.c                                   |    4 ++--
 14 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index 79787e9..38f48d1 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -6,7 +6,7 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-ac-adapter.png		\
+	ac-adapter.png			\
 	gpm-brightness-lcd.png		\
 	gpm-brightness-kbd.png		\
 	gpm-brightness-lcd-disabled.png	\
diff --git a/data/icons/16x16/status/gpm-ac-adapter.png b/data/icons/16x16/status/ac-adapter.png
similarity index 100%
rename from data/icons/16x16/status/gpm-ac-adapter.png
rename to data/icons/16x16/status/ac-adapter.png
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
index 57e2f97..1184c55 100644
--- a/data/icons/22x22/status/Makefile.am
+++ b/data/icons/22x22/status/Makefile.am
@@ -6,7 +6,7 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-ac-adapter.png		\
+	ac-adapter.png			\
 	gpm-brightness-lcd.png		\
 	gpm-brightness-kbd.png		\
 	gpm-brightness-lcd-disabled.png	\
diff --git a/data/icons/22x22/status/gpm-ac-adapter.png b/data/icons/22x22/status/ac-adapter.png
similarity index 100%
rename from data/icons/22x22/status/gpm-ac-adapter.png
rename to data/icons/22x22/status/ac-adapter.png
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
index 4a1b2db..d5af505 100644
--- a/data/icons/24x24/status/Makefile.am
+++ b/data/icons/24x24/status/Makefile.am
@@ -6,7 +6,7 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-ac-adapter.png		\
+	ac-adapter.png			\
 	gpm-brightness-lcd.png		\
 	gpm-brightness-kbd.png		\
 	gpm-brightness-lcd-disabled.png	\
diff --git a/data/icons/24x24/status/gpm-ac-adapter.png b/data/icons/24x24/status/ac-adapter.png
similarity index 100%
rename from data/icons/24x24/status/gpm-ac-adapter.png
rename to data/icons/24x24/status/ac-adapter.png
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
index 17a68f1..7eefec8 100644
--- a/data/icons/32x32/status/Makefile.am
+++ b/data/icons/32x32/status/Makefile.am
@@ -6,7 +6,7 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-ac-adapter.png		\
+	ac-adapter.png			\
 	gpm-brightness-lcd.png		\
 	gpm-brightness-kbd.png		\
 	gpm-brightness-lcd-disabled.png	\
diff --git a/data/icons/32x32/status/gpm-ac-adapter.png b/data/icons/32x32/status/ac-adapter.png
similarity index 100%
rename from data/icons/32x32/status/gpm-ac-adapter.png
rename to data/icons/32x32/status/ac-adapter.png
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
index e4d44fa..53124c8 100644
--- a/data/icons/48x48/status/Makefile.am
+++ b/data/icons/48x48/status/Makefile.am
@@ -6,7 +6,7 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-ac-adapter.png		\
+	ac-adapter.png			\
 	gpm-brightness-lcd.png		\
 	gpm-brightness-kbd.png		\
 	gpm-brightness-lcd-disabled.png	\
diff --git a/data/icons/48x48/status/gpm-ac-adapter.png b/data/icons/48x48/status/ac-adapter.png
similarity index 100%
rename from data/icons/48x48/status/gpm-ac-adapter.png
rename to data/icons/48x48/status/ac-adapter.png
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
index cfba01e..e7b6c04 100644
--- a/data/icons/scalable/status/Makefile.am
+++ b/data/icons/scalable/status/Makefile.am
@@ -6,7 +6,7 @@ iconsdir = $(themedir)/$(size)/$(context)
 
 
 icons_DATA = 			        \
-	gpm-ac-adapter.svg		\
+	ac-adapter.svg			\
 	gpm-brightness-lcd.svg		\
 	gpm-brightness-kbd.svg		\
 	gpm-brightness-lcd-disabled.svg	\
diff --git a/data/icons/scalable/status/gpm-ac-adapter.svg b/data/icons/scalable/status/ac-adapter.svg
similarity index 100%
rename from data/icons/scalable/status/gpm-ac-adapter.svg
rename to data/icons/scalable/status/ac-adapter.svg
diff --git a/docs/icon-naming.txt b/docs/icon-naming.txt
index 9d8bd3a..33a827e 100644
--- a/docs/icon-naming.txt
+++ b/docs/icon-naming.txt
@@ -17,7 +17,7 @@ A percentage scale is divided into 6 index groups:
 
 These are the icon names.
 
-gpm-ac-adapter = AC adapter icon
+ac-adapter = AC adapter icon
 gpm-primary-{index} = Laptop battery icon
 gpm-primary-{index}-charging = Laptop battery icon, charging
 gpm-primary-missing = Laptop battery missing or state invalid
diff --git a/src/gpm-upower.c b/src/gpm-upower.c
index f32396a..5a7007f 100644
--- a/src/gpm-upower.c
+++ b/src/gpm-upower.c
@@ -98,7 +98,7 @@ gpm_upower_get_device_icon (UpDevice *device)
 
 	/* get the icon from some simple rules */
 	if (kind == UP_DEVICE_KIND_LINE_POWER) {
-		filename = g_strdup ("gpm-ac-adapter");
+		filename = g_strdup ("ac-adapter");
 	} else if (kind == UP_DEVICE_KIND_MONITOR) {
 		filename = g_strdup ("gpm-monitor");
 	} else if (kind == UP_DEVICE_KIND_UPS) {
@@ -521,7 +521,7 @@ gpm_device_kind_to_icon (UpDeviceKind kind)
 	const gchar *icon = NULL;
 	switch (kind) {
 	case UP_DEVICE_KIND_LINE_POWER:
-		icon = "gpm-ac-adapter";
+		icon = "ac-adapter";
 		break;
 	case UP_DEVICE_KIND_BATTERY:
 		icon = "battery";



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]