Add nm-stage* status icons originally missedlr/icon-naming-fdo661044

35 files changed, 72 insertions, 6 deletions

diff --git a/icons/status/22/Makefile.am b/icons/status/22/Makefile.am
index ffe58a7a..d41f4320 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 00000000..1b0b336c
--- /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 00000000..35e66cdd
--- /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 00000000..baa75aad
--- /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 00000000..9c747d83
--- /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 00000000..4e1fb5c9
--- /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 00000000..001e2e82
--- /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 00000000..b6481f0b
--- /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 00000000..9754c6ea
--- /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 00000000..c714d521
--- /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 00000000..8cd04739
--- /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 00000000..274e41f9
--- /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 00000000..4f50ef6b
--- /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 00000000..ca66292c
--- /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 00000000..9527a2bb
--- /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 00000000..a242faac
--- /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 00000000..01744818
--- /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 00000000..db637ce2
--- /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 00000000..acffea3f
--- /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 00000000..f1cd55f0
--- /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 00000000..ba68d3c4
--- /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 00000000..ee59ff1b
--- /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 00000000..aa420cea
--- /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 00000000..4d97bcba
--- /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 00000000..9130604a
--- /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 00000000..45f47be1
--- /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 00000000..6ca82c46
--- /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 00000000..43043288
--- /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 00000000..aee7d781
--- /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 00000000..83f1bd53
--- /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 00000000..f53e1bfc
--- /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 00000000..b16542fe
--- /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 00000000..23541b78
--- /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 00000000..080baa27
--- /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 2bd93c00..f0971e91 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 *