Attachment 213106 Details for Bug 262334

[patch] gnome-main-menu-bnc262334-detect-no-nm-running.patch

gnome-main-menu-bnc262334-detect-no-nm-running.patch (text/plain), 3.67 KB, created by Magnus Boman on 2008-05-07 11:41:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Magnus Boman

Created: 2008-05-07 11:41:00 UTC

Size: 3.67 KB

patch

obsolete

>diff -auN gnome-main-menu-0.9.10/main-menu/src/main-menu-ui.c gnome-main-menu-0.9.10.new/main-menu/src/main-menu-ui.c
>--- gnome-main-menu-0.9.10/main-menu/src/main-menu-ui.c	2008-04-14 08:43:33.000000000 +1000
>+++ gnome-main-menu-0.9.10.new/main-menu/src/main-menu-ui.c	2008-05-07 21:37:13.000000000 +1000
>@@ -100,6 +100,7 @@
> 
> 	GtkWidget *search_section;
> 	GtkWidget *search_entry;
>+	GtkWidget *network_status;
> 
> 	GtkNotebook *file_section;
> 	GtkWidget   *page_selectors    [3];
>@@ -404,6 +405,7 @@
> 
> 	priv->status_section                             = NULL;
> 	priv->system_section                             = NULL;
>+	priv->network_status                             = NULL;
> 
> 	priv->volume_mon                                 = NULL;
> 
>@@ -730,15 +732,15 @@
> 
> 	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 @@
> {
> 	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 -auN gnome-main-menu-0.9.10/main-menu/src/network-status-agent.c gnome-main-menu-0.9.10.new/main-menu/src/network-status-agent.c
>--- gnome-main-menu-0.9.10/main-menu/src/network-status-agent.c	2008-04-14 09:29:20.000000000 +1000
>+++ gnome-main-menu-0.9.10.new/main-menu/src/network-status-agent.c	2008-05-07 21:00:40.000000000 +1000
>@@ -131,7 +131,7 @@
> 
> 	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 -auN gnome-main-menu-0.9.10/main-menu/src/network-status-tile.c gnome-main-menu-0.9.10.new/main-menu/src/network-status-tile.c
>--- gnome-main-menu-0.9.10/main-menu/src/network-status-tile.c	2007-12-28 07:55:04.000000000 +1100
>+++ gnome-main-menu-0.9.10.new/main-menu/src/network-status-tile.c	2008-05-07 21:37:03.000000000 +1000
>@@ -50,6 +50,8 @@
> static void set_glade_label (GladeXML *, const gchar *, const gchar *);
> static void launch_network_config (void);
> 
>+void network_tile_update_status (GtkWidget *);
>+
> typedef struct
> {
> 	NetworkStatusAgent *agent;
>@@ -363,6 +365,19 @@
> 	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 -auN gnome-main-menu-0.9.10/main-menu/src/network-status-tile.h gnome-main-menu-0.9.10.new/main-menu/src/network-status-tile.h
>--- gnome-main-menu-0.9.10/main-menu/src/network-status-tile.h	2007-12-28 07:55:04.000000000 +1100
>+++ gnome-main-menu-0.9.10.new/main-menu/src/network-status-tile.h	2008-05-07 21:37:17.000000000 +1000
>@@ -48,5 +48,7 @@
> 
> GtkWidget *network_status_tile_new (void);
> 
>+void network_tile_update_status (GtkWidget * widget);
>+
> G_END_DECLS
> #endif

Actions: View | Diff

Attachments on bug 262334: 211348 | 213106 | 223581 | 223905