Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1:Test
gnome-main-menu
gnome-main-menu-bnc436718-network-status.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gnome-main-menu-bnc436718-network-status.patch of Package gnome-main-menu
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"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor