[Galago-commits] r3002 - in trunk/notification-daemon: . src/daemon

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2008-03-18 21:41:12 -0700 (Tue, 18 Mar 2008)
New Revision: 3002

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/daemon/daemon.c
Log:
Patch by parasti to prevent our notification blocking when the fullscreen window is not on the current workspace. Fixes bug #142.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2008-03-19 03:56:25 UTC (rev 3001)
+++ trunk/notification-daemon/ChangeLog	2008-03-19 04:41:12 UTC (rev 3002)
@@ -1,3 +1,9 @@
+Tue Mar 18 21:39:53 PDT 2008  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon/daemon.c:
+	  - Patch by parasti to prevent our notification blocking when the
+	    fullscreen window is not on the current workspace. Fixes bug #142.
+
 Tue Mar 18 20:55:27 PDT 2008  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/themes/bubble/eggnotificationbubblewidget.c:

Modified: trunk/notification-daemon/src/daemon/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon/daemon.c	2008-03-19 03:56:25 UTC (rev 3001)
+++ trunk/notification-daemon/src/daemon/daemon.c	2008-03-19 04:41:12 UTC (rev 3002)
@@ -784,19 +784,23 @@
 fullscreen_window_exists(GtkWidget *nw)
 {
 	WnckScreen *wnck_screen;
+	WnckWorkspace *wnck_workspace;
 	GList *l;
 
 	wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(
 		gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
 	wnck_screen_force_update(wnck_screen);
 
+	wnck_workspace = wnck_screen_get_active_workspace(wnck_screen);
+
 	for (l = wnck_screen_get_windows_stacked(wnck_screen);
 		 l != NULL;
 		 l = l->next)
 	{
 		WnckWindow *wnck_win = (WnckWindow *)l->data;
 
-		if (wnck_window_is_fullscreen(wnck_win) &&
+		if (wnck_window_is_on_workspace(wnck_win, wnck_workspace) &&
+			wnck_window_is_fullscreen(wnck_win) &&
 			wnck_window_is_active(wnck_win))
 		{
 			/*