[gnome-bluetooth] Additional fixes for killswitch add support

[Bastien Nocera <hadess src gnome org>]

commit 93dac7ffc6fe928f6630b1f735a012ccfde12f77
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Oct 13 12:26:40 2009 +0100

    Additional fixes for killswitch add support
    
    We need to handle rfkill switches coming and going, and
    this is even more true now that simple Bluetooth adapters
    support a fake rfkill through power-down.

 applet/main.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/applet/main.c b/applet/main.c
index 2f743f3..33d1ad2 100644
--- a/applet/main.c
+++ b/applet/main.c
@@ -329,7 +329,7 @@ static GtkWidget *create_popupmenu(void)
 
 	gtk_builder_connect_signals (xml, NULL);
 
-	if (killswitch != NULL) {
+	if (bluetooth_killswitch_has_killswitches (killswitch) != FALSE) {
 		GObject *object;
 
 		object = gtk_builder_get_object (xml, "killswitch-label");
@@ -387,7 +387,8 @@ update_icon_visibility (void)
 		set_icon (TRUE);
 
 	if (show_icon_pref != FALSE) {
-		if (num_adapters_present > 0 || killswitch != NULL) {
+		if (num_adapters_present > 0 ||
+		    bluetooth_killswitch_has_killswitches (killswitch) != FALSE) {
 			show_icon ();
 			return;
 		}
@@ -1003,7 +1004,7 @@ int main(int argc, char *argv[])
 			  G_CALLBACK (device_changed), NULL);
 	/* Set the default */
 	device_changed (devices_model, NULL, NULL, NULL);
-	if (killswitch != NULL) {
+	if (bluetooth_killswitch_has_killswitches (killswitch) != FALSE) {
 		killswitch_state_changed (killswitch,
 					  bluetooth_killswitch_get_state (killswitch));
 	}