diff -u bluez-gnome-0.5/debian/changelog bluez-gnome-0.5/debian/changelog
--- bluez-gnome-0.5/debian/changelog
+++ bluez-gnome-0.5/debian/changelog
@@ -1,3 +1,9 @@
+bluez-gnome (0.5-2ubuntu2) edgy; urgency=low
+
+  * Only show the icon when we have active requests.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Fri, 13 Oct 2006 13:16:00 +0200
+
 bluez-gnome (0.5-2ubuntu1) edgy; urgency=low
 
   * debian/copyright:
only in patch2:
unchanged:
--- bluez-gnome-0.5.orig/applet/main.c
+++ bluez-gnome-0.5/applet/main.c
@@ -50,7 +50,7 @@
 
 static int volatile registered = 0;
 
-static int always_show_icon = 1;
+static int always_show_icon = 0;
 
 static GtkStatusIcon *statusicon = NULL;
 
@@ -134,8 +134,11 @@
 	g_free(input->path);
 	g_free(input);
 
-	if (g_list_length(input_list) == 0)
+	if (g_list_length(input_list) == 0) {
 		gtk_status_icon_set_blinking(statusicon, FALSE);
+		gtk_status_icon_set_visible(statusicon, FALSE);
+	}
+
 }
 
 static void changed_callback(GtkWidget *editable, gpointer user_data)
@@ -281,6 +284,7 @@
 	g_signal_connect(G_OBJECT(dialog), "response",
 				G_CALLBACK(response_callback), input);
 
+	gtk_status_icon_set_visible(statusicon, TRUE);
 	gtk_status_icon_set_blinking(statusicon, TRUE);
 }
 
@@ -414,6 +418,7 @@
 {
 	g_list_foreach(input_list, show_dialog, NULL);
 
+	gtk_status_icon_set_visible(statusicon, FALSE);
 	gtk_status_icon_set_blinking(statusicon, FALSE);
 }
 
@@ -685,11 +690,12 @@
 		register_passkey_agent(conn);
 
 	add_adapter(conn, path);
-
+        /*
 	if (!always_show_icon) {
 		if (g_list_length(adapter_list) > 0)
 			gtk_status_icon_set_visible(statusicon, TRUE);
 	}
+        */
 }
 
 static void adapter_removed(DBusGProxy *object,
@@ -704,10 +710,12 @@
 		adapter->attached = 0;
 	}
 
+/*
 	if (!always_show_icon) {
 		if (g_list_length(adapter_list) == 0)
 			gtk_status_icon_set_visible(statusicon, FALSE);
 	}
+*/
 }
 
 static int setup_manager(DBusGConnection *conn)
@@ -837,6 +845,7 @@
 
 	g_list_foreach(input_list, show_dialog, NULL);
 
+        gtk_status_icon_set_visible(statusicon, FALSE);
 	gtk_status_icon_set_blinking(statusicon, FALSE);
 }
 
@@ -908,11 +917,13 @@
 	setup_dbus(conn);
 
 	setup_manager(conn);
-
+/*
 	if (!always_show_icon) {
 		gtk_status_icon_set_visible(statusicon,
 			g_list_length(adapter_list) > 0 ? TRUE : FALSE);
 	}
+*/
+	gtk_status_icon_set_visible(statusicon, FALSE);
 
 	register_passkey_agent(conn);
 
FALSE);
-	}
+	gtk_status_icon_set_visible(statusicon, FALSE);
 
 	register_passkey_agent(conn);