diff -Nru mate-screensaver-1.20.3/debian/changelog mate-screensaver-1.20.3/debian/changelog --- mate-screensaver-1.20.3/debian/changelog 2019-01-18 13:56:34.000000000 +0000 +++ mate-screensaver-1.20.3/debian/changelog 2019-01-22 09:38:16.000000000 +0000 @@ -1,3 +1,11 @@ +mate-screensaver (1.20.3-3) unstable; urgency=medium + + * debian/patches: + + Update 1003_mate-screensaver-command-Support-unlocking-unlock-th.patch. + Add/fix -u short option. + + -- Mike Gabriel Tue, 22 Jan 2019 10:38:16 +0100 + mate-screensaver (1.20.3-2) unstable; urgency=medium * debian/patches: diff -Nru mate-screensaver-1.20.3/debian/patches/1003_mate-screensaver-command-Support-unlocking-unlock-th.patch mate-screensaver-1.20.3/debian/patches/1003_mate-screensaver-command-Support-unlocking-unlock-th.patch --- mate-screensaver-1.20.3/debian/patches/1003_mate-screensaver-command-Support-unlocking-unlock-th.patch 2019-01-18 13:56:34.000000000 +0000 +++ mate-screensaver-1.20.3/debian/patches/1003_mate-screensaver-command-Support-unlocking-unlock-th.patch 2019-01-22 09:36:06.000000000 +0000 @@ -1,17 +1,55 @@ -From 148755e195cc36207fcae23d24532d63c94fc424 Mon Sep 17 00:00:00 2001 +From 62d832e6b28ed76bff12cbbdbf627454a6612871 Mon Sep 17 00:00:00 2001 From: Mike Gabriel -Date: Fri, 18 Jan 2019 14:49:21 +0100 +Date: Sun, 20 Jan 2019 01:10:51 +0100 Subject: [PATCH] mate-screensaver-command: Support unlocking (--unlock) the screensaver via CLI. --- - src/gs-listener-dbus.c | 7 +++++++ - src/mate-screensaver-command.c | 9 +++++++++ - 2 files changed, 16 insertions(+) + data/mate-screensaver-command.1 | 3 +++ + doc/dbus-interface.xml | 9 +++++++++ + src/gs-listener-dbus.c | 7 +++++++ + src/mate-screensaver-command.c | 10 ++++++++++ + 4 files changed, 29 insertions(+) +diff --git a/data/mate-screensaver-command.1 b/data/mate-screensaver-command.1 +index f02c735..6aa60a5 100644 +--- a/data/mate-screensaver-command.1 ++++ b/data/mate-screensaver-command.1 +@@ -35,6 +35,9 @@ Query the length of time the screensaver has been active + .B \-l, \-\-lock + Tells the running screensaver process to lock the screen immediately + .TP ++.B \-u, \-\-unlock ++Tells the running screensaver process to unlock the screen immediately ++.TP + .B \-c, \-\-cycle + If the screensaver is active then switch to another graphics demo + .TP +diff --git a/doc/dbus-interface.xml b/doc/dbus-interface.xml +index d245bf1..207d849 100644 +--- a/doc/dbus-interface.xml ++++ b/doc/dbus-interface.xml +@@ -52,6 +52,15 @@ + + + ++ ++ ++ <literal>Unlock</literal> ++ ++ ++ Request that the screen be unlocked. ++ ++ ++ + + + <literal>Cycle</literal> +diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c +index d398601..a37e3f9 100644 --- a/src/gs-listener-dbus.c +++ b/src/gs-listener-dbus.c -@@ -1373,6 +1373,8 @@ +@@ -1373,6 +1373,8 @@ do_introspect (DBusConnection *connection, " <interface name=\"org.mate.ScreenSaver\">\n" " <method name=\"Lock\">\n" " </method>\n" @@ -20,7 +58,7 @@ " <method name=\"Cycle\">\n" " </method>\n" " <method name=\"SimulateUserActivity\">\n" -@@ -1465,6 +1467,11 @@ +@@ -1465,6 +1467,11 @@ listener_dbus_handle_session_message (DBusConnection *connection, g_signal_emit (listener, signals [LOCK], 0); return DBUS_HANDLER_RESULT_HANDLED; } @@ -32,6 +70,8 @@ if (dbus_message_is_method_call (message, GS_LISTENER_SERVICE, "Quit")) { g_signal_emit (listener, signals [QUIT], 0); +diff --git a/src/mate-screensaver-command.c b/src/mate-screensaver-command.c +index 11feb8b..60c6001 100644 --- a/src/mate-screensaver-command.c +++ b/src/mate-screensaver-command.c @@ -39,6 +39,7 @@ @@ -42,18 +82,18 @@ static gboolean do_cycle = FALSE; static gboolean do_activate = FALSE; static gboolean do_deactivate = FALSE; -@@ -71,6 +72,10 @@ +@@ -71,6 +72,10 @@ static GOptionEntry entries [] = N_("Tells the running screensaver process to lock the screen immediately"), NULL }, { -+ "unlock", 'l', 0, G_OPTION_ARG_NONE, &do_unlock, ++ "unlock", 'u', 0, G_OPTION_ARG_NONE, &do_unlock, + N_("Tells the running screensaver process to unlock the screen immediately"), NULL + }, + { "cycle", 'c', 0, G_OPTION_ARG_NONE, &do_cycle, N_("If the screensaver is active then switch to another graphics demo"), NULL }, -@@ -423,6 +428,11 @@ +@@ -423,6 +428,11 @@ do_command (DBusConnection *connection) reply = screensaver_send_message_void (connection, "Lock", FALSE); } @@ -65,33 +105,6 @@ if (do_cycle) { reply = screensaver_send_message_void (connection, "Cycle", FALSE); ---- a/doc/dbus-interface.xml -+++ b/doc/dbus-interface.xml -@@ -52,6 +52,15 @@ - </para> - </sect2> - -+ <sect2 id="gs-method-Unlock"> -+ <title> -+ <literal>Unlock</literal> -+ -+ -+ Request that the screen be unlocked. -+ -+ -+ - - - <literal>Cycle</literal> ---- a/data/mate-screensaver-command.1 -+++ b/data/mate-screensaver-command.1 -@@ -35,6 +35,9 @@ - .B \-l, \-\-lock - Tells the running screensaver process to lock the screen immediately - .TP -+.B \-l, \-\-unlock -+Tells the running screensaver process to unlock the screen immediately -+.TP - .B \-c, \-\-cycle - If the screensaver is active then switch to another graphics demo - .TP +-- +2.11.0 +