gnome-bluetooth r514 - trunk/applet

[hadess svn gnome org]

Author: hadess
Date: Fri Mar 20 10:58:37 2009
New Revision: 514
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=514&view=rev

Log:
Fix display errors for the killswitch

Now that I tested it...



Modified:
   trunk/applet/main.c

Modified: trunk/applet/main.c
==============================================================================
--- trunk/applet/main.c	(original)
+++ trunk/applet/main.c	Fri Mar 20 10:58:37 2009
@@ -231,21 +231,20 @@
 		g_assert_not_reached ();
 	}
 
+	object = gtk_builder_get_object (xml, "killswitch-label");
+	gtk_action_set_label (GTK_ACTION (object), _(status_label));
+
 	object = gtk_builder_get_object (xml, "killswitch");
 	gtk_action_set_visible (GTK_ACTION (object), sensitive);
-	gtk_action_set_label (GTK_ACTION (object), _(status_label));
+	gtk_action_set_label (GTK_ACTION (object), _(label));
 
 	if (sensitive != FALSE) {
-		object = gtk_builder_get_object (xml, "killswitch-label");
-		g_signal_handlers_block_by_func (object,
-						 G_CALLBACK (bluetooth_status_callback),
-						 NULL);
 		gtk_action_set_label (GTK_ACTION (object), _(label));
 		g_object_set_data (object, "bt-active", GINT_TO_POINTER (bstate));
-		g_signal_handlers_unblock_by_func (object,
-						   G_CALLBACK (bluetooth_status_callback),
-						   NULL);
 	}
+
+	object = gtk_builder_get_object (xml, "bluetooth-applet-ui-manager");
+	gtk_ui_manager_ensure_update (GTK_UI_MANAGER (object));
 }
 
 static GtkWidget *create_popupmenu(void)
@@ -578,8 +577,6 @@
 
 	gtk_window_set_default_icon_name("bluetooth");
 
-	menu = create_popupmenu();
-
 	killswitch = bluetooth_killswitch_new ();
 	if (bluetooth_killswitch_has_killswitches (killswitch) == FALSE) {
 		g_object_unref (killswitch);
@@ -589,6 +586,8 @@
 				  G_CALLBACK (killswitch_state_changed), NULL);
 	}
 
+	menu = create_popupmenu();
+
 	client = bluetooth_client_new();
 
 	devices_model = bluetooth_client_get_model(client);