Merge lp:~laney/notify-osd/no-dnd-screensaver-test into lp:notify-osd

[Iain Lane]

Don't run test_dnd_screensaver - we can't dbus activate gnome-session and it's not practical to run a full session in autopkgtest currently

Since we now run under gnome-session, which is not dbus activatable, we can't run this test in headless environments any more...

[Sebastien Bacher (seb128)]

gut!

review: Approve

[lp:~laney/notify-osd/no-dnd-screensaver-test]

494. By Iain Lane on 2015-10-14

Merge the wily-proposed branch

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-05 14:27:28 +0000
+++ debian/changelog	2015-10-14 09:48:39 +0000
@@ -1,3 +1,13 @@
+notify-osd (0.9.35+15.10.20151013.1-0ubuntu1) wily; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Lars Uebernickel ]
+  * Only request rgba visuals on composited screens (LP: #1473269)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 13 Oct 2015 15:50:35 +0000
+
 notify-osd (0.9.35+15.10.20151005-0ubuntu1) wily; urgency=medium
 
   * Remove leftover debug statement and fix identation issue
@@ -11,6 +21,13 @@
 
  -- Sebastien Bacher <[e-mail]>  Tue, 15 Sep 2015 09:24:19 +0000
 
+notify-osd (0.9.35+15.04.20150126-0ubuntu2) UNRELEASED; urgency=medium
+
+  * dnd_is_screensaver_inhibited no longer works due to obsoleted dbus
+    method. replace it by an equivalent dbus call, LP: #1440825
+
+ -- Nobuto Murata <[e-mail]>  Tue, 07 Apr 2015 17:47:18 +0900
+
 notify-osd (0.9.35+15.04.20150126-0ubuntu1) vivid; urgency=low
 
   [ Alberts Muktupāvels ]

=== modified file 'src/bubble.c'
--- src/bubble.c	2015-09-22 15:59:50 +0000
+++ src/bubble.c	2015-10-14 09:48:39 +0000
@@ -1643,7 +1643,12 @@
 						gpointer   data)
 {
 	GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (window));
-	GdkVisual* visual = gdk_screen_get_rgba_visual (screen);
+	GdkVisual* visual;
+
+	if (!gdk_screen_is_composited (screen))
+		return;
+
+	visual = gdk_screen_get_rgba_visual (screen);
 
 	if (!visual)
 		visual = gdk_screen_get_system_visual (screen);

=== modified file 'src/dnd.c'
--- src/dnd.c	2012-01-24 08:14:04 +0000
+++ src/dnd.c	2015-10-14 09:48:39 +0000
@@ -45,6 +45,7 @@
 #include "dbus.h"
 
 static DBusGProxy *gsmgr = NULL;
+static DBusGProxy *gscrsvr = NULL;
 
 gboolean
 dnd_is_xscreensaver_active ()
@@ -98,55 +99,65 @@
 }
 
 static DBusGProxy*
-get_screensaver_proxy (void)
+get_gnomesession_proxy (void)
 {
 	if (gsmgr == NULL)
 	{
 		DBusGConnection *connection = dbus_get_connection ();
 		gsmgr = dbus_g_proxy_new_for_name (connection,
+						   "org.gnome.SessionManager",
+						   "/org/gnome/SessionManager",
+						   "org.gnome.SessionManager");
+	}
+
+	return gsmgr;
+}
+
+gboolean
+dnd_is_idle_inhibited ()
+{
+	GError  *error = NULL;
+	gboolean inhibited = FALSE;
+	guint idle = 8; // 8: Inhibit the session being marked as idle
+
+	if (! get_gnomesession_proxy ())
+		return FALSE;
+
+	dbus_g_proxy_call_with_timeout (
+		gsmgr, "IsInhibited", 2000, &error,
+		G_TYPE_UINT, idle,
+		G_TYPE_INVALID,
+		G_TYPE_BOOLEAN, &inhibited,
+		G_TYPE_INVALID);
+
+	if (error)
+	{
+		g_warning ("dnd_is_idle_inhibited(): "
+		           "got error \"%s\"\n",
+		           error->message);
+		g_error_free (error);
+		error = NULL;
+	}
+
+	if (inhibited)
+		g_debug ("Session idleness has been inhibited");
+
+	return inhibited;
+}
+
+static DBusGProxy*
+get_screensaver_proxy (void)
+{
+	if (gscrsvr == NULL)
+	{
+		DBusGConnection *connection = dbus_get_connection ();
+		gscrsvr = dbus_g_proxy_new_for_name (connection,
 						   "org.gnome.ScreenSaver",
 						   "/org/gnome/ScreenSaver",
 						   "org.gnome.ScreenSaver");
 	}
 
-	return gsmgr;
-}	
-
-gboolean
-dnd_is_screensaver_inhibited ()
-{
-	GError  *error = NULL;
-	gboolean inhibited = FALSE;
-	char **list;
-
-	if (! get_screensaver_proxy ())
-		return FALSE;
-
-	if (dbus_g_proxy_call_with_timeout (
-		    gsmgr, "GetInhibitors", 2000, &error,
-		    G_TYPE_INVALID,
-		    G_TYPE_STRV, &list,
-		    G_TYPE_INVALID))
-	{
-		if (error)
-		{
-			g_warning ("dnd_is_screensaver_inhibited(): "
-			           "got error \"%s\"\n",
-			           error->message);
-			g_error_free (error);
-			error = NULL;
-		}
-
-		/* if the list is not empty, the screensaver is inhibited */
-		if (*list)
-		{
-			inhibited = TRUE;
-			g_debug ("Screensaver has been inhibited");
-		}
-		g_strfreev (list);
-	}
-
-	return inhibited;
+	return gscrsvr;
 }
 
 gboolean
@@ -159,7 +170,7 @@
 		return FALSE;
 
 	dbus_g_proxy_call_with_timeout (
-		gsmgr, "GetActive", 2000, &error,
+		gscrsvr, "GetActive", 2000, &error,
 		G_TYPE_INVALID,
 		G_TYPE_BOOLEAN, &active,
 		G_TYPE_INVALID);
@@ -222,7 +233,7 @@
 	return (dnd_is_online_presence_dnd()
 		|| dnd_is_xscreensaver_active()
 		|| dnd_is_screensaver_active()
-		|| dnd_is_screensaver_inhibited()
+		|| dnd_is_idle_inhibited()
 		|| dnd_has_one_fullscreen_window()
 		);
 }

=== modified file 'src/dnd.h'
--- src/dnd.h	2009-06-02 16:28:26 +0000
+++ src/dnd.h	2015-10-14 09:48:39 +0000
@@ -39,7 +39,7 @@
 dnd_is_xscreensaver_active (void);
 
 gboolean
-dnd_is_screensaver_inhibited (void);
+dnd_is_idle_inhibited (void);
 
 gboolean
 dnd_is_screensaver_active (void);

=== modified file 'tests/test-dnd.c'
--- tests/test-dnd.c	2011-07-01 18:23:39 +0000
+++ tests/test-dnd.c	2015-10-14 09:48:39 +0000
@@ -38,21 +38,6 @@
 #define TEST_DBUS_NAME "org.freedesktop.Notificationstest"
 
 static
-void
-test_dnd_screensaver (gpointer fixture, gconstpointer user_data)
-{
-	gboolean test = dnd_is_screensaver_inhibited();
-
-	if (test)
-		g_debug ("screensaver is inhibited");
-
-	test = dnd_is_screensaver_active();
-
-	if (test)
-		g_debug ("screensaver is active");
-}
-
-static
 gboolean
 check_fullscreen (GMainLoop *loop)
 {
@@ -122,7 +107,6 @@
 
 	ts = g_test_create_suite ("dnd");
 #define TC(x) g_test_create_case(#x, 0, NULL, NULL, x, NULL)
-	g_test_suite_add (ts, TC(test_dnd_screensaver));
 
 	// FIXME: test_dnd_fullscreen() fails under compiz because of it using
 	// viewports instead of workspaces