vino r1056 - in trunk: . server

[jwendell svn gnome org]

Author: jwendell
Date: Thu Jan 22 11:48:24 2009
New Revision: 1056
URL: http://svn.gnome.org/viewvc/vino?rev=1056&view=rev

Log:
2009-01-22  Jonh Wendell  <jwendell gnome org>

	* server/vino-status-icon.c (vino_status_icon_add_client):
	Only show notification if the status icon is visible.
	Closes Ubuntu #318708.



Modified:
   trunk/ChangeLog
   trunk/server/vino-status-icon.c

Modified: trunk/server/vino-status-icon.c
==============================================================================
--- trunk/server/vino-status-icon.c	(original)
+++ trunk/server/vino-status-icon.c	Thu Jan 22 11:48:24 2009
@@ -480,13 +480,17 @@
 
   vino_status_icon_update_state (icon);
 
-  VinoStatusIconNotify *a;
-  a = g_new (VinoStatusIconNotify, 1);
-  a->icon   = icon;
-  a->client = client;
-  g_timeout_add (1000, 
-                 vino_status_icon_show_new_client_notification,
-                 (gpointer) a);
+  if (gtk_status_icon_get_visible (GTK_STATUS_ICON (icon)))
+    {
+      VinoStatusIconNotify *a;
+
+      a = g_new (VinoStatusIconNotify, 1);
+      a->icon   = icon;
+      a->client = client;
+      g_timeout_add_seconds (1, 
+                             vino_status_icon_show_new_client_notification,
+                             (gpointer) a);
+    }
 }
 
 gboolean