Hide menu when daemon is not available

1 files changed, 15 insertions, 0 deletions

diff --git a/applet/status.c b/applet/status.c
index 1775922..ef11bcc 100644
--- a/applet/status.c
+++ b/applet/status.c
@@ -27,6 +27,8 @@
 
 #include "status.h"
 
+static gboolean available = FALSE;
+
 static GtkStatusIcon *statusicon = NULL;
 
 static GdkPixbuf *pixbuf_load(GtkIconTheme *icontheme, const gchar *name)
@@ -98,6 +100,8 @@ static gboolean icon_animation_timeout(gpointer data)
 static void icon_animation_start(IconAnimation *animation,
 						guint start, guint end)
 {
+	available = TRUE;
+
 	gtk_status_icon_set_tooltip(statusicon, NULL);
 
 	animation->start = start;
@@ -114,6 +118,8 @@ static void icon_animation_start(IconAnimation *animation,
 
 static void icon_animation_stop(IconAnimation *animation)
 {
+	available = TRUE;
+
 	gtk_status_icon_set_tooltip(statusicon, NULL);
 
 	if (animation->id > 0)
@@ -149,6 +155,9 @@ static void activate_callback(GObject *object, gpointer user_data)
 	guint32 activate_time = gtk_get_current_event_time();
 	GtkWidget *menu;
 
+	if (available == FALSE)
+		return;
+
 	menu = gtk_menu_new();
 
 	if (callback == NULL || callback(GTK_MENU(menu)) == FALSE) {
@@ -238,6 +247,8 @@ void status_unavailable(void)
 {
 	icon_animation_stop(animation);
 
+	available = FALSE;
+
 	gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_notifier);
 	gtk_status_icon_set_tooltip(statusicon,
 				"Connection Manager daemon is not running");
@@ -251,6 +262,8 @@ void status_hide(void)
 
 	icon_animation_stop(animation);
 
+	available = FALSE;
+
 	gtk_status_icon_set_from_pixbuf(statusicon, NULL);
 }
 
@@ -281,6 +294,8 @@ static void set_ready(gint signal)
 {
 	int index;
 
+	available = TRUE;
+
 	if (signal < 0) {
 		gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_wired);
 		gtk_status_icon_set_tooltip(statusicon, NULL);