Merge lp:~nobuto/notify-osd/fix_dnd_is_screensaver_inhibited into lp:notify-osd

[Nobuto Murata]

This merge proposal fixes LP: #1440825.

However the dnd_is_screensaver_inhibited is broken at least for a few years now, users of caffeine[1] or indicator-session-idle-inhibit[2] might feel the "fix" is a regression, i.e. notification suddenly stops working by notify-osd update.

[1] https://launchpad.net/caffeine
[2] https://github.com/oyvindstegard/indicator-session-idle-inhibit

I'm not sure which is the right way. A cleaner way to inhibit notifications(e.g. example org.freedesktop.Notifications.X-Inhibit dbus method) might be needed though.

[Lars Karlitski (larsu)]

I'm not sure. Inhibiting the session from going idle doesn't necessarily mean "don't show notifications" to me...

[Marco Trevisan (Treviño) (3v1n0)]

> I'm not sure. Inhibiting the session from going idle doesn't necessarily mean
> "don't show notifications" to me...

Yeah, I agree. But still this is what was supposed to happen before (so not sure we should resume it).
However, it is even true that 99% of apps that inhibit the screensaver are media-players which might use this strategy.
Do we have a list of apps using this API?

Having an inhibit "notifications" (API is extendible) would be nicer, though.
Also, I'm not sure whether unity does support this currently (in case we've to fix it).

[Marco Trevisan (Treviño) (3v1n0)]

> Also, I'm not sure whether unity does support this currently (in case we've to
> fix it).

Ok, it seems unity works fine when inhibited, but this is not checked when the screensaver is launched by logind or manually (but that's not idle).

[Iain Lane (laney)]

I tried it, it works good - the code seems fine. Let's get this in for wily.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-26 14:16:51 +0000
+++ debian/changelog	2015-04-08 16:29:00 +0000
@@ -1,3 +1,10 @@
+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/dnd.c'
--- src/dnd.c	2012-01-24 08:14:04 +0000
+++ src/dnd.c	2015-04-08 16:29:00 +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-04-08 16:29:00 +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-04-08 16:29:00 +0000
@@ -41,10 +41,10 @@
 void
 test_dnd_screensaver (gpointer fixture, gconstpointer user_data)
 {
-	gboolean test = dnd_is_screensaver_inhibited();
+	gboolean test = dnd_is_idle_inhibited();
 
 	if (test)
-		g_debug ("screensaver is inhibited");
+		g_debug ("idleness is inhibited");
 
 	test = dnd_is_screensaver_active();