ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-session/session-desktop-files into lp:indicator-session.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ted/indicator-session/session-desktop-files/+merge/72628

Add desktop files for the system menu functions.
-- 
https://code.launchpad.net/~ted/indicator-session/session-desktop-files/+merge/72628
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file '.bzrignore'
--- .bzrignore	2011-08-22 12:32:00 +0000
+++ .bzrignore	2011-08-23 21:49:26 +0000
@@ -203,3 +203,11 @@
 consolekit-seat-client.h
 data/com.canonical.indicator.session.gschema.valid
 data/com.canonical.indicator.session.gschema.xml
+indicator-session-shutdown.desktop
+indicator-session-shutdown.desktop.in
+indicator-session-logout.desktop.in
+indicator-session-logout.desktop
+indicator-session-restart.desktop.in
+indicator-session-restart.desktop
+data/indicator-session-lock-screen.desktop.in
+data/indicator-session-lock-screen.desktop

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-08-19 19:32:20 +0000
+++ data/Makefile.am	2011-08-23 21:49:26 +0000
@@ -18,13 +18,33 @@
 convertdir = $(datadir)/GConf/gsettings
 dist_convert_DATA = indicator-session.convert
 
+@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 =					\
 	$(service_in_files)			\
-	$(gsettings_SCHEMAS:.xml=.xml.in)
+	$(gsettings_SCHEMAS:.xml=.xml.in) \
+	$(logout_helper_desktop_in_in_files)
 
 
 CLEANFILES =					\
 	$(dbus_services_DATA)			\
-	$(gsettings_SCHEMAS)
+	$(gsettings_SCHEMAS) \
+	$(logout_helper_desktop_files)
 

=== added file 'data/indicator-session-lock-screen.desktop.in.in'
--- data/indicator-session-lock-screen.desktop.in.in	1970-01-01 00:00:00 +0000
+++ data/indicator-session-lock-screen.desktop.in.in	2011-08-23 21:49:26 +0000
@@ -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

=== added file 'data/indicator-session-logout.desktop.in.in'
--- data/indicator-session-logout.desktop.in.in	1970-01-01 00:00:00 +0000
+++ data/indicator-session-logout.desktop.in.in	2011-08-23 21:49:26 +0000
@@ -0,0 +1,9 @@
+[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;
+Version=1.0

=== added file 'data/indicator-session-restart.desktop.in.in'
--- data/indicator-session-restart.desktop.in.in	1970-01-01 00:00:00 +0000
+++ data/indicator-session-restart.desktop.in.in	2011-08-23 21:49:26 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Restart
+TryExec=@libexecdir@/gtk-logout-helper
+Exec=@libexecdir@/gtk-logout-helper --restart
+Icon=system-restart
+Terminal=false
+Type=Application
+OnlyShowIn=Unity;
+Version=1.0

=== added file 'data/indicator-session-shutdown.desktop.in.in'
--- data/indicator-session-shutdown.desktop.in.in	1970-01-01 00:00:00 +0000
+++ data/indicator-session-shutdown.desktop.in.in	2011-08-23 21:49:26 +0000
@@ -0,0 +1,9 @@
+[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;
+Version=1.0

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-08-19 19:31:09 +0000
+++ po/POTFILES.in	2011-08-23 21:49:26 +0000
@@ -1,6 +1,10 @@
 [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

=== modified file 'src/user-menu-mgr.c'
--- src/user-menu-mgr.c	2011-08-23 11:51:51 +0000
+++ src/user-menu-mgr.c	2011-08-23 21:49:26 +0000
@@ -44,6 +44,9 @@
 static void activate_user_session (DbusmenuMenuitem *mi,
                                    guint timestamp,
                                    gpointer user_data);
+static void activate_user_accounts (DbusmenuMenuitem *mi,
+                                    guint timestamp,
+                                    gpointer user_data);
 static gint compare_users_by_username (const gchar *a,
                                        const gchar *b);
 static void activate_online_accounts (DbusmenuMenuitem *mi,