Merge lp:~ted/indicator-session/no-system-desktop-files into lp:indicator-session/0.4

[Ted Gould]

Remove the desktop files so they don't appear in the dash

[Charles Kerr (charlesk)]

I have mixed feelings about this ticket, but okay.

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-11-23 21:58:41 +0000
+++ data/Makefile.am	2012-04-04 17:45:31 +0000
@@ -25,30 +25,3 @@
 CLEANFILES =					\
 	$(dbus_services_DATA)			\
 	$(gsettings_SCHEMAS)
-
-if BUILD_GTKLOGOUTHELPER
-@INTLTOOL_DESKTOP_RULE@
-
-%.desktop.in: %.desktop.in.in
-	sed \
-		-e "s|\@libexecdir\@|$(libexecdir)|" \
-		-e "s|\@bindir\@|$(bindir)|" \
-		$< > $@
-
-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
-
-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 +=					\
-	$(logout_helper_desktop_in_in_files)
-
-CLEANFILES +=					\
-	$(logout_helper_desktop_files)
-endif

=== removed file 'data/indicator-session-lock-screen.desktop.in.in'
--- data/indicator-session-lock-screen.desktop.in.in	2011-09-26 15:07:33 +0000
+++ data/indicator-session-lock-screen.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Lock Screen
-TryExec=@bindir@/xdg-screensaver
-Exec=@bindir@/xdg-screensaver lock
-Icon=system-lock-screen
-Terminal=false
-Type=Application
-OnlyShowIn=Unity;
-Categories=System;
-Version=1.0

=== removed file 'data/indicator-session-logout.desktop.in.in'
--- data/indicator-session-logout.desktop.in.in	2011-09-26 15:07:33 +0000
+++ data/indicator-session-logout.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Log Out
-TryExec=@libexecdir@/gtk-logout-helper
-Exec=@libexecdir@/gtk-logout-helper --logout
-Icon=system-log-out
-Terminal=false
-Type=Application
-OnlyShowIn=Unity;
-Categories=System;
-Version=1.0

=== removed file 'data/indicator-session-restart.desktop.in.in'
--- data/indicator-session-restart.desktop.in.in	2011-09-26 15:07:33 +0000
+++ data/indicator-session-restart.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Restart
-TryExec=@libexecdir@/gtk-logout-helper
-Exec=@libexecdir@/gtk-logout-helper --restart
-Icon=system-restart
-Terminal=false
-Type=Application
-OnlyShowIn=Unity;
-Categories=System;
-Version=1.0

=== removed file 'data/indicator-session-shutdown.desktop.in.in'
--- data/indicator-session-shutdown.desktop.in.in	2011-09-26 15:07:33 +0000
+++ data/indicator-session-shutdown.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Shut Down
-TryExec=@libexecdir@/gtk-logout-helper
-Exec=@libexecdir@/gtk-logout-helper --shutdown
-Icon=system-shutdown
-Terminal=false
-Type=Application
-OnlyShowIn=Unity;
-Categories=System;
-Version=1.0

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-08-25 10:11:50 +0000
+++ po/POTFILES.in	2012-04-04 17:45:31 +0000
@@ -1,10 +1,6 @@
 [encoding: UTF-8]
 data/com.canonical.indicator.session.gschema.xml.in
 data/extra-sessions/classic-desktop.desktop.in.in
-data/indicator-session-lock-screen.desktop.in.in
-data/indicator-session-shutdown.desktop.in.in
-data/indicator-session-logout.desktop.in.in
-data/indicator-session-restart.desktop.in.in
 src/settings-helper.c
 src/lock-helper.c
 src/gtk-logout-helper.c