From 2be9b756aad33d2fc938830de210e5d5bcdb9cd0 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Tue, 11 Sep 2007 18:51:13 +0000 Subject: Remove gnome-session.desktop since it is provided by gnome-session. 2007-09-11 William Jon McCann * config/Makefile.am: * config/gnome.desktop.in.in: * configure.ac: Remove gnome-session.desktop since it is provided by gnome-session. svn path=/branches/mccann-gobject/; revision=5242 --- ChangeLog | 8 ++++++++ config/Makefile.am | 17 +++-------------- config/gnome.desktop.in.in | 9 --------- configure.ac | 5 ----- po/ChangeLog | 4 ++++ po/POTFILES.in | 1 - 6 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 config/gnome.desktop.in.in diff --git a/ChangeLog b/ChangeLog index 00ef4426..87ed0f0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-09-11 William Jon McCann + + * config/Makefile.am: + * config/gnome.desktop.in.in: + * configure.ac: + Remove gnome-session.desktop since it is provided + by gnome-session. + 2007-09-11 William Jon McCann * configure.ac: diff --git a/config/Makefile.am b/config/Makefile.am index 1901cbe2..f8782143 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -13,14 +13,13 @@ postlogindir = $(gdmconfdir)/PostLogin noinst_DATA = gdm.conf -DESKTOP_FILES = default.desktop gnome.desktop @SSHDESKTOP@ +DESKTOP_FILES = default.desktop @SSHDESKTOP@ EXTRA_DIST = \ gdm.conf.in \ gdm.conf-custom.in \ $(DESKTOP_FILES) \ default.desktop.in \ - gnome.desktop.in.in \ ssh.desktop.in.in \ Xsession.in \ gdm \ @@ -35,7 +34,7 @@ EXTRA_DIST = \ gdmprefetchlist.in \ extract-shell.sh -CLEANFILES = Xsession gdm.conf gdm.conf-custom default.desktop gnome.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist +CLEANFILES = Xsession gdm.conf gdm.conf-custom default.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist Xsession: $(srcdir)/Xsession.in sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \ @@ -83,9 +82,8 @@ clean-local: rm -f $(DESKTOP_FILES) uninstall-hook: - rm -f $(DESTDIR)$(bisessdir)/gnome.desktop \ + rm -f \ $(DESTDIR)$(bisessdir)/default.desktop \ - $(DESTDIR)$(instsessdir)/gnome.desktop \ $(DESTDIR)$(instsessdir)/default.desktop \ $(DESTDIR)$(instsessdir)/ssh.desktop \ $(DESTDIR)$(GDM_DEFAULTS_CONF) \ @@ -161,15 +159,6 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession $(INSTALL_DATA) default.desktop $(DESTDIR)$(bisessdir)/default.desktop chmod 644 $(DESTDIR)$(bisessdir)/default.desktop - -if test -f $(DESTDIR)$(bisessdir)/gnome.desktop; then \ - mv -f $(DESTDIR)$(bisessdir)/gnome.desktop $(DESTDIR)$(bisessdir)/gnome.desktop.orig; \ - fi - -if test -f $(DESTDIR)$(instsessdir)/gnome.desktop; then \ - cp -f $(DESTDIR)$(instsessdir)/gnome.desktop $(DESTDIR)$(instsessdir)/gnome.desktop.orig; \ - fi - $(INSTALL_DATA) gnome.desktop $(DESTDIR)$(instsessdir)/gnome.desktop - chmod 644 $(DESTDIR)$(instsessdir)/gnome.desktop - if test '!' -d $(DESTDIR)$(initdir); then \ $(mkinstalldirs) $(DESTDIR)$(initdir); \ chmod 755 $(DESTDIR)$(initdir); \ diff --git a/config/gnome.desktop.in.in b/config/gnome.desktop.in.in deleted file mode 100644 index a522fb45..00000000 --- a/config/gnome.desktop.in.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=GNOME -_Comment=This session logs you into GNOME -Exec=@GDMGNOMESESSIONCMD@ -TryExec=@GDMGNOMESESSIONCMD@ -# no icon yet, only the top three are currently used -Icon= -Type=Application diff --git a/configure.ac b/configure.ac index b683d07f..ea289121 100644 --- a/configure.ac +++ b/configure.ac @@ -1029,7 +1029,6 @@ case "$host" in SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n" XSESSION_SHELL=/bin/ksh SOUND_PROGRAM=/usr/bin/audioplay - GDMGNOMESESSIONCMD=/usr/dt/config/Xsession.jds GDM_RBAC_SYSCMD_KEYS="HALT:solaris.system.shutdown;REBOOT:solaris.system.shutdown" ;; *freebsd*) @@ -1039,7 +1038,6 @@ case "$host" in SUSPEND_COMMAND="/usr/sbin/zzz" XSESSION_SHELL=/bin/sh SOUND_PROGRAM= - GDMGNOMESESSIONCMD=gnome-session ;; *) GDM_USER_PATH="/bin:/usr/bin" @@ -1048,7 +1046,6 @@ case "$host" in SUSPEND_COMMAND="" XSESSION_SHELL=/bin/sh SOUND_PROGRAM=/usr/bin/play - GDMGNOMESESSIONCMD=gnome-session ;; esac @@ -1268,7 +1265,6 @@ AC_SUBST(GDM_USER_PATH) AC_DEFINE_UNQUOTED(GDM_USER_PATH,"$GDM_USER_PATH") AC_SUBST(SOUND_PROGRAM) AC_DEFINE_UNQUOTED(SOUND_PROGRAM,"$SOUND_PROGRAM") -AC_SUBST(GDMGNOMESESSIONCMD) AC_SUBST(GDM_RBAC_SYSCMD_KEYS) AC_DEFINE_UNQUOTED(GDM_RBAC_SYSCMD_KEYS,"$GDM_RBAC_SYSCMD_KEYS") @@ -1323,7 +1319,6 @@ config/Init config/PreSession config/PostSession config/gdmprefetchlist -config/gnome.desktop.in config/ssh.desktop.in ]) diff --git a/po/ChangeLog b/po/ChangeLog index 12463eca..4667d8a8 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2007-09-11 William Jon McCann + + * POTFILES.in: Remove file. + 2007-09-11 William Jon McCann * POTFILES.in: diff --git a/po/POTFILES.in b/po/POTFILES.in index dc4b81c8..cb114859 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -15,7 +15,6 @@ common/test-settings-client.c common/test-settings-server.c common/ve-signal.c config/default.desktop.in -config/gnome.desktop.in.in config/ssh.desktop.in.in daemon/auth.c daemon/choose.c -- cgit v1.2.1