[network-manager-applet/lr/icon-naming-fdo661044: 1/2] Split status icons and apps icons
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/icon-naming-fdo661044: 1/2] Split status icons and apps icons
- Date: Tue, 10 Feb 2015 14:30:38 +0000 (UTC)
commit 06e13b1edf0f661e8c789fb99804c849a978fcbd
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Tue Feb 10 15:02:50 2015 +0100
Split status icons and apps icons
Conflicts:
src/applet-device-bt.c
src/applet-device-cdma.c
src/applet-device-ethernet.c
src/applet-device-gsm.c
src/applet-device-wifi.c
src/applet-device-wimax.c
src/applet.c
src/applet.h
src/mobile-helpers.c
src/mobile-helpers.h
configure.ac | 16 ++++++---
icons/Makefile.am | 3 +-
icons/{ => apps}/16/Makefile.am | 0
icons/{ => apps}/16/nm-device-wired.png | Bin 473 -> 473 bytes
icons/{ => apps}/16/nm-no-connection.png | Bin 601 -> 601 bytes
icons/{ => apps}/16/nm-vpn-standalone-lock.png | Bin 595 -> 595 bytes
icons/{ => apps}/22/Makefile.am | 0
icons/{ => apps}/22/nm-adhoc.png | Bin 748 -> 748 bytes
icons/{ => apps}/22/nm-device-wired.png | Bin 672 -> 672 bytes
icons/{ => apps}/22/nm-device-wwan.png | Bin 817 -> 817 bytes
icons/{ => apps}/22/nm-mb-roam.png | Bin 267 -> 267 bytes
icons/{ => apps}/22/nm-no-connection.png | Bin 811 -> 811 bytes
icons/{ => apps}/22/nm-secure-lock.png | Bin 335 -> 335 bytes
icons/{ => apps}/22/nm-signal-00.png | Bin 494 -> 494 bytes
icons/{ => apps}/22/nm-signal-100.png | Bin 413 -> 413 bytes
icons/{ => apps}/22/nm-signal-25.png | Bin 500 -> 500 bytes
icons/{ => apps}/22/nm-signal-50.png | Bin 496 -> 496 bytes
icons/{ => apps}/22/nm-signal-75.png | Bin 474 -> 474 bytes
icons/{ => apps}/22/nm-stage01-connecting01.png | Bin 1168 -> 1168 bytes
icons/{ => apps}/22/nm-stage01-connecting02.png | Bin 1188 -> 1188 bytes
icons/{ => apps}/22/nm-stage01-connecting03.png | Bin 1206 -> 1206 bytes
icons/{ => apps}/22/nm-stage01-connecting04.png | Bin 1220 -> 1220 bytes
icons/{ => apps}/22/nm-stage01-connecting05.png | Bin 1200 -> 1200 bytes
icons/{ => apps}/22/nm-stage01-connecting06.png | Bin 1144 -> 1144 bytes
icons/{ => apps}/22/nm-stage01-connecting07.png | Bin 1139 -> 1139 bytes
icons/{ => apps}/22/nm-stage01-connecting08.png | Bin 1092 -> 1092 bytes
icons/{ => apps}/22/nm-stage01-connecting09.png | Bin 1157 -> 1157 bytes
icons/{ => apps}/22/nm-stage01-connecting10.png | Bin 1205 -> 1205 bytes
icons/{ => apps}/22/nm-stage01-connecting11.png | Bin 1152 -> 1152 bytes
icons/{ => apps}/22/nm-stage02-connecting01.png | Bin 1190 -> 1190 bytes
icons/{ => apps}/22/nm-stage02-connecting02.png | Bin 1198 -> 1198 bytes
icons/{ => apps}/22/nm-stage02-connecting03.png | Bin 1204 -> 1204 bytes
icons/{ => apps}/22/nm-stage02-connecting04.png | Bin 1258 -> 1258 bytes
icons/{ => apps}/22/nm-stage02-connecting05.png | Bin 1218 -> 1218 bytes
icons/{ => apps}/22/nm-stage02-connecting06.png | Bin 1173 -> 1173 bytes
icons/{ => apps}/22/nm-stage02-connecting07.png | Bin 1156 -> 1156 bytes
icons/{ => apps}/22/nm-stage02-connecting08.png | Bin 1131 -> 1131 bytes
icons/{ => apps}/22/nm-stage02-connecting09.png | Bin 1209 -> 1209 bytes
icons/{ => apps}/22/nm-stage02-connecting10.png | Bin 1229 -> 1229 bytes
icons/{ => apps}/22/nm-stage02-connecting11.png | Bin 1201 -> 1201 bytes
icons/{ => apps}/22/nm-stage03-connecting01.png | Bin 1174 -> 1174 bytes
icons/{ => apps}/22/nm-stage03-connecting02.png | Bin 1214 -> 1214 bytes
icons/{ => apps}/22/nm-stage03-connecting03.png | Bin 1207 -> 1207 bytes
icons/{ => apps}/22/nm-stage03-connecting04.png | Bin 1235 -> 1235 bytes
icons/{ => apps}/22/nm-stage03-connecting05.png | Bin 1204 -> 1204 bytes
icons/{ => apps}/22/nm-stage03-connecting06.png | Bin 1156 -> 1156 bytes
icons/{ => apps}/22/nm-stage03-connecting07.png | Bin 1120 -> 1120 bytes
icons/{ => apps}/22/nm-stage03-connecting08.png | Bin 1102 -> 1102 bytes
icons/{ => apps}/22/nm-stage03-connecting09.png | Bin 1188 -> 1188 bytes
icons/{ => apps}/22/nm-stage03-connecting10.png | Bin 1216 -> 1216 bytes
icons/{ => apps}/22/nm-stage03-connecting11.png | Bin 1185 -> 1185 bytes
icons/{ => apps}/22/nm-tech-3g.png | Bin 209 -> 209 bytes
icons/{ => apps}/22/nm-tech-cdma-1x.png | Bin 212 -> 212 bytes
icons/{ => apps}/22/nm-tech-edge.png | Bin 205 -> 205 bytes
icons/{ => apps}/22/nm-tech-evdo.png | Bin 215 -> 215 bytes
icons/{ => apps}/22/nm-tech-gprs.png | Bin 207 -> 207 bytes
icons/{ => apps}/22/nm-tech-hspa.png | Bin 213 -> 213 bytes
icons/{ => apps}/22/nm-tech-lte.png | Bin 158 -> 158 bytes
icons/{ => apps}/22/nm-tech-umts.png | Bin 196 -> 196 bytes
icons/{ => apps}/22/nm-vpn-active-lock.png | Bin 560 -> 560 bytes
icons/{ => apps}/22/nm-vpn-connecting01.png | Bin 890 -> 890 bytes
icons/{ => apps}/22/nm-vpn-connecting02.png | Bin 981 -> 981 bytes
icons/{ => apps}/22/nm-vpn-connecting03.png | Bin 1109 -> 1109 bytes
icons/{ => apps}/22/nm-vpn-connecting04.png | Bin 1142 -> 1142 bytes
icons/{ => apps}/22/nm-vpn-connecting05.png | Bin 1286 -> 1286 bytes
icons/{ => apps}/22/nm-vpn-connecting06.png | Bin 1301 -> 1301 bytes
icons/{ => apps}/22/nm-vpn-connecting07.png | Bin 1259 -> 1259 bytes
icons/{ => apps}/22/nm-vpn-connecting08.png | Bin 1046 -> 1046 bytes
icons/{ => apps}/22/nm-vpn-connecting09.png | Bin 911 -> 911 bytes
icons/{ => apps}/22/nm-vpn-connecting10.png | Bin 791 -> 791 bytes
icons/{ => apps}/22/nm-vpn-connecting11.png | Bin 554 -> 554 bytes
icons/{ => apps}/22/nm-vpn-connecting12.png | Bin 571 -> 571 bytes
icons/{ => apps}/22/nm-vpn-connecting13.png | Bin 578 -> 578 bytes
icons/{ => apps}/22/nm-vpn-connecting14.png | Bin 575 -> 575 bytes
icons/{ => apps}/22/nm-wwan-tower.png | Bin 227 -> 227 bytes
icons/{ => apps}/32/Makefile.am | 0
icons/{ => apps}/32/nm-device-wired.png | Bin 989 -> 989 bytes
icons/{ => apps}/32/nm-no-connection.png | Bin 1143 -> 1143 bytes
icons/{ => apps}/48/Makefile.am | 0
icons/{ => apps}/48/nm-device-wireless.png | Bin 1752 -> 1752 bytes
icons/apps/Makefile.am | 2 +
icons/{ => apps}/scalable/Makefile.am | 0
icons/{ => apps}/scalable/nm-device-wired.svg | 0
icons/{ => apps}/scalable/nm-no-connection.svg | 0
icons/status/16/Makefile.am | 7 ++++
icons/status/16/nm-device-wired-status.png | 1 +
icons/status/16/nm-no-connection-status.png | 1 +
icons/status/22/Makefile.am | 36 +++++++++++++++++++++
icons/status/22/nm-device-wired-status.png | 1 +
icons/status/22/nm-device-wwan-status.png | 1 +
icons/status/22/nm-mb-roam-status.png | 1 +
icons/status/22/nm-no-connection-status.png | 1 +
icons/status/22/nm-signal-00-status.png | 1 +
icons/status/22/nm-signal-100-status.png | 1 +
icons/status/22/nm-signal-25-status.png | 1 +
icons/status/22/nm-signal-50-status.png | 1 +
icons/status/22/nm-signal-75-status.png | 1 +
icons/status/22/nm-tech-cdma-1x-status.png | 1 +
icons/status/22/nm-tech-edge-status.png | 1 +
icons/status/22/nm-tech-evdo-status.png | 1 +
icons/status/22/nm-tech-gprs-status.png | 1 +
icons/status/22/nm-tech-hspa-status.png | 1 +
icons/status/22/nm-tech-umts-status.png | 1 +
icons/status/22/nm-vpn-active-lock-status.png | 1 +
icons/status/22/nm-vpn-connecting01-status.png | 1 +
icons/status/22/nm-vpn-connecting02-status.png | 1 +
icons/status/22/nm-vpn-connecting03-status.png | 1 +
icons/status/22/nm-vpn-connecting04-status.png | 1 +
icons/status/22/nm-vpn-connecting05-status.png | 1 +
icons/status/22/nm-vpn-connecting06-status.png | 1 +
icons/status/22/nm-vpn-connecting07-status.png | 1 +
icons/status/22/nm-vpn-connecting08-status.png | 1 +
icons/status/22/nm-vpn-connecting09-status.png | 1 +
icons/status/22/nm-vpn-connecting10-status.png | 1 +
icons/status/22/nm-vpn-connecting11-status.png | 1 +
icons/status/22/nm-vpn-connecting12-status.png | 1 +
icons/status/22/nm-vpn-connecting13-status.png | 1 +
icons/status/22/nm-vpn-connecting14-status.png | 1 +
icons/status/22/nm-wwan-tower-status.png | 1 +
icons/status/32/Makefile.am | 7 ++++
icons/status/32/nm-device-wired-status.png | 1 +
icons/status/32/nm-no-connection-status.png | 1 +
icons/status/Makefile.am | 1 +
icons/status/scalable/Makefile.am | 6 +++
icons/status/scalable/nm-no-connection-status.svg | 1 +
src/applet-device-bond.c | 18 +++++-----
src/applet-device-bridge.c | 18 +++++-----
src/applet-device-broadband.c | 16 +++++-----
src/applet-device-bt.c | 18 +++++-----
src/applet-device-cdma.c | 16 +++++-----
src/applet-device-ethernet.c | 18 +++++-----
src/applet-device-gsm.c | 16 +++++-----
src/applet-device-infiniband.c | 18 +++++-----
src/applet-device-team.c | 18 +++++-----
src/applet-device-vlan.c | 18 +++++-----
src/applet-device-wifi.c | 26 +++++++-------
src/applet-device-wimax.c | 16 +++++-----
src/applet.c | 21 +++++++-----
src/applet.h | 2 +-
src/mobile-helpers.c | 28 ++++++++--------
140 files changed, 242 insertions(+), 139 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f6ce1d5..d1e3590 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,11 +207,17 @@ src/wireless-security/Makefile
src/connection-editor/Makefile
src/gnome-bluetooth/Makefile
icons/Makefile
-icons/16/Makefile
-icons/22/Makefile
-icons/32/Makefile
-icons/48/Makefile
-icons/scalable/Makefile
+icons/apps/Makefile
+icons/apps/16/Makefile
+icons/apps/22/Makefile
+icons/apps/32/Makefile
+icons/apps/48/Makefile
+icons/apps/scalable/Makefile
+icons/status/Makefile
+icons/status/16/Makefile
+icons/status/22/Makefile
+icons/status/32/Makefile
+icons/status/scalable/Makefile
po/Makefile.in
man/Makefile
man/nm-applet.1
diff --git a/icons/Makefile.am b/icons/Makefile.am
index a249a75..e84e91b 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,2 +1 @@
-SUBDIRS=16 22 32 48 scalable
-
+SUBDIRS=apps status
diff --git a/icons/16/Makefile.am b/icons/apps/16/Makefile.am
similarity index 100%
rename from icons/16/Makefile.am
rename to icons/apps/16/Makefile.am
diff --git a/icons/22/Makefile.am b/icons/apps/22/Makefile.am
similarity index 100%
rename from icons/22/Makefile.am
rename to icons/apps/22/Makefile.am
diff --git a/icons/32/Makefile.am b/icons/apps/32/Makefile.am
similarity index 100%
rename from icons/32/Makefile.am
rename to icons/apps/32/Makefile.am
diff --git a/icons/48/Makefile.am b/icons/apps/48/Makefile.am
similarity index 100%
rename from icons/48/Makefile.am
rename to icons/apps/48/Makefile.am
diff --git a/icons/apps/Makefile.am b/icons/apps/Makefile.am
new file mode 100644
index 0000000..a249a75
--- /dev/null
+++ b/icons/apps/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS=16 22 32 48 scalable
+
diff --git a/icons/scalable/Makefile.am b/icons/apps/scalable/Makefile.am
similarity index 100%
rename from icons/scalable/Makefile.am
rename to icons/apps/scalable/Makefile.am
diff --git a/icons/scalable/nm-device-wired.svg b/icons/apps/scalable/nm-device-wired.svg
similarity index 100%
rename from icons/scalable/nm-device-wired.svg
rename to icons/apps/scalable/nm-device-wired.svg
diff --git a/icons/scalable/nm-no-connection.svg b/icons/apps/scalable/nm-no-connection.svg
similarity index 100%
rename from icons/scalable/nm-no-connection.svg
rename to icons/apps/scalable/nm-no-connection.svg
diff --git a/icons/status/16/Makefile.am b/icons/status/16/Makefile.am
new file mode 100644
index 0000000..9bc7c26
--- /dev/null
+++ b/icons/status/16/Makefile.am
@@ -0,0 +1,7 @@
+icondir=${datadir}/icons/hicolor/16x16/status
+icon_DATA = \
+ nm-device-wired-status.png \
+ nm-no-connection-status.png
+
+EXTRA_DIST = $(icon_DATA)
+
diff --git a/icons/status/16/nm-device-wired-status.png b/icons/status/16/nm-device-wired-status.png
new file mode 120000
index 0000000..7c8df5e
--- /dev/null
+++ b/icons/status/16/nm-device-wired-status.png
@@ -0,0 +1 @@
+../../apps/16/nm-device-wired.png
\ No newline at end of file
diff --git a/icons/status/16/nm-no-connection-status.png b/icons/status/16/nm-no-connection-status.png
new file mode 120000
index 0000000..3092497
--- /dev/null
+++ b/icons/status/16/nm-no-connection-status.png
@@ -0,0 +1 @@
+../../apps/16/nm-no-connection.png
\ No newline at end of file
diff --git a/icons/status/22/Makefile.am b/icons/status/22/Makefile.am
new file mode 100644
index 0000000..ffe58a7
--- /dev/null
+++ b/icons/status/22/Makefile.am
@@ -0,0 +1,36 @@
+icondir=${datadir}/icons/hicolor/22x22/status
+icon_DATA = \
+ nm-device-wired-status.png \
+ nm-device-wwan-status.png \
+ nm-mb-roam-status.png \
+ nm-no-connection-status.png \
+ nm-signal-00-status.png \
+ nm-signal-100-status.png \
+ nm-signal-25-status.png \
+ nm-signal-50-status.png \
+ nm-signal-75-status.png \
+ nm-tech-cdma-1x-status.png \
+ nm-tech-edge-status.png \
+ nm-tech-evdo-status.png \
+ nm-tech-gprs-status.png \
+ nm-tech-hspa-status.png \
+ nm-tech-umts-status.png \
+ nm-vpn-active-lock-status.png \
+ nm-vpn-connecting01-status.png \
+ nm-vpn-connecting02-status.png \
+ nm-vpn-connecting03-status.png \
+ nm-vpn-connecting04-status.png \
+ nm-vpn-connecting05-status.png \
+ nm-vpn-connecting06-status.png \
+ nm-vpn-connecting07-status.png \
+ nm-vpn-connecting08-status.png \
+ nm-vpn-connecting09-status.png \
+ nm-vpn-connecting10-status.png \
+ nm-vpn-connecting11-status.png \
+ nm-vpn-connecting12-status.png \
+ nm-vpn-connecting13-status.png \
+ nm-vpn-connecting14-status.png \
+ nm-wwan-tower-status.png
+
+EXTRA_DIST = $(icon_DATA)
+
diff --git a/icons/status/22/nm-device-wired-status.png b/icons/status/22/nm-device-wired-status.png
new file mode 120000
index 0000000..afdb260
--- /dev/null
+++ b/icons/status/22/nm-device-wired-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-device-wired.png
\ No newline at end of file
diff --git a/icons/status/22/nm-device-wwan-status.png b/icons/status/22/nm-device-wwan-status.png
new file mode 120000
index 0000000..94c7faa
--- /dev/null
+++ b/icons/status/22/nm-device-wwan-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-device-wwan.png
\ No newline at end of file
diff --git a/icons/status/22/nm-mb-roam-status.png b/icons/status/22/nm-mb-roam-status.png
new file mode 120000
index 0000000..8bf2168
--- /dev/null
+++ b/icons/status/22/nm-mb-roam-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-mb-roam.png
\ No newline at end of file
diff --git a/icons/status/22/nm-no-connection-status.png b/icons/status/22/nm-no-connection-status.png
new file mode 120000
index 0000000..9401599
--- /dev/null
+++ b/icons/status/22/nm-no-connection-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-no-connection.png
\ No newline at end of file
diff --git a/icons/status/22/nm-signal-00-status.png b/icons/status/22/nm-signal-00-status.png
new file mode 120000
index 0000000..4e59313
--- /dev/null
+++ b/icons/status/22/nm-signal-00-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-signal-00.png
\ No newline at end of file
diff --git a/icons/status/22/nm-signal-100-status.png b/icons/status/22/nm-signal-100-status.png
new file mode 120000
index 0000000..578cd83
--- /dev/null
+++ b/icons/status/22/nm-signal-100-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-signal-100.png
\ No newline at end of file
diff --git a/icons/status/22/nm-signal-25-status.png b/icons/status/22/nm-signal-25-status.png
new file mode 120000
index 0000000..afa2210
--- /dev/null
+++ b/icons/status/22/nm-signal-25-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-signal-25.png
\ No newline at end of file
diff --git a/icons/status/22/nm-signal-50-status.png b/icons/status/22/nm-signal-50-status.png
new file mode 120000
index 0000000..e666fa0
--- /dev/null
+++ b/icons/status/22/nm-signal-50-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-signal-50.png
\ No newline at end of file
diff --git a/icons/status/22/nm-signal-75-status.png b/icons/status/22/nm-signal-75-status.png
new file mode 120000
index 0000000..a1cabb3
--- /dev/null
+++ b/icons/status/22/nm-signal-75-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-signal-75.png
\ No newline at end of file
diff --git a/icons/status/22/nm-tech-cdma-1x-status.png b/icons/status/22/nm-tech-cdma-1x-status.png
new file mode 120000
index 0000000..60fe877
--- /dev/null
+++ b/icons/status/22/nm-tech-cdma-1x-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-tech-cdma-1x.png
\ No newline at end of file
diff --git a/icons/status/22/nm-tech-edge-status.png b/icons/status/22/nm-tech-edge-status.png
new file mode 120000
index 0000000..16aff81
--- /dev/null
+++ b/icons/status/22/nm-tech-edge-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-tech-edge.png
\ No newline at end of file
diff --git a/icons/status/22/nm-tech-evdo-status.png b/icons/status/22/nm-tech-evdo-status.png
new file mode 120000
index 0000000..a66150a
--- /dev/null
+++ b/icons/status/22/nm-tech-evdo-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-tech-evdo.png
\ No newline at end of file
diff --git a/icons/status/22/nm-tech-gprs-status.png b/icons/status/22/nm-tech-gprs-status.png
new file mode 120000
index 0000000..5580684
--- /dev/null
+++ b/icons/status/22/nm-tech-gprs-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-tech-gprs.png
\ No newline at end of file
diff --git a/icons/status/22/nm-tech-hspa-status.png b/icons/status/22/nm-tech-hspa-status.png
new file mode 120000
index 0000000..8aae99c
--- /dev/null
+++ b/icons/status/22/nm-tech-hspa-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-tech-hspa.png
\ No newline at end of file
diff --git a/icons/status/22/nm-tech-umts-status.png b/icons/status/22/nm-tech-umts-status.png
new file mode 120000
index 0000000..0189d11
--- /dev/null
+++ b/icons/status/22/nm-tech-umts-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-tech-umts.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-active-lock-status.png b/icons/status/22/nm-vpn-active-lock-status.png
new file mode 120000
index 0000000..2cf5327
--- /dev/null
+++ b/icons/status/22/nm-vpn-active-lock-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-active-lock.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting01-status.png b/icons/status/22/nm-vpn-connecting01-status.png
new file mode 120000
index 0000000..6ae8d21
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting01-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting01.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting02-status.png b/icons/status/22/nm-vpn-connecting02-status.png
new file mode 120000
index 0000000..c8d2e3e
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting02-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting02.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting03-status.png b/icons/status/22/nm-vpn-connecting03-status.png
new file mode 120000
index 0000000..37367ba
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting03-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting03.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting04-status.png b/icons/status/22/nm-vpn-connecting04-status.png
new file mode 120000
index 0000000..649c651
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting04-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting04.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting05-status.png b/icons/status/22/nm-vpn-connecting05-status.png
new file mode 120000
index 0000000..ac72d3a
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting05-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting05.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting06-status.png b/icons/status/22/nm-vpn-connecting06-status.png
new file mode 120000
index 0000000..d1d4134
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting06-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting06.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting07-status.png b/icons/status/22/nm-vpn-connecting07-status.png
new file mode 120000
index 0000000..259019c
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting07-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting07.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting08-status.png b/icons/status/22/nm-vpn-connecting08-status.png
new file mode 120000
index 0000000..b88ebfa
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting08-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting08.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting09-status.png b/icons/status/22/nm-vpn-connecting09-status.png
new file mode 120000
index 0000000..d8bbe9c
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting09-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting09.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting10-status.png b/icons/status/22/nm-vpn-connecting10-status.png
new file mode 120000
index 0000000..21aa7d0
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting10-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting10.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting11-status.png b/icons/status/22/nm-vpn-connecting11-status.png
new file mode 120000
index 0000000..3057e5f
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting11-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting11.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting12-status.png b/icons/status/22/nm-vpn-connecting12-status.png
new file mode 120000
index 0000000..2f8b7f6
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting12-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting12.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting13-status.png b/icons/status/22/nm-vpn-connecting13-status.png
new file mode 120000
index 0000000..83449a9
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting13-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting13.png
\ No newline at end of file
diff --git a/icons/status/22/nm-vpn-connecting14-status.png b/icons/status/22/nm-vpn-connecting14-status.png
new file mode 120000
index 0000000..112e92d
--- /dev/null
+++ b/icons/status/22/nm-vpn-connecting14-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-vpn-connecting14.png
\ No newline at end of file
diff --git a/icons/status/22/nm-wwan-tower-status.png b/icons/status/22/nm-wwan-tower-status.png
new file mode 120000
index 0000000..cde49d4
--- /dev/null
+++ b/icons/status/22/nm-wwan-tower-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-wwan-tower.png
\ No newline at end of file
diff --git a/icons/status/32/Makefile.am b/icons/status/32/Makefile.am
new file mode 100644
index 0000000..3660cad
--- /dev/null
+++ b/icons/status/32/Makefile.am
@@ -0,0 +1,7 @@
+icondir=${datadir}/icons/hicolor/32x32/status
+icon_DATA = \
+ nm-device-wired-status.png \
+ nm-no-connection-status.png
+
+EXTRA_DIST = $(icon_DATA)
+
diff --git a/icons/status/32/nm-device-wired-status.png b/icons/status/32/nm-device-wired-status.png
new file mode 120000
index 0000000..5020e4a
--- /dev/null
+++ b/icons/status/32/nm-device-wired-status.png
@@ -0,0 +1 @@
+../../apps/32/nm-device-wired.png
\ No newline at end of file
diff --git a/icons/status/32/nm-no-connection-status.png b/icons/status/32/nm-no-connection-status.png
new file mode 120000
index 0000000..5992ddb
--- /dev/null
+++ b/icons/status/32/nm-no-connection-status.png
@@ -0,0 +1 @@
+../../apps/32/nm-no-connection.png
\ No newline at end of file
diff --git a/icons/status/Makefile.am b/icons/status/Makefile.am
new file mode 100644
index 0000000..55ca9d1
--- /dev/null
+++ b/icons/status/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=16 22 32 scalable
diff --git a/icons/status/scalable/Makefile.am b/icons/status/scalable/Makefile.am
new file mode 100644
index 0000000..06b9e5b
--- /dev/null
+++ b/icons/status/scalable/Makefile.am
@@ -0,0 +1,6 @@
+icondir=${datadir}/icons/hicolor/scalable/status
+icon_DATA = \
+ nm-no-connection-status.svg
+
+EXTRA_DIST = $(icon_DATA)
+
diff --git a/icons/status/scalable/nm-no-connection-status.svg
b/icons/status/scalable/nm-no-connection-status.svg
new file mode 120000
index 0000000..ffa5c38
--- /dev/null
+++ b/icons/status/scalable/nm-no-connection-status.svg
@@ -0,0 +1 @@
+../../apps/scalable/nm-no-connection.svg
\ No newline at end of file
diff --git a/src/applet-device-bond.c b/src/applet-device-bond.c
index 17c90d1..720e211 100644
--- a/src/applet-device-bond.c
+++ b/src/applet-device-bond.c
@@ -93,13 +93,13 @@ bond_notify_connected (NMDevice *device,
}
static void
-bond_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+bond_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
const char *id;
@@ -124,7 +124,7 @@ bond_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- *out_icon_name = "nm-device-wired";
+ *out_icon_name = "nm-device-wired-status";
*tip = g_strdup_printf (_("Bond connection '%s' active"), id);
break;
default:
@@ -161,7 +161,7 @@ applet_device_bond_get_class (NMApplet *applet)
dclass->new_auto_connection = bond_new_auto_connection;
dclass->add_menu_item = bond_add_menu_item;
dclass->notify_connected = bond_notify_connected;
- dclass->get_icon = bond_get_icon;
+ dclass->get_icon_status = bond_get_icon_status;
dclass->get_secrets = bond_get_secrets;
return dclass;
diff --git a/src/applet-device-bridge.c b/src/applet-device-bridge.c
index 43215ea..200ddd8 100644
--- a/src/applet-device-bridge.c
+++ b/src/applet-device-bridge.c
@@ -93,13 +93,13 @@ bridge_notify_connected (NMDevice *device,
}
static void
-bridge_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+bridge_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
const char *id;
@@ -124,7 +124,7 @@ bridge_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- *out_icon_name = "nm-device-wired";
+ *out_icon_name = "nm-device-wired-status";
*tip = g_strdup_printf (_("Bridge connection '%s' active"), id);
break;
default:
@@ -160,7 +160,7 @@ applet_device_bridge_get_class (NMApplet *applet)
dclass->new_auto_connection = bridge_new_auto_connection;
dclass->add_menu_item = bridge_add_menu_item;
dclass->notify_connected = bridge_notify_connected;
- dclass->get_icon = bridge_get_icon;
+ dclass->get_icon_status = bridge_get_icon_status;
dclass->get_secrets = bridge_get_secrets;
return dclass;
diff --git a/src/applet-device-broadband.c b/src/applet-device-broadband.c
index 26d7707..4f83e7b 100644
--- a/src/applet-device-broadband.c
+++ b/src/applet-device-broadband.c
@@ -617,13 +617,13 @@ broadband_act_to_mb_act (BroadbandDeviceInfo *info)
}
static void
-get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
BroadbandDeviceInfo *info;
@@ -1058,7 +1058,7 @@ applet_device_broadband_get_class (NMApplet *applet)
dclass->add_menu_item = add_menu_item;
dclass->device_added = device_added;
dclass->notify_connected = notify_connected;
- dclass->get_icon = get_icon;
+ dclass->get_icon_status = get_icon_status;
dclass->get_secrets = get_secrets;
dclass->secrets_request_size = sizeof (MobileHelperSecretsInfo);
diff --git a/src/applet-device-bt.c b/src/applet-device-bt.c
index 6c9cb21..e3b4673 100644
--- a/src/applet-device-bt.c
+++ b/src/applet-device-bt.c
@@ -106,13 +106,13 @@ bt_notify_connected (NMDevice *device,
}
static void
-bt_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+bt_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
const char *id;
@@ -137,7 +137,7 @@ bt_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting a network address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- *out_icon_name = "nm-device-wwan";
+ *out_icon_name = "nm-device-wwan-status";
*tip = g_strdup_printf (_("Mobile broadband connection '%s' active"), id);
break;
default:
@@ -271,7 +271,7 @@ applet_device_bt_get_class (NMApplet *applet)
dclass->new_auto_connection = bt_new_auto_connection;
dclass->add_menu_item = bt_add_menu_item;
dclass->notify_connected = bt_notify_connected;
- dclass->get_icon = bt_get_icon;
+ dclass->get_icon_status = bt_get_icon_status;
dclass->get_secrets = bt_get_secrets;
dclass->secrets_request_size = sizeof (NMBtSecretsInfo);
diff --git a/src/applet-device-cdma.c b/src/applet-device-cdma.c
index 5abd75d..01453a9 100644
--- a/src/applet-device-cdma.c
+++ b/src/applet-device-cdma.c
@@ -344,13 +344,13 @@ cdma_notify_connected (NMDevice *device,
}
static void
-cdma_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+cdma_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
CdmaDeviceInfo *info;
@@ -737,7 +737,7 @@ applet_device_cdma_get_class (NMApplet *applet)
dclass->add_menu_item = cdma_add_menu_item;
dclass->device_state_changed = cdma_device_state_changed;
dclass->notify_connected = cdma_notify_connected;
- dclass->get_icon = cdma_get_icon;
+ dclass->get_icon_status = cdma_get_icon_status;
dclass->get_secrets = cdma_get_secrets;
dclass->secrets_request_size = sizeof (MobileHelperSecretsInfo);
dclass->device_added = cdma_device_added;
diff --git a/src/applet-device-ethernet.c b/src/applet-device-ethernet.c
index 6081948..6c4db06 100644
--- a/src/applet-device-ethernet.c
+++ b/src/applet-device-ethernet.c
@@ -150,13 +150,13 @@ ethernet_notify_connected (NMDevice *device,
}
static void
-ethernet_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+ethernet_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
const char *id;
@@ -181,7 +181,7 @@ ethernet_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting an ethernet network address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- *out_icon_name = g_strdup_printf ("nm-device-wired");
+ *out_icon_name = g_strdup_printf ("nm-device-wired-status");
*tip = g_strdup_printf (_("Ethernet network connection '%s' active"), id);
break;
default:
@@ -520,7 +520,7 @@ applet_device_ethernet_get_class (NMApplet *applet)
dclass->new_auto_connection = ethernet_new_auto_connection;
dclass->add_menu_item = ethernet_add_menu_item;
dclass->notify_connected = ethernet_notify_connected;
- dclass->get_icon = ethernet_get_icon;
+ dclass->get_icon_status = ethernet_get_icon_status;
dclass->get_secrets = ethernet_get_secrets;
dclass->secrets_request_size = MAX (sizeof (NM8021xInfo), sizeof (NMPppoeInfo));
diff --git a/src/applet-device-gsm.c b/src/applet-device-gsm.c
index b398224..688d776 100644
--- a/src/applet-device-gsm.c
+++ b/src/applet-device-gsm.c
@@ -400,13 +400,13 @@ gsm_notify_connected (NMDevice *device,
}
static void
-gsm_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+gsm_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
GsmDeviceInfo *info;
@@ -1212,7 +1212,7 @@ applet_device_gsm_get_class (NMApplet *applet)
dclass->add_menu_item = gsm_add_menu_item;
dclass->device_state_changed = gsm_device_state_changed;
dclass->notify_connected = gsm_notify_connected;
- dclass->get_icon = gsm_get_icon;
+ dclass->get_icon_status = gsm_get_icon_status;
dclass->get_secrets = gsm_get_secrets;
dclass->secrets_request_size = sizeof (MobileHelperSecretsInfo);
dclass->device_added = gsm_device_added;
diff --git a/src/applet-device-infiniband.c b/src/applet-device-infiniband.c
index a47ef3c..0651eab 100644
--- a/src/applet-device-infiniband.c
+++ b/src/applet-device-infiniband.c
@@ -146,13 +146,13 @@ infiniband_notify_connected (NMDevice *device,
}
static void
-infiniband_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+infiniband_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
const char *id;
@@ -177,7 +177,7 @@ infiniband_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- *out_icon_name = "nm-device-wired";
+ *out_icon_name = "nm-device-wired-status";
*tip = g_strdup_printf (_("InfiniBand connection '%s' active"), id);
break;
default:
@@ -205,7 +205,7 @@ applet_device_infiniband_get_class (NMApplet *applet)
dclass->new_auto_connection = infiniband_new_auto_connection;
dclass->add_menu_item = infiniband_add_menu_item;
dclass->notify_connected = infiniband_notify_connected;
- dclass->get_icon = infiniband_get_icon;
+ dclass->get_icon_status = infiniband_get_icon_status;
dclass->get_secrets = infiniband_get_secrets;
return dclass;
diff --git a/src/applet-device-team.c b/src/applet-device-team.c
index 3d98ca6..8666c11 100644
--- a/src/applet-device-team.c
+++ b/src/applet-device-team.c
@@ -89,13 +89,13 @@ team_notify_connected (NMDevice *device,
}
static void
-team_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+team_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
const char *id;
@@ -120,7 +120,7 @@ team_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- *out_icon_name = "nm-device-wired";
+ *out_icon_name = "nm-device-wired-status";
*tip = g_strdup_printf (_("Team connection '%s' active"), id);
break;
default:
@@ -157,7 +157,7 @@ applet_device_team_get_class (NMApplet *applet)
dclass->new_auto_connection = team_new_auto_connection;
dclass->add_menu_item = team_add_menu_item;
dclass->notify_connected = team_notify_connected;
- dclass->get_icon = team_get_icon;
+ dclass->get_icon_status = team_get_icon_status;
dclass->get_secrets = team_get_secrets;
return dclass;
diff --git a/src/applet-device-vlan.c b/src/applet-device-vlan.c
index b6039df..749a32c 100644
--- a/src/applet-device-vlan.c
+++ b/src/applet-device-vlan.c
@@ -207,13 +207,13 @@ vlan_notify_connected (NMDevice *device,
}
static void
-vlan_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+vlan_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
const char *id;
@@ -238,7 +238,7 @@ vlan_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
- *out_icon_name = "nm-device-wired";
+ *out_icon_name = "nm-device-wired-status";
*tip = g_strdup_printf (_("VLAN connection '%s' active"), id);
break;
default:
@@ -274,7 +274,7 @@ applet_device_vlan_get_class (NMApplet *applet)
dclass->new_auto_connection = vlan_new_auto_connection;
dclass->add_menu_item = vlan_add_menu_item;
dclass->notify_connected = vlan_notify_connected;
- dclass->get_icon = vlan_get_icon;
+ dclass->get_icon_status = vlan_get_icon_status;
dclass->get_secrets = vlan_get_secrets;
return dclass;
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index c67f8b6..b6c4493 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -1247,13 +1247,13 @@ wifi_notify_connected (NMDevice *device,
}
static void
-wifi_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+wifi_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
NMAccessPoint *ap;
@@ -1286,15 +1286,15 @@ wifi_get_icon (NMDevice *device,
strength = MIN (strength, 100);
if (strength > 80)
- *out_icon_name = "nm-signal-100";
+ *out_icon_name = "nm-signal-100-status";
else if (strength > 55)
- *out_icon_name = "nm-signal-75";
+ *out_icon_name = "nm-signal-75-status";
else if (strength > 30)
- *out_icon_name = "nm-signal-50";
+ *out_icon_name = "nm-signal-50-status";
else if (strength > 5)
- *out_icon_name = "nm-signal-25";
+ *out_icon_name = "nm-signal-25-status";
else
- *out_icon_name = "nm-signal-00";
+ *out_icon_name = "nm-signal-00-status";
if (ap) {
char *ssid = get_ssid_utf8 (ap);
@@ -1609,7 +1609,7 @@ applet_device_wifi_get_class (NMApplet *applet)
dclass->device_added = wifi_device_added;
dclass->device_state_changed = wifi_device_state_changed;
dclass->notify_connected = wifi_notify_connected;
- dclass->get_icon = wifi_get_icon;
+ dclass->get_icon_status = wifi_get_icon_status;
dclass->get_secrets = wifi_get_secrets;
dclass->secrets_request_size = sizeof (NMWifiInfo);
diff --git a/src/applet-device-wimax.c b/src/applet-device-wimax.c
index 1741b2f..0d8db11 100644
--- a/src/applet-device-wimax.c
+++ b/src/applet-device-wimax.c
@@ -405,13 +405,13 @@ wimax_notify_connected (NMDevice *device,
}
static void
-wimax_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- GdkPixbuf **out_pixbuf,
- const char **out_icon_name,
- char **tip,
- NMApplet *applet)
+wimax_get_icon_status (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ GdkPixbuf **out_pixbuf,
+ const char **out_icon_name,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
const char *id;
@@ -486,7 +486,7 @@ applet_device_wimax_get_class (NMApplet *applet)
dclass->add_menu_item = wimax_add_menu_item;
dclass->device_added = wimax_device_added;
dclass->notify_connected = wimax_notify_connected;
- dclass->get_icon = wimax_get_icon;
+ dclass->get_icon_status = wimax_get_icon_status;
dclass->get_secrets = wimax_get_secrets;
return dclass;
diff --git a/src/applet.c b/src/applet.c
index 39ea8e4..2bd93c0 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -2380,7 +2380,10 @@ applet_add_default_connection_item (NMDevice *device,
/*****************************************************************************/
static void
-foo_set_icon (NMApplet *applet, guint32 layer, GdkPixbuf *pixbuf, char *icon_name)
+foo_set_icon_status (NMApplet *applet,
+ guint32 layer,
+ GdkPixbuf *pixbuf,
+ char *icon_name)
{
int i;
@@ -2399,7 +2402,7 @@ foo_set_icon (NMApplet *applet, guint32 layer, GdkPixbuf *pixbuf, char *icon_nam
applet->icon_layers[layer] = g_object_ref (pixbuf);
if (!applet->icon_layers[0]) {
- pixbuf = g_object_ref (nma_icon_check_and_load ("nm-no-connection", applet));
+ pixbuf = g_object_ref (nma_icon_check_and_load ("nm-no-connection-status", applet));
} else {
pixbuf = gdk_pixbuf_copy (applet->icon_layers[0]);
@@ -2852,7 +2855,7 @@ applet_get_device_icon_for_state (NMApplet *applet,
connection = applet_find_active_connection_for_device (device, applet, NULL);
- dclass->get_icon (device, state, connection, out_pixbuf, &icon_name, out_tip, applet);
+ dclass->get_icon_status (device, state, connection, out_pixbuf, &icon_name, out_tip, applet);
if (!*out_pixbuf && icon_name)
*out_pixbuf = g_object_ref (nma_icon_check_and_load (icon_name, applet));
@@ -2941,12 +2944,12 @@ applet_update_icon (gpointer user_data)
switch (state) {
case NM_STATE_UNKNOWN:
case NM_STATE_ASLEEP:
- icon_name = g_strdup ("nm-no-connection");
+ icon_name = g_strdup ("nm-no-connection-status");
pixbuf = g_object_ref (nma_icon_check_and_load (icon_name, applet));
dev_tip = g_strdup (_("Networking disabled"));
break;
case NM_STATE_DISCONNECTED:
- icon_name = g_strdup ("nm-no-connection");
+ icon_name = g_strdup ("nm-no-connection-status");
pixbuf = g_object_ref (nma_icon_check_and_load (icon_name, applet));
dev_tip = g_strdup (_("No network connection"));
break;
@@ -2955,7 +2958,7 @@ applet_update_icon (gpointer user_data)
break;
}
- foo_set_icon (applet, ICON_LAYER_LINK, pixbuf, icon_name);
+ foo_set_icon_status (applet, ICON_LAYER_LINK, pixbuf, icon_name);
if (pixbuf)
g_object_unref (pixbuf);
if (icon_name)
@@ -2970,14 +2973,14 @@ applet_update_icon (gpointer user_data)
switch (vpn_state) {
case NM_VPN_CONNECTION_STATE_ACTIVATED:
- icon_name = g_strdup_printf ("nm-vpn-active-lock");
+ icon_name = g_strdup_printf ("nm-vpn-active-lock-status");
pixbuf = nma_icon_check_and_load (icon_name, applet);
break;
case NM_VPN_CONNECTION_STATE_PREPARE:
case NM_VPN_CONNECTION_STATE_NEED_AUTH:
case NM_VPN_CONNECTION_STATE_CONNECT:
case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
- name = g_strdup_printf ("nm-vpn-connecting%02d", applet->animation_step + 1);
+ name = g_strdup_printf ("nm-vpn-connecting%02d-status", applet->animation_step + 1);
pixbuf = nma_icon_check_and_load (name, applet);
g_free (name);
@@ -2998,7 +3001,7 @@ applet_update_icon (gpointer user_data)
vpn_tip = tmp;
}
}
- foo_set_icon (applet, ICON_LAYER_VPN, pixbuf, icon_name);
+ foo_set_icon_status (applet, ICON_LAYER_VPN, pixbuf, icon_name);
if (icon_name)
g_free (icon_name);
diff --git a/src/applet.h b/src/applet.h
index 66ca945..2a4e098 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -226,7 +226,7 @@ struct NMADeviceClass {
* be unrefed by the icon code. This allows the device class to create
* a composited pixbuf if necessary and pass the reference to the caller.
*/
- void (*get_icon) (NMDevice *device,
+ void (*get_icon_status) (NMDevice *device,
NMDeviceState state,
NMConnection *connection,
GdkPixbuf **out_pixbuf,
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index 9cfb5fe..b8157dd 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -40,7 +40,7 @@ mobile_helper_get_status_pixbuf (guint32 quality,
{
GdkPixbuf *pixbuf, *qual_pixbuf, *wwan_pixbuf, *tmp;
- wwan_pixbuf = nma_icon_check_and_load ("nm-wwan-tower", applet);
+ wwan_pixbuf = nma_icon_check_and_load ("nm-wwan-tower-status", applet);
if (!quality_valid)
quality = 0;
@@ -71,7 +71,7 @@ mobile_helper_get_status_pixbuf (guint32 quality,
/* And finally the roaming or technology icon */
if (state == MB_STATE_ROAMING) {
- tmp = nma_icon_check_and_load ("nm-mb-roam", applet);
+ tmp = nma_icon_check_and_load ("nm-mb-roam-status", applet);
gdk_pixbuf_composite (tmp, pixbuf, 0, 0,
gdk_pixbuf_get_width (tmp),
gdk_pixbuf_get_height (tmp),
@@ -96,15 +96,15 @@ const char *
mobile_helper_get_quality_icon_name (guint32 quality)
{
if (quality > 80)
- return "nm-signal-100";
+ return "nm-signal-100-status";
else if (quality > 55)
- return "nm-signal-75";
+ return "nm-signal-75-status";
else if (quality > 30)
- return "nm-signal-50";
+ return "nm-signal-50-status";
else if (quality > 5)
- return "nm-signal-25";
+ return "nm-signal-25-status";
else
- return "nm-signal-00";
+ return "nm-signal-00-status";
}
const char *
@@ -112,23 +112,23 @@ mobile_helper_get_tech_icon_name (guint32 tech)
{
switch (tech) {
case MB_TECH_1XRTT:
- return "nm-tech-cdma-1x";
+ return "nm-tech-cdma-1x-status";
case MB_TECH_EVDO:
- return "nm-tech-evdo";
+ return "nm-tech-evdo-status";
case MB_TECH_GSM:
case MB_TECH_GPRS:
- return "nm-tech-gprs";
+ return "nm-tech-gprs-status";
case MB_TECH_EDGE:
- return "nm-tech-edge";
+ return "nm-tech-edge-status";
case MB_TECH_UMTS:
- return "nm-tech-umts";
+ return "nm-tech-umts-status";
case MB_TECH_HSDPA:
case MB_TECH_HSUPA:
case MB_TECH_HSPA:
case MB_TECH_HSPA_PLUS:
- return "nm-tech-hspa";
+ return "nm-tech-hspa-status";
case MB_TECH_LTE:
- return "nm-tech-lte";
+ return "nm-tech-lte-status";
case MB_TECH_WIMAX:
default:
return NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
