[network-manager-applet/lr/icon-naming-fdo661044: 2/2] Add nm-stage* status icons originally missed



commit 3249ad5ecfa327421889efe6ae8a652e37ed5cde
Author: Yclept Nemo <orbisvicis gmail com>
Date:   Sun Oct 9 12:59:18 2011 -0400

    Add nm-stage* status icons originally missed

 icons/status/22/Makefile.am                        |   33 ++++++++++++++++++++
 icons/status/22/nm-stage01-connecting01-status.png |    1 +
 icons/status/22/nm-stage01-connecting02-status.png |    1 +
 icons/status/22/nm-stage01-connecting03-status.png |    1 +
 icons/status/22/nm-stage01-connecting04-status.png |    1 +
 icons/status/22/nm-stage01-connecting05-status.png |    1 +
 icons/status/22/nm-stage01-connecting06-status.png |    1 +
 icons/status/22/nm-stage01-connecting07-status.png |    1 +
 icons/status/22/nm-stage01-connecting08-status.png |    1 +
 icons/status/22/nm-stage01-connecting09-status.png |    1 +
 icons/status/22/nm-stage01-connecting10-status.png |    1 +
 icons/status/22/nm-stage01-connecting11-status.png |    1 +
 icons/status/22/nm-stage02-connecting01-status.png |    1 +
 icons/status/22/nm-stage02-connecting02-status.png |    1 +
 icons/status/22/nm-stage02-connecting03-status.png |    1 +
 icons/status/22/nm-stage02-connecting04-status.png |    1 +
 icons/status/22/nm-stage02-connecting05-status.png |    1 +
 icons/status/22/nm-stage02-connecting06-status.png |    1 +
 icons/status/22/nm-stage02-connecting07-status.png |    1 +
 icons/status/22/nm-stage02-connecting08-status.png |    1 +
 icons/status/22/nm-stage02-connecting09-status.png |    1 +
 icons/status/22/nm-stage02-connecting10-status.png |    1 +
 icons/status/22/nm-stage02-connecting11-status.png |    1 +
 icons/status/22/nm-stage03-connecting01-status.png |    1 +
 icons/status/22/nm-stage03-connecting02-status.png |    1 +
 icons/status/22/nm-stage03-connecting03-status.png |    1 +
 icons/status/22/nm-stage03-connecting04-status.png |    1 +
 icons/status/22/nm-stage03-connecting05-status.png |    1 +
 icons/status/22/nm-stage03-connecting06-status.png |    1 +
 icons/status/22/nm-stage03-connecting07-status.png |    1 +
 icons/status/22/nm-stage03-connecting08-status.png |    1 +
 icons/status/22/nm-stage03-connecting09-status.png |    1 +
 icons/status/22/nm-stage03-connecting10-status.png |    1 +
 icons/status/22/nm-stage03-connecting11-status.png |    1 +
 src/applet.c                                       |   12 +++---
 35 files changed, 72 insertions(+), 6 deletions(-)
---
diff --git a/icons/status/22/Makefile.am b/icons/status/22/Makefile.am
index ffe58a7..d41f432 100644
--- a/icons/status/22/Makefile.am
+++ b/icons/status/22/Makefile.am
@@ -9,6 +9,39 @@ icon_DATA = \
                nm-signal-25-status.png \
                nm-signal-50-status.png \
                nm-signal-75-status.png \
+               nm-stage01-connecting01-status.png \
+               nm-stage01-connecting02-status.png \
+               nm-stage01-connecting03-status.png \
+               nm-stage01-connecting04-status.png \
+               nm-stage01-connecting05-status.png \
+               nm-stage01-connecting06-status.png \
+               nm-stage01-connecting07-status.png \
+               nm-stage01-connecting08-status.png \
+               nm-stage01-connecting09-status.png \
+               nm-stage01-connecting10-status.png \
+               nm-stage01-connecting11-status.png \
+               nm-stage02-connecting01-status.png \
+               nm-stage02-connecting02-status.png \
+               nm-stage02-connecting03-status.png \
+               nm-stage02-connecting04-status.png \
+               nm-stage02-connecting05-status.png \
+               nm-stage02-connecting06-status.png \
+               nm-stage02-connecting07-status.png \
+               nm-stage02-connecting08-status.png \
+               nm-stage02-connecting09-status.png \
+               nm-stage02-connecting10-status.png \
+               nm-stage02-connecting11-status.png \
+               nm-stage03-connecting01-status.png \
+               nm-stage03-connecting02-status.png \
+               nm-stage03-connecting03-status.png \
+               nm-stage03-connecting04-status.png \
+               nm-stage03-connecting05-status.png \
+               nm-stage03-connecting06-status.png \
+               nm-stage03-connecting07-status.png \
+               nm-stage03-connecting08-status.png \
+               nm-stage03-connecting09-status.png \
+               nm-stage03-connecting10-status.png \
+               nm-stage03-connecting11-status.png \
                nm-tech-cdma-1x-status.png \
                nm-tech-edge-status.png \
                nm-tech-evdo-status.png \
diff --git a/icons/status/22/nm-stage01-connecting01-status.png 
b/icons/status/22/nm-stage01-connecting01-status.png
new file mode 120000
index 0000000..1b0b336
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting01-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting01.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting02-status.png 
b/icons/status/22/nm-stage01-connecting02-status.png
new file mode 120000
index 0000000..35e66cd
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting02-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting02.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting03-status.png 
b/icons/status/22/nm-stage01-connecting03-status.png
new file mode 120000
index 0000000..baa75aa
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting03-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting03.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting04-status.png 
b/icons/status/22/nm-stage01-connecting04-status.png
new file mode 120000
index 0000000..9c747d8
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting04-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting04.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting05-status.png 
b/icons/status/22/nm-stage01-connecting05-status.png
new file mode 120000
index 0000000..4e1fb5c
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting05-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting05.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting06-status.png 
b/icons/status/22/nm-stage01-connecting06-status.png
new file mode 120000
index 0000000..001e2e8
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting06-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting06.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting07-status.png 
b/icons/status/22/nm-stage01-connecting07-status.png
new file mode 120000
index 0000000..b6481f0
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting07-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting07.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting08-status.png 
b/icons/status/22/nm-stage01-connecting08-status.png
new file mode 120000
index 0000000..9754c6e
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting08-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting08.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting09-status.png 
b/icons/status/22/nm-stage01-connecting09-status.png
new file mode 120000
index 0000000..c714d52
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting09-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting09.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting10-status.png 
b/icons/status/22/nm-stage01-connecting10-status.png
new file mode 120000
index 0000000..8cd0473
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting10-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting10.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage01-connecting11-status.png 
b/icons/status/22/nm-stage01-connecting11-status.png
new file mode 120000
index 0000000..274e41f
--- /dev/null
+++ b/icons/status/22/nm-stage01-connecting11-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage01-connecting11.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting01-status.png 
b/icons/status/22/nm-stage02-connecting01-status.png
new file mode 120000
index 0000000..4f50ef6
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting01-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting01.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting02-status.png 
b/icons/status/22/nm-stage02-connecting02-status.png
new file mode 120000
index 0000000..ca66292
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting02-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting02.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting03-status.png 
b/icons/status/22/nm-stage02-connecting03-status.png
new file mode 120000
index 0000000..9527a2b
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting03-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting03.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting04-status.png 
b/icons/status/22/nm-stage02-connecting04-status.png
new file mode 120000
index 0000000..a242faa
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting04-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting04.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting05-status.png 
b/icons/status/22/nm-stage02-connecting05-status.png
new file mode 120000
index 0000000..0174481
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting05-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting05.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting06-status.png 
b/icons/status/22/nm-stage02-connecting06-status.png
new file mode 120000
index 0000000..db637ce
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting06-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting06.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting07-status.png 
b/icons/status/22/nm-stage02-connecting07-status.png
new file mode 120000
index 0000000..acffea3
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting07-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting07.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting08-status.png 
b/icons/status/22/nm-stage02-connecting08-status.png
new file mode 120000
index 0000000..f1cd55f
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting08-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting08.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting09-status.png 
b/icons/status/22/nm-stage02-connecting09-status.png
new file mode 120000
index 0000000..ba68d3c
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting09-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting09.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting10-status.png 
b/icons/status/22/nm-stage02-connecting10-status.png
new file mode 120000
index 0000000..ee59ff1
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting10-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting10.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage02-connecting11-status.png 
b/icons/status/22/nm-stage02-connecting11-status.png
new file mode 120000
index 0000000..aa420ce
--- /dev/null
+++ b/icons/status/22/nm-stage02-connecting11-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage02-connecting11.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting01-status.png 
b/icons/status/22/nm-stage03-connecting01-status.png
new file mode 120000
index 0000000..4d97bcb
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting01-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting01.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting02-status.png 
b/icons/status/22/nm-stage03-connecting02-status.png
new file mode 120000
index 0000000..9130604
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting02-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting02.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting03-status.png 
b/icons/status/22/nm-stage03-connecting03-status.png
new file mode 120000
index 0000000..45f47be
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting03-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting03.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting04-status.png 
b/icons/status/22/nm-stage03-connecting04-status.png
new file mode 120000
index 0000000..6ca82c4
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting04-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting04.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting05-status.png 
b/icons/status/22/nm-stage03-connecting05-status.png
new file mode 120000
index 0000000..4304328
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting05-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting05.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting06-status.png 
b/icons/status/22/nm-stage03-connecting06-status.png
new file mode 120000
index 0000000..aee7d78
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting06-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting06.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting07-status.png 
b/icons/status/22/nm-stage03-connecting07-status.png
new file mode 120000
index 0000000..83f1bd5
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting07-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting07.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting08-status.png 
b/icons/status/22/nm-stage03-connecting08-status.png
new file mode 120000
index 0000000..f53e1bf
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting08-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting08.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting09-status.png 
b/icons/status/22/nm-stage03-connecting09-status.png
new file mode 120000
index 0000000..b16542f
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting09-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting09.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting10-status.png 
b/icons/status/22/nm-stage03-connecting10-status.png
new file mode 120000
index 0000000..23541b7
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting10-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting10.png
\ No newline at end of file
diff --git a/icons/status/22/nm-stage03-connecting11-status.png 
b/icons/status/22/nm-stage03-connecting11-status.png
new file mode 120000
index 0000000..080baa2
--- /dev/null
+++ b/icons/status/22/nm-stage03-connecting11-status.png
@@ -0,0 +1 @@
+../../apps/22/nm-stage03-connecting11.png
\ No newline at end of file
diff --git a/src/applet.c b/src/applet.c
index 2bd93c0..f0971e9 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -2745,10 +2745,10 @@ mm1_client_setup (NMApplet *applet)
 #endif /* WITH_MODEM_MANAGER_1 */
 
 static void
-applet_common_get_device_icon (NMDeviceState state,
-                               GdkPixbuf **out_pixbuf,
-                               char **out_icon_name,
-                               NMApplet *applet)
+applet_common_get_device_icon_status (NMDeviceState state,
+                                      GdkPixbuf **out_pixbuf,
+                                      char **out_icon_name,
+                                      NMApplet *applet)
 {
        int stage = -1;
 
@@ -2768,7 +2768,7 @@ applet_common_get_device_icon (NMDeviceState state,
        }
 
        if (stage >= 0) {
-               char *name = g_strdup_printf ("nm-stage%02d-connecting%02d", stage + 1, 
applet->animation_step + 1);
+               char *name = g_strdup_printf ("nm-stage%02d-connecting%02d-status", stage + 1, 
applet->animation_step + 1);
 
                if (out_pixbuf)
                        *out_pixbuf = g_object_ref (nma_icon_check_and_load (name, applet));
@@ -2868,7 +2868,7 @@ applet_get_device_icon_for_state (NMApplet *applet,
        }
 
 out:
-       applet_common_get_device_icon (state, out_pixbuf, out_icon_name, applet);
+       applet_common_get_device_icon_status (state, out_pixbuf, out_icon_name, applet);
 }
 
 static char *


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