Ted Gould has proposed merging lp:~ted/indicator-session/classic-session into lp:indicator-session.
Requested reviews: Indicator Applet Developers (indicator-applet-developers) For more details, see: https://code.launchpad.net/~ted/indicator-session/classic-session/+merge/60746 Add the desktop files and shell file to start a guest session in the classic desktop. -- https://code.launchpad.net/~ted/indicator-session/classic-session/+merge/60746 Your team ayatana-commits is subscribed to branch lp:indicator-session.
=== modified file 'configure.ac' --- configure.ac 2011-04-14 20:57:46 +0000 +++ configure.ac 2011-05-12 09:38:16 +0000 @@ -147,6 +147,7 @@ data/icons/scalable/Makefile data/icons/scalable/actions/Makefile data/icons/scalable/status/Makefile +data/extra-sessions/Makefile po/Makefile.in ]) === modified file 'data/Makefile.am' --- data/Makefile.am 2011-01-17 17:05:13 +0000 +++ data/Makefile.am 2011-05-12 09:38:16 +0000 @@ -1,4 +1,6 @@ -SUBDIRS = icons +SUBDIRS = \ + icons \ + extra-sessions dbus_servicesdir = $(DBUSSERVICEDIR) service_in_files = indicator-session.service.in === added directory 'data/extra-sessions' === added file 'data/extra-sessions/Makefile.am' --- data/extra-sessions/Makefile.am 1970-01-01 00:00:00 +0000 +++ data/extra-sessions/Makefile.am 2011-05-12 09:38:16 +0000 @@ -0,0 +1,33 @@ + +################################### +# The files that are actually here +################################### + +extra_guests_desktop_in_in_files = \ + classic-desktop.desktop.in.in +extra_guests_sh_files = \ + classic-desktop.sh + +################################### +# Rules to make things work +################################### + +extra_guestsdir = $(datadir)/indicators/session/applications/ +extra_guests_desktop_files = \ + $(extra_guests_desktop_in_in_files:.desktop.in.in=.desktop) + +@INTLTOOL_DESKTOP_RULE@ + +%.desktop.in: %.desktop.in.in + sed -e "s|\@guestdir\@|$(extra_guestsdir)|" $< > $@ + +extra_guests_DATA = \ + $(extra_guests_desktop_files) \ + $(extra_guests_sh_files) + +EXTRA_DIST = \ + $(extra_guests_desktop_in_in_files) \ + $(extra_guests_sh_files) + +CLEANFILES = \ + $(extra_guests_desktop_files) === added file 'data/extra-sessions/classic-desktop.desktop.in.in' --- data/extra-sessions/classic-desktop.desktop.in.in 1970-01-01 00:00:00 +0000 +++ data/extra-sessions/classic-desktop.desktop.in.in 2011-05-12 09:38:16 +0000 @@ -0,0 +1,6 @@ +[Desktop Entry] +Version=1.0 +_Name=Classic Guest Session +_Comment=Start a guest session using the classic desktop +Exec=@guestdir@/test.sh +Type=Application === added file 'data/extra-sessions/classic-desktop.sh' --- data/extra-sessions/classic-desktop.sh 1970-01-01 00:00:00 +0000 +++ data/extra-sessions/classic-desktop.sh 2011-05-12 09:38:16 +0000 @@ -0,0 +1,5 @@ +#!/bin/bash + +export GDMSESSION=gnome-classic + +/usr/share/gdm/guest-session/guest-session-launch --lock === modified file 'po/POTFILES.in' --- po/POTFILES.in 2010-03-16 21:27:07 +0000 +++ po/POTFILES.in 2011-05-12 09:38:16 +0000 @@ -1,5 +1,6 @@ [encoding: UTF-8] data/indicator-session.schemas.in +data/extra-sessions/classic-desktop.desktop.in.in src/gconf-helper.c src/lock-helper.c src/gtk-logout-helper.c
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
