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

Proposed by Ted Gould on 2012-04-04
Status: Merged
Approved by: Charles Kerr on 2012-04-04
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) 2012-04-04 Approve on 2012-04-04
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.
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
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2011-11-23 21:58:41 +0000
3+++ data/Makefile.am 2012-04-04 17:45:31 +0000
4@@ -25,30 +25,3 @@
5 CLEANFILES = \
6 $(dbus_services_DATA) \
7 $(gsettings_SCHEMAS)
8-
9-if BUILD_GTKLOGOUTHELPER
10-@INTLTOOL_DESKTOP_RULE@
11-
12-%.desktop.in: %.desktop.in.in
13- sed \
14- -e "s|\@libexecdir\@|$(libexecdir)|" \
15- -e "s|\@bindir\@|$(bindir)|" \
16- $< > $@
17-
18-logout_helper_desktop_in_in_files = \
19- indicator-session-lock-screen.desktop.in.in \
20- indicator-session-logout.desktop.in.in \
21- indicator-session-restart.desktop.in.in \
22- indicator-session-shutdown.desktop.in.in
23-
24-logout_helperdir = $(datadir)/applications
25-logout_helper_desktop_files = \
26- $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
27-logout_helper_DATA = $(logout_helper_desktop_files)
28-
29-EXTRA_DIST += \
30- $(logout_helper_desktop_in_in_files)
31-
32-CLEANFILES += \
33- $(logout_helper_desktop_files)
34-endif
35
36=== removed file 'data/indicator-session-lock-screen.desktop.in.in'
37--- data/indicator-session-lock-screen.desktop.in.in 2011-09-26 15:07:33 +0000
38+++ data/indicator-session-lock-screen.desktop.in.in 1970-01-01 00:00:00 +0000
39@@ -1,10 +0,0 @@
40-[Desktop Entry]
41-_Name=Lock Screen
42-TryExec=@bindir@/xdg-screensaver
43-Exec=@bindir@/xdg-screensaver lock
44-Icon=system-lock-screen
45-Terminal=false
46-Type=Application
47-OnlyShowIn=Unity;
48-Categories=System;
49-Version=1.0
50
51=== removed file 'data/indicator-session-logout.desktop.in.in'
52--- data/indicator-session-logout.desktop.in.in 2011-09-26 15:07:33 +0000
53+++ data/indicator-session-logout.desktop.in.in 1970-01-01 00:00:00 +0000
54@@ -1,10 +0,0 @@
55-[Desktop Entry]
56-_Name=Log Out
57-TryExec=@libexecdir@/gtk-logout-helper
58-Exec=@libexecdir@/gtk-logout-helper --logout
59-Icon=system-log-out
60-Terminal=false
61-Type=Application
62-OnlyShowIn=Unity;
63-Categories=System;
64-Version=1.0
65
66=== removed file 'data/indicator-session-restart.desktop.in.in'
67--- data/indicator-session-restart.desktop.in.in 2011-09-26 15:07:33 +0000
68+++ data/indicator-session-restart.desktop.in.in 1970-01-01 00:00:00 +0000
69@@ -1,10 +0,0 @@
70-[Desktop Entry]
71-_Name=Restart
72-TryExec=@libexecdir@/gtk-logout-helper
73-Exec=@libexecdir@/gtk-logout-helper --restart
74-Icon=system-restart
75-Terminal=false
76-Type=Application
77-OnlyShowIn=Unity;
78-Categories=System;
79-Version=1.0
80
81=== removed file 'data/indicator-session-shutdown.desktop.in.in'
82--- data/indicator-session-shutdown.desktop.in.in 2011-09-26 15:07:33 +0000
83+++ data/indicator-session-shutdown.desktop.in.in 1970-01-01 00:00:00 +0000
84@@ -1,10 +0,0 @@
85-[Desktop Entry]
86-_Name=Shut Down
87-TryExec=@libexecdir@/gtk-logout-helper
88-Exec=@libexecdir@/gtk-logout-helper --shutdown
89-Icon=system-shutdown
90-Terminal=false
91-Type=Application
92-OnlyShowIn=Unity;
93-Categories=System;
94-Version=1.0
95
96=== modified file 'po/POTFILES.in'
97--- po/POTFILES.in 2011-08-25 10:11:50 +0000
98+++ po/POTFILES.in 2012-04-04 17:45:31 +0000
99@@ -1,10 +1,6 @@
100 [encoding: UTF-8]
101 data/com.canonical.indicator.session.gschema.xml.in
102 data/extra-sessions/classic-desktop.desktop.in.in
103-data/indicator-session-lock-screen.desktop.in.in
104-data/indicator-session-shutdown.desktop.in.in
105-data/indicator-session-logout.desktop.in.in
106-data/indicator-session-restart.desktop.in.in
107 src/settings-helper.c
108 src/lock-helper.c
109 src/gtk-logout-helper.c

Subscribers

People subscribed via source and target branches