From 75d768a24ff3d658ac01e94a29d774a5ba9dba40 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 6 Oct 2005 20:37:13 +0000 Subject: [PATCH] 2005-10-06 Christopher Aillon * gnome/applet/applet.c: * gnome/applet/applet.h: * gnome/applet/icons/Makefile.am: Convey information about the current connection stage in the icons themselves instead of creating a separate progress bar. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@998 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 + gnome/applet/applet.c | 197 ++++++++++++------------- gnome/applet/applet.h | 10 +- gnome/applet/icons/Makefile.am | 56 ++++--- gnome/applet/icons/nm-connecting01.png | Bin 1168 -> 0 bytes gnome/applet/icons/nm-connecting02.png | Bin 1188 -> 0 bytes gnome/applet/icons/nm-connecting03.png | Bin 1206 -> 0 bytes gnome/applet/icons/nm-connecting04.png | Bin 1220 -> 0 bytes gnome/applet/icons/nm-connecting05.png | Bin 1200 -> 0 bytes gnome/applet/icons/nm-connecting06.png | Bin 1144 -> 0 bytes gnome/applet/icons/nm-connecting07.png | Bin 1139 -> 0 bytes gnome/applet/icons/nm-connecting08.png | Bin 1092 -> 0 bytes gnome/applet/icons/nm-connecting09.png | Bin 1157 -> 0 bytes gnome/applet/icons/nm-connecting10.png | Bin 1205 -> 0 bytes gnome/applet/icons/nm-connecting11.png | Bin 1152 -> 0 bytes 15 files changed, 139 insertions(+), 132 deletions(-) delete mode 100644 gnome/applet/icons/nm-connecting01.png delete mode 100644 gnome/applet/icons/nm-connecting02.png delete mode 100644 gnome/applet/icons/nm-connecting03.png delete mode 100644 gnome/applet/icons/nm-connecting04.png delete mode 100644 gnome/applet/icons/nm-connecting05.png delete mode 100644 gnome/applet/icons/nm-connecting06.png delete mode 100644 gnome/applet/icons/nm-connecting07.png delete mode 100644 gnome/applet/icons/nm-connecting08.png delete mode 100644 gnome/applet/icons/nm-connecting09.png delete mode 100644 gnome/applet/icons/nm-connecting10.png delete mode 100644 gnome/applet/icons/nm-connecting11.png diff --git a/ChangeLog b/ChangeLog index 78b3cb98c4..a1be1eb37d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-06 Christopher Aillon + + * gnome/applet/applet.c: + * gnome/applet/applet.h: + * gnome/applet/icons/Makefile.am: + Convey information about the current connection stage in the + icons themselves instead of creating a separate progress bar. + 2005-10-04 Robert Love * src/nm-dbus-device.c: Use iw_ether_ntop(), not ether_ntoa_r(), to diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c index 5cc2e3a625..3c39a8675e 100644 --- a/gnome/applet/applet.c +++ b/gnome/applet/applet.c @@ -859,17 +859,6 @@ out: } -static void nmwa_set_progress (NMWirelessApplet *applet, GdkPixbuf *progress_icon) -{ - g_return_if_fail (applet != NULL); - - gtk_image_set_from_pixbuf (GTK_IMAGE (applet->progress_bar), progress_icon); - if (!progress_icon) - gtk_widget_hide (applet->progress_bar); - else - gtk_widget_show (applet->progress_bar); -} - static GdkPixbuf *nmwa_get_connected_icon (NMWirelessApplet *applet, NetworkDevice *dev) { int strength = 0; @@ -904,62 +893,12 @@ static GdkPixbuf *nmwa_get_connected_icon (NMWirelessApplet *applet, NetworkDevi } -/* - * animation_timeout - * - * Jump to the next frame of the applets icon if the icon - * is supposed to be animated. - * - */ -static gboolean animation_timeout (NMWirelessApplet *applet) -{ - NetworkDevice *act_dev; - - g_return_val_if_fail (applet != NULL, FALSE); - - if (!applet->nm_running) - { - applet->animation_step = 0; - return TRUE; - } - - act_dev = nmwa_get_first_active_device (applet->device_list); - - if (applet->nm_state == NM_STATE_CONNECTING) - { - if (act_dev && network_device_is_wireless (act_dev)) - { - if (applet->animation_step >= NUM_WIRELESS_CONNECTING_FRAMES) - applet->animation_step = 0; - nmwa_set_icon (applet, applet->wireless_connecting_icons[applet->animation_step], NULL); - } - else if (act_dev) - { - if (applet->animation_step >= NUM_WIRED_CONNECTING_FRAMES) - applet->animation_step = 0; - nmwa_set_icon (applet, applet->wired_connecting_icons[applet->animation_step], NULL); - } - applet->animation_step ++; - } - else if (nmwa_get_first_activating_vpn_connection (applet) != NULL) - { - GdkPixbuf *connected_icon; - connected_icon = nmwa_get_connected_icon (applet, act_dev); - - if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES) - applet->animation_step = 0; - nmwa_set_icon (applet, connected_icon, applet->vpn_connecting_icons[applet->animation_step]); - applet->animation_step ++; - } - - return TRUE; -} - - static GdkPixbuf * nmwa_act_stage_to_pixbuf (NMWirelessApplet *applet, NetworkDevice *dev, WirelessNetwork *net, char **tip) { const char *essid; const char *iface; + gint connecting_stage = -1; + GdkPixbuf *pixbuf = NULL; g_return_val_if_fail (applet != NULL, NULL); g_return_val_if_fail (dev != NULL, NULL); @@ -975,7 +914,8 @@ static GdkPixbuf * nmwa_act_stage_to_pixbuf (NMWirelessApplet *applet, NetworkDe *tip = g_strdup_printf (_("Preparing device %s for the wired network..."), iface); else if (network_device_is_wireless (dev)) *tip = g_strdup_printf (_("Preparing device %s for the wireless network '%s'..."), iface, essid); - return applet->progress_icons[1]; + connecting_stage = 0; + break; } case NM_ACT_STAGE_DEVICE_CONFIG: @@ -984,14 +924,16 @@ static GdkPixbuf * nmwa_act_stage_to_pixbuf (NMWirelessApplet *applet, NetworkDe *tip = g_strdup_printf (_("Configuring device %s for the wired network..."), iface); else if (network_device_is_wireless (dev)) *tip = g_strdup_printf (_("Attempting to join the wireless network '%s'..."), essid); - return applet->progress_icons[3]; + connecting_stage = 0; + break; } case NM_ACT_STAGE_NEED_USER_KEY: { if (network_device_is_wireless (dev)) *tip = g_strdup_printf (_("Waiting for Network Key for the wireless network '%s'..."), essid); - return applet->progress_icons[4]; + connecting_stage = 0; + break; } case NM_ACT_STAGE_IP_CONFIG_START: @@ -1000,7 +942,8 @@ static GdkPixbuf * nmwa_act_stage_to_pixbuf (NMWirelessApplet *applet, NetworkDe *tip = g_strdup_printf (_("Requesting a network address from the wired network...")); else if (network_device_is_wireless (dev)) *tip = g_strdup_printf (_("Requesting a network address from the wireless network '%s'..."), essid); - return applet->progress_icons[5]; + connecting_stage = 1; + break; } case NM_ACT_STAGE_IP_CONFIG_GET: @@ -1009,7 +952,8 @@ static GdkPixbuf * nmwa_act_stage_to_pixbuf (NMWirelessApplet *applet, NetworkDe *tip = g_strdup_printf (_("Requesting a network address from the wired network...")); else if (network_device_is_wireless (dev)) *tip = g_strdup_printf (_("Requesting a network address from the wireless network '%s'..."), essid); - return applet->progress_icons[8]; + connecting_stage = 2; + break; } case NM_ACT_STAGE_IP_CONFIG_COMMIT: @@ -1018,7 +962,8 @@ static GdkPixbuf * nmwa_act_stage_to_pixbuf (NMWirelessApplet *applet, NetworkDe *tip = g_strdup_printf (_("Finishing connection to the wired network...")); else if (network_device_is_wireless (dev)) *tip = g_strdup_printf (_("Finishing connection to the wireless network '%s'..."), essid); - return applet->progress_icons[10]; + connecting_stage = 2; + break; } default: @@ -1028,7 +973,71 @@ static GdkPixbuf * nmwa_act_stage_to_pixbuf (NMWirelessApplet *applet, NetworkDe case NM_ACT_STAGE_UNKNOWN: break; } - return NULL; + + if (connecting_stage >= 0 && connecting_stage < NUM_CONNECTING_STAGES) + { + if (applet->animation_step > NUM_CONNECTING_FRAMES) + applet->animation_step = 0; + + pixbuf = applet->network_connecting_icons[connecting_stage][applet->animation_step]; + } + + return pixbuf; +} + + + +/* + * animation_timeout + * + * Jump to the next frame of the applets icon if the icon + * is supposed to be animated. + * + */ +static gboolean animation_timeout (NMWirelessApplet *applet) +{ + NetworkDevice *act_dev; + GdkPixbuf *pixbuf; + + g_return_val_if_fail (applet != NULL, FALSE); + + if (!applet->nm_running) + { + applet->animation_step = 0; + return TRUE; + } + + act_dev = nmwa_get_first_active_device (applet->device_list); + if (!act_dev) + { + applet->animation_step = 0; + return TRUE; + } + + if (applet->nm_state == NM_STATE_CONNECTING) + { + if (act_dev) + { + char *tip = NULL; + pixbuf = nmwa_act_stage_to_pixbuf (applet, act_dev, NULL, &tip); + g_free (tip); + + if (pixbuf) + nmwa_set_icon (applet, pixbuf, NULL); + } + applet->animation_step ++; + } + else if (nmwa_get_first_activating_vpn_connection (applet) != NULL) + { + pixbuf = nmwa_get_connected_icon (applet, act_dev); + + if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES) + applet->animation_step = 0; + nmwa_set_icon (applet, pixbuf, applet->vpn_connecting_icons[applet->animation_step]); + applet->animation_step ++; + } + + return TRUE; } @@ -1044,7 +1053,6 @@ static void nmwa_update_state (NMWirelessApplet *applet) gboolean show_applet = TRUE; gboolean need_animation = FALSE; GdkPixbuf * pixbuf = NULL; - GdkPixbuf * progress = NULL; gint strength = -1; char * tip = NULL; char * vpntip = NULL; @@ -1094,8 +1102,10 @@ static void nmwa_update_state (NMWirelessApplet *applet) break; case NM_STATE_CONNECTING: - progress = nmwa_act_stage_to_pixbuf (applet, act_dev, active_network, &tip); - need_animation = TRUE; + { + pixbuf = nmwa_act_stage_to_pixbuf (applet, act_dev, active_network, &tip); + need_animation = TRUE; + } break; default: @@ -1133,8 +1143,6 @@ done: gtk_tooltips_set_tip (applet->tooltips, applet->event_box, tip, NULL); g_free (tip); - nmwa_set_progress (applet, progress); - applet->animation_step = 0; if (applet->animation_id) g_source_remove (applet->animation_id); @@ -2121,13 +2129,11 @@ static void nmwa_setup_widgets (NMWirelessApplet *applet) applet->dropdown_menu = nmwa_dropdown_menu_create (GTK_MENU_ITEM (applet->top_menu_item), applet); applet->pixmap = gtk_image_new (); - applet->progress_bar = gtk_image_new (); applet->icon_box = gtk_hbox_new (FALSE, 3); gtk_container_set_border_width (GTK_CONTAINER (applet->icon_box), 0); /* Set up the widget structure and show the applet */ - gtk_container_add (GTK_CONTAINER (applet->icon_box), applet->progress_bar); gtk_container_add (GTK_CONTAINER (applet->icon_box), applet->pixmap); gtk_container_add (GTK_CONTAINER (applet->top_menu_item), applet->icon_box); gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), applet->top_menu_item); @@ -2356,7 +2362,7 @@ static void setup_stock (void) static void nmwa_icons_free (NMWirelessApplet *applet) { - gint i; + gint i,j; g_object_unref (applet->no_connection_icon); g_object_unref (applet->wired_icon); @@ -2369,11 +2375,9 @@ static void nmwa_icons_free (NMWirelessApplet *applet) g_object_unref (applet->wireless_75_icon); g_object_unref (applet->wireless_100_icon); - for (i = 0; i < NUM_WIRED_CONNECTING_FRAMES; i++) - g_object_unref (applet->wired_connecting_icons[i]); - - for (i = 0; i < NUM_WIRELESS_CONNECTING_FRAMES; i++) - g_object_unref (applet->wireless_connecting_icons[i]); + for (i = 0; i < NUM_CONNECTING_STAGES; i++) + for (j = 0; j < NUM_CONNECTING_FRAMES; j++) + g_object_unref (applet->network_connecting_icons[i][j]); for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) g_object_unref (applet->vpn_connecting_icons[i]); @@ -2395,7 +2399,7 @@ static gboolean nmwa_icons_load_from_disk (NMWirelessApplet *applet, GtkIconTheme *icon_theme) { char * name; - int i; + int i, j; gboolean success = FALSE; /* Assume icons are square */ @@ -2412,25 +2416,14 @@ nmwa_icons_load_from_disk (NMWirelessApplet *applet, GtkIconTheme *icon_theme) ICON_LOAD(applet->wireless_75_icon, "nm-signal-75"); ICON_LOAD(applet->wireless_100_icon, "nm-signal-100"); - for (i = 0; i < NUM_PROGRESS_FRAMES; i++) + for (i = 0; i < NUM_CONNECTING_STAGES; i++) { - name = g_strdup_printf ("nm-progress%02d", i+1); - ICON_LOAD(applet->progress_icons[i], name); - g_free (name); - } - - for (i = 0; i < NUM_WIRED_CONNECTING_FRAMES; i++) - { - name = g_strdup_printf ("nm-connecting%02d", i+1); - ICON_LOAD(applet->wired_connecting_icons[i], name); - g_free (name); - } - - for (i = 0; i < NUM_WIRELESS_CONNECTING_FRAMES; i++) - { - name = g_strdup_printf ("nm-connecting%02d", i+1); - ICON_LOAD(applet->wireless_connecting_icons[i], name); - g_free (name); + for (j = 0; j < NUM_CONNECTING_FRAMES; j++) + { + name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1); + ICON_LOAD(applet->network_connecting_icons[i][j], name); + g_free (name); + } } for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) diff --git a/gnome/applet/applet.h b/gnome/applet/applet.h index 0ed958d137..7c875804e1 100644 --- a/gnome/applet/applet.h +++ b/gnome/applet/applet.h @@ -93,17 +93,14 @@ typedef struct GdkPixbuf * no_connection_icon; GdkPixbuf * wired_icon; GdkPixbuf * adhoc_icon; -#define NUM_PROGRESS_FRAMES 11 - GdkPixbuf * progress_icons[NUM_PROGRESS_FRAMES]; -#define NUM_WIRED_CONNECTING_FRAMES 11 - GdkPixbuf * wired_connecting_icons[NUM_WIRED_CONNECTING_FRAMES]; GdkPixbuf * wireless_00_icon; GdkPixbuf * wireless_25_icon; GdkPixbuf * wireless_50_icon; GdkPixbuf * wireless_75_icon; GdkPixbuf * wireless_100_icon; -#define NUM_WIRELESS_CONNECTING_FRAMES 11 - GdkPixbuf * wireless_connecting_icons[NUM_WIRELESS_CONNECTING_FRAMES]; +#define NUM_CONNECTING_STAGES 3 +#define NUM_CONNECTING_FRAMES 11 + GdkPixbuf * network_connecting_icons[NUM_CONNECTING_STAGES][NUM_CONNECTING_FRAMES]; #define NUM_VPN_CONNECTING_FRAMES 14 GdkPixbuf * vpn_connecting_icons[NUM_VPN_CONNECTING_FRAMES]; GdkPixbuf * vpn_lock_icon; @@ -115,7 +112,6 @@ typedef struct /* Direct UI elements */ GtkWidget * icon_box; GtkWidget * pixmap; - GtkWidget * progress_bar; GtkWidget * top_menu_item; GtkWidget * dropdown_menu; GtkWidget * vpn_menu; diff --git a/gnome/applet/icons/Makefile.am b/gnome/applet/icons/Makefile.am index d922faf494..fd59a8a927 100644 --- a/gnome/applet/icons/Makefile.am +++ b/gnome/applet/icons/Makefile.am @@ -10,29 +10,39 @@ smallicon_DATA= \ nm-no-connection.png\ nm-device-wired.png \ nm-adhoc.png \ - nm-connecting01.png \ - nm-connecting02.png \ - nm-connecting03.png \ - nm-connecting04.png \ - nm-connecting05.png \ - nm-connecting06.png \ - nm-connecting07.png \ - nm-connecting08.png \ - nm-connecting09.png \ - nm-connecting10.png \ - nm-connecting11.png \ - nm-progress11.png \ - nm-progress01.png \ - nm-progress02.png \ - nm-progress03.png \ - nm-progress04.png \ - nm-progress05.png \ - nm-progress06.png \ - nm-progress07.png \ - nm-progress08.png \ - nm-progress09.png \ - nm-progress10.png \ - nm-progress11.png \ + nm-stage01-connecting01.png \ + nm-stage01-connecting02.png \ + nm-stage01-connecting03.png \ + nm-stage01-connecting04.png \ + nm-stage01-connecting05.png \ + nm-stage01-connecting06.png \ + nm-stage01-connecting07.png \ + nm-stage01-connecting08.png \ + nm-stage01-connecting09.png \ + nm-stage01-connecting10.png \ + nm-stage01-connecting11.png \ + nm-stage02-connecting01.png \ + nm-stage02-connecting02.png \ + nm-stage02-connecting03.png \ + nm-stage02-connecting04.png \ + nm-stage02-connecting05.png \ + nm-stage02-connecting06.png \ + nm-stage02-connecting07.png \ + nm-stage02-connecting08.png \ + nm-stage02-connecting09.png \ + nm-stage02-connecting10.png \ + nm-stage02-connecting11.png \ + nm-stage03-connecting01.png \ + nm-stage03-connecting02.png \ + nm-stage03-connecting03.png \ + nm-stage03-connecting04.png \ + nm-stage03-connecting05.png \ + nm-stage03-connecting06.png \ + nm-stage03-connecting07.png \ + nm-stage03-connecting08.png \ + nm-stage03-connecting09.png \ + nm-stage03-connecting10.png \ + nm-stage03-connecting11.png \ nm-signal-00.png \ nm-signal-25.png \ nm-signal-50.png \ diff --git a/gnome/applet/icons/nm-connecting01.png b/gnome/applet/icons/nm-connecting01.png deleted file mode 100644 index f82235fd0945e0ba61934d85f18e1b12874e8ef3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1168 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 O0000HP)h0w-md?7yYrcW9Y zVy7|DSAmciB>H5c7!lA?3W|hQOD{s(>2%64ojG%^d%LEg%|I&YxRO0*_T_xD_N;&X zgmVt}$1Cp-kgt#QEpK$~PlgPe3i%@FicGxrxEa)anI2%CJwKnawsmYj_2CD7x9(?< zwZJd*C56QtQB${tM#JK5lE`%gC1k%8+X?R{>SZd-;lbaA+7+3r}^GrM~6wVU_@ zcUBm*9Qg9PNm6>wERf*jENwGP*6lHPqflgT8K&D4DGtB=P;D^&@Rp5oeO-bi;0};Ma}d-Z%p~GbBE_m>Ffwul zCMTz$swxJtSPXnV@sUd-*Lt%Ch%2n+FMIow6f@(~^F*4>kj*|3+8HBFmIJCNz_==T zg)o69LIF7z@cThiH4sD!p3A_tZJbNejY4?0IVXIJxRKS234T%>97x1tWK+>0aZVr` z3-eP|Ve1 z-|h)MRp6rVdq^-2N2T0%Ys&3G@zE!rZB5NDzL>Lp4XM2J)Qnf(0900h5EHkjG@3u8 zOS!WmR2YPiTN`Stj-=+qnw+FRD>JDRt5bu;FLK~#6v4Sd30A7oj8~$ke~_3=i?~Fr z^|(*=f$fT5{queDo!ozRUL~=o?+a>!0zVG)vIn*_7OB*ICCNBA1RP#z9ow~{4DJEn zh59|uYgo!IKF>VH(+g>@xux|4t}h|HP%(HVQ^#?de>->fSaTuuLoT26^iS+4MP{seHo2J9^16B!JkOPX*^yN2nYO~zn=f)IG(9qZ^q?d z^Y78oeVQV-EE~;bG@7Yt&~+WnMh96Go3HFH4qSx6{Q3N*R`=JC>j;6Q_AluW&M8z7R769+I-w) ze6(aNj^hGj98A-JC7h%4jcwW5d~&_Ypyg6KeCWNI)@^OCXYb@M&ZQRe^XUwmO{EJ< zh2l_ad&ho+PX8|*ml@6G+nLNhv_=^fh0000< KMNUMnLSTZURu;|x diff --git a/gnome/applet/icons/nm-connecting07.png b/gnome/applet/icons/nm-connecting07.png deleted file mode 100644 index 869a188c465b464bb859fc627bdd40216d0e9a95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1139 zcmV-(1dRKMP)no~)go<8EyZp>_M^M(-rc?T&Ykhxic;!Y+ITjT-I<;F z<(&WdAW}-WlkM;Bqe6gUb0Ruwt&Osj?s7O6iG>BbxxM4;@i)4!uY5yR1MfT1M#)s zB#_9G4*dOS!KT|;ai%j8RH~z~C|th$6HHBAgQ}`1M59qq8EYB3^y^`p-{P@yV2nYO z93oItKcx`WDX(BmmVyDD1_J>w{01nDg3ATiwhe|))2^h9z2*d*!{-D43C55hS}84E zg%RA&g$>vcc6f;pWjj?Azt8Uj#uzw`4Y&u}RUq%Et%+%N^ugyp$W({i@v>5U)q6x% z1|+}q$*T!mqkCFlq`kG_v@6`7^Z5b-Im#u$vK;XCiGnU}(2a^iwF3(|^$|iqC2J`+ z&rZD8>%+SZlM@pkN5bJP=yf2qm=}}rf;*gPCWL8N3W}<#;)_^?b8OAvzwMoqr?#e( z$-NkU==vhtc4e`q(Gq&QL{X4LF(;$CB2F?`rx8MCs$#L;s|nqh6Z#I#&<;_T)^iDA zRL8~igc);V>-KoL?Rw>-SkcvAb_9FL6;OwzN$`_ngul<=f0)5+$05c%5j5^f5^#l7 zB}kJ3)mfP&VKkuPa&UPa=z8baQU3~!0yi~c_j9T;B9$jmrl1rurxEA7+oZS&4Y;nm zDVIqSpbj)!+1zx!RJo(EQS1a?_v9PnQmF>x3RH< zhEH!<8Z^T=Xs%5|Boe`469JvErmLgBbfVXlYf0>Kk1M={X`1d228^XaLlp|b^;*~R zW`iH+f+vNwUa-lSqBw#U5D?UTe+?SWZEOk(gyK1+@@A#n(f*MFGwwFr+jxcxIktSz zlu8cda4&(3-?z2t^KzB3D%h)v<8QteZ`;=XTqc|UVQxN|Ur40H?0mw^nZ=>D`yV)j z(CIa|ez}&$LDRUHN*$zB(Xpn@s#x?(g#NysuKZJg0RY-(<#ru>@NED9002ovPDHLk FV1kD_Ej$1K diff --git a/gnome/applet/icons/nm-connecting08.png b/gnome/applet/icons/nm-connecting08.png deleted file mode 100644 index 01e2929b55b13ed6465af52a68e11e9d92c45ea6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1092 zcmV-K1iSl*P)sWz%+6AGySp^qjoVLw(1OK86Nw2;uzm8u2g4(#FA@bCBQJ(TB8eJ} z8hNnQn3y0Bi24BftO13VVu50yM!;+f%9h=2x9#rEe$Cvuo-u-J-K4wmBqzIf=FBhW zp7TG4NGYKiJMzxaSbjOX$8j8)N~i5@13OMn{|?DhNB92=L>d9V{lOS<1hh!kj$NEM z_r>t=(>*22GNvzGE|#m#&8Kz^?!~Y_4jtUTdjA``9`u<5=p{laodVUvw3A?K1GLy_KmBgQMsWqbd2px z+`4t5H5h!vFm!VzSE$b2&6g&U-L^}(>E%f&Is5QN_jS^&j^BF!qfObx#bH7eHI;+- zxw%kB(N+hsOa`(9hFF}*V+@)!Lde}vBr@ieeLI~;JE(hYG*zf5l_Bw!YV0TfI@8INSC@&Vi{~&2Wko-dRLY*uV&M!(Hp;9AH`>F z_|B}CHCH5Os>)Q(T+W%`Diip>NY`d++jiH~`5(WEMca-i*}OS5dHx%G7sVL9 z7EFn|%7~a%6*8x)w16%tW9izAbzFt<>8Z)jf`LF^S4Z58M%!`GZ1g|mH=nq8Vd5ml zMAm|JT3SFqMTz)QA#g@foNI>P^!>GHs6xRN-so0=akC7m9nlqs4-qobawZg zbX<9(cF~l}HstY)>b%*zY4g_@XEg=(YJB*$SCakPw(nV4EnK>nS}de9OYTA{W96;V zbpN9R&m;6s!=qnsq;b*oEH5oRi_Oze(^e=F{uZHg%}nK=0t^6rgv5JMevkbC0000< KMNUMnLSTZr783XX diff --git a/gnome/applet/icons/nm-connecting09.png b/gnome/applet/icons/nm-connecting09.png deleted file mode 100644 index dfb44fbcc6c609fafe84f471a71a850a843eaf54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1157 zcmV;01bX|4P)=eL37Z+m-u-j<64KYiNW z{d8NYSTryH^6N_3^~WE3;>nkB|27`5bpIP#B~cSWYcCHC_FDCIyE3iK(Wa&}ZEQ?M zYog|!feRPT2mx^rXe0rKq8RyKX9ElCXLAgAHNeQEhB3xfRWqZJ2$+Tmj8h1F0j}$UuB*oFqOp7WH`x97s~-;! z_P$=`RklJBATFVFg)$b^4IMb=;CU|K8hpV-enr`7JMfI|(ERr2Pu;Ax$0F0-{-qy? zQQKZYKp%vV;5Z(H>w86|{HK%FY=`eEl;xw8%Ot5*ZrBbTYg?x#Ci<-U`fY}xo6ELc zp1oU`AH0(pE%|Dj5X@IO4AjPCFWIb)kH7a(M}B_3n^ML-U+N?C*0qT{d~cylo|6Jn zKww5w;S&y<9E6bBcruyAMPzHV_PbPq#mGdzPK zINoDDQ_O_SQ2&pgH>Fd@lJU9|7&dPY4fcP9dugmuD}iI0rxMPaDQ6uB8B-KW7-vLP zSiX|6j#1c*L36skuI_?vSr|4JXq>Tj7Mo-=BO%a^f#iD&{F8 zC1flW&daJwuhd0@?<#?d*nGAYG@$7^7znQE3Yvn#>U&D%no`!xB4-H5A&_#4P$Ge| zsT$oqA5)!6v?6nZ*0!zZd?CjwgQi^epnz)$WW2qj^NTQ>?|<_{_N7vU*!>**K6Khy zgF1Z%clz-#`)}ukstC1u{KSWCHzy`Pi(B>E!=NeHc4={Gd30N6=ONr5*+|QK51+MA z>@`tZDo~J1-=2KU-_X(+G+P&PxqTQk8fv;2PbR)b(BJ>dh0h*2MX@9Do9tovmjD9* X-dDqF*Vf7n00000NkvXXu0mjf$6pof diff --git a/gnome/applet/icons/nm-connecting10.png b/gnome/applet/icons/nm-connecting10.png deleted file mode 100644 index 5c47f89fa03b095cf5f2c870cf87693f925ae9b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1205 zcmV;m1WNmfP)27NFwF~$cI5^sr; z@F4gAHkeRFNl=bD4j> z`Oo)%|F=X+3B`;(AMT5!<`SKpb2&XTItSv}Bu z`pfqAN7iOD8EbIp>_X1wV>{Y*K8Ndn;Q`5;d+0I~wGgy)u)ptcFi^IkuD04AiB!?b z$_oDqzja^lFFzl~m>?#gKlA1RvTR_?Br`rX+G!bjW4JsF=g(h&YuBzrC=`ZpI1IX` zHeMVVdCX%VXaBp0Ee9AgS)nKj(=^@k`+Q)T7ATB@%LUlB4Z5zGglU0A4*KzZyK}`* zAqfzhP`W@B1q{;w6Tx*u1MgXa;>6S1s?(Qb#e**%(2D^Ub@lbfxhpQE(+l7@9E6at zxaffQJeOsO(PVY{a#U@cNzj_jPk*YB<;o4|Ffg|Ek1JQc2nGW8n5JQ+(&=nGk(&5z zrtakYf>tF7jS>mNKAoH+#p?LIk3U(Th{xM0RT%DN#0-A(!-&!}IjcN@jMbndqJ+o+ z21O1+$YiLzd_Uf*9+jw=+;>kMR8%IfBQp*7t{M4NiU#(iw{&aYIt*l1SLHN{B;#_Z z5R$B<@IS})7Y-3gh(;*UQ68QmyjjZb(!SnjIye=a?oy`zSqz8MimVN7HW%B0h=>Gf zdce08Zwb`rx^8u9KJlnhXUJ=Ok#9n9OSrC= z)SvXuOwkkS`p=yDI#N}!r#w{l5t_}r{e5Rn;93>NXgA}x?CLgBj=7ObWi!^WMJgmf z6rvLBB8l7-QemJKM$l+J3zU`JTUS#J$>iTK6`k@Y67yRIe(gQFb=w1vKfL?%D9S2C zh|!$mv|WH`qlyR-t}sGCAbDA)h>1er-1z8d2O3RN-e`s|0BRM2!5~VEVwc$smoNVQ z$vX{T$Q|1l$JPU4zT27mLk-{Vijb4t<5dC0;GiXiUG)${P(;C+k diff --git a/gnome/applet/icons/nm-connecting11.png b/gnome/applet/icons/nm-connecting11.png deleted file mode 100644 index 6669b5b17bd05e7564407bab108ac8b78ac40b85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1152 zcmV-`1b_R9P)^F<0)genMH z8<9XCL{kN=5584sV^dRVs3|sfo4*!KWAn4kW`AaO=FYvINfX$HC|U5pW#-;{?sv~Q z_d6d^N$w9~#OO(-Q*in67~HsV6Ozdkq*5s`bgk#=l`GGM z6<9yRw*rijG%&`vt{aveje=!bz&M3KNbo!l3_~|{L$}dY$Kh@n7)=o%9-*{C8M7m1 z1UTp5`ySvN2X_b|e&|+tsxnUH%T=qHf@IJNn_LUHQeuK8pF{S)NEGPpvqx zbY`3y1oLmS)ykRvHv$fI8rE_)nNAAaJ^7>#GBdP z7yGl*bL3g6R5cM(Lv7pCG==}cDpi#VB(!N7WL%Hjhunzpe`((^&5%9}N3hl;o2K^I zODCuhkiZDjQWCuyK*QV;y_arlpwS=*vdc>gZ{_E2AI^>cei+v>xEI|Fc)3JUC5N;F zRT!z-hPO9Ts!X~uQq+Wwk@G{}v@~aqq?1j@P;A~Cxp4jm+-pW3ecgZe3twp2=lj!+ z3%%HYJ-C#{=SmA7Qc)AE+EPSN3R_TU2I5Uk4|cTeghF8jZq41Y^ZDhy7k?QZv|1m3 zt$Y7~GPvZPpxr?LDO87632F}^5FndtDL2povjc$bYW=VbxCV9H)!wNH7KOY)e4R4 z`cTCAqGJ-*>eNv?2{$yV8BEu8PIQCMMJ)DxV@!UViMhGaFJJZV(Tb22AyF*EPUiQwUYMPeEWrIrv6Q(s|3Ue&1oqs=O(u`W|XpTDgBQ-n}x zcHLQ8+9wo?FIR{)?KbBNqOl<$td&v_Ci7;I1v3%qT~ktyo;z`{v=QSU0R{k%<>%{R Sy9glw0000