Attachment #213106 for bug #262334

View | Details | Raw Unified | Return to bug 262334
Collapse All | Expand All





	GtkWidget *search_section;
	GtkWidget *search_entry;
	GtkWidget *network_status;

	GtkNotebook *file_section;
	GtkWidget   *page_selectors    [3];


	priv->status_section                             = NULL;
	priv->system_section                             = NULL;
	priv->network_status                             = NULL;

	priv->volume_mon                                 = NULL;



	ctnr = GTK_CONTAINER (glade_xml_get_widget (
		priv->main_menu_xml, "network-status-container"));
	priv->network_status = network_status_tile_new ();

	gtk_widget_set_size_request (priv->network_status, 6 * icon_width, -1);

	g_signal_connect (
		G_OBJECT (priv->network_status), "tile-action-triggered",
		G_CALLBACK (tile_action_triggered_cb), this);

	gtk_container_add   (ctnr, priv->network_status);
	gtk_widget_show_all (GTK_WIDGET (ctnr));

	priv->status_section = glade_xml_get_widget (

{
	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 ());

Lines 131-137 Link Here

(-)gnome-main-menu-0.9.10/main-menu/src/network-status-agent.c (-1 / +1 lines)
131		131
132	priv->nm_client = nm_client_new();	132	priv->nm_client = nm_client_new();
133		133
134	if (!priv->nm_client)	134	if (!(priv->nm_client && nm_client_get_manager_running (priv->nm_client)))
135	{	135	{
136	g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "nm_client_new failed");	136	g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "nm_client_new failed");
137		137

Lines 50-55 Link Here

(-)gnome-main-menu-0.9.10/main-menu/src/network-status-tile.c (+15 lines)
50	static void set_glade_label (GladeXML , const gchar , const gchar *);	50	static void set_glade_label (GladeXML , const gchar , const gchar *);
51	static void launch_network_config (void);	51	static void launch_network_config (void);
52		52
		53	void network_tile_update_status (GtkWidget *);
		54
53	typedef struct	55	typedef struct
54	{	56	{
55	NetworkStatusAgent *agent;	57	NetworkStatusAgent *agent;
Lines 363-368 Link Here
363	update_tile (tile);	365	update_tile (tile);
364	}	366	}
365		367
		368	void
		369	network_tile_update_status (GtkWidget * widget)
		370	{
		371	NetworkStatusTile *tile = NETWORK_STATUS_TILE (widget);
		372	NetworkStatusTilePrivate *priv = NETWORK_STATUS_TILE_GET_PRIVATE (tile);
		373
		374	if (priv->agent->nm_present)
		375	return;
		376
		377	refresh_status (tile);
		378	update_tile (tile);
		379	}
		380
366	static void	381	static void
367	status_changed_cb (NetworkStatusAgent * agent, gpointer user_data)	382	status_changed_cb (NetworkStatusAgent * agent, gpointer user_data)
368	{	383	{

Lines 48-52 Link Here

(-)gnome-main-menu-0.9.10/main-menu/src/network-status-tile.h (+2 lines)
48		48
49	GtkWidget *network_status_tile_new (void);	49	GtkWidget *network_status_tile_new (void);
50		50
		51	void network_tile_update_status (GtkWidget * widget);
		52
51	G_END_DECLS	53	G_END_DECLS
52	#endif	54	#endif

Return to bug 262334

Lines 100-105 Link Here

(-)gnome-main-menu-0.9.10/main-menu/src/main-menu-ui.c (-4 / +8 lines)
100		100
101	GtkWidget *search_section;	101	GtkWidget *search_section;
102	GtkWidget *search_entry;	102	GtkWidget *search_entry;
		103	GtkWidget *network_status;
103		104
104	GtkNotebook *file_section;	105	GtkNotebook *file_section;
105	GtkWidget *page_selectors [3];	106	GtkWidget *page_selectors [3];
Lines 404-409 Link Here
404		405
405	priv->status_section = NULL;	406	priv->status_section = NULL;
406	priv->system_section = NULL;	407	priv->system_section = NULL;
		408	priv->network_status = NULL;
407		409
408	priv->volume_mon = NULL;	410	priv->volume_mon = NULL;
409		411
Lines 730-744 Link Here
730		732
731	ctnr = GTK_CONTAINER (glade_xml_get_widget (	733	ctnr = GTK_CONTAINER (glade_xml_get_widget (
732	priv->main_menu_xml, "network-status-container"));	734	priv->main_menu_xml, "network-status-container"));
733	tile = network_status_tile_new ();	735	priv->network_status = network_status_tile_new ();
734		736
735	gtk_widget_set_size_request (tile, 6 * icon_width, -1);	737	gtk_widget_set_size_request (priv->network_status, 6 * icon_width, -1);
736		738
737	g_signal_connect (	739	g_signal_connect (
738	G_OBJECT (tile), "tile-action-triggered",	740	G_OBJECT (priv->network_status), "tile-action-triggered",
739	G_CALLBACK (tile_action_triggered_cb), this);	741	G_CALLBACK (tile_action_triggered_cb), this);
740		742
741	gtk_container_add (ctnr, tile);	743	gtk_container_add (ctnr, priv->network_status);
742	gtk_widget_show_all (GTK_WIDGET (ctnr));	744	gtk_widget_show_all (GTK_WIDGET (ctnr));
743		745
744	priv->status_section = glade_xml_get_widget (	746	priv->status_section = glade_xml_get_widget (
Lines 1841-1846 Link Here
1841	{	1843	{
1842	MainMenuUIPrivate *priv = PRIVATE (this);	1844	MainMenuUIPrivate *priv = PRIVATE (this);
1843		1845
		1846	network_tile_update_status (priv->network_status);
		1847
1844	update_recently_used_sections (this);	1848	update_recently_used_sections (this);
1845		1849
1846	gtk_window_present_with_time (GTK_WINDOW (priv->slab_window), gtk_get_current_event_time ());	1850	gtk_window_present_with_time (GTK_WINDOW (priv->slab_window), gtk_get_current_event_time ());