From 41f7c6c709a74f90cd12ee2b09bbc1648fc8607f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 14:29:06 -0500 Subject: Fixing the TryExecs and the versions --- data/indicator-session-logout.desktop.in.in | 3 ++- data/indicator-session-restart.desktop.in.in | 3 ++- data/indicator-session-shutdown.desktop.in.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/indicator-session-logout.desktop.in.in b/data/indicator-session-logout.desktop.in.in index 78548d1..46ba087 100644 --- a/data/indicator-session-logout.desktop.in.in +++ b/data/indicator-session-logout.desktop.in.in @@ -1,8 +1,9 @@ [Desktop Entry] _Name=Log Out -Try-Exec=@libexecdir@/gtk-logout-helper +TryExec=@libexecdir@/gtk-logout-helper Exec=@libexecdir@/gtk-logout-helper --logout Icon=system-log-out Terminal=false Type=Application OnlyShowIn=Unity; +Version=1.0 diff --git a/data/indicator-session-restart.desktop.in.in b/data/indicator-session-restart.desktop.in.in index 68a2f7f..67aa390 100644 --- a/data/indicator-session-restart.desktop.in.in +++ b/data/indicator-session-restart.desktop.in.in @@ -1,8 +1,9 @@ [Desktop Entry] _Name=Restart -Try-Exec=@libexecdir@/gtk-logout-helper +TryExec=@libexecdir@/gtk-logout-helper Exec=@libexecdir@/gtk-logout-helper --restart Icon=system-restart Terminal=false Type=Application OnlyShowIn=Unity; +Version=1.0 diff --git a/data/indicator-session-shutdown.desktop.in.in b/data/indicator-session-shutdown.desktop.in.in index 419a952..4bd51fe 100644 --- a/data/indicator-session-shutdown.desktop.in.in +++ b/data/indicator-session-shutdown.desktop.in.in @@ -1,8 +1,9 @@ [Desktop Entry] _Name=Shut Down -Try-Exec=@libexecdir@/gtk-logout-helper +TryExec=@libexecdir@/gtk-logout-helper Exec=@libexecdir@/gtk-logout-helper --shutdown Icon=system-shutdown Terminal=false Type=Application OnlyShowIn=Unity; +Version=1.0 -- cgit v1.2.3 From 4151eaaab0a2f4d5ee8f7cdadb3fa5bf7187ff83 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 15:07:33 -0500 Subject: Adding a lock screen desktop file as well --- data/Makefile.am | 1 + data/indicator-session-lock-screen.desktop.in.in | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 data/indicator-session-lock-screen.desktop.in.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 347f91f..8b4a99c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -24,6 +24,7 @@ dist_convert_DATA = indicator-session.convert sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ logout_helper_desktop_in_in_files = \ + indicator-session-lock-screen.desktop.in.in \ indicator-session-logout.desktop.in.in \ indicator-session-restart.desktop.in.in \ indicator-session-shutdown.desktop.in.in diff --git a/data/indicator-session-lock-screen.desktop.in.in b/data/indicator-session-lock-screen.desktop.in.in new file mode 100644 index 0000000..e44cd9f --- /dev/null +++ b/data/indicator-session-lock-screen.desktop.in.in @@ -0,0 +1,9 @@ +[Desktop Entry] +_Name=Lock Screen +TryExec=@bindir@/xdg-screensaver +Exec=@bindir@/xdg-screensaver lock +Icon=system-lock-screen +Terminal=false +Type=Application +OnlyShowIn=Unity; +Version=1.0 -- cgit v1.2.3 From 6e6ca9a62c6325c3b130e6e26eac225a25b5a2b9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 15:16:40 -0500 Subject: Making the desktop files actually install --- data/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 8b4a99c..a545ec0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -32,6 +32,7 @@ logout_helper_desktop_in_in_files = \ logout_helperdir = $(datadir)/applications logout_helper_desktop_files = \ $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) +logout_helper_DATA = $(logout_helper_desktop_files) EXTRA_DIST = \ $(service_in_files) \ -- cgit v1.2.3 From 39806a70caf6b4a7dc9f6772d915ddacebc928a3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 15:28:24 -0500 Subject: Adding the bin directory as well --- data/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index a545ec0..7e851a7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,7 +21,10 @@ dist_convert_DATA = indicator-session.convert @INTLTOOL_DESKTOP_RULE@ %.desktop.in: %.desktop.in.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed \ + -e "s|\@libexecdir\@|$(libexecdir)|" \ + -e "s|\@bindir\@|$(bindir)|" \ + $< > $@ logout_helper_desktop_in_in_files = \ indicator-session-lock-screen.desktop.in.in \ -- cgit v1.2.3 From 11ee8ffc85036820c4f8f8dbaf79f1dbfff82e94 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 16:30:32 -0500 Subject: Fixing those ASCII quotes --- data/com.canonical.indicator.session.gschema.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in index 0cb6815..d1d7d4c 100644 --- a/data/com.canonical.indicator.session.gschema.xml.in +++ b/data/com.canonical.indicator.session.gschema.xml.in @@ -8,17 +8,17 @@ false <_summary>Remove the Log Out item from the session menu - <_description>Makes it so that the logout button doesn't show in the session menu. + <_description>Makes it so that the logout button doesn’t show in the session menu. false <_summary>Remove the Restart item from the session menu - <_description>Makes it so that the restart button doesn't show in the session menu. + <_description>Makes it so that the restart button doesn’t show in the session menu. false <_summary>Remove the shutdown item from the session menu - <_description>Makes it so that the shutdown button doesn't show in the session menu. + <_description>Makes it so that the shutdown button doesn’t show in the session menu. -- cgit v1.2.3