Merge lp:~pitti/notify-osd/wnck_shutdown-precise into lp:~canonical-dx-team/notify-osd/precise

[Martin Pitt]

Use wnck_shutdown() if available.

dnd_has_one_fullscreen_window() initializes libwnck, which causes notify-osd to
unnecessarily wake up on each focus change and keyboard event, even if there
are no notification bubbles for a long time.

To fix this, check if libwnck has the new wnck_shutdown() function and use it
if available. This function is available in Ubuntu Precise's libwnck3 now, and
will soon go upstream as well (already talked to Vincent Untz).

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=642692
Bug-Ubuntu: https://launchpad.net/bugs/915389

=== modified file 'configure.in'
--- configure.in	2012-01-31 10:25:17 +0000
+++ configure.in	2012-02-02 12:35:22 +0000
@@ -37,6 +37,11 @@
 # libwnck used by the dnd code
 #
 PKG_CHECK_MODULES([WNCK], [libwnck-3.0])
+AC_CHECK_LIB(wnck-3,wnck_shutdown, have_wnck_shutdown=yes,)
+if test "$have_wnck_shutdown" = "yes"; then
+  AC_DEFINE(HAVE_WNCK_SHUTDOWN, 1, [Define to 1 if libwnck provides wnck_shutdown()])
+fi
+
 
 #
 # libnotify, used unit-tests 
 
=== modified file 'src/dnd.c'
--- src/dnd.c	2011-07-08 08:34:52 +0000
+++ src/dnd.c	2012-02-02 12:35:22 +0000
@@ -201,12 +201,18 @@
 gboolean
 dnd_has_one_fullscreen_window (void)
 {
+	gboolean result;
+
 	WnckScreen *screen = wnck_screen_get_default ();
 	wnck_screen_force_update (screen);
 	WnckWorkspace *workspace = wnck_screen_get_active_workspace (screen);
 	GList *list = wnck_screen_get_windows (screen);
 	GList *item = g_list_find_custom (list, workspace, (GCompareFunc) is_fullscreen_cb);
-	return item != NULL;
+	result = item != NULL;
+#ifdef HAVE_WNCK_SHUTDOWN
+	wnck_shutdown ();
+#endif
+	return result;
 }
 
 /* Tries to determine whether the user is in "do not disturb" mode */