From 85d4ebd93cfbb22b2e12b89ffd29a3c6d76f82be Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 28 Sep 2004 20:38:23 +0000 Subject: [PATCH] Tue Sep 28 16:35:20 2004 Jonathan Blandford * panel-applet/NMWirelessApplet.c: Fix deadlock. Add a separator before 'select custom ESSID'. * panel-applet/menu-info.c: Start rewrite for better headers. Not fully complete, but syncing in prep for merge. * panel-applet/icons/*png: New images git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@178 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 10 +++ panel-applet/NMWirelessApplet.c | 9 ++- panel-applet/icons/Makefile.am | 12 ++++ panel-applet/icons/nm-connecting00.png | Bin 0 -> 929 bytes panel-applet/icons/nm-connecting01.png | Bin 0 -> 972 bytes panel-applet/icons/nm-connecting02.png | Bin 0 -> 1019 bytes panel-applet/icons/nm-connecting03.png | Bin 0 -> 971 bytes panel-applet/icons/nm-detect00.png | Bin 0 -> 611 bytes panel-applet/icons/nm-detect01.png | Bin 0 -> 650 bytes panel-applet/icons/nm-detect02.png | Bin 0 -> 598 bytes panel-applet/icons/nm-detect03.png | Bin 0 -> 711 bytes panel-applet/icons/nm-detect04.png | Bin 0 -> 629 bytes panel-applet/icons/nm-detect05.png | Bin 0 -> 774 bytes panel-applet/icons/nm-detect06.png | Bin 0 -> 586 bytes panel-applet/icons/nm-detect07.png | Bin 0 -> 696 bytes panel-applet/menu-info.c | 90 +++---------------------- panel-applet/menu-info.h | 10 ++- 17 files changed, 42 insertions(+), 89 deletions(-) create mode 100644 panel-applet/icons/nm-connecting00.png create mode 100644 panel-applet/icons/nm-connecting01.png create mode 100644 panel-applet/icons/nm-connecting02.png create mode 100644 panel-applet/icons/nm-connecting03.png create mode 100644 panel-applet/icons/nm-detect00.png create mode 100644 panel-applet/icons/nm-detect01.png create mode 100644 panel-applet/icons/nm-detect02.png create mode 100644 panel-applet/icons/nm-detect03.png create mode 100644 panel-applet/icons/nm-detect04.png create mode 100644 panel-applet/icons/nm-detect05.png create mode 100644 panel-applet/icons/nm-detect06.png create mode 100644 panel-applet/icons/nm-detect07.png diff --git a/ChangeLog b/ChangeLog index 113de15777..89760a3b53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Sep 28 16:35:20 2004 Jonathan Blandford + + * panel-applet/NMWirelessApplet.c: Fix deadlock. Add a separator + before 'select custom ESSID'. + + * panel-applet/menu-info.c: Start rewrite for better headers. Not + fully complete, but syncing in prep for merge. + + * panel-applet/icons/*png: New images + 2004-09-28 Dan Williams * src/NetworkManager.c diff --git a/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c index 38bd8f81dc..7c01ffba6b 100644 --- a/panel-applet/NMWirelessApplet.c +++ b/panel-applet/NMWirelessApplet.c @@ -640,8 +640,7 @@ static void nmwa_menu_device_add_networks (GtkWidget *menu, NetworkDevice *dev, net = (WirelessNetwork *) list->data; - menu_item = nm_menu_wireless_new (applet->image_size_group, - applet->encryption_size_group); + menu_item = nm_menu_wireless_new (applet->encryption_size_group); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); if (applet->active_device == dev && net->active) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE); @@ -708,10 +707,10 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet) g_return_if_fail (applet != NULL); g_mutex_lock (applet->data_mutex); - if (! applet->devices) { nmwa_menu_add_text_item (menu, _("No network devices have been found")); + g_mutex_unlock (applet->data_mutex); return; } @@ -757,8 +756,11 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet) } if (n_wireless_interfaces > 0) + { /* Add the 'Select a custom esssid entry */ + nmwa_menu_add_separator_item (menu); nmwa_menu_add_custom_essid_item (menu, applet); + } g_mutex_unlock (applet->data_mutex); } @@ -919,6 +921,7 @@ static void change_background_cb(PanelApplet *a, PanelAppletBackgroundType type, { GtkRcStyle *rc_style = gtk_rc_style_new (); + return; switch (type) { case PANEL_PIXMAP_BACKGROUND: diff --git a/panel-applet/icons/Makefile.am b/panel-applet/icons/Makefile.am index 3c1d9a0910..1469e3b8be 100644 --- a/panel-applet/icons/Makefile.am +++ b/panel-applet/icons/Makefile.am @@ -4,6 +4,18 @@ largeicondir=${datadir}/icons/hicolor/48x48/apps largeicon_DATA=\ nm-device-wired.png \ nm-device-wireless.png \ + nm-connecting00.png \ + nm-connecting01.png \ + nm-connecting02.png \ + nm-connecting03.png \ + nm-detect00.png \ + nm-detect01.png \ + nm-detect02.png \ + nm-detect03.png \ + nm-detect04.png \ + nm-detect05.png \ + nm-detect06.png \ + nm-detect07.png \ $(NULL) EXTRA_DIST=\ diff --git a/panel-applet/icons/nm-connecting00.png b/panel-applet/icons/nm-connecting00.png new file mode 100644 index 0000000000000000000000000000000000000000..38d33664843d5099c326ba91ee1de9c03c4cacb3 GIT binary patch literal 929 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 literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect00.png b/panel-applet/icons/nm-detect00.png new file mode 100644 index 0000000000000000000000000000000000000000..d81e551b2375f206b4635e2306bea1fa209011b1 GIT binary patch literal 611 zcmV-p0-XJcP){`%bjbAU_4BM5(Lo@8xaGs5DN|3*=Z#rf>suGR|txv z33#cr^iM!6;svw{C|Ic2*yy2EKoZHB%jN#;&hE_E*(q);Z0_5>fe-Tr2I$wXU%&q! zoxb|q{>8Z-00SVuRGpzT00a0fknyDDI&7Jc0I2UOWsj!40TV&_p6GneHO#C5K$w~Y zC?Rf?hXxw?tm_dWx_EBlOKQMcys@y_5$X7zvqnVP_uX3}{7uD4cC#HVjFp30so+np zuD5Tb1^~Q|l&ME5DFh||g9xp6y6VvQSTOJVP9cu<`N1In9su-}nY~2osZzn;F|xaOVyhhu zyW-3;)18&I)~MF@OchevadjRr;QC9 zp`jPg=0Bxf5dh%v-BZ_Nt)C{^M4{5-N|`GLc9jUZyzhNC+Aj9Oq_&+m_|?PPCoij5 z-!sM(qc|ydI_hj|D;!C*Xa-faK?002ovPDHLkV1jom9R~ma literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect01.png b/panel-applet/icons/nm-detect01.png new file mode 100644 index 0000000000000000000000000000000000000000..1cbe900ef63b187c3c9e715cf6f033abd8f166d9 GIT binary patch literal 650 zcmV;50(Jd~P)&zb+fuifkon?$2x6Hp7WQn3&M+G!SStdvwXk}N2Kg(xv8L`!RJ zECov!1dD*iLQoM6_#jGzAPXij5AwWs@BU+>V7u9?RZcb4`8W(`2G~|Bs#I(Jd3(xV z=GOsCRI0VHJOSpn`6Uu}R8;_+IB@Jdzr230DEUFRkHwk_~GlAu-Yp zM54fBIgZ3RH>Ii{g_tC%o{@zpu**hB0M{zj+KsIxuqHAhGuFtYD(3g}mfjX3o06C- zcZT&Sup5Lf0JuCb{P5$#Tc%6)-3Mrjqi07ZO`gjV#C0iDD>W~tfeK8-vZA( zO4Fv_GC+vWPGM9rR|su=c_mqQifm_h@p(Cp>Wj;prw$+7{XobkV?#%lS_Y7qfoh4Q z@qLqRE@hc#2$G?HO=})!$iK9l#0RkByCKQ+_-RN-)vhwP}O-rzdEOyq?r?u zRVy-1V*29Q{Yl$RzCU_$P8A=VV%Di9jb^jqRFf-%hi3A)Mf@`i-I|C&q+wu_yH}6v kKY2LAw_kAk?f!TD0!CKYT>~j!xBvhE07*qoM6N<$g8#)E6#xJL literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect02.png b/panel-applet/icons/nm-detect02.png new file mode 100644 index 0000000000000000000000000000000000000000..8649e25ce6291ccf0d05e220c679ca8ed76b9e99 GIT binary patch literal 598 zcmV-c0;&CpP)?yH0pm$T zK~yNu?bE+&6JZ?3@$Zl4?s7@4iI`$hFraNjB#St8aBvfwMFo|Pt&0}A6hUwZI5;?{ zgM*{EDk#<=IHaJ1I*7keL=bB%{=l9WE-{z8JkQsEzzRv~me=?!Z$4jm5H@h+?EN_a z*aH9u5Mf#bYyiLq*DDBpAo$PJ-ySOq%NGG;w-G2iHkA;Nqgdmn1Wui+U5k6>j4>uA zqO@bHu%~qfVm?cBWzzPmC`vA9Bl$rB1OQ+$%_HJF zTk%t+=n?>y%cX6{_DvPubi2I;V`T6Xovzj=5z)7p8m_DE5#WwomY*fMx3s#}Tmq5M zb*wclW@|UrV|_1RrXqlRK!n$diIDKq>bKy;m+#>$A$D?OsXG(n8P6E;23jBhzZ79; zS^PFhbhaJEy9nWEaeJ<|C7)UO>9h!l==@aH5`WxA+noNftymkQgl1zP+J??dHCSem5D<3^3A(1 kCf9?`6Brp88QFY)08oRw#(Kd(!TI>nUnwk0#r#v zK~yNu?U7ALRACf`&-uRZ-nlwDsZFS93n#}YY*8@F!kr;C5Um1t71Gb9eUMs2w2Yi( ztDx3~(=IZD7PS%jSriCjAxMp5Gjs3#e$HuSNIE(}%XyZE!}D^^i%^Hlw_hqLManp8 zmqH8^aVpZbn;hv_yHFcfBW4Q#SpZlp7V; z5*2OTKvzerOtmKllPzAGQs@wo_mbBQ005Y{kYz;Rgs&1|WREYcl#cyeuN^8^;x=O_ z$;?xG$?JBol_$ler0>bY&x#*LW9=>ha6dCVC>HY5&;Vkuh4Hb0>Zh-3AAL{00e}`} txYwxspE!H{dDqyr*(=bbNs}i3pWmm-Bv8dp#hU;C002ovPDHLkV1mwhEu{be literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect04.png b/panel-applet/icons/nm-detect04.png new file mode 100644 index 0000000000000000000000000000000000000000..e6b1aa00565fa2ec0ee321b4d0087785a6084ea0 GIT binary patch literal 629 zcmV-*0*d{KP)@)|_%Sd7QgHs- z3nWL|iMc2MV&`b-US*=aR!01b040HqgVGU6Yu_(k!b`OAIU?p{Kt6j zTA5UWFwoea&zLZy-vrwG;47>lO64oOeXcS$y8#V6As9A$D0BI~pqkCOqmZp!)JihungJ}fE&s=bhxFLXdHCD~pT&VhjK+nIgt~`-a zECgEd>UXn)h?j@opY87pFTG)CN`OLjuz^zcs6m4rIaBt z>;`}l02oOn@RfI9{&lVLt=>MN6h1V@MvEWo)7enJb&dz>O*86iFY>h<27oaD81vEy z1_yH2n~^zatt)RSW}`T^QT!v>W=wL0nbCCZRv}Rc5G(}jPkjR@9oo||_NcYgA9cC~ z5P;Tk$P57h05i)ZAz>ZMU%N3?gOz6d5&+u7Ajy&dfc!?ip&mVY{MY;hka62Avb#tX P00000NkvXXu0mjfp6w1$ literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect05.png b/panel-applet/icons/nm-detect05.png new file mode 100644 index 0000000000000000000000000000000000000000..25124502168d9c0cda13e9c5c51128942f0c315e GIT binary patch literal 774 zcmV+h1Nr=kP)2qJD0CtVc!2TBnm2>t<~RfO)` zWEL*m)r}}6X@a|Ii-HD`5CTGj1X8gknvcntdEfVW?mccAaA_vCi{e?{#W~!2IOhT% z@Lyu+@*nQZrQZv0&)oYWKljr;p>Yez-qRQFcE4AF3$;g)6U0tXh#a;EaNzWhcXk4R zY=-#C&(m!rdzMy`mtHMhZ6tfu_%VrXW}GHD8MR7&_12$4va6YdV_7gUvo#WVHSQy^ zM@06EV5+4PT^pHci(~0>&h@DBlcoAvCxIxAo#rB!7eSfiGq2XMVS($nXA8L~`qq1` zCYj&6u(-Nw^>ubQ&9tp87psWmMWhdcMG<+vA%X9I_$_uKrH500ot%8~;yV)MMlD-I@@enlb?XDp6R`Fg- zB;P#;#4r(5FUyxzy}zG}6za$n8oqJ>WxVPg38}c%6Q_ArHoe zs|zH*G2`RRt4n?8F=NFCtB8{?;>aCLvan;Nkrq;KD{7RMg4RDYvK_#$0FH==0+2Xz z%~ByZp9S6ReR!aT36i5NQpg`gH%3Mm5qDU^U` zsw*r+EUco4wV;ipQ4}#z&=hxi%bk~Gci--t85;!=Ep9<krO;?hLkt zRsT}O_t+AOPxU4BCs1kjR61<(cI7hlhay_%)akVEhqV& zHw*E}`sT3dx%zaL(+*}1b4%v|09un1^G=zkM=Vj27S|mIyR|Tw)*3J71)pLTlNWru zH97J2r&}t3h~#@trxy8huGRn%vIWtTdsh!n|LT?s1in^|#%i~hG?+O-M9*{Z z&ixxlF8uD6o5-?QORG%IuTjA(09kl=^XQd7xn%-k3bG>b8~|Rjz`MuIM(eM0{_DT! YJ6BZUTVvzzY5)KL07*qoM6N<$f;Uk5_5c6? literal 0 HcmV?d00001 diff --git a/panel-applet/icons/nm-detect07.png b/panel-applet/icons/nm-detect07.png new file mode 100644 index 0000000000000000000000000000000000000000..cf976ca4131dac6e245149c20f2915129f0d6f0e GIT binary patch literal 696 zcmV;p0!RIcP)InN0!2wg zK~yNu?UGGPlu;Ol@8_KJp7(WToHU%lBm=3W4=9Ti0)>KB4*mdtfE%ZNfE7gqt=kwR zQLAbb5spE-f*^^=7AX`eNRX6cGc`Fg&O39Sr%i^7)IMC!wLjOz&2xY{b?VgFK2qsS zGL_B@{p~yThw=n~2TIYIp({^Yw>6MTXObfF2*6=xNh(Eq?>$*KvMqsBI+Fx2p|v_` zjS2#*I}0n7J4;`RgSW@$_Wf62O-_Vk)~G^jB34f9jLf$s8edzhv(9mK?BT5Wr@)$A zM7l*l%u-&?m6pF3!*4am3;D05)i9Jpl}hcv^}92hE}_ljL<9ir8I>VI%zFB`F)H5} zv6H@UvMo)~Y2WG>VU^!s9O~jN1O3C}Ng|pMk#4OO6cGa`vq(W$CU?XG-5mEbg<_bG z1ZKWD-cUA5e+HrGnBBE=J+fh-e|S7XM9)Ozgd&1(wRoPc5a^TAv{Z9E?HqsTXluG< zjP^WF<-*WeffUNCRpl5AA~!nH%Ns68r8DONTm?`wnhIJgkBH*&nEx`cX3@9$og#t= z-e^Tr&T&&%a|EEof+B#d(rR^dr1#eny*@De>i+Z2p1}%0yIC;hoGglPu3FZH(IQTOG5Wsd%0)X+>G3 z@D`wefEGaJL@;yn(y5PI{-Sj^i4u{0JUWmcI6D!IHkd#god #include "menu-info.h" #include "gtkcellview.h" #include "gtkcellrendererprogress.h" #include "NMWirelessAppletDbus.h" #include -G_DEFINE_TYPE (NMMenuNetwork, nm_menu_network, GTK_TYPE_CHECK_MENU_ITEM); +G_DEFINE_TYPE (NMMenuNetwork, nm_menu_network, GTK_TYPE_MENU_ITEM); -static void nm_menu_network_update_image (NMMenuNetwork *menu_network); static void nm_menu_network_init (NMMenuNetwork *menu_network) { - GtkWidget *hbox; + GtkWidget *eb; - gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menu_network), TRUE); - hbox = gtk_hbox_new (FALSE, 2); - menu_network->image = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (hbox), menu_network->image, FALSE, FALSE, 0); + eb = gtk_event_box_new (); menu_network->label = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (menu_network->label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), menu_network->label, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (menu_network), hbox); - gtk_widget_show_all (hbox); + gtk_container_add (GTK_CONTAINER (eb), menu_network->label); + gtk_container_add (GTK_CONTAINER (menu_network), eb); + gtk_widget_show_all (eb); } @@ -57,32 +53,16 @@ nm_menu_network_style_set (GtkWidget *widget, GtkStyle *previous_style) { GTK_WIDGET_CLASS (nm_menu_network_parent_class)->style_set (widget, previous_style); - - nm_menu_network_update_image (NM_MENU_NETWORK (widget)); -} - -static void -nm_menu_network_draw_indicator (GtkCheckMenuItem *check_menu_item, - GdkRectangle *area) -{ - /* Don't draw the indicator if we're a wireless device */ - if (NM_MENU_NETWORK (check_menu_item)->type == DEVICE_TYPE_WIRELESS_ETHERNET) - return; - - GTK_CHECK_MENU_ITEM_CLASS (nm_menu_network_parent_class)->draw_indicator (check_menu_item, area); } static void nm_menu_network_class_init (NMMenuNetworkClass *menu_network) { GtkWidgetClass *widget_class; - GtkCheckMenuItemClass *check_menu_item_class; widget_class = GTK_WIDGET_CLASS (menu_network); - check_menu_item_class = GTK_CHECK_MENU_ITEM_CLASS (menu_network); widget_class->style_set = nm_menu_network_style_set; - check_menu_item_class->draw_indicator = nm_menu_network_draw_indicator; } GtkWidget * @@ -96,42 +76,6 @@ nm_menu_network_new (GtkSizeGroup *image_size_group) return retval; } -/* updates the image based on the icon type. It is called when themes - * change too as the icon size is theme dependent */ -static void -nm_menu_network_update_image (NMMenuNetwork *menu_network) -{ - GtkIconTheme *icon_theme; - GdkPixbuf *icon; - const gchar *icon_name = NULL; - gint size; - - if (menu_network->type == DEVICE_TYPE_WIRED_ETHERNET) - { - icon_name = "nm-device-wired"; - } - else if (menu_network->type == DEVICE_TYPE_WIRELESS_ETHERNET) - { - icon_name = "nm-device-wireless"; - } - else - { - gtk_image_set_from_pixbuf (GTK_IMAGE (menu_network->image), NULL); - return; - } - - gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), - GTK_ICON_SIZE_MENU, - &size, NULL); - - icon_theme = gtk_icon_theme_get_default (); - icon = gtk_icon_theme_load_icon (icon_theme, - icon_name, - size, 0, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE (menu_network->image), icon); - if (icon) - g_object_unref (icon); -} void nm_menu_network_update (NMMenuNetwork *menu_network, @@ -166,12 +110,6 @@ nm_menu_network_update (NMMenuNetwork *menu_network, } gtk_label_set_text (GTK_LABEL (menu_network->label), text); g_free (text); - nm_menu_network_update_image (menu_network); - - if (menu_network->type == DEVICE_TYPE_WIRELESS_ETHERNET) - gtk_widget_set_sensitive (GTK_WIDGET (menu_network), FALSE); - else - gtk_widget_set_sensitive (GTK_WIDGET (menu_network), TRUE); } /* NMMenuWireless items*/ @@ -183,15 +121,12 @@ nm_menu_wireless_init (NMMenuWireless *menu_info) GtkWidget *hbox; gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menu_info), TRUE); - hbox = gtk_hbox_new (FALSE, 2); - menu_info->spacer = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (menu_info->spacer), GTK_SHADOW_NONE); + hbox = gtk_hbox_new (FALSE, 6); menu_info->label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (menu_info->label), 0.0, 0.5); menu_info->security_image = gtk_image_new (); gtk_container_add (GTK_CONTAINER (menu_info), hbox); - gtk_box_pack_start (GTK_BOX (hbox), menu_info->spacer, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), menu_info->label, TRUE, TRUE, 0); menu_info->cell_view = gtk_cell_view_new (); menu_info->progress_bar = g_object_new (GTK_TYPE_CELL_RENDERER_PROGRESS, @@ -201,10 +136,8 @@ nm_menu_wireless_init (NMMenuWireless *menu_info) GTK_CELL_RENDERER (menu_info->progress_bar), TRUE); gtk_box_pack_start (GTK_BOX (hbox), menu_info->cell_view, FALSE, FALSE, 0); - gtk_box_pack_end (GTK_BOX (hbox), menu_info->security_image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), menu_info->security_image, FALSE, FALSE, 0); - /* We don't show all the widgets, but we do show a few */ - gtk_widget_show (menu_info->spacer); gtk_widget_show (menu_info->label); gtk_widget_show (menu_info->cell_view); gtk_widget_show (hbox); @@ -216,13 +149,10 @@ nm_menu_wireless_class_init (NMMenuWirelessClass *menu_info_class) } GtkWidget * -nm_menu_wireless_new (GtkSizeGroup *image_size_group, - GtkSizeGroup *encryption_size_group) +nm_menu_wireless_new (GtkSizeGroup *encryption_size_group) { GtkWidget *retval = g_object_new (nm_menu_wireless_get_type (), NULL); - gtk_size_group_add_widget (image_size_group, - NM_MENU_WIRELESS (retval)->spacer); gtk_size_group_add_widget (encryption_size_group, NM_MENU_WIRELESS (retval)->security_image); diff --git a/panel-applet/menu-info.h b/panel-applet/menu-info.h index 828f51333d..3978f25e0a 100644 --- a/panel-applet/menu-info.h +++ b/panel-applet/menu-info.h @@ -36,12 +36,12 @@ typedef struct { - GtkCheckMenuItemClass parent_class; + GtkMenuItemClass parent_class; } NMMenuNetworkClass; typedef struct { - GtkCheckMenuItem parent; + GtkMenuItem parent; GtkWidget *image; GtkWidget *label; int type; @@ -56,9 +56,8 @@ typedef struct typedef struct { GtkCheckMenuItem parent; - GtkWidget *spacer; - GtkWidget *cell_view; GtkWidget *label; + GtkWidget *cell_view; GtkWidget *security_image; GObject *progress_bar; } NMMenuWireless; @@ -73,8 +72,7 @@ void nm_menu_network_update (NMMenuNetwork *menu_network, gboolean multiple_devices); GType nm_menu_wireless_get_type (void); -GtkWidget *nm_menu_wireless_new (GtkSizeGroup *image_size_group, - GtkSizeGroup *encryption_size_group); +GtkWidget *nm_menu_wireless_new (GtkSizeGroup *encryption_size_group); void nm_menu_wireless_update (NMMenuWireless *menu_info, WirelessNetwork *network, gboolean has_encrypted);