Attachment #353162 for bug #470248

Lines 766-774 Makefile Link Here

(-)cinnamon-screensaver-1.8.0-orig/configure.ac (-1 / +1 lines)
766	po/Makefile.in	766	po/Makefile.in
767	src/Makefile	767	src/Makefile
768	src/cinnamon-screensaver.desktop.in	768	src/cinnamon-screensaver.desktop.in
		769	src/cinnamon2d-screensaver.desktop.in
769	data/Makefile	770	data/Makefile
770	data/org.cinnamon.ScreenSaver.service	771	data/org.cinnamon.ScreenSaver.service
771	files/Makefile
772	])	772	])
773		773
774	echo "	774	echo "

Lines 2-7 Link Here

(-)cinnamon-screensaver-1.8.0-orig/doc/dbus-interface.html (-1 / +9 lines)
2	<code class="email"><<a class="email" href="mailto:mccann@jhu.edu">mccann@jhu.edu</a>></code><br>	2	<code class="email"><<a class="email" href="mailto:mccann@jhu.edu">mccann@jhu.edu</a>></code><br>
3	</p></div></div></div></div></div><div><p class="releaseinfo">Version 1.8.0</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#dbus-interface">1. DBUS Interface</a></span></dt><dd><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">	3	</p></div></div></div></div></div><div><p class="releaseinfo">Version 1.8.0</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#dbus-interface">1. DBUS Interface</a></span></dt><dd><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">
4	<code class="literal">Lock</code>	4	<code class="literal">Lock</code>
		5	</a></span></dt><dt><span class="sect2"><a href="#gs-method-LockMessage">
		6	<code class="literal">LockMessage</code>
5	</a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">	7	</a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
6	<code class="literal">Cycle</code>	8	<code class="literal">Cycle</code>
7	</a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">	9	</a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">
Lines 30-35 Link Here
30	<code class="literal">AuthenticationRequestEnd</code>	32	<code class="literal">AuthenticationRequestEnd</code>
31	</a></span></dt></dl></dd><dt><span class="sect1"><a href="#gs-examples">Examples</a></span></dt></dl></dd></dl></div><div class="chapter" title="Chapter 1. DBUS Interface"><div class="titlepage"><div><div><h2 class="title"><a name="dbus-interface"></a>Chapter 1. DBUS Interface</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">	33	</a></span></dt></dl></dd><dt><span class="sect1"><a href="#gs-examples">Examples</a></span></dt></dl></dd></dl></div><div class="chapter" title="Chapter 1. DBUS Interface"><div class="titlepage"><div><div><h2 class="title"><a name="dbus-interface"></a>Chapter 1. DBUS Interface</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">
32	<code class="literal">Lock</code>	34	<code class="literal">Lock</code>
		35	</a></span></dt><dt><span class="sect2"><a href="#gs-method-LockMessage">
		36	<code class="literal">LockMessage</code>
33	</a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">	37	</a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
34	<code class="literal">Cycle</code>	38	<code class="literal">Cycle</code>
35	</a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">	39	</a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">
Lines 70-76 Link Here
70	<code class="literal">Lock</code>	74	<code class="literal">Lock</code>
71	</h3></div></div></div><p>	75	</h3></div></div></div><p>
72	Request that the screen be locked.	76	Request that the screen be locked.
73	</p></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>	77	</p></div><div class="sect2" title="LockMessage"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-LockMessage"></a>
		78	<code class="literal">LockMessage</code>
		79	</h3></div></div></div><p>
		80	Request that the screen be locked, and set an away message.
		81	</p><div class="informaltable"><table border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the away message</td></tr></tbody></table></div></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
74	<code class="literal">Cycle</code>	82	<code class="literal">Cycle</code>
75	</h3></div></div></div><p>	83	</h3></div></div></div><p>
76	Request that the screen saver theme be restarted and, if applicable,	84	Request that the screen saver theme be restarted and, if applicable,

Lines 1-11 Link Here

(-)cinnamon-screensaver-1.8.0-orig/files/Makefile.in (-11 lines)
1	all:
2
3	clean:
4
5	distclean:
6
7	install:
8	find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
9
10	uninstall:
11	find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;

Lines 1-2 Link Here

(-)cinnamon-screensaver-1.8.0-orig/files/usr/bin/gnome-screensaver (-2 lines)
1	#!/bin/sh
2	cinnamon-screensaver $@

Lines 1-2 Link Here

(-)cinnamon-screensaver-1.8.0-orig/files/usr/bin/gnome-screensaver-command (-2 lines)
1	#!/bin/sh
2	cinnamon-screensaver-command $@

Lines 8-14 SUBDIRS = \ Link Here

(-)cinnamon-screensaver-1.8.0-orig/Makefile.am (-1 lines)
8	src \	8	src \
9	po \	9	po \
10	data \	10	data \
11	files \
12	$(NULL)	11	$(NULL)
13		12
14	EXTRA_DIST = \	13	EXTRA_DIST = \

Lines 4-9 src/cinnamon-screensaver-command.c Link Here

(-)cinnamon-screensaver-1.8.0-orig/po/POTFILES.in (+1 lines)
4	src/cinnamon-screensaver-dialog.c	4	src/cinnamon-screensaver-dialog.c
5	src/cinnamon-screensaver.c	5	src/cinnamon-screensaver.c
6	src/cinnamon-screensaver.desktop.in.in	6	src/cinnamon-screensaver.desktop.in.in
		7	src/cinnamon2d-screensaver.desktop.in.in
7	src/gs-auth-pam.c	8	src/gs-auth-pam.c
8	src/gs-listener-dbus.c	9	src/gs-listener-dbus.c
9	src/gs-lock-plug.c	10	src/gs-lock-plug.c




[Desktop Entry]
Type=Application
_Name=Screensaver
_Comment=Launch screensaver and locker program
Icon=preferences-desktop-screensaver
Exec=cinnamon-screensaver
OnlyShowIn=GNOME;
AutostartCondition=GNOME3 if-session cinnamon2d
NoDisplay=true
X-GNOME-Autostart-Delay=20
X-GNOME-Autostart-Phase=Application
X-GNOME-Autostart-Notify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=cinnamon-screensaver
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=@VERSION@

Lines 311-321 do_command (GDBusConnection *connection) Link Here

(-)cinnamon-screensaver-1.8.0-orig/src/cinnamon-screensaver-command.c (-2 / +2 lines)
311		311
312	if (do_lock) {	312	if (do_lock) {
313	if (g_strcmp0 (away_message, "DEFAULT") == 0) {	313	if (g_strcmp0 (away_message, "DEFAULT") == 0) {
314	reply = screensaver_send_message_string (connection, "Lock", away_message);	314	reply = screensaver_send_message_string (connection, "LockMessage", away_message);
315	}	315	}
316	else {	316	else {
317	gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);	317	gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);
318	reply = screensaver_send_message_string (connection, "Lock", custom_message);	318	reply = screensaver_send_message_string (connection, "LockMessage", custom_message);
319	g_free (custom_message);	319	g_free (custom_message);
320	}	320	}
321	if (reply == NULL) {	321	if (reply == NULL) {




[Desktop Entry]
Type=Application
_Name=Screensaver
_Comment=Launch screensaver and locker program
Icon=preferences-desktop-screensaver
Exec=cinnamon-screensaver
OnlyShowIn=GNOME;Unity;Xfce;
NoDisplay=true
X-GNOME-Autostart-Delay=20
X-GNOME-Autostart-Phase=Application
X-GNOME-Autostart-Notify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=cinnamon-screensaver
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=1.8.0

Lines 4-10 _Name=Screensaver Link Here

(-)cinnamon-screensaver-1.8.0-orig/src/cinnamon-screensaver.desktop.in.in (-1 / +2 lines)
4	_Comment=Launch screensaver and locker program	4	_Comment=Launch screensaver and locker program
5	Icon=preferences-desktop-screensaver	5	Icon=preferences-desktop-screensaver
6	Exec=cinnamon-screensaver	6	Exec=cinnamon-screensaver
7	OnlyShowIn=GNOME;Unity;Xfce;	7	OnlyShowIn=GNOME;
		8	AutostartCondition=GNOME3 if-session cinnamon
8	NoDisplay=true	9	NoDisplay=true
9	X-GNOME-Autostart-Delay=20	10	X-GNOME-Autostart-Delay=20
10	X-GNOME-Autostart-Phase=Application	11	X-GNOME-Autostart-Phase=Application

Lines 653-658 do_introspect (DBusConnection *connectio Link Here

(-)cinnamon-screensaver-1.8.0-orig/src/gs-listener-dbus.c (-2 / +8 lines)
653	xml = g_string_append (xml,	653	xml = g_string_append (xml,
654	" <interface name=\""GS_INTERFACE"\">\n"	654	" <interface name=\""GS_INTERFACE"\">\n"
655	" <method name=\"Lock\">\n"	655	" <method name=\"Lock\">\n"
		656	" </method>\n"
		657	" <method name=\"LockMessage\">\n"
656	" <arg name=\"body\" direction=\"in\" type=\"s\"/>\n"	658	" <arg name=\"body\" direction=\"in\" type=\"s\"/>\n"
657	" </method>\n"	659	" </method>\n"
658	" <method name=\"SimulateUserActivity\">\n"	660	" <method name=\"SimulateUserActivity\">\n"
Lines 744-749 listener_dbus_handle_session_message (DB Link Here
744	g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);	746	g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
745		747
746	if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) {	748	if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) {
		749	g_signal_emit (listener, signals [LOCK], 0);
		750	return send_success_reply (connection, message);
		751	}
		752	if (dbus_message_is_method_call (message, GS_SERVICE, "LockMessage")) {
747	return listener_lock (listener, connection, message);	753	return listener_lock (listener, connection, message);
748	}	754	}
749	if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) {	755	if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) {
Lines 906-912 listener_dbus_handle_system_message (DBu Link Here
906	} else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {	912	} else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
907	if (_listener_message_path_is_our_session (listener, message)) {	913	if (_listener_message_path_is_our_session (listener, message)) {
908	gs_debug ("systemd requested session lock");	914	gs_debug ("systemd requested session lock");
909	return listener_lock (listener, connection, message);	915	g_signal_emit (listener, signals [LOCK], 0);
910	}	916	}
911		917
912	return DBUS_HANDLER_RESULT_HANDLED;	918	return DBUS_HANDLER_RESULT_HANDLED;
Lines 948-954 listener_dbus_handle_system_message (DBu Link Here
948	} else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) {	954	} else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) {
949	if (_listener_message_path_is_our_session (listener, message)) {	955	if (_listener_message_path_is_our_session (listener, message)) {
950	gs_debug ("ConsoleKit requested session lock");	956	gs_debug ("ConsoleKit requested session lock");
951	return listener_lock (listener, connection, message);	957	g_signal_emit (listener, signals [LOCK], 0);
952	}	958	}
953		959
954	return DBUS_HANDLER_RESULT_HANDLED;	960	return DBUS_HANDLER_RESULT_HANDLED;




gs_manager_set_away_message (GSManager   *manager,
                             const char  *message)
{
        g_free (manager->priv->logout_command);

        manager->priv->away_message = g_strdup(message);
        GSList *l;

        g_return_if_fail (GS_IS_MANAGER (manager));

        g_free (manager->priv->away_message);

        if (message) {
                manager->priv->away_message = g_strdup (message);
        } else {
                manager->priv->away_message = NULL;
        }

        for (l = manager->priv->windows; l; l = l->next) {
                gs_window_set_away_message (l->data, manager->priv->away_message);
        }

Lines 48-54 noinst_PROGRAMS = \ Link Here

(-)cinnamon-screensaver-1.8.0-orig/src/Makefile.am (-1 / +3 lines)
48	$(NULL)	48	$(NULL)
49		49
50	desktopdir = $(sysconfdir)/xdg/autostart	50	desktopdir = $(sysconfdir)/xdg/autostart
51	desktop_in_files = cinnamon-screensaver.desktop.in	51	desktop_in_files = \
		52	cinnamon-screensaver.desktop.in \
		53	cinnamon2d-screensaver.desktop.in
52	desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)	54	desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
53	@INTLTOOL_DESKTOP_RULE@	55	@INTLTOOL_DESKTOP_RULE@
54		56

Return to bug 470248

Lines 1275-1284 void Link Here

(-)cinnamon-screensaver-1.8.0-orig/src/gs-manager.c (-3 / +11 lines)
1275	gs_manager_set_away_message (GSManager *manager,	1275	gs_manager_set_away_message (GSManager *manager,
1276	const char *message)	1276	const char *message)
1277	{	1277	{
1278	g_free (manager->priv->logout_command);
1279
1280	manager->priv->away_message = g_strdup(message);
1281	GSList *l;	1278	GSList *l;
		1279
		1280	g_return_if_fail (GS_IS_MANAGER (manager));
		1281
		1282	g_free (manager->priv->away_message);
		1283
		1284	if (message) {
		1285	manager->priv->away_message = g_strdup (message);
		1286	} else {
		1287	manager->priv->away_message = NULL;
		1288	}
		1289
1282	for (l = manager->priv->windows; l; l = l->next) {	1290	for (l = manager->priv->windows; l; l = l->next) {
1283	gs_window_set_away_message (l->data, manager->priv->away_message);	1291	gs_window_set_away_message (l->data, manager->priv->away_message);
1284	}	1292	}

Line 0 Link Here

(-)cinnamon-screensaver-1.8.0-orig/src/cinnamon2d-screensaver.desktop.in.in (+16 lines)
	1	[Desktop Entry]
	2	Type=Application
	3	_Name=Screensaver
	4	_Comment=Launch screensaver and locker program
	5	Icon=preferences-desktop-screensaver
	6	Exec=cinnamon-screensaver
	7	OnlyShowIn=GNOME;
	8	AutostartCondition=GNOME3 if-session cinnamon2d
	9	NoDisplay=true
	10	X-GNOME-Autostart-Delay=20
	11	X-GNOME-Autostart-Phase=Application
	12	X-GNOME-Autostart-Notify=true
	13	X-GNOME-Bugzilla-Bugzilla=GNOME
	14	X-GNOME-Bugzilla-Product=cinnamon-screensaver
	15	X-GNOME-Bugzilla-Component=general
	16	X-GNOME-Bugzilla-Version=@VERSION@