![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package gnome-main-menu checked in at Thu May 8 02:01:35 CEST 2008. -------- --- GNOME/gnome-main-menu/gnome-main-menu.changes 2008-04-23 23:56:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-main-menu/gnome-main-menu.changes 2008-05-07 21:54:47.586927000 +0200 @@ -1,0 +2,8 @@ +Wed May 7 21:59:53 CEST 2008 - federico@novell.com + +- Added gnome-main-menu-bnc262334-network-status-without-nm.diff to + fix https://bugzilla.novell.com/show_bug.cgi?id=262334 - Main-menu + now shows the correct network status even if NetworkManager is not + running. + +------------------------------------------------------------------- New: ---- gnome-main-menu-bnc262334-network-status-without-nm.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-main-menu.spec ++++++ --- /var/tmp/diff_new_pack.d14774/_old 2008-05-08 01:52:44.000000000 +0200 +++ /var/tmp/diff_new_pack.d14774/_new 2008-05-08 01:52:44.000000000 +0200 @@ -20,12 +20,14 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.10 -Release: 6 +Release: 14 Summary: The GNOME Desktop Menu Source: %{name}-%{version}.tar.gz Source1: system-items-opensuse.xbel # PATCH-FIX-UPSTREAM gnome-main-menu-bnc380339-multiple-applet-crash.diff bnc380339 federico@novell.com Patch1: gnome-main-menu-bnc380339-multiple-applet-crash.diff +# PATCH-FIX-UPSTREAM gnome-main-menu-bnc262334-network-status-without-nm.diff bnc262334 captain.magnus@gmail.com +Patch2: gnome-main-menu-bnc262334-network-status-without-nm.diff Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gnome-panel dbus-1-glib hal tango-icon-theme wireless-tools libssui eel @@ -82,6 +84,7 @@ %setup -n gnome-main-menu-%{version} cp -f %{S:1} main-menu/etc/system-items.xbel %patch1 -p1 +%patch2 -p1 %build autoreconf -f -i @@ -152,6 +155,11 @@ %{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la %changelog +* Wed May 07 2008 federico@novell.com +- Added gnome-main-menu-bnc262334-network-status-without-nm.diff to + fix https://bugzilla.novell.com/show_bug.cgi?id=262334 - Main-menu + now shows the correct network status even if NetworkManager is not + running. * Thu Apr 24 2008 federico@suse.de - Added gnome-main-menu-bnc380339-multiple-applet-crash.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=380339 - Crash when ++++++ gnome-main-menu-bnc262334-network-status-without-nm.diff ++++++ bnc262334 - Correct network status even if NetworkManager is not running 2008-05-07 Magnus Boman <captain.magnus@gmail.com> https://bugzilla.novell.com/show_bug.cgi?id=262334 - Show the correct status in the network status tile even if NetworkManager is not running. * main-menu/src/main-menu-ui.c (create_status_section): Remember our network_status widget in the MainMenuUIPrivate. (present_slab_window): Update the network tile. * main-menu/src/network-status-tile.c (network_tile_update_status): New function. * main-menu/src/network-status-agent.c (init_nm_connection): Handle the case where we obtained a NM client object, but NM is not running. diff --git a/main-menu/src/main-menu-ui.c b/main-menu/src/main-menu-ui.c index 50643a3..91ac2cc 100644 --- a/main-menu/src/main-menu-ui.c +++ b/main-menu/src/main-menu-ui.c @@ -100,6 +100,7 @@ typedef struct { GtkWidget *search_section; GtkWidget *search_entry; + GtkWidget *network_status; GtkNotebook *file_section; GtkWidget *page_selectors [3]; @@ -404,6 +405,7 @@ main_menu_ui_init (MainMenuUI *this) priv->status_section = NULL; priv->system_section = NULL; + priv->network_status = NULL; priv->volume_mon = NULL; @@ -730,15 +732,15 @@ create_status_section (MainMenuUI *this) ctnr = GTK_CONTAINER (glade_xml_get_widget ( priv->main_menu_xml, "network-status-container")); - tile = network_status_tile_new (); + priv->network_status = network_status_tile_new (); - gtk_widget_set_size_request (tile, 6 * icon_width, -1); + gtk_widget_set_size_request (priv->network_status, 6 * icon_width, -1); g_signal_connect ( - G_OBJECT (tile), "tile-action-triggered", + G_OBJECT (priv->network_status), "tile-action-triggered", G_CALLBACK (tile_action_triggered_cb), this); - gtk_container_add (ctnr, tile); + gtk_container_add (ctnr, priv->network_status); gtk_widget_show_all (GTK_WIDGET (ctnr)); priv->status_section = glade_xml_get_widget ( @@ -1841,6 +1843,8 @@ present_slab_window (MainMenuUI *this) { MainMenuUIPrivate *priv = PRIVATE (this); + network_tile_update_status (priv->network_status); + update_recently_used_sections (this); gtk_window_present_with_time (GTK_WINDOW (priv->slab_window), gtk_get_current_event_time ()); diff --git a/main-menu/src/network-status-agent.c b/main-menu/src/network-status-agent.c index f93e528..a39cdf2 100644 --- a/main-menu/src/network-status-agent.c +++ b/main-menu/src/network-status-agent.c @@ -131,7 +131,7 @@ init_nm_connection (NetworkStatusAgent * agent) priv->nm_client = nm_client_new(); - if (!priv->nm_client) + if (!(priv->nm_client && nm_client_get_manager_running (priv->nm_client))) { g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "nm_client_new failed"); diff --git a/main-menu/src/network-status-tile.c b/main-menu/src/network-status-tile.c index ae5da49..22541aa 100644 --- a/main-menu/src/network-status-tile.c +++ b/main-menu/src/network-status-tile.c @@ -363,6 +363,19 @@ tile_show_event_cb (GtkWidget * widget, gpointer user_data) update_tile (tile); } +void +network_tile_update_status (GtkWidget * widget) +{ + NetworkStatusTile *tile = NETWORK_STATUS_TILE (widget); + NetworkStatusTilePrivate *priv = NETWORK_STATUS_TILE_GET_PRIVATE (tile); + + if (priv->agent->nm_present) + return; + + refresh_status (tile); + update_tile (tile); +} + static void status_changed_cb (NetworkStatusAgent * agent, gpointer user_data) { diff --git a/main-menu/src/network-status-tile.h b/main-menu/src/network-status-tile.h index 85b5ae1..146760e 100644 --- a/main-menu/src/network-status-tile.h +++ b/main-menu/src/network-status-tile.h @@ -48,5 +48,7 @@ GType network_status_tile_get_type (void); GtkWidget *network_status_tile_new (void); +void network_tile_update_status (GtkWidget * widget); + G_END_DECLS #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org