Hello community, here is the log from the commit of package gnome-main-menu checked in at Fri Nov 28 15:03:46 CET 2008. -------- --- GNOME/gnome-main-menu/gnome-main-menu.changes 2008-11-07 15:17:34.000000000 +0100 +++ gnome-main-menu/gnome-main-menu.changes 2008-11-25 20:22:32.505745000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 20 18:57:08 CEST 2008 - sreeves@suse.de + +- Fix BNC#436718 - network status + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-main-menu-bnc436718-network-status.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-main-menu.spec ++++++ --- /var/tmp/diff_new_pack.Pb8926/_old 2008-11-28 15:03:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Pb8926/_new 2008-11-28 15:03:04.000000000 +0100 @@ -27,7 +27,7 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.11 -Release: 21 +Release: 22 Summary: The GNOME Desktop Menu Source: %{name}-%{version}.tar.bz2 Source1: system-items-opensuse.xbel @@ -38,6 +38,8 @@ # PATCH-FIX-UPSTREAM gnome-main-menu-bnc402256-leaks.diff bnc402256 federico@novell.com - Fixes for memory leaks Patch3: gnome-main-menu-bnc402256-leaks.diff Patch4: gnome-main-menu-nm-r4274.patch +# PATCH-FIX-UPSTREAM gnome-main-menu-bnc436718-network-status.patch bnc436718 sreeves@novell.com - Fixes for network status +Patch5: gnome-main-menu-bnc436718-network-status.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gnome-panel dbus-1-glib hal tango-icon-theme wireless-tools @@ -101,6 +103,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p0 cp -f %{S:1} main-menu/etc/system-items.xbel %build @@ -182,6 +185,8 @@ %{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la %changelog +* Thu Nov 20 2008 sreeves@suse.de +- Fix BNC#436718 - network status * Fri Nov 07 2008 tambet@novell.com - Fix the NetworkManager API breakage again. * Fri Nov 07 2008 federico@novell.com ++++++ gnome-main-menu-bnc436718-network-status.patch ++++++ Index: main-menu/src/network-status-tile.c =================================================================== --- main-menu/src/network-status-tile.c (revision 529) +++ main-menu/src/network-status-tile.c (working copy) @@ -48,7 +48,7 @@ static void info_dialog_cfg_button_clicked_cb (GtkButton *, gpointer); static void set_glade_label (GladeXML *, const gchar *, const gchar *); -static void launch_network_config (void); +static void launch_network_config (const gchar * desktop_key); typedef struct { @@ -159,11 +159,17 @@ if (!priv->status_info || !priv->agent->nm_present) { - launch_network_config (); + launch_network_config (SLAB_NETWORK_CONFIG_TOOL_KEY); return; } + else + { + launch_network_config (SLAB_NETWORK_CONFIG_TOOL_KEY_NM); + return; + } + /* if (!priv->info_dialog) build_info_dialog (NETWORK_STATUS_TILE (tile)); @@ -178,6 +184,7 @@ update_info_dialog (NETWORK_STATUS_TILE (tile)); gtk_window_present_with_time (GTK_WINDOW (priv->info_dialog), event->time); + */ } static void @@ -285,6 +292,7 @@ static void build_info_dialog (NetworkStatusTile * tile) { + /* NetworkStatusTilePrivate *priv = NETWORK_STATUS_TILE_GET_PRIVATE (tile); gchar *filename; @@ -314,6 +322,7 @@ priv->info_dialog); g_free (filename); + */ } static void @@ -413,11 +422,13 @@ static void info_dialog_cfg_button_clicked_cb (GtkButton * button, gpointer user_data) { + /* GtkWidget *dialog = GTK_WIDGET (user_data); launch_network_config (); gtk_widget_hide (dialog); + */ } static void @@ -432,10 +443,10 @@ } static void -launch_network_config () +launch_network_config (const gchar * desktop_key) { GnomeDesktopItem *desktop_item = - load_desktop_item_from_gconf_key (SLAB_NETWORK_CONFIG_TOOL_KEY); + load_desktop_item_from_gconf_key (desktop_key); if (!open_desktop_item_exec (desktop_item)) g_warning ("network_status_tile_open: couldn't exec item\n"); Index: main-menu/etc/slab.schemas.in.in =================================================================== --- main-menu/etc/slab.schemas.in.in (revision 529) +++ main-menu/etc/slab.schemas.in.in (working copy) @@ -73,6 +73,18 @@ </schema> <schema> + <key>/schemas/desktop/gnome/applications/main-menu/network_config_tool_nm</key> + <applyto>/desktop/gnome/applications/main-menu/network_config_tool_nm</applyto> + <owner>gnome-main-menu</owner> + <type>string</type> + <default>/usr/share/applications/nm-connection-editor.desktop</default> + <locale name="C"> + <short>.desktop file for the net config tool</short> + <long>.desktop file for the YaST2 network_devices utility</long> + </locale> + </schema> + + <schema> <key>/schemas/desktop/gnome/applications/main-menu/search_command</key> <applyto>/desktop/gnome/applications/main-menu/search_command</applyto> <owner>gnome-main-menu</owner> Index: libslab/slab-gnome-util.h =================================================================== --- libslab/slab-gnome-util.h (revision 529) +++ libslab/slab-gnome-util.h (working copy) @@ -32,6 +32,7 @@ #define SLAB_FILE_BROWSER_KEY "/desktop/gnome/applications/main-menu/file_browser" #define SLAB_SYSTEM_MONITOR_KEY "/desktop/gnome/applications/main-menu/system_monitor" #define SLAB_NETWORK_CONFIG_TOOL_KEY "/desktop/gnome/applications/main-menu/network_config_tool" +#define SLAB_NETWORK_CONFIG_TOOL_KEY_NM "/desktop/gnome/applications/main-menu/network_config_tool_nm" #define SLAB_URGENT_CLOSE_KEY "/desktop/gnome/applications/main-menu/urgent_close" #define SLAB_LOCK_SCREEN_PRIORITY_KEY "/desktop/gnome/applications/main-menu/lock_screen_priority" #define SLAB_MAIN_MENU_REORDERING_KEY "/desktop/gnome/applications/main-menu/main_menu_reordering" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org