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

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 255
Merged at revision: 253
Proposed branch: lp:~ted/indicator-session/no-system-desktop-files
Merge into: lp:indicator-session/0.4
Diff against target: 109 lines (+0/-71)
6 files modified
data/Makefile.am (+0/-27)
data/indicator-session-lock-screen.desktop.in.in (+0/-10)
data/indicator-session-logout.desktop.in.in (+0/-10)
data/indicator-session-restart.desktop.in.in (+0/-10)
data/indicator-session-shutdown.desktop.in.in (+0/-10)
po/POTFILES.in (+0/-4)
To merge this branch: bzr merge lp:~ted/indicator-session/no-system-desktop-files
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+100847@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

I have mixed feelings about this ticket, but okay.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
25CLEANFILES = \25CLEANFILES = \
26 $(dbus_services_DATA) \26 $(dbus_services_DATA) \
27 $(gsettings_SCHEMAS)27 $(gsettings_SCHEMAS)
28
29if BUILD_GTKLOGOUTHELPER
30@INTLTOOL_DESKTOP_RULE@
31
32%.desktop.in: %.desktop.in.in
33 sed \
34 -e "s|\@libexecdir\@|$(libexecdir)|" \
35 -e "s|\@bindir\@|$(bindir)|" \
36 $< > $@
37
38logout_helper_desktop_in_in_files = \
39 indicator-session-lock-screen.desktop.in.in \
40 indicator-session-logout.desktop.in.in \
41 indicator-session-restart.desktop.in.in \
42 indicator-session-shutdown.desktop.in.in
43
44logout_helperdir = $(datadir)/applications
45logout_helper_desktop_files = \
46 $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
47logout_helper_DATA = $(logout_helper_desktop_files)
48
49EXTRA_DIST += \
50 $(logout_helper_desktop_in_in_files)
51
52CLEANFILES += \
53 $(logout_helper_desktop_files)
54endif
5528
=== 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 @@
1[Desktop Entry]
2_Name=Lock Screen
3TryExec=@bindir@/xdg-screensaver
4Exec=@bindir@/xdg-screensaver lock
5Icon=system-lock-screen
6Terminal=false
7Type=Application
8OnlyShowIn=Unity;
9Categories=System;
10Version=1.0
110
=== 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 @@
1[Desktop Entry]
2_Name=Log Out
3TryExec=@libexecdir@/gtk-logout-helper
4Exec=@libexecdir@/gtk-logout-helper --logout
5Icon=system-log-out
6Terminal=false
7Type=Application
8OnlyShowIn=Unity;
9Categories=System;
10Version=1.0
110
=== 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 @@
1[Desktop Entry]
2_Name=Restart
3TryExec=@libexecdir@/gtk-logout-helper
4Exec=@libexecdir@/gtk-logout-helper --restart
5Icon=system-restart
6Terminal=false
7Type=Application
8OnlyShowIn=Unity;
9Categories=System;
10Version=1.0
110
=== 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 @@
1[Desktop Entry]
2_Name=Shut Down
3TryExec=@libexecdir@/gtk-logout-helper
4Exec=@libexecdir@/gtk-logout-helper --shutdown
5Icon=system-shutdown
6Terminal=false
7Type=Application
8OnlyShowIn=Unity;
9Categories=System;
10Version=1.0
110
=== 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 @@
1[encoding: UTF-8]1[encoding: UTF-8]
2data/com.canonical.indicator.session.gschema.xml.in2data/com.canonical.indicator.session.gschema.xml.in
3data/extra-sessions/classic-desktop.desktop.in.in3data/extra-sessions/classic-desktop.desktop.in.in
4data/indicator-session-lock-screen.desktop.in.in
5data/indicator-session-shutdown.desktop.in.in
6data/indicator-session-logout.desktop.in.in
7data/indicator-session-restart.desktop.in.in
8src/settings-helper.c4src/settings-helper.c
9src/lock-helper.c5src/lock-helper.c
10src/gtk-logout-helper.c6src/gtk-logout-helper.c

Subscribers

People subscribed via source and target branches