Merge lp:~vikoadi/audience/fix-1040729 into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

1. Create Utils.GnomeSessionManager
2. create VideoPlayer.set_screenlock method and call it from VideoPlayer.playing setter

[Cody Garver (codygarver)]

I have been testing this and it works as advertised.

Just waiting on Tom Beckmann to get some time to check it out before merge.

[Tom Beckmann (tombeckmann)]

Code looks fine to me.

review: Approve

[Cody Garver (codygarver)]

Thanks Viko Adi!

review: Approve

=== modified file 'Audience/Utils.vala'
--- Audience/Utils.vala	2013-04-06 11:45:41 +0000
+++ Audience/Utils.vala	2013-04-25 18:38:24 +0000
@@ -6,6 +6,13 @@
     public signal void MediaPlayerKeyPressed (string application, string key);
 }
 
+[DBus (name = "org.gnome.SessionManager")]
+public interface GnomeSessionManager : GLib.Object {
+	public abstract bool isSessionRunning() throws GLib.IOError;
+    public abstract uint32 Inhibit (string app_id, uint32 toplevel_xid, string reason, uint32 flags) throws GLib.IOError;
+    public abstract void Uninhibit (uint32 inhibit_cookie) throws GLib.IOError;
+}
+
 namespace Audience {
     public delegate void FuncOverDir (File file_under_dir);
     public static void recurse_over_dir (File file_to_process, FuncOverDir func) {

=== modified file 'Audience/Widgets/VideoPlayer.vala'
--- Audience/Widgets/VideoPlayer.vala	2013-04-07 18:53:17 +0000
+++ Audience/Widgets/VideoPlayer.vala	2013-04-25 18:38:24 +0000
@@ -36,6 +36,7 @@
 				playbin.set_state (value ? Gst.State.PLAYING : Gst.State.PAUSED);
 
 				set_screensaver (!value);
+				set_screenlock (!value);
 
 				if (!value) {
 					paused = true;
@@ -201,6 +202,9 @@
 		
 		uint hiding_timer;
 		
+		public GnomeSessionManager session_manager;
+		uint32 inhibit_cookie;
+		
 		public bool fullscreened { get; set; }
 		
 		public signal void ended ();
@@ -624,5 +628,19 @@
 				dpy.get_screensaver (out timeout, out interval, out prefer_blanking, out allow_exposures);
 			dpy.set_screensaver (enable ? timeout : 0, interval, prefer_blanking, allow_exposures);
 		}
+		
+		//prevent screenlocking in Gnome 3 using org.gnome.SessionManager
+		void set_screenlock (bool enable)
+		{
+			try{
+				session_manager = Bus.get_proxy_sync (BusType.SESSION, 
+						"org.gnome.SessionManager", "/org/gnome/SessionManager");
+				if (enable) {
+					session_manager.Uninhibit (inhibit_cookie);
+				}else{
+					inhibit_cookie = session_manager.Inhibit ("audience", 0, "Playing Video using Audience", 12);
+				}
+			} catch (Error e) { warning (e.message); }
+		}
 	}
 }