gnome-main-menu r534 - in trunk: . libslab main-menu/etc main-menu/src

[sreeves svn gnome org]

Author: sreeves
Date: Tue Dec 30 00:37:31 2008
New Revision: 534
URL: http://svn.gnome.org/viewvc/gnome-main-menu?rev=534&view=rev

Log:
Fix for BNC#436718 - NM status display

Modified:
   trunk/ChangeLog
   trunk/libslab/slab-gnome-util.h
   trunk/main-menu/etc/slab.schemas.in.in
   trunk/main-menu/src/network-status-tile.c

Modified: trunk/libslab/slab-gnome-util.h
==============================================================================
--- trunk/libslab/slab-gnome-util.h	(original)
+++ trunk/libslab/slab-gnome-util.h	Tue Dec 30 00:37:31 2008
@@ -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_NM_KEY "/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"

Modified: trunk/main-menu/etc/slab.schemas.in.in
==============================================================================
--- trunk/main-menu/etc/slab.schemas.in.in	(original)
+++ trunk/main-menu/etc/slab.schemas.in.in	Tue Dec 30 00:37:31 2008
@@ -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 Network Manager editor 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>

Modified: trunk/main-menu/src/network-status-tile.c
==============================================================================
--- trunk/main-menu/src/network-status-tile.c	(original)
+++ trunk/main-menu/src/network-status-tile.c	Tue Dec 30 00:37:31 2008
@@ -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,18 @@
 
 	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_NM_KEY);
+		return;
+	}
 
+	/*  Using NM's glade file directly is a big maintenance problem. We need to get
+	* NM to provide a API or .desktop file to show their status. For now just call the config
 	if (!priv->info_dialog)
 		build_info_dialog (NETWORK_STATUS_TILE (tile));
 
@@ -178,6 +185,7 @@
 	update_info_dialog (NETWORK_STATUS_TILE (tile));
 
 	gtk_window_present_with_time (GTK_WINDOW (priv->info_dialog), event->time);
+	*/
 }
 
 static void
@@ -285,6 +293,7 @@
 static void
 build_info_dialog (NetworkStatusTile * tile)
 {
+	/*
 	NetworkStatusTilePrivate *priv = NETWORK_STATUS_TILE_GET_PRIVATE (tile);
 
 	gchar *filename;
@@ -314,6 +323,7 @@
 		priv->info_dialog);
 
 	g_free (filename);
+	*/
 }
 
 static void
@@ -413,11 +423,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 +444,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");