Merge lp:~darkxst/gnome-session/3.14 into lp:~ubuntu-desktop/gnome-session/ubuntu

[Tim Lunn]

gnome-session-properties app was removed upstream, I have reverted it since I assume its used in Ubuntu.

[Martin Pitt (pitti)]

Thanks for the merge! debian/control needed an update for commenting out xwayland and @GNOME_TEAM@, I did that. Otherwise looks good, merged/uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-15 10:18:16 +0000
+++ debian/changelog	2014-10-31 04:52:33 +0000
@@ -1,3 +1,142 @@
+gnome-session (3.14.0-2ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian, Remaining Changes:
+    - debian/control.in: 
+      + Recommend session-migration
+      * don't depend on xwayland
+    - debian/gnome-session.install: Don't install wayland session for now
+      since its not yet possible to run it
+    - Split ubuntu-session out of gnome-session.
+    - Add upstart user session
+    - debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm:
+       Moved registering gnome-session binary as a session manager to 
+       gnome-session-bin package
+    - don't install defaults.list (installed by desktop-file-utils in ubuntu):
+       debian/gnome-session-common.dirs and gnome-session-common.install
+   - debian/patches/22_support_autostart_delay.patch:
+      Bugzilla patch to support adding a delay to autostart apps, using
+      a "X-GNOME-Autostart-Delay" key in the desktop file
+   - debian/patches/50_ubuntu_sessions.patch:
+      + Add Ubuntu session
+      + gnome-shell.desktop adds --session=gnome now that the "ubuntu" session
+        is the default. Use TryExec to test if gnome-shell is installed.
+   - debian/patches/51_remove_session_saving_from_gui.patch:
+      add GNOME_SESSION_SAVE environment variable for people wanting to
+      use the save session still, knowing that it can break your system
+      if used unwisely (LP: #771896)
+   - debian/patches/52_xdg_current_desktop.patch:
+      Set XDG_CURRENT_DESKTOP inside gnome-session based on a
+      new key 'DesktopName' in gnome-session .desktop files.
+   - debian/patches/53_add_sessionmigration.patch, debian/control:
+      recommends and launch the session-migration if present at the start
+      of the session. This sync tool is running different session migration
+      scripts that can be provided in various desktop packages.
+   - debian/patches/95_dbus_request_shutdown.patch:
+      Add "RequestShutdown" and "RequestReboot" DBus methods to allow other
+      applications to shutdown or reboot the machine via the session manager.
+    - debian/patches/103_kill_the_fail_whale.patch:
+      Kill the Fail Whale as it tends to be more annoying than helpful
+  * debian/patches/revert_remove_gnome_session_properties.patch
+  * Dropped Changes:
+  * debian/patches/52_xdg_current_desktop.patch: Dropped Upsream includes a
+    fallback to set this now. 
+  * Remove patches that have been disabled since 3.8
+
+ -- Tim Lunn <[e-mail]>  Fri, 31 Oct 2014 09:57:57 +1100
+
+gnome-session (3.14.0-2) unstable; urgency=medium
+
+  * Update debian/defaults.list to catch up with times:
+    - Drop swfdec-player which is long gone.
+    - Update File-Roller to new .desktop file name.
+    - Update GEdit to new .desktop file name.
+    - Update Font Viewer to new .desktop file name.
+    - Update Nautilus to new .desktop file name.
+    - Update Totem to new .desktop file name.
+    (Closes: #763595)
+  Note: This breaks the defaults for those who install the new
+        gnome-session-common and keep their << 3.14 application
+        packages (partial upgrades).
+
+ -- Andreas Henriksson <[e-mail]>  Wed, 01 Oct 2014 16:11:51 +0200
+
+gnome-session (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Mon, 22 Sep 2014 20:42:37 +0200
+
+gnome-session (3.13.3-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream development release.
+
+  [ Josselin Mouette ]
+  * Fix typos in defaults.list. Closes: #759429.
+
+ -- Andreas Henriksson <[e-mail]>  Fri, 05 Sep 2014 15:09:51 -0700
+
+gnome-session (3.12.1-4) experimental; urgency=medium
+
+  * gnome-session: Install wayland session files.
+  * gnome-session-bin: add xwayland dependency on linux-any.
+
+ -- Andreas Henriksson <[e-mail]>  Sat, 02 Aug 2014 17:22:46 +0200
+
+gnome-session (3.12.1-3) unstable; urgency=medium
+
+  [ Laurent Bigonville ]
+  * debian/control.in: Recommends libpam-systemd instead of systemd on linux
+    architectures and add recommends against consolekit on non linux arch.
+    Also move the Recommends to the arch any package.
+
+  [ Andreas Henriksson ]
+  * Drop build-dependency on libupower-glib-dev (<< 0.99.0) [!linux-any]
+    - This can no longer be fulfilled anyway.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Mon, 14 Jul 2014 23:57:59 +0200
+
+gnome-session (3.12.1-2) experimental; urgency=medium
+
+  * Enable systemd support on linux architectures only
+
+ -- Laurent Bigonville <[e-mail]>  Sun, 04 May 2014 15:02:14 +0200
+
+gnome-session (3.12.1-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 27 Apr 2014 18:03:58 +0200
+
+gnome-session (3.12.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Require upower build-dependency to be lower then 0.99.x and
+    only on non-linux.
+    - The new upower 0.99.x does not implement the used interfaces.
+    - Functionality is available via logind.
+  * Drop installing /usr/share/applications
+    - new upstream no longer ships gnome-session-properties
+  * Bump build-dependency on libglib2.0-dev to >= 2.39.90
+    - using g_subprocess requires a recent glib.
+  * Bump Standards-Version to 3.9.5
+
+ -- Andreas Henriksson <[e-mail]>  Wed, 26 Mar 2014 22:51:00 +0100
+
+gnome-session (3.10.1-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/patches/13_display_session_properties.patch
+    + Dropped. gnome-session-properties has been dropped upstream
+  * debian/rules, debian/control.in: Explicitely enabled systemd support and
+    recommend systemd for logind. Recommends is enough as gnome-session should
+    fall back to consolekit
+  * debian/control.in: Update build-depends
+
+ -- Sjoerd Simons <[e-mail]>  Fri, 01 Nov 2013 23:04:59 +0100
+
 gnome-session (3.9.90-0ubuntu16) utopic; urgency=medium
 
   * set GNOME_SHELL_SESSION_MODE for gnome-classic sessions (LP: #1381297)
@@ -136,6 +275,34 @@
 
  -- Jeremy Bicha <[e-mail]>  Mon, 26 Aug 2013 08:47:31 -0400
 
+gnome-session (3.8.4-3) unstable; urgency=medium
+
+  * debian/control.in:
+    +Break gdm3 < 3.8. Closes: #726498.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sat, 26 Oct 2013 16:12:19 +0200
+
+gnome-session (3.8.4-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sun, 13 Oct 2013 17:27:19 +0200
+
+gnome-session (3.8.4-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * debian/control.in:
+    - Don't recommend gnome-power-manager
+  * Completely drop gnome-session-fallback (moved to gnome-panel source)
+
+  [ Michael Biebl ]
+  * Drop Build-Depends on libnotify-dev. No longer necessary after
+    debian/patches/04_fallback_warning_notify.patch has been removed.
+  * Bump Standards-Version to 3.9.4. No further changes.
+
+ -- Michael Biebl <[e-mail]>  Fri, 11 Oct 2013 17:07:46 +0200
+
 gnome-session (3.8.2.1-1ubuntu5) saucy; urgency=low
 
   * debian/patches/50_ubuntu_sessions.patch:
 
=== modified file 'debian/control'
--- debian/control	2014-09-30 17:01:54 +0000
+++ debian/control	2014-10-31 04:52:33 +0000
@@ -1,31 +1,22 @@
-# This file is autogenerated. DO NOT EDIT!
-# 
-# Modifications should be made to debian/control.in instead.
-# This file is regenerated automatically in the clean target.
 Source: gnome-session
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>
-Standards-Version: 3.9.3
+Uploaders: @GNOME_TEAM@
+Standards-Version: 3.9.5
 Build-Depends: cdbs (>= 0.4.41),
                dh-autoreconf,
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.13),
                gnome-common,
                intltool (>= 0.40.6),
-               libglib2.0-dev (>= 2.34.0),
+               libglib2.0-dev (>= 2.39.90),
                libgtk-3-dev (>= 2.90.7),
-               libupower-glib-dev (>= 0.9.0),
                libdbus-glib-1-dev (>= 0.76),
                libjson-glib-dev (>= 0.10),
-               libnotify-dev (>= 0.7),
-               libgnome-desktop-3-dev (>= 3.7.90),
+               libgnome-desktop-3-dev (>= 3.9.91),
                libsm-dev,
-               libsystemd-daemon-dev,
-               libsystemd-journal-dev,
-               libsystemd-login-dev (>= 183),
                libice-dev,
                libx11-dev,
                libxt-dev,
@@ -37,13 +28,17 @@
                libxrender-dev,
                xmlto,
                xsltproc,
-               xtrans-dev
+               xtrans-dev,
+               libsystemd-login-dev (>= 183) [linux-any],
+               libsystemd-daemon-dev [linux-any],
+               libsystemd-journal-dev [linux-any]
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-session/ubuntu
 
 Package: gnome-session
 Architecture: all
 Depends: ${misc:Depends},
          gnome-settings-daemon (>= 3.0),
+         gnome-shell (>= 3.0),
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion}),
          gnome-session-common (= ${binary:Version})
@@ -92,8 +87,11 @@
          ${misc:Depends},
          dbus-x11,
          gsettings-desktop-schemas,
-         upower (>= 0.9.0)
+         upower (>= 0.9.0),
+         xwayland [linux-any]
+Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
+Breaks: gdm (<< 3.8)
 Description: GNOME Session Manager - Minimal runtime
  The GNOME Session Manager is in charge of starting the core components
  of the GNOME desktop, and applications that should be launched at
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-02-20 07:56:43 +0000
+++ debian/control.in	2014-10-31 04:52:33 +0000
@@ -4,24 +4,19 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Build-Depends: cdbs (>= 0.4.41),
                dh-autoreconf,
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.13),
                gnome-common,
                intltool (>= 0.40.6),
-               libglib2.0-dev (>= 2.34.0),
+               libglib2.0-dev (>= 2.39.90),
                libgtk-3-dev (>= 2.90.7),
-               libupower-glib-dev (>= 0.9.0),
                libdbus-glib-1-dev (>= 0.76),
                libjson-glib-dev (>= 0.10),
-               libnotify-dev (>= 0.7),
-               libgnome-desktop-3-dev (>= 3.7.90),
+               libgnome-desktop-3-dev (>= 3.9.91),
                libsm-dev,
-               libsystemd-daemon-dev,
-               libsystemd-journal-dev,
-               libsystemd-login-dev (>= 183),
                libice-dev,
                libx11-dev,
                libxt-dev,
@@ -33,13 +28,17 @@
                libxrender-dev,
                xmlto,
                xsltproc,
-               xtrans-dev
+               xtrans-dev,
+               libsystemd-login-dev (>= 183) [linux-any],
+               libsystemd-daemon-dev [linux-any],
+               libsystemd-journal-dev [linux-any]
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-session/ubuntu
 
 Package: gnome-session
 Architecture: all
 Depends: ${misc:Depends},
          gnome-settings-daemon (>= 3.0),
+         gnome-shell (>= 3.0),
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion}),
          gnome-session-common (= ${binary:Version})
@@ -88,8 +87,11 @@
          ${misc:Depends},
          dbus-x11,
          gsettings-desktop-schemas,
-         upower (>= 0.9.0)
+         upower (>= 0.9.0),
+#         xwayland [linux-any]
+Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
+Breaks: gdm (<< 3.8)
 Description: GNOME Session Manager - Minimal runtime
  The GNOME Session Manager is in charge of starting the core components
  of the GNOME desktop, and applications that should be launched at
 
=== modified file 'debian/defaults.list'
--- debian/defaults.list	2014-09-11 20:52:35 +0000
+++ debian/defaults.list	2014-10-31 04:52:33 +0000
@@ -64,84 +64,84 @@
 application/mbox=evolution.desktop
 message/rfc822=evolution.desktop
 x-scheme-handler/mailto=evolution.desktop
-application/x-7z-compressed=file-roller.desktop
-application/x-7z-compressed-tar=file-roller.desktop
-application/x-ace=file-roller.desktop
-application/x-alz=file-roller.desktop
-application/x-ar=file-roller.desktop
-application/x-arj=file-roller.desktop
-application/x-bzip=file-roller.desktop
-application/x-bzip-compressed-tar=file-roller.desktop
-application/x-bzip1=file-roller.desktop
-application/x-bzip1-compressed-tar=file-roller.desktop
-application/x-cabinet=file-roller.desktop
-application/x-cd-image=file-roller.desktop
-application/x-compress=file-roller.desktop
-application/x-compressed-tar=file-roller.desktop
-application/x-cpio=file-roller.desktop
-application/x-deb=file-roller.desktop
-application/x-ear=file-roller.desktop
-application/x-gtar=file-roller.desktop
-application/x-gzip=file-roller.desktop
-application/x-java-archive=file-roller.desktop
-application/x-lha=file-roller.desktop
-application/x-lhz=file-roller.desktop
-application/x-lzip=file-roller.desktop
-application/x-lzip-compressed-tar=file-roller.desktop
-application/x-lzma=file-roller.desktop
-application/x-lzma-compressed-tar=file-roller.desktop
-application/x-lzop=file-roller.desktop
-application/x-lzop-compressed-tar=file-roller.desktop
-application/x-rar=file-roller.desktop
-application/x-rar-compressed=file-roller.desktop
-application/x-rpm=file-roller.desktop
-application/x-rzip=file-roller.desktop
-application/x-tar=file-roller.desktop
-application/x-tarz=file-roller.desktop
-application/x-stuffit=file-roller.desktop
-application/x-war=file-roller.desktop
-application/x-xz=file-roller.desktop
-application/x-xz-compressed-tar=file-roller.desktop
-application/x-zip=file-roller.desktop
-application/x-zip-compressed=file-roller.desktop
-application/x-zoo=file-roller.desktop
-application/zip=file-roller.desktop
-multipart/x-zip=file-roller.desktop
-text/plain=gedit.desktop
-text/css=gedit.desktop
-text/javascript=gedit.desktop
-text/mathml=gedit.desktop
-text/x-c++hdr=gedit.desktop
-text/x-c++src=gedit.desktop
-text/x-csrc=gedit.desktop
-text/x-chdr=gedit.desktop
-text/x-dtd=gedit.desktop
-text/x-java=gedit.desktop
-text/x-javascript=gedit.desktop
-text/x-makefile=gedit.desktop
-text/x-moc=gedit.desktop
-text/x-pascal=gedit.desktop
-text/x-patch=gedit.desktop
-text/x-perl=gedit.desktop
-text/x-php=gedit.desktop
-text/x-python=gedit.desktop
-text/x-sql=gedit.desktop
-text/x-tcl=gedit.desktop
-text/x-tex=gedit.desktop
-text/xml=gedit.desktop
-application/javascript=gedit.desktop
-application/x-cgi=gedit.desktop
-application/x-javascript=gedit.desktop
-application/x-perl=gedit.desktop
-application/x-php=gedit.desktop
-application/x-python=gedit.desktop
-application/x-shellscript=gedit.desktop
-application/xml=gedit.desktop
-application/xml-dtd=gedit.desktop
-application/x-font-ttf=gnome-font-viewer.desktop
-application/x-font-pcf=gnome-font-viewer.desktop
-application/x-font-type1=gnome-font-viewer.desktop
-application/x-font-otf=gnome-font-viewer.desktop
+application/x-7z-compressed=org.gnome.FileRoller.desktop
+application/x-7z-compressed-tar=org.gnome.FileRoller.desktop
+application/x-ace=org.gnome.FileRoller.desktop
+application/x-alz=org.gnome.FileRoller.desktop
+application/x-ar=org.gnome.FileRoller.desktop
+application/x-arj=org.gnome.FileRoller.desktop
+application/x-bzip=org.gnome.FileRoller.desktop
+application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop
+application/x-bzip1=org.gnome.FileRoller.desktop
+application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop
+application/x-cabinet=org.gnome.FileRoller.desktop
+application/x-cd-image=org.gnome.FileRoller.desktop
+application/x-compress=org.gnome.FileRoller.desktop
+application/x-compressed-tar=org.gnome.FileRoller.desktop
+application/x-cpio=org.gnome.FileRoller.desktop
+application/x-deb=org.gnome.FileRoller.desktop
+application/x-ear=org.gnome.FileRoller.desktop
+application/x-gtar=org.gnome.FileRoller.desktop
+application/x-gzip=org.gnome.FileRoller.desktop
+application/x-java-archive=org.gnome.FileRoller.desktop
+application/x-lha=org.gnome.FileRoller.desktop
+application/x-lhz=org.gnome.FileRoller.desktop
+application/x-lzip=org.gnome.FileRoller.desktop
+application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop
+application/x-lzma=org.gnome.FileRoller.desktop
+application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop
+application/x-lzop=org.gnome.FileRoller.desktop
+application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop
+application/x-rar=org.gnome.FileRoller.desktop
+application/x-rar-compressed=org.gnome.FileRoller.desktop
+application/x-rpm=org.gnome.FileRoller.desktop
+application/x-rzip=org.gnome.FileRoller.desktop
+application/x-tar=org.gnome.FileRoller.desktop
+application/x-tarz=org.gnome.FileRoller.desktop
+application/x-stuffit=org.gnome.FileRoller.desktop
+application/x-war=org.gnome.FileRoller.desktop
+application/x-xz=org.gnome.FileRoller.desktop
+application/x-xz-compressed-tar=org.gnome.FileRoller.desktop
+application/x-zip=org.gnome.FileRoller.desktop
+application/x-zip-compressed=org.gnome.FileRoller.desktop
+application/x-zoo=org.gnome.FileRoller.desktop
+application/zip=org.gnome.FileRoller.desktop
+multipart/x-zip=org.gnome.FileRoller.desktop
+text/plain=org.gnome.gedit.desktop
+text/css=org.gnome.gedit.desktop
+text/javascript=org.gnome.gedit.desktop
+text/mathml=org.gnome.gedit.desktop
+text/x-c++hdr=org.gnome.gedit.desktop
+text/x-c++src=org.gnome.gedit.desktop
+text/x-csrc=org.gnome.gedit.desktop
+text/x-chdr=org.gnome.gedit.desktop
+text/x-dtd=org.gnome.gedit.desktop
+text/x-java=org.gnome.gedit.desktop
+text/x-javascript=org.gnome.gedit.desktop
+text/x-makefile=org.gnome.gedit.desktop
+text/x-moc=org.gnome.gedit.desktop
+text/x-pascal=org.gnome.gedit.desktop
+text/x-patch=org.gnome.gedit.desktop
+text/x-perl=org.gnome.gedit.desktop
+text/x-php=org.gnome.gedit.desktop
+text/x-python=org.gnome.gedit.desktop
+text/x-sql=org.gnome.gedit.desktop
+text/x-tcl=org.gnome.gedit.desktop
+text/x-tex=org.gnome.gedit.desktop
+text/xml=org.gnome.gedit.desktop
+application/javascript=org.gnome.gedit.desktop
+application/x-cgi=org.gnome.gedit.desktop
+application/x-javascript=org.gnome.gedit.desktop
+application/x-perl=org.gnome.gedit.desktop
+application/x-php=org.gnome.gedit.desktop
+application/x-python=org.gnome.gedit.desktop
+application/x-shellscript=org.gnome.gedit.desktop
+application/xml=org.gnome.gedit.desktop
+application/xml-dtd=org.gnome.gedit.desktop
+application/x-font-ttf=org.gnome.font-viewer.desktop
+application/x-font-pcf=org.gnome.font-viewer.desktop
+application/x-font-type1=org.gnome.font-viewer.desktop
+application/x-font-otf=org.gnome.font-viewer.desktop
 application/x-gnumeric=gnumeric.desktop
 application/tab-separated-values=gnumeric.desktop
 text/tab-separated-values=gnumeric.desktop
@@ -218,130 +218,128 @@
 application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop
 application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop
 x-content/software=nautilus-autorun-software.desktop
-inode/directory=nautilus.desktop
-application/x-gnome-saved-search=nautilus.desktop
+inode/directory=org.gnome.Nautilus.desktop
+application/x-gnome-saved-search=org.gnome.Nautilus.desktop
 x-content/audio-player=rhythmbox.desktop
 x-content/audio-cdda=sound-juicer.desktop
-application/x-shockwave-flash=swfdec-player.desktop
-application/futuresplash=swfdec-player.desktop
-application/mxf=totem.desktop
-application/ogg=totem.desktop
-application/ram=totem.desktop
-application/sdp=totem.desktop
-application/smil=totem.desktop
-application/smil+xml=totem.desktop
-application/vnd.ms-wpl=totem.desktop
-application/vnd.rn-realmedia=totem.desktop
-application/x-extension-m4a=totem.desktop
-application/x-extension-mp4=totem.desktop
-application/x-flac=totem.desktop
-application/x-flash-video=totem.desktop
-application/x-matroska=totem.desktop
-application/x-netshow-channel=totem.desktop
-application/x-ogg=totem.desktop
-application/x-quicktime-media-link=totem.desktop
-application/x-quicktimeplayer=totem.desktop
-application/x-shorten=totem.desktop
-application/x-smil=totem.desktop
-application/xspf+xml=totem.desktop
-audio/3gpp=totem.desktop
-audio/ac3=totem.desktop
-audio/AMR=totem.desktop
-audio/AMR-WB=totem.desktop
-audio/basic=totem.desktop
-audio/flac=totem.desktop
-audio/midi=totem.desktop
-audio/mp4=totem.desktop
-audio/mpeg=totem.desktop
-audio/mpegurl=totem.desktop
-audio/ogg=totem.desktop
-audio/prs.sid=totem.desktop
-audio/vnd.rn-realaudio=totem.desktop
-audio/x-ape=totem.desktop
-audio/x-flac=totem.desktop
-audio/x-gsm=totem.desktop
-audio/x-it=totem.desktop
-audio/x-m4a=totem.desktop
-audio/x-matroska=totem.desktop
-audio/x-mod=totem.desktop
-audio/x-mp3=totem.desktop
-audio/x-mpeg=totem.desktop
-audio/x-mpegurl=totem.desktop
-audio/x-ms-asf=totem.desktop
-audio/x-ms-asx=totem.desktop
-audio/x-ms-wax=totem.desktop
-audio/x-ms-wma=totem.desktop
-audio/x-musepack=totem.desktop
-audio/x-pn-aiff=totem.desktop
-audio/x-pn-au=totem.desktop
-audio/x-pn-realaudio=totem.desktop
-audio/x-pn-realaudio-plugin=totem.desktop
-audio/x-pn-wav=totem.desktop
-audio/x-pn-windows-acm=totem.desktop
-audio/x-realaudio=totem.desktop
-audio/x-real-audio=totem.desktop
-audio/x-sbc=totem.desktop
-audio/x-scpls=totem.desktop
-audio/x-speex=totem.desktop
-audio/x-tta=totem.desktop
-audio/x-vorbis=totem.desktop
-audio/x-vorbis+ogg=totem.desktop
-audio/x-wav=totem.desktop
-audio/x-wavpack=totem.desktop
-audio/x-xm=totem.desktop
-image/vnd.rn-realpix=totem.desktop
-image/x-pict=totem.desktop
-misc/ultravox=totem.desktop
-text/google-video-pointer=totem.desktop
-text/x-google-video-pointer=totem.desktop
-video/3gpp=totem.desktop
-video/dv=totem.desktop
-video/fli=totem.desktop
-video/flv=totem.desktop
-video/mp2t=totem.desktop
-video/mp4=totem.desktop
-video/mp4v-es=totem.desktop
-video/mpeg=totem.desktop
-video/msvideo=totem.desktop
-video/ogg=totem.desktop
-video/quicktime=totem.desktop
-video/vivo=totem.desktop
-video/vnd.divx=totem.desktop
-video/vnd.rn-realvideo=totem.desktop
-video/vnd.vivo=totem.desktop
-video/webm=totem.desktop
-video/x-anim=totem.desktop
-video/x-avi=totem.desktop
-video/x-flc=totem.desktop
-video/x-fli=totem.desktop
-video/x-flic=totem.desktop
-video/x-flv=totem.desktop
-video/x-m4v=totem.desktop
-video/x-matroska=totem.desktop
-video/x-mpeg=totem.desktop
-video/x-ms-asf=totem.desktop
-video/x-ms-asx=totem.desktop
-video/x-msvideo=totem.desktop
-video/x-ms-wm=totem.desktop
-video/x-ms-wmv=totem.desktop
-video/x-ms-wmx=totem.desktop
-video/x-ms-wvx=totem.desktop
-video/x-nsv=totem.desktop
-video/x-ogm+ogg=totem.desktop
-video/x-theora+ogg=totem.desktop
-video/x-totem-stream=totem.desktop
-x-content/video-dvd=totem.desktop
-x-content/video-vcd=totem.desktop
-x-content/video-svcd=totem.desktop
-x-scheme-handler/pnm=totem.desktop
-x-scheme-handler/mms=totem.desktop
-x-scheme-handler/net=totem.desktop
-x-scheme-handler/rtp=totem.desktop
-x-scheme-handler/rtsp=totem.desktop
-x-scheme-handler/mmsh=totem.desktop
-x-scheme-handler/uvox=totem.desktop
-x-scheme-handler/icy=totem.desktop
-x-scheme-handler/icyx=totem.desktop
+application/mxf=org.gnome.Totem.desktop
+application/ogg=org.gnome.Totem.desktop
+application/ram=org.gnome.Totem.desktop
+application/sdp=org.gnome.Totem.desktop
+application/smil=org.gnome.Totem.desktop
+application/smil+xml=org.gnome.Totem.desktop
+application/vnd.ms-wpl=org.gnome.Totem.desktop
+application/vnd.rn-realmedia=org.gnome.Totem.desktop
+application/x-extension-m4a=org.gnome.Totem.desktop
+application/x-extension-mp4=org.gnome.Totem.desktop
+application/x-flac=org.gnome.Totem.desktop
+application/x-flash-video=org.gnome.Totem.desktop
+application/x-matroska=org.gnome.Totem.desktop
+application/x-netshow-channel=org.gnome.Totem.desktop
+application/x-ogg=org.gnome.Totem.desktop
+application/x-quicktime-media-link=org.gnome.Totem.desktop
+application/x-quicktimeplayer=org.gnome.Totem.desktop
+application/x-shorten=org.gnome.Totem.desktop
+application/x-smil=org.gnome.Totem.desktop
+application/xspf+xml=org.gnome.Totem.desktop
+audio/3gpp=org.gnome.Totem.desktop
+audio/ac3=org.gnome.Totem.desktop
+audio/AMR=org.gnome.Totem.desktop
+audio/AMR-WB=org.gnome.Totem.desktop
+audio/basic=org.gnome.Totem.desktop
+audio/flac=org.gnome.Totem.desktop
+audio/midi=org.gnome.Totem.desktop
+audio/mp4=org.gnome.Totem.desktop
+audio/mpeg=org.gnome.Totem.desktop
+audio/mpegurl=org.gnome.Totem.desktop
+audio/ogg=org.gnome.Totem.desktop
+audio/prs.sid=org.gnome.Totem.desktop
+audio/vnd.rn-realaudio=org.gnome.Totem.desktop
+audio/x-ape=org.gnome.Totem.desktop
+audio/x-flac=org.gnome.Totem.desktop
+audio/x-gsm=org.gnome.Totem.desktop
+audio/x-it=org.gnome.Totem.desktop
+audio/x-m4a=org.gnome.Totem.desktop
+audio/x-matroska=org.gnome.Totem.desktop
+audio/x-mod=org.gnome.Totem.desktop
+audio/x-mp3=org.gnome.Totem.desktop
+audio/x-mpeg=org.gnome.Totem.desktop
+audio/x-mpegurl=org.gnome.Totem.desktop
+audio/x-ms-asf=org.gnome.Totem.desktop
+audio/x-ms-asx=org.gnome.Totem.desktop
+audio/x-ms-wax=org.gnome.Totem.desktop
+audio/x-ms-wma=org.gnome.Totem.desktop
+audio/x-musepack=org.gnome.Totem.desktop
+audio/x-pn-aiff=org.gnome.Totem.desktop
+audio/x-pn-au=org.gnome.Totem.desktop
+audio/x-pn-realaudio=org.gnome.Totem.desktop
+audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop
+audio/x-pn-wav=org.gnome.Totem.desktop
+audio/x-pn-windows-acm=org.gnome.Totem.desktop
+audio/x-realaudio=org.gnome.Totem.desktop
+audio/x-real-audio=org.gnome.Totem.desktop
+audio/x-sbc=org.gnome.Totem.desktop
+audio/x-scpls=org.gnome.Totem.desktop
+audio/x-speex=org.gnome.Totem.desktop
+audio/x-tta=org.gnome.Totem.desktop
+audio/x-vorbis=org.gnome.Totem.desktop
+audio/x-vorbis+ogg=org.gnome.Totem.desktop
+audio/x-wav=org.gnome.Totem.desktop
+audio/x-wavpack=org.gnome.Totem.desktop
+audio/x-xm=org.gnome.Totem.desktop
+image/vnd.rn-realpix=org.gnome.Totem.desktop
+image/x-pict=org.gnome.Totem.desktop
+misc/ultravox=org.gnome.Totem.desktop
+text/google-video-pointer=org.gnome.Totem.desktop
+text/x-google-video-pointer=org.gnome.Totem.desktop
+video/3gpp=org.gnome.Totem.desktop
+video/dv=org.gnome.Totem.desktop
+video/fli=org.gnome.Totem.desktop
+video/flv=org.gnome.Totem.desktop
+video/mp2t=org.gnome.Totem.desktop
+video/mp4=org.gnome.Totem.desktop
+video/mp4v-es=org.gnome.Totem.desktop
+video/mpeg=org.gnome.Totem.desktop
+video/msvideo=org.gnome.Totem.desktop
+video/ogg=org.gnome.Totem.desktop
+video/quicktime=org.gnome.Totem.desktop
+video/vivo=org.gnome.Totem.desktop
+video/vnd.divx=org.gnome.Totem.desktop
+video/vnd.rn-realvideo=org.gnome.Totem.desktop
+video/vnd.vivo=org.gnome.Totem.desktop
+video/webm=org.gnome.Totem.desktop
+video/x-anim=org.gnome.Totem.desktop
+video/x-avi=org.gnome.Totem.desktop
+video/x-flc=org.gnome.Totem.desktop
+video/x-fli=org.gnome.Totem.desktop
+video/x-flic=org.gnome.Totem.desktop
+video/x-flv=org.gnome.Totem.desktop
+video/x-m4v=org.gnome.Totem.desktop
+video/x-matroska=org.gnome.Totem.desktop
+video/x-mpeg=org.gnome.Totem.desktop
+video/x-ms-asf=org.gnome.Totem.desktop
+video/x-ms-asx=org.gnome.Totem.desktop
+video/x-msvideo=org.gnome.Totem.desktop
+video/x-ms-wm=org.gnome.Totem.desktop
+video/x-ms-wmv=org.gnome.Totem.desktop
+video/x-ms-wmx=org.gnome.Totem.desktop
+video/x-ms-wvx=org.gnome.Totem.desktop
+video/x-nsv=org.gnome.Totem.desktop
+video/x-ogm+ogg=org.gnome.Totem.desktop
+video/x-theora+ogg=org.gnome.Totem.desktop
+video/x-totem-stream=org.gnome.Totem.desktop
+x-content/video-dvd=org.gnome.Totem.desktop
+x-content/video-vcd=org.gnome.Totem.desktop
+x-content/video-svcd=org.gnome.Totem.desktop
+x-scheme-handler/pnm=org.gnome.Totem.desktop
+x-scheme-handler/mms=org.gnome.Totem.desktop
+x-scheme-handler/net=org.gnome.Totem.desktop
+x-scheme-handler/rtp=org.gnome.Totem.desktop
+x-scheme-handler/rtsp=org.gnome.Totem.desktop
+x-scheme-handler/mmsh=org.gnome.Totem.desktop
+x-scheme-handler/uvox=org.gnome.Totem.desktop
+x-scheme-handler/icy=org.gnome.Totem.desktop
+x-scheme-handler/icyx=org.gnome.Totem.desktop
 x-scheme-handler/ghelp=yelp.desktop
 x-scheme-handler/help=yelp.desktop
 x-scheme-handler/info=yelp.desktop
 
=== added file 'debian/gnome-session-common.dirs'
--- debian/gnome-session-common.dirs	1970-01-01 00:00:00 +0000
+++ debian/gnome-session-common.dirs	2014-10-31 04:52:33 +0000
@@ -0,0 +1,1 @@
+usr/share/gnome/applications
 
=== modified file 'debian/gnome-session-common.install'
--- debian/gnome-session-common.install	2012-05-07 02:35:47 +0000
+++ debian/gnome-session-common.install	2014-10-31 04:52:33 +0000
@@ -3,3 +3,4 @@
 usr/share/locale
 debian/55gnome-session_gnomerc etc/X11/Xsession.d
 #debian/defaults.list etc/gnome
+
 
=== modified file 'debian/gnome-session.install'
--- debian/gnome-session.install	2014-02-20 02:02:54 +0000
+++ debian/gnome-session.install	2014-10-31 04:52:33 +0000
@@ -1,3 +1,5 @@
 usr/share/doc
 usr/share/xsessions/gnome.desktop
 usr/share/gnome-session/sessions/gnome.session
+#usr/share/gnome-session/sessions/gnome-wayland.session
+#usr/share/wayland-sessions/gnome-wayland.desktop
 
=== removed file 'debian/patches/01_gnome-wm.patch'
--- debian/patches/01_gnome-wm.patch	2011-05-23 14:00:56 +0000
+++ debian/patches/01_gnome-wm.patch	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Index: gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in
-===================================================================
---- gnome-session-3.0.0.orig/data/gnome-fallback.session.desktop.in.in	2011-04-20 21:19:19.751604438 +0200
-+++ gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in	2011-04-20 21:19:24.495627620 +0200
-@@ -2,5 +2,5 @@
- _Name=GNOME fallback
- RequiredComponents=gnome-panel;gnome-settings-daemon;
- RequiredProviders=windowmanager;notifications;
--DefaultProvider-windowmanager=metacity
-+DefaultProvider-windowmanager=gnome-wm
- DefaultProvider-notifications=notification-daemon
 
=== removed file 'debian/patches/02_fallback_desktop.patch'
--- debian/patches/02_fallback_desktop.patch	2012-05-07 02:35:47 +0000
+++ debian/patches/02_fallback_desktop.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Index: gnome-session-3.0.2/data/gnome-fallback.desktop.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.0.2/data/gnome-fallback.desktop.in	2011-11-04 20:06:03.653307488 +0100
-@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+_Name=GNOME Classic
-+_Comment=This session logs you into GNOME
-+Exec=gnome-session-fallback
-+TryExec=gnome-session
-+Icon=
-+Type=Application
 
=== removed file 'debian/patches/03_fallback_desktop_makefile.patch'
--- debian/patches/03_fallback_desktop_makefile.patch	2012-05-07 02:35:47 +0000
+++ debian/patches/03_fallback_desktop_makefile.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: gnome-session-3.4.0/data/Makefile.am
-===================================================================
---- gnome-session-3.4.0.orig/data/Makefile.am	2011-10-21 16:35:39.000000000 +0200
-+++ gnome-session-3.4.0/data/Makefile.am	2012-04-06 23:20:36.422851504 +0200
-@@ -9,7 +9,7 @@
- hwcompat_DATA = hardware-compatibility
- 
- xsessiondir = $(datadir)/xsessions
--xsession_in_files = gnome.desktop.in
-+xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in
- xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
- 
- desktopdir = $(datadir)/applications
 
=== removed file 'debian/patches/101_screen_lock_on_suspend.patch'
--- debian/patches/101_screen_lock_on_suspend.patch	2010-12-06 12:26:37 +0000
+++ debian/patches/101_screen_lock_on_suspend.patch	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-Description: Use the same logic as gnome-power-manager for deciding the "screen lock on suspend" policy. This restores the Jaunty behaviour rather than just using the screensaver settings, which is surprising for users
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=598118
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/karmic/+source/gnome-session/+bug/446191
-
-Index: gnome-session-2.32.1/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-manager.c	2010-12-06 13:26:17.733212002 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-manager.c	2010-12-06 13:26:17.829212002 +0100
-@@ -85,6 +85,9 @@
- #define KEY_AUTOSAVE              KEY_GNOME_SESSION_DIR "/auto_save_session"
- 
- #define KEY_SLEEP_LOCK            "/apps/gnome-screensaver/lock_enabled"
-+#define KEY_SLEEP_LOCK_USE_SCREENSAVER "/apps/gnome-power-manager/lock/use_screensaver_settings"
-+#define GPM_CONF_LOCK_ON_SUSPEND   "/apps/gnome-power-manager/lock/suspend"
-+#define GPM_CONF_LOCK_ON_HIBERNATE "/apps/gnome-power-manager/lock/hibernate"
- 
- typedef enum
- {
-@@ -975,18 +978,33 @@
- }
- 
- static gboolean
--sleep_lock_is_enabled (GsmManager *manager)
-+sleep_lock_is_enabled (GsmManager  *manager,
-+                       const gchar *policy)
- {
--        GError   *error;
--        gboolean  enable_lock;
-+        GError      *error;
-+        gboolean     enable_lock;
-+        gboolean     use_ss_setting;
-+        const gchar *real_policy;
- 
-         error = NULL;
-+        use_ss_setting = gconf_client_get_bool (manager->priv->gconf_client, 
-+                                                KEY_SLEEP_LOCK_USE_SCREENSAVER, &error);
-+        if (error) {
-+                g_warning ("Error retrieving configuration key '%s': %s",
-+                           KEY_SLEEP_LOCK_USE_SCREENSAVER, error->message);
-+                g_error_free (error);
-+
-+                use_ss_setting = FALSE;
-+        }
-+
-+        real_policy = (use_ss_setting ? KEY_SLEEP_LOCK : policy);
-+
-         enable_lock = gconf_client_get_bool (manager->priv->gconf_client,
--                                             KEY_SLEEP_LOCK, &error);
-+                                             real_policy, &error);
- 
-         if (error) {
-                 g_warning ("Error retrieving configuration key '%s': %s",
--                           KEY_SLEEP_LOCK, error->message);
-+                           real_policy, error->message);
-                 g_error_free (error);
- 
-                 /* If we fail to query gconf key, just enable locking */
-@@ -997,13 +1015,14 @@
- }
- 
- static void
--manager_perhaps_lock (GsmManager *manager)
-+manager_perhaps_lock (GsmManager  *manager,
-+                      const gchar *policy)
- {
-         GError   *error;
-         gboolean  ret;
- 
-         /* only lock if gnome-screensaver is set to lock */
--        if (!sleep_lock_is_enabled (manager)) {
-+        if (!sleep_lock_is_enabled (manager, policy)) {
-                 return;
-         }
- 
-@@ -1035,7 +1054,7 @@
-         if (can_hibernate) {
- 
-                 /* lock the screen before we suspend */
--                manager_perhaps_lock (manager);
-+                manager_perhaps_lock (manager, GPM_CONF_LOCK_ON_HIBERNATE);
- 
-                 error = NULL;
-                 ret = up_client_hibernate_sync (manager->priv->up_client, NULL, &error);
-@@ -1059,7 +1078,7 @@
-         if (can_suspend) {
- 
-                 /* lock the screen before we suspend */
--                manager_perhaps_lock (manager);
-+                manager_perhaps_lock (manager, GPM_CONF_LOCK_ON_SUSPEND);
- 
-                 error = NULL;
-                 ret = up_client_suspend_sync (manager->priv->up_client, NULL, &error);
 
=== removed file 'debian/patches/10_session_save.patch'
--- debian/patches/10_session_save.patch	2011-05-23 14:00:56 +0000
+++ debian/patches/10_session_save.patch	1970-01-01 00:00:00 +0000
@@ -1,536 +0,0 @@
-Based on the patch in GNOME #575544
-
-Index: gnome-session-3.0.0/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-manager.c	2011-03-30 09:47:33.000000000 +0200
-+++ gnome-session-3.0.0/gnome-session/gsm-manager.c	2011-04-20 21:13:32.237905522 +0200
-@@ -79,6 +79,7 @@
-  * let's make this fairly long.
-  */
- #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
-+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
- 
- #define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
- #define GDM_FLEXISERVER_ARGS    "--startnew Standard"
-@@ -1405,6 +1406,69 @@ query_end_session_complete (GsmManager *
- 
- }
- 
-+static gboolean
-+_client_request_save (GsmClient            *client,
-+                      ClientEndSessionData *data)
-+{
-+        gboolean ret;
-+        GError  *error;
-+
-+        error = NULL;
-+        ret = gsm_client_request_save (client, data->flags, &error);
-+        if (ret) {
-+                g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client));
-+                data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients,
-+                                                                      client);
-+        } else if (error) {
-+                g_debug ("GsmManager: unable to query client: %s", error->message);
-+                g_error_free (error);
-+        }
-+
-+        return FALSE;
-+}
-+
-+static gboolean
-+_client_request_save_helper (const char           *id,
-+                             GsmClient            *client,
-+                             ClientEndSessionData *data)
-+{
-+        return _client_request_save (client, data);
-+}
-+
-+static void
-+query_save_session_complete (GsmManager *manager)
-+{
-+        GError *error = NULL;
-+
-+        if (g_slist_length (manager->priv->next_query_clients) > 0) {
-+                ClientEndSessionData data;
-+
-+                data.manager = manager;
-+                data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST;
-+
-+                g_slist_foreach (manager->priv->next_query_clients,
-+                                 (GFunc)_client_request_save,
-+                                 &data);
-+
-+                g_slist_free (manager->priv->next_query_clients);
-+                manager->priv->next_query_clients = NULL;
-+
-+                return;
-+        }
-+
-+        if (manager->priv->query_timeout_id > 0) {
-+                g_source_remove (manager->priv->query_timeout_id);
-+                manager->priv->query_timeout_id = 0;
-+        }
-+
-+        gsm_session_save (manager->priv->clients, &error);
-+
-+        if (error) {
-+                g_warning ("Error saving session: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
- static guint32
- generate_cookie (void)
- {
-@@ -1485,6 +1549,21 @@ _on_query_end_session_timeout (GsmManage
-         return FALSE;
- }
- 
-+static gboolean
-+_on_query_save_session_timeout (GsmManager *manager)
-+{
-+        manager->priv->query_timeout_id = 0;
-+
-+        g_debug ("GsmManager: query to save session timed out");
-+
-+        g_slist_free (manager->priv->query_clients);
-+        manager->priv->query_clients = NULL;
-+
-+        query_save_session_complete (manager);
-+
-+        return FALSE;
-+}
-+
- static void
- do_phase_query_end_session (GsmManager *manager)
- {
-@@ -2160,13 +2239,32 @@ _handle_client_end_session_response (Gsm
-                                      gboolean    cancel,
-                                      const char *reason)
- {
--        /* just ignore if received outside of shutdown */
--        if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
-+        /* just ignore if we are not yet running */
-+        if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) {
-                 return;
-         }
- 
-         g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
- 
-+        if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
-+                /* Ignore responses when no requests were sent */
-+                if (manager->priv->query_clients == NULL) {
-+                        return;
-+                }
-+
-+                manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
-+
-+                if (do_last) {
-+                        manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
-+                                                                             client);
-+                }
-+
-+                if (manager->priv->query_clients == NULL) {
-+                        query_save_session_complete (manager);
-+                }
-+                return;
-+        }
-+
-         if (cancel) {
-                 cancel_end_session (manager);
-                 return;
-@@ -2281,6 +2379,15 @@ on_xsmp_client_logout_request (GsmXSMPCl
- }
- 
- static void
-+on_xsmp_client_save_request (GsmXSMPClient *client,
-+                             gboolean       show_dialog,
-+                             GsmManager    *manager)
-+{
-+        g_debug ("GsmManager: save_request");
-+        gsm_manager_save_session (manager, NULL);
-+}
-+
-+static void
- on_store_client_added (GsmStore   *store,
-                        const char *id,
-                        GsmManager *manager)
-@@ -2301,6 +2408,10 @@ on_store_client_added (GsmStore   *store
-                                   "logout-request",
-                                   G_CALLBACK (on_xsmp_client_logout_request),
-                                   manager);
-+		g_signal_connect (client,
-+				  "save-request",
-+				  G_CALLBACK (on_xsmp_client_save_request),
-+				  manager);
-         }
- 
-         g_signal_connect (client,
-@@ -3324,6 +3435,41 @@ gsm_manager_shutdown (GsmManager *manage
- }
- 
- gboolean
-+gsm_manager_save_session (GsmManager *manager,
-+                          GError     **error)
-+{
-+        ClientEndSessionData data;
-+
-+        g_debug ("GsmManager: SaveSession called");
-+
-+        g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
-+
-+        if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
-+                g_set_error (error,
-+                             GSM_MANAGER_ERROR,
-+                             GSM_MANAGER_ERROR_NOT_IN_RUNNING,
-+                             "SaveSession interface is only available during the Running phase");
-+                return FALSE;
-+        }
-+
-+        data.manager = manager;
-+        data.flags = 0;
-+        gsm_store_foreach (manager->priv->clients,
-+                           (GsmStoreFunc)_client_request_save_helper,
-+                           &data);
-+
-+        if (manager->priv->query_clients) {
-+                manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT,
-+                                                                         (GSourceFunc)_on_query_save_session_timeout,
-+                                                                         manager);
-+                return TRUE;
-+        } else {
-+                g_debug ("GsmManager: Nothing to save");
-+                return FALSE;
-+        }
-+}
-+
-+gboolean
- gsm_manager_can_shutdown (GsmManager *manager,
-                           gboolean   *shutdown_available,
-                           GError    **error)
-Index: gnome-session-3.0.0/gnome-session/gsm-manager.h
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-manager.h	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/gsm-manager.h	2011-04-20 21:12:54.057718875 +0200
-@@ -164,6 +164,9 @@ gboolean            gsm_manager_is_inhib
- gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
-                                                                 GError        **error);
- 
-+gboolean            gsm_manager_save_session                   (GsmManager     *manager,
-+                                                                GError        **error);
-+
- gboolean            gsm_manager_can_shutdown                   (GsmManager     *manager,
-                                                                 gboolean       *shutdown_available,
-                                                                 GError        **error);
-Index: gnome-session-3.0.0/gnome-session/gsm-xsmp-client.c
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-xsmp-client.c	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/gsm-xsmp-client.c	2011-04-20 21:12:54.057718875 +0200
-@@ -68,6 +68,7 @@ enum {
- enum {
-         REGISTER_REQUEST,
-         LOGOUT_REQUEST,
-+	SAVE_REQUEST,
-         LAST_SIGNAL
- };
- 
-@@ -501,6 +502,30 @@ xsmp_cancel_end_session (GsmClient *clie
-         return TRUE;
- }
- 
-+static gboolean
-+xsmp_request_save (GsmClient *client,
-+                   guint      flags,
-+                   GError   **error)
-+{
-+        GsmXSMPClient *xsmp = (GsmXSMPClient *) client;
-+
-+        g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description);
-+
-+        if (xsmp->priv->conn == NULL) {
-+                g_set_error (error,
-+                             GSM_CLIENT_ERROR,
-+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
-+                             "Client is not registered");
-+                return FALSE;
-+        }
-+
-+        if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST)
-+                xsmp_save_yourself_phase2 (client);
-+        else
-+                do_save_yourself (xsmp, SmSaveLocal, FALSE);
-+
-+        return TRUE;
-+}
- static char *
- get_desktop_file_path (GsmXSMPClient *client)
- {
-@@ -970,6 +995,7 @@ gsm_xsmp_client_class_init (GsmXSMPClien
-         object_class->get_property         = gsm_xsmp_client_get_property;
-         object_class->set_property         = gsm_xsmp_client_set_property;
- 
-+        client_class->impl_request_save           = xsmp_request_save;
-         client_class->impl_save                   = xsmp_save;
-         client_class->impl_stop                   = xsmp_stop;
-         client_class->impl_query_end_session      = xsmp_query_end_session;
-@@ -997,6 +1023,17 @@ gsm_xsmp_client_class_init (GsmXSMPClien
-                               NULL,
-                               NULL,
-                               g_cclosure_marshal_VOID__BOOLEAN,
-+                              G_TYPE_NONE,
-+                              1, G_TYPE_BOOLEAN);
-+
-+	signals[SAVE_REQUEST] =
-+		g_signal_new ("save-request",
-+                              G_OBJECT_CLASS_TYPE (object_class),
-+                              G_SIGNAL_RUN_LAST,
-+                              G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
-+                              NULL,
-+                              NULL,
-+                              g_cclosure_marshal_VOID__BOOLEAN,
-                               G_TYPE_NONE,
-                               1, G_TYPE_BOOLEAN);
- 
-Index: gnome-session-3.0.0/gnome-session/gsm-xsmp-client.h
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-xsmp-client.h	2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/gsm-xsmp-client.h	2011-04-20 21:12:54.061718891 +0200
-@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
-                                           char          **client_id);
-         gboolean (*logout_request)       (GsmXSMPClient  *client,
-                                           gboolean        prompt);
--
-+	gboolean (*save_request)	 (GsmXSMPClient  *client,
-+                                          gboolean        prompt);
- 
-         void     (*saved_state)          (GsmXSMPClient  *client);
- 
-Index: gnome-session-3.0.0/gnome-session/org.gnome.SessionManager.xml
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/org.gnome.SessionManager.xml	2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/org.gnome.SessionManager.xml	2011-04-20 21:12:54.061718891 +0200
-@@ -256,6 +256,14 @@
-       </doc:doc>
-     </method>
- 
-+    <method name="SaveSession">
-+      <doc:doc>
-+	<doc:description>
-+	  <doc:para>Request to save session</doc:para>
-+	</doc:description>
-+      </doc:doc>
-+    </method>
-+
-     <method name="CanShutdown">
-       <arg name="is_available" direction="out" type="b">
-         <doc:doc>
-Index: gnome-session-3.0.0/capplet/gsm-properties-dialog.c
-===================================================================
---- gnome-session-3.0.0.orig/capplet/gsm-properties-dialog.c	2011-03-22 21:31:42.000000000 +0100
-+++ gnome-session-3.0.0/capplet/gsm-properties-dialog.c	2011-04-20 21:12:54.061718891 +0200
-@@ -33,6 +33,12 @@
- #include "gsm-util.h"
- #include "gsp-app.h"
- #include "gsp-app-manager.h"
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+
-+#define GSM_SERVICE_DBUS   "org.gnome.SessionManager"
-+#define GSM_PATH_DBUS      "/org/gnome/SessionManager"
-+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
- 
- #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
- 
-@@ -43,6 +49,7 @@
- #define CAPPLET_DELETE_WIDGET_NAME        "session_properties_delete_button"
- #define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"
- #define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"
-+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
- #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
- 
- #define STARTUP_APP_ICON     "system-run"
-@@ -455,10 +462,64 @@ on_row_activated (GtkTreeView         *t
- }
- 
- static void
-+session_saved_message (GsmPropertiesDialog *dialog,
-+                       const char *msg,
-+                       gboolean is_error)
-+{
-+        GtkLabel *label;
-+        gchar *markup;
-+        label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
-+        if (is_error)
-+                markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
-+        else
-+                markup = g_markup_escape_text (msg, -1);
-+        gtk_label_set_markup (label, markup);
-+        g_free (markup);
-+}
-+
-+static void
-+session_saved_cb (DBusGProxy *proxy,
-+                  DBusGProxyCall *call_id,
-+                  void *user_data)
-+{
-+        gboolean res;
-+        GsmPropertiesDialog *dialog = user_data;
-+
-+        res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
-+        if (res)
-+                session_saved_message (dialog, _("Your session has been saved."), FALSE);
-+        else
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+
-+        g_object_unref (proxy);
-+}
-+
-+static void
- on_save_session_clicked (GtkWidget           *widget,
-                          GsmPropertiesDialog *dialog)
- {
--        g_debug ("Session saving is not implemented yet!");
-+        DBusGConnection *conn;
-+        DBusGProxy *proxy;
-+        DBusGProxyCall *call;
-+
-+        conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+        if (conn == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
-+                return;
-+        }
-+
-+        proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
-+        if (proxy == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
-+                return;
-+        }
-+
-+        call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
-+        if (call == NULL) {
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+                g_object_unref (proxy);
-+                return;
-+        }
- }
- 
- static void
-Index: gnome-session-3.0.0/configure.ac
-===================================================================
---- gnome-session-3.0.0.orig/configure.ac	2011-03-30 09:47:33.000000000 +0200
-+++ gnome-session-3.0.0/configure.ac	2011-04-20 21:12:54.061718891 +0200
-@@ -63,6 +63,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
-         glib-2.0 >= $GLIB_REQUIRED
-         gtk+-3.0 >= $GTK3_REQUIRED
-+        dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- )
- 
- PKG_CHECK_MODULES(SM, sm)
-Index: gnome-session-3.0.0/gnome-session/gsm-client.h
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-client.h	2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/gsm-client.h	2011-04-20 21:12:54.061718891 +0200
-@@ -92,6 +92,9 @@ struct _GsmClientClass
-                                                               GError   **error);
-         gboolean              (*impl_stop)                   (GsmClient *client,
-                                                               GError   **error);
-+        gboolean              (*impl_request_save)           (GsmClient *client,
-+                                                              guint      flags,
-+                                                              GError   **error);
-         GKeyFile *            (*impl_save)                   (GsmClient *client,
-                                                               GError   **error);
- };
-@@ -137,6 +140,9 @@ gboolean              gsm_client_cancel_
- 
- void                  gsm_client_disconnected               (GsmClient  *client);
- 
-+gboolean              gsm_client_request_save               (GsmClient  *client,
-+                                                             guint       flags,
-+                                                             GError    **error);
- GKeyFile             *gsm_client_save                       (GsmClient  *client,
-                                                              GError    **error);
- /* exported to bus */
-Index: gnome-session-3.0.0/gnome-session/gsm-dbus-client.c
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-dbus-client.c	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/gsm-dbus-client.c	2011-04-20 21:12:54.061718891 +0200
-@@ -412,6 +412,19 @@ gsm_dbus_client_finalize (GObject *objec
-         G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
- }
- 
-+static gboolean
-+dbus_client_request_save (GsmClient *client,
-+                          guint      flags,
-+                          GError   **error)
-+{
-+        g_debug ("GsmDBusClient: sending save request to client with id %s",
-+                 gsm_client_peek_id (client));
-+
-+        /* FIXME: The protocol does not support this */
-+
-+        return FALSE;
-+}
-+
- static GKeyFile *
- dbus_client_save (GsmClient *client,
-                   GError   **error)
-@@ -664,6 +677,7 @@ gsm_dbus_client_class_init (GsmDBusClien
-         object_class->set_property         = gsm_dbus_client_set_property;
-         object_class->dispose              = gsm_dbus_client_dispose;
- 
-+        client_class->impl_request_save           = dbus_client_request_save;
-         client_class->impl_save                   = dbus_client_save;
-         client_class->impl_stop                   = dbus_client_stop;
-         client_class->impl_query_end_session      = dbus_client_query_end_session;
-Index: gnome-session-3.0.0/gnome-session/gsm-client.c
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-client.c	2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/gsm-client.c	2011-04-20 21:12:54.061718891 +0200
-@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *clie
-         g_signal_emit (client, signals[DISCONNECTED], 0);
- }
- 
-+gboolean
-+gsm_client_request_save (GsmClient *client,
-+                         guint      flags,
-+                         GError   **error)
-+{
-+        g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);
-+
-+        return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);
-+}
-+
- GKeyFile *
- gsm_client_save (GsmClient *client,
-                  GError   **error)
-Index: gnome-session-3.0.0/data/session-properties.ui
-===================================================================
---- gnome-session-3.0.0.orig/data/session-properties.ui	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.0.0/data/session-properties.ui	2011-04-20 21:12:54.061718891 +0200
-@@ -148,6 +148,7 @@
-             <property name="visible">True</property>
-             <child>
-               <object class="GtkButton" id="session_properties_save_button">
-+                <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="receives_default">True</property>
-                 <child>
-@@ -191,6 +192,17 @@
-             <property name="position">1</property>
-           </packing>
-         </child>
-+        <child>
-+          <object class="GtkLabel" id="session_properties_session_saved_label">
-+            <property name="visible">True</property>
-+            <property name="wrap">True</property>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">False</property>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
-       </object>
-       <packing>
-         <property name="position">1</property>
 
=== removed file 'debian/patches/12_no_gdm_fallback.patch'
--- debian/patches/12_no_gdm_fallback.patch	2012-07-29 14:22:20 +0000
+++ debian/patches/12_no_gdm_fallback.patch	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-Debian #572085
-
-Don’t fall back to GDM when ConsoleKit fails. If CK is not available, it 
-will not be attempted anyway.
-
-Index: gnome-session-3.5.4/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-3.5.4.orig/gnome-session/gsm-manager.c	2012-07-19 13:41:23.511406643 +1200
-+++ gnome-session-3.5.4/gnome-session/gsm-manager.c	2012-07-19 13:41:50.227405715 +1200
-@@ -492,7 +492,7 @@
-                 g_signal_connect (manager->priv->system,
-                                   "request-completed",
-                                   G_CALLBACK (quit_request_completed),
--                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_REBOOT));
-+                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE));
-                 gsm_system_attempt_restart (manager->priv->system);
-                 break;
-         case GSM_MANAGER_LOGOUT_REBOOT_GDM:
-@@ -506,7 +506,7 @@
-                 g_signal_connect (manager->priv->system,
-                                   "request-completed",
-                                   G_CALLBACK (quit_request_completed),
--                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_SHUTDOWN));
-+                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE));
-                 gsm_system_attempt_stop (manager->priv->system);
-                 break;
-         case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM:
 
=== modified file 'debian/patches/13_display_session_properties.patch'
--- debian/patches/13_display_session_properties.patch	2013-06-08 23:25:03 +0000
+++ debian/patches/13_display_session_properties.patch	2014-10-31 04:52:33 +0000
@@ -4,11 +4,11 @@
  the builtian search.
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683814
 
-Index: gnome-session-3.4.2.1/data/session-properties.desktop.in.in
+Index: gnome-session/data/gnome-session-properties.desktop.in.in
 ===================================================================
---- gnome-session-3.4.2.1.orig/data/session-properties.desktop.in.in	2012-05-17 20:26:07.000000000 +0200
-+++ gnome-session-3.4.2.1/data/session-properties.desktop.in.in	2012-08-07 01:08:23.755210722 +0200
-@@ -8,7 +8,6 @@
+--- gnome-session.orig/data/gnome-session-properties.desktop.in.in
++++ gnome-session/data/gnome-session-properties.desktop.in.in
+@@ -8,7 +8,6 @@ Type=Application
  StartupNotify=true
  Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
  OnlyShowIn=GNOME;Unity;
 
=== modified file 'debian/patches/50_ubuntu_sessions.patch'
--- debian/patches/50_ubuntu_sessions.patch	2014-06-04 12:26:37 +0000
+++ debian/patches/50_ubuntu_sessions.patch	2014-10-31 04:52:33 +0000
@@ -4,9 +4,11 @@
  (TryExec enables to show them or not depends on the package installed)
 Forwarded: Not needed
 
---- a/data/gnome.desktop.in
-+++ b/data/gnome.desktop.in
-@@ -1,7 +1,8 @@
+Index: gnome-session/data/gnome.desktop.in
+===================================================================
+--- gnome-session.orig/data/gnome.desktop.in
++++ gnome-session/data/gnome.desktop.in
+@@ -1,8 +1,9 @@
  [Desktop Entry]
  _Name=GNOME
  _Comment=This session logs you into GNOME
@@ -16,10 +18,13 @@
 +TryExec=gnome-shell
  Icon=
  Type=Application
+ DesktopNames=GNOME
 +X-LightDM-DesktopName=GNOME
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -13,7 +13,7 @@
+Index: gnome-session/data/Makefile.am
+===================================================================
+--- gnome-session.orig/data/Makefile.am
++++ gnome-session/data/Makefile.am
+@@ -12,7 +12,7 @@ hwcompatdir = $(pkgdatadir)
  hwcompat_DATA = hardware-compatibility
  
  xsessiondir = $(datadir)/xsessions
@@ -28,25 +33,29 @@
  
  if BUILD_SESSION_SELECTOR
  xsession_in_files += gnome-custom-session.desktop.in
-@@ -26,7 +26,7 @@
+@@ -29,7 +29,7 @@ desktop_in_files = gnome-session-propert
  desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
  
  sessiondir = $(datadir)/gnome-session/sessions
--session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in
-+session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in ubuntu.session.desktop.in.in
+-session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.session.desktop.in.in
++session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.session.desktop.in.in ubuntu.session.desktop.in.in
  session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
  session_DATA = $(session_in_files:.session.desktop.in=.session)
  
+Index: gnome-session/data/ubuntu.session.desktop.in.in
+===================================================================
 --- /dev/null
-+++ b/data/ubuntu.session.desktop.in.in
++++ gnome-session/data/ubuntu.session.desktop.in.in
 @@ -0,0 +1,4 @@
 +[GNOME Session]
 +_Name=Ubuntu
-+RequiredComponents=unity-settings-daemon;
++RequiredComponents=unity-settings-daemon;compiz;
 +DesktopName=Unity
+Index: gnome-session/data/ubuntu.desktop.in
+===================================================================
 --- /dev/null
-+++ b/data/ubuntu.desktop.in
-@@ -0,0 +1,8 @@
++++ gnome-session/data/ubuntu.desktop.in
+@@ -0,0 +1,9 @@
 +[Desktop Entry]
 +_Name=Ubuntu
 +_Comment=This session logs you into Ubuntu
@@ -54,4 +63,5 @@
 +TryExec=unity
 +Icon=
 +Type=Application
++DesktopNames=Unity
 +X-LightDM-DesktopName=Unity
 
=== removed file 'debian/patches/52_xdg_current_desktop.patch'
--- debian/patches/52_xdg_current_desktop.patch	2014-02-17 03:42:04 +0000
+++ debian/patches/52_xdg_current_desktop.patch	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-Index: gnome-session-3.7.4/gnome-session/gsm-session-fill.c
-===================================================================
---- gnome-session-3.7.4.orig/gnome-session/gsm-session-fill.c	2013-02-07 18:04:28.954708097 -0500
-+++ gnome-session-3.7.4/gnome-session/gsm-session-fill.c	2013-02-07 18:04:28.946708097 -0500
-@@ -31,6 +31,7 @@
- #define GSM_KEYFILE_SESSION_GROUP "GNOME Session"
- #define GSM_KEYFILE_RUNNABLE_KEY "IsRunnableHelper"
- #define GSM_KEYFILE_FALLBACK_KEY "FallbackSession"
-+#define GSM_KEYFILE_DESKTOP_NAME_KEY "DesktopName"
- #define GSM_KEYFILE_REQUIRED_COMPONENTS_KEY "RequiredComponents"
- 
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
-@@ -315,6 +316,24 @@
-         return keyfile;
- }
- 
-+static void
-+set_xdg_current_desktop (GKeyFile *keyfile)
-+{
-+        char     *value;
-+
-+        value = g_key_file_get_string (keyfile,
-+                                       GSM_KEYFILE_SESSION_GROUP, GSM_KEYFILE_DESKTOP_NAME_KEY,
-+                                       NULL);
-+
-+        if (!IS_STRING_EMPTY (value)) {
-+                gsm_util_setenv ("XDG_CURRENT_DESKTOP", value);
-+        }
-+        else {
-+                gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
-+        }
-+        g_free (value);
-+}
-+
- gboolean
- gsm_session_fill (GsmManager  *manager,
-                   const char  *session)
-@@ -332,6 +351,8 @@
- 
-         g_free (actual_session);
- 
-+        set_xdg_current_desktop (keyfile);
-+
-         load_standard_apps (manager, keyfile);
- 
-         g_key_file_free (keyfile);
 
=== removed file 'debian/patches/80_new_upstream_session_dialog.patch'
--- debian/patches/80_new_upstream_session_dialog.patch	2011-05-24 08:56:36 +0000
+++ debian/patches/80_new_upstream_session_dialog.patch	1970-01-01 00:00:00 +0000
@@ -1,699 +0,0 @@
-Description: change the logout dialog to the opensuse proposal.
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=507101
-Author: Vincent Untz
-
-Index: gnome-session-3.0.0/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-manager.c	2011-05-24 10:17:22.244968980 +0200
-+++ gnome-session-3.0.0/gnome-session/gsm-manager.c	2011-05-24 10:17:22.284969173 +0200
-@@ -3050,7 +3050,8 @@
- 
-         display = gtk_widget_get_display (GTK_WIDGET (logout_dialog));
- 
--        gtk_widget_destroy (GTK_WIDGET (logout_dialog));
-+        if (response_id != GTK_RESPONSE_HELP)
-+                gtk_widget_destroy (GTK_WIDGET (logout_dialog));
- 
-         /* In case of dialog cancel, switch user, hibernate and
-          * suspend, we just perform the respective action and return,
-@@ -3060,6 +3061,10 @@
-         case GTK_RESPONSE_NONE:
-         case GTK_RESPONSE_DELETE_EVENT:
-                 break;
-+        case GTK_RESPONSE_HELP:
-+                gsm_util_help_display (GTK_WINDOW (logout_dialog),
-+                                       "gosgetstarted-73");
-+                break;
-         case GSM_LOGOUT_RESPONSE_SWITCH_USER:
-                 request_switch_user (display, manager);
-                 break;
-Index: gnome-session-3.0.0/gnome-session/gsm-util.c
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-util.c	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/gsm-util.c	2011-05-24 10:17:22.284969173 +0200
-@@ -21,6 +21,7 @@
- #include <config.h>
- #include <stdlib.h>
- #include <ctype.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <sys/time.h>
-@@ -519,3 +520,86 @@
- 
-         return icon_size;
- }
-+
-+void
-+gsm_util_help_display (GtkWindow  *parent,
-+                       const char *link_id)
-+{
-+        GError *error = NULL;
-+        const char *lang;
-+        char *uri = NULL;
-+        gboolean found;
-+
-+        int i;
-+
-+        const char * const * langs = g_get_language_names ();
-+
-+        uri = NULL;
-+        found = FALSE;
-+
-+        for (i = 0; langs[i]; i++) {
-+                lang = langs[i];
-+                if (strchr (lang, '.')) {
-+                        continue;
-+                }
-+
-+                uri = g_build_filename (DATADIR,
-+                                        "/gnome/help/user-guide/",
-+                                        lang,
-+                                        "/user-guide.xml",
-+                                        NULL);
-+
-+                if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
-+                        found = TRUE;
-+                        break;
-+                }
-+        }
-+
-+        if (found) {
-+		GAppInfo *app_info;
-+        	char *command;
-+
-+                if (link_id) {
-+                        command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL);
-+                } else {
-+                        command = g_strconcat ("gnome-open ghelp://", uri,  NULL);
-+                }
-+
-+		app_info = g_app_info_create_from_commandline (command, "gnome-open",G_APP_INFO_CREATE_NONE, &error);
-+		g_free (command);
-+
-+		if (error == NULL && app_info != NULL) {
-+			GdkScreen *screen;
-+			GdkAppLaunchContext *context;
-+
-+			screen = gtk_widget_get_screen (GTK_WIDGET (parent));
-+			context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
-+			g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (context), &error);
-+
-+			g_object_unref (context);
-+			g_object_unref (app_info);
-+		}
-+	}
-+
-+        if (!found || error != NULL) {
-+                GtkWidget *d;
-+                const char *errmsg;
-+
-+                if (!found)
-+                        errmsg = _("Cannot find help.");
-+                else {
-+                        errmsg = error->message;
-+                        g_error_free (error);
-+                }
-+
-+                d = gtk_message_dialog_new (parent,
-+                                            GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-+                                            GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-+                                            "%s", errmsg);
-+                gtk_widget_show (GTK_WIDGET (d));
-+                g_signal_connect (d, "response",
-+                                  G_CALLBACK (gtk_widget_destroy), NULL);
-+        }
-+
-+        g_free (uri);
-+}
-Index: gnome-session-3.0.0/gnome-session/Makefile.am
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/Makefile.am	2011-03-22 21:36:21.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/Makefile.am	2011-05-24 10:17:22.288969198 +0200
-@@ -94,6 +94,10 @@
- 	gsm-util.c				\
- 	gsm-util.h
- 
-+libgsmutil_la_CPPFLAGS =			\
-+	$(AM_CPPFLAGS)				\
-+	-DDATADIR=\""$(datadir)"\"
-+
- libgsmutil_la_LIBADD = 				\
- 	$(GNOME_SESSION_LIBS)
- 
-Index: gnome-session-3.0.0/gnome-session/gsm-logout-dialog.c
-===================================================================
---- gnome-session-3.0.0.orig/gnome-session/gsm-logout-dialog.c	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.0.0/gnome-session/gsm-logout-dialog.c	2011-05-24 10:29:39.732625980 +0200
-@@ -43,6 +43,14 @@
- #define LOCKDOWN_SCHEMA            "org.gnome.desktop.lockdown"
- #define KEY_DISABLE_USER_SWITCHING "disable-user-switching"
- 
-+#define GSM_ICON_LOGOUT    "system-log-out"
-+#define GSM_ICON_SWITCH    "system-users"
-+#define GSM_ICON_SHUTDOWN  "system-shutdown"
-+#define GSM_ICON_REBOOT    "view-refresh"
-+/* TODO: use gpm icons? */
-+#define GSM_ICON_HIBERNATE "drive-harddisk"
-+#define GSM_ICON_SLEEP     "gnome-session-sleep"
-+
- typedef enum {
-         GSM_DIALOG_LOGOUT_TYPE_LOGOUT,
-         GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN
-@@ -50,11 +58,12 @@
- 
- struct _GsmLogoutDialogPrivate
- {
--        GsmDialogLogoutType  type;
--
-         UpClient            *up_client;
-         GsmConsolekit       *consolekit;
- 
-+        GtkWidget           *info_label;
-+        GtkWidget           *cancel_button;
-+
-         int                  timeout;
-         unsigned int         timeout_id;
- 
-@@ -63,7 +72,8 @@
- 
- static GsmLogoutDialog *current_dialog = NULL;
- 
--static void gsm_logout_dialog_set_timeout  (GsmLogoutDialog *logout_dialog);
-+static void gsm_logout_dialog_set_timeout  (GsmLogoutDialog *logout_dialog,
-+                                            int              seconds);
- 
- static void gsm_logout_dialog_destroy  (GsmLogoutDialog *logout_dialog,
-                                         gpointer         data);
-@@ -71,43 +81,10 @@
- static void gsm_logout_dialog_show     (GsmLogoutDialog *logout_dialog,
-                                         gpointer         data);
- 
--enum {
--        PROP_0,
--        PROP_MESSAGE_TYPE
--};
--
--G_DEFINE_TYPE (GsmLogoutDialog, gsm_logout_dialog, GTK_TYPE_MESSAGE_DIALOG);
--
--static void
--gsm_logout_dialog_set_property (GObject      *object,
--                                guint         prop_id,
--                                const GValue *value,
--                                GParamSpec   *pspec)
--{
--        switch (prop_id) {
--        case PROP_MESSAGE_TYPE:
--                break;
--        default:
--                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
--                break;
--        }
--}
-+static void gsm_logout_set_info_text   (GsmLogoutDialog *logout_dialog,
-+                                        int              seconds);
- 
--static void
--gsm_logout_dialog_get_property (GObject     *object,
--                                guint        prop_id,
--                                GValue      *value,
--                                GParamSpec  *pspec)
--{
--        switch (prop_id) {
--        case PROP_MESSAGE_TYPE:
--                g_value_set_enum (value, GTK_MESSAGE_WARNING);
--                break;
--        default:
--                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
--                break;
--        }
--}
-+G_DEFINE_TYPE (GsmLogoutDialog, gsm_logout_dialog, GTK_TYPE_DIALOG);
- 
- static void
- gsm_logout_dialog_class_init (GsmLogoutDialogClass *klass)
-@@ -116,18 +93,6 @@
- 
-         gobject_class = G_OBJECT_CLASS (klass);
- 
--        /* This is a workaround to avoid a stupid crash: libgnomeui
--         * listens for the "show" signal on all GtkMessageDialog and
--         * gets the "message-type" of the dialogs. We will crash when
--         * it accesses this property if we don't override it since we
--         * didn't define it. */
--        gobject_class->set_property = gsm_logout_dialog_set_property;
--        gobject_class->get_property = gsm_logout_dialog_get_property;
--
--        g_object_class_override_property (gobject_class,
--                                          PROP_MESSAGE_TYPE,
--                                          "message-type");
--
-         g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate));
- }
- 
-@@ -139,11 +104,22 @@
-         logout_dialog->priv->timeout_id = 0;
-         logout_dialog->priv->timeout = 0;
-         logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL;
-+        logout_dialog->priv->info_label = NULL;
- 
--        gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
-+        gtk_window_set_resizable (GTK_WINDOW (logout_dialog), FALSE);
-         gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
-         gtk_window_stick (GTK_WINDOW (logout_dialog));
- 
-+        /* use HIG spacings */
-+        gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), 12);
-+        gtk_container_set_border_width (GTK_CONTAINER (logout_dialog), 6);
-+
-+        gtk_dialog_add_button (GTK_DIALOG (logout_dialog), GTK_STOCK_HELP,
-+                               GTK_RESPONSE_HELP);
-+        logout_dialog->priv->cancel_button =
-+                gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
-+                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-+
-         logout_dialog->priv->up_client = up_client_new ();
- 
-         logout_dialog->priv->consolekit = gsm_get_consolekit ();
-@@ -239,38 +215,26 @@
- static void
- gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog, gpointer user_data)
- {
--        gsm_logout_dialog_set_timeout (logout_dialog);
--}
-+        gsm_logout_set_info_text (logout_dialog, AUTOMATIC_ACTION_TIMEOUT);
- 
--static gboolean
--gsm_logout_dialog_timeout (gpointer data)
--{
--        GsmLogoutDialog *logout_dialog;
--        char            *seconds_warning;
--        char            *secondary_text;
--        int              seconds_to_show;
--        static char     *session_type = NULL;
--
--        logout_dialog = (GsmLogoutDialog *) data;
--
--        if (!logout_dialog->priv->timeout) {
--                gtk_dialog_response (GTK_DIALOG (logout_dialog),
--                                     logout_dialog->priv->default_response);
--
--                return FALSE;
--        }
-+        if (logout_dialog->priv->default_response != GTK_RESPONSE_CANCEL)
-+                gsm_logout_dialog_set_timeout (logout_dialog,
-+                                               AUTOMATIC_ACTION_TIMEOUT);
-+}
- 
--        if (logout_dialog->priv->timeout <= 30) {
--                seconds_to_show = logout_dialog->priv->timeout;
--        } else {
--                seconds_to_show = (logout_dialog->priv->timeout/10) * 10;
- 
--                if (logout_dialog->priv->timeout % 10)
--                        seconds_to_show += 10;
--        }
-+static void
-+gsm_logout_set_info_text (GsmLogoutDialog *logout_dialog,
-+                          int              seconds_to_show)
-+{
-+        const char  *seconds_warning;
-+        char        *secondary_text;
-+        char        *buf;
-+        char        *markup;
-+        static char *session_type = NULL;
- 
--        switch (logout_dialog->priv->type) {
--        case GSM_DIALOG_LOGOUT_TYPE_LOGOUT:
-+        switch (logout_dialog->priv->default_response) {
-+        case GSM_LOGOUT_RESPONSE_LOGOUT:
-                 /* This string is shared with gsm-fail-whale-dialog.c */
-                 seconds_warning = ngettext ("You will be automatically logged "
-                                             "out in %d second.",
-@@ -279,7 +243,7 @@
-                                             seconds_to_show);
-                 break;
- 
--        case GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN:
-+        case GSM_LOGOUT_RESPONSE_SHUTDOWN:
-                 seconds_warning = ngettext ("This system will be automatically "
-                                             "shut down in %d second.",
-                                             "This system will be automatically "
-@@ -287,6 +251,10 @@
-                                             seconds_to_show);
-                 break;
- 
-+        case GTK_RESPONSE_CANCEL:
-+                seconds_warning = "";
-+                break;
-+
-         default:
-                 g_assert_not_reached ();
-         }
-@@ -321,25 +289,50 @@
- 		secondary_text = g_strdup (seconds_warning);
- 	}
- 
--        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog),
--                                                  secondary_text,
--                                                  seconds_to_show,
--                                                  NULL);
-+        buf = g_strdup_printf (secondary_text, seconds_to_show);
-+        markup = g_markup_printf_escaped ("<i>%s</i>", buf);
-+        g_free (buf);
-+        gtk_label_set_markup (GTK_LABEL (logout_dialog->priv->info_label),
-+                              markup);
-+        g_free (markup);
-+}
- 
--        logout_dialog->priv->timeout--;
-+static gboolean
-+gsm_logout_dialog_timeout (gpointer data)
-+{
-+        GsmLogoutDialog *logout_dialog;
-+        int              seconds_to_show;
-+
-+        logout_dialog = (GsmLogoutDialog *) data;
-+
-+        if (!logout_dialog->priv->timeout) {
-+                gtk_dialog_response (GTK_DIALOG (logout_dialog),
-+                                     logout_dialog->priv->default_response);
-+
-+                return FALSE;
-+        }
-+
-+        if (logout_dialog->priv->timeout <= 30) {
-+                seconds_to_show = logout_dialog->priv->timeout;
-+        } else {
-+                seconds_to_show = (logout_dialog->priv->timeout/10) * 10;
-+
-+                if (logout_dialog->priv->timeout % 10)
-+                        seconds_to_show += 10;
-+        }
- 
--        g_free (secondary_text);
-+        gsm_logout_set_info_text (logout_dialog, seconds_to_show);
-+
-+        logout_dialog->priv->timeout--;
- 
-         return TRUE;
- }
- 
- static void
--gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog)
-+gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog,
-+                               int              seconds)
- {
--        logout_dialog->priv->timeout = AUTOMATIC_ACTION_TIMEOUT;
--
--        /* Sets the secondary text */
--        gsm_logout_dialog_timeout (logout_dialog);
-+        logout_dialog->priv->timeout = seconds;
- 
-         if (logout_dialog->priv->timeout_id != 0) {
-                 g_source_remove (logout_dialog->priv->timeout_id);
-@@ -351,14 +344,120 @@
- }
- 
- static GtkWidget *
-+gsm_logout_tile_new (const char *icon_name,
-+                     const char *title,
-+                     const char *description)
-+{
-+        GtkWidget *button;
-+        GtkWidget *alignment;
-+        GtkWidget *hbox;
-+        GtkWidget *vbox;
-+        GtkWidget *image;
-+        GtkWidget *label;
-+        char      *markup;
-+
-+        g_assert (title != NULL);
-+
-+        button = GTK_WIDGET (gtk_button_new ());
-+        gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-+
-+        alignment = gtk_alignment_new (0, 0.5, 0, 0);
-+        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 6);
-+        gtk_container_add (GTK_CONTAINER (button), alignment);
-+
-+        hbox = gtk_hbox_new (FALSE, 12);
-+        gtk_container_add (GTK_CONTAINER (alignment), hbox);
-+        if (icon_name != NULL) {
-+                image = gtk_image_new_from_icon_name (icon_name,
-+                                                      GTK_ICON_SIZE_DIALOG);
-+                gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-+        }
-+
-+        vbox = gtk_vbox_new (FALSE, 2);
-+
-+        markup = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
-+                                          title);
-+        label = gtk_label_new (markup);
-+        g_free (markup);
-+
-+        gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-+        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-+        gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
-+
-+        gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-+
-+        if (description != NULL) {
-+                gchar     *markup;
-+                GdkColor  *color;
-+                GtkWidget *label;
-+                GtkStyle  *style;
-+
-+                style = gtk_widget_get_style (GTK_WIDGET (button));
-+                color = &style->fg[GTK_STATE_INSENSITIVE];
-+                markup = g_markup_printf_escaped ("<span size=\"small\" foreground=\"#%.2x%.2x%.2x\">%s</span>",
-+                                                  color->red,
-+                                                  color->green,
-+                                                  color->blue,
-+                                                  description);
-+                label = gtk_label_new (markup);
-+                g_free (markup);
-+
-+                gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-+                gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-+                gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
-+                gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-+
-+                gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-+        }
-+
-+        gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
-+
-+        return button;
-+}
-+
-+static void
-+gsm_logout_tile_clicked (GtkWidget *tile,
-+                         gpointer   response_p)
-+{
-+        GtkWidget *dialog;
-+
-+        dialog = gtk_widget_get_toplevel (tile);
-+        g_assert (GTK_IS_DIALOG (dialog));
-+        gtk_dialog_response (GTK_DIALOG (dialog),
-+                             GPOINTER_TO_UINT (response_p));
-+}
-+
-+static GtkWidget *
-+gsm_logout_append_tile (GtkWidget    *vbox,
-+                        unsigned int  response,
-+                        const char   *icon_name,
-+                        const char   *title,
-+                        const char   *description)
-+{
-+        GtkWidget *tile;
-+
-+        tile = gsm_logout_tile_new (icon_name, title, description);
-+        gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0);
-+        gtk_widget_show_all (tile);
-+
-+        g_signal_connect (tile,
-+                          "clicked",
-+                          G_CALLBACK (gsm_logout_tile_clicked),
-+                          GUINT_TO_POINTER (response));
-+
-+        return tile;
-+}
-+
-+static GtkWidget *
- gsm_get_dialog (GsmDialogLogoutType type,
-                 GdkScreen          *screen,
-                 guint32             activate_time)
- {
-         GsmLogoutDialog *logout_dialog;
--        GtkWidget       *dialog_image;
--        const char      *primary_text;
-+        GtkWidget       *vbox;
-+        GtkWidget       *tile;
-         const char      *icon_name;
-+        const char      *title;
- 
-         if (current_dialog != NULL) {
-                 gtk_widget_destroy (GTK_WIDGET (current_dialog));
-@@ -368,83 +467,119 @@
- 
-         current_dialog = logout_dialog;
- 
--        gtk_window_set_title (GTK_WINDOW (logout_dialog), "");
--
--        logout_dialog->priv->type = type;
-+        vbox = gtk_vbox_new (FALSE, 12);
-+        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), vbox,
-+                            FALSE, FALSE, 0);
-+        gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
-+        gtk_widget_show (vbox);
- 
-         icon_name = NULL;
--        primary_text = NULL;
-+        title = NULL;
- 
-         switch (type) {
-         case GSM_DIALOG_LOGOUT_TYPE_LOGOUT:
-                 icon_name    = GSM_ICON_LOGOUT;
--                primary_text = _("Log out of this system now?");
-+                title        = _("Log Out of the Session");
- 
-                 logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_LOGOUT;
- 
--                if (gsm_logout_supports_switch_user (logout_dialog)) {
--                        gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
-+
-+                gsm_logout_append_tile (vbox, GSM_LOGOUT_RESPONSE_LOGOUT,
-+                                        GSM_ICON_LOGOUT, _("_Log Out"),
-+                                        _("Ends your session and logs you "
-+                                          "out."));
-+
-+                tile = gsm_logout_append_tile (vbox,
-+                                               GSM_LOGOUT_RESPONSE_SWITCH_USER,
-+                                               GSM_ICON_SWITCH,
-                                                _("_Switch User"),
--                                               GSM_LOGOUT_RESPONSE_SWITCH_USER);
-+                                               _("Suspends your session, "
-+                                                 "allowing another user to "
-+                                                 "log in and use the "
-+                                                 "computer."));
-+                if (!gsm_logout_supports_switch_user (logout_dialog)) {
-+                        gtk_widget_set_sensitive (tile, FALSE);
-                 }
- 
--                gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
--                                       GTK_STOCK_CANCEL,
--                                       GTK_RESPONSE_CANCEL);
--
--                gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
--                                       _("_Log Out"),
--                                       GSM_LOGOUT_RESPONSE_LOGOUT);
--
-                 break;
-         case GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN:
-                 icon_name    = GSM_ICON_SHUTDOWN;
--                primary_text = _("Shut down this system now?");
-+                title        = _("Shut Down the Computer");
- 
-                 logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_SHUTDOWN;
- 
--                if (gsm_logout_supports_system_suspend (logout_dialog)) {
--                        gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
--                                               _("S_uspend"),
--                                               GSM_LOGOUT_RESPONSE_SLEEP);
-+                tile = gsm_logout_append_tile (vbox,
-+                                               GSM_LOGOUT_RESPONSE_SHUTDOWN,
-+                                               GSM_ICON_SHUTDOWN,
-+                                               _("_Shut Down"),
-+                                               _("Ends your session and turns "
-+                                                 "off the computer."));
-+                if (!gsm_logout_supports_shutdown (logout_dialog)) {
-+                        gtk_widget_set_sensitive (tile, FALSE);
-+                        /* If shutdown is not available, let's just fallback
-+                         * on cancel as the default action. We could fallback
-+                         * on reboot first, then suspend and then hibernate
-+                         * but it's not that useful, really */
-+                        logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL;
-                 }
- 
--                if (gsm_logout_supports_system_hibernate (logout_dialog)) {
--                        gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
--                                               _("_Hibernate"),
--                                               GSM_LOGOUT_RESPONSE_HIBERNATE);
-+                tile = gsm_logout_append_tile (vbox,
-+                                               GSM_LOGOUT_RESPONSE_REBOOT,
-+                                               GSM_ICON_REBOOT, _("_Restart"),
-+                                               _("Ends your session and "
-+                                                 "restarts the computer."));
-+                if (!gsm_logout_supports_reboot (logout_dialog)) {
-+                        gtk_widget_set_sensitive (tile, FALSE);
-                 }
- 
--                if (gsm_logout_supports_reboot (logout_dialog)) {
--                        gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
--                                               _("_Restart"),
--                                               GSM_LOGOUT_RESPONSE_REBOOT);
-+                /* We don't set those options insensitive if they are no
-+                 * supported (like we do for shutdown/restart) since some
-+                 * hardware just don't support suspend/hibernate. So we
-+                 * don't show those options in this case. */
-+                if (gsm_logout_supports_system_suspend (logout_dialog)) {
-+                        gsm_logout_append_tile (vbox,
-+                                                GSM_LOGOUT_RESPONSE_SLEEP,
-+                                                GSM_ICON_SLEEP, _("S_uspend"),
-+                                                _("Suspends your session "
-+                                                  "quickly, using minimal "
-+                                                  "power while the computer "
-+                                                  "stands by."));
-                 }
- 
--                gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
--                                       GTK_STOCK_CANCEL,
--                                       GTK_RESPONSE_CANCEL);
--
--                if (gsm_logout_supports_shutdown (logout_dialog)) {
--                        gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
--                                               _("_Shut Down"),
--                                               GSM_LOGOUT_RESPONSE_SHUTDOWN);
-+                if (gsm_logout_supports_system_hibernate (logout_dialog)) {
-+                        gsm_logout_append_tile (vbox,
-+                                                GSM_LOGOUT_RESPONSE_HIBERNATE,
-+                                                GSM_ICON_HIBERNATE,
-+                                                _("_Hibernate"),
-+                                                _("Suspends your session, "
-+                                                  "using no power until the "
-+                                                  "computer is restarted."));
-                 }
-+
-                 break;
-         default:
-                 g_assert_not_reached ();
-         }
- 
--        dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog));
-+        logout_dialog->priv->info_label = gtk_label_new ("");
-+        gtk_label_set_line_wrap (GTK_LABEL (logout_dialog->priv->info_label),
-+                                 TRUE);
-+        gtk_box_pack_start (GTK_BOX (vbox), logout_dialog->priv->info_label,
-+                            TRUE, TRUE, 0);
-+        gtk_widget_show (logout_dialog->priv->info_label);
- 
--        gtk_image_set_from_icon_name (GTK_IMAGE (dialog_image),
--                                      icon_name, GTK_ICON_SIZE_DIALOG);
-         gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name);
--        gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS);
--        gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text);
-+        gtk_window_set_title (GTK_WINDOW (logout_dialog), title);
-+        gtk_window_set_position (GTK_WINDOW (logout_dialog),
-+                                 GTK_WIN_POS_CENTER_ALWAYS);
- 
-         gtk_dialog_set_default_response (GTK_DIALOG (logout_dialog),
-                                          logout_dialog->priv->default_response);
-+        /* Note that focus is on the widget for the default response by default
-+         * (since they're the first widget, except when it's Cancel */
-+        if (logout_dialog->priv->default_response == GTK_RESPONSE_CANCEL)
-+                gtk_window_set_focus (GTK_WINDOW (logout_dialog),
-+                                      logout_dialog->priv->cancel_button);
- 
-         gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
- 
 
=== modified file 'debian/patches/95_dbus_request_shutdown.patch'
--- debian/patches/95_dbus_request_shutdown.patch	2013-06-08 23:25:03 +0000
+++ debian/patches/95_dbus_request_shutdown.patch	2014-10-31 04:52:33 +0000
@@ -2,11 +2,9 @@
 other applications to shutdown or reboot the machine via the session manager
 Author: Chris Coulson <[e-mail]>
 
-Index: gnome-session-3.7.3/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-3.7.3.orig/gnome-session/gsm-manager.c	2013-01-07 12:51:02.026999067 +1300
-+++ gnome-session-3.7.3/gnome-session/gsm-manager.c	2013-01-07 12:51:02.022999066 +1300
-@@ -3664,6 +3664,48 @@
+--- a/gnome-session/gsm-manager.c
++++ b/gnome-session/gsm-manager.c
+@@ -3116,6 +3116,48 @@
  }
  
  gboolean
@@ -52,14 +50,12 @@
 +}
 +
 +gboolean
- gsm_manager_shutdown (GsmManager *manager,
-                       GError    **error)
+ gsm_manager_shutdown (GsmManager            *manager,
+                       DBusGMethodInvocation *context)
  {
-Index: gnome-session-3.7.3/gnome-session/gsm-manager.h
-===================================================================
---- gnome-session-3.7.3.orig/gnome-session/gsm-manager.h	2013-01-07 12:51:02.026999067 +1300
-+++ gnome-session-3.7.3/gnome-session/gsm-manager.h	2013-01-07 12:51:02.022999066 +1300
-@@ -160,7 +160,10 @@
+--- a/gnome-session/gsm-manager.h
++++ b/gnome-session/gsm-manager.h
+@@ -159,7 +159,10 @@
                                                                  guint                  flags,
                                                                  gboolean              *is_inhibited,
                                                                  GError                *error);
@@ -69,13 +65,11 @@
 +gboolean            gsm_manager_request_reboot                 (GsmManager     *manager,
 +                                                                GError        **error);  
  gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
-                                                                 GError        **error);
+                                                                 DBusGMethodInvocation *context);
  gboolean            gsm_manager_reboot                         (GsmManager     *manager,
-Index: gnome-session-3.7.3/gnome-session/org.gnome.SessionManager.xml
-===================================================================
---- gnome-session-3.7.3.orig/gnome-session/org.gnome.SessionManager.xml	2013-01-07 12:51:02.026999067 +1300
-+++ gnome-session-3.7.3/gnome-session/org.gnome.SessionManager.xml	2013-01-07 12:51:02.022999066 +1300
-@@ -346,6 +346,23 @@
+--- a/gnome-session/org.gnome.SessionManager.xml
++++ b/gnome-session/org.gnome.SessionManager.xml
+@@ -348,6 +348,23 @@
        </doc:doc>
      </method>
  
 
=== removed file 'debian/patches/git_fix_wrong_unref_call.patch'
--- debian/patches/git_fix_wrong_unref_call.patch	2013-10-11 13:45:07 +0000
+++ debian/patches/git_fix_wrong_unref_call.patch	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-Subject: shell: unref correct proxy on destroy
-
-gsm-shell.c tries to automatically clear it's reference to the
-EndSessionDialog proxy when the proxy is destroyed.
-
-It accidentally unrefs the wrong object though.  This commit
-fixes that by changing the open coded unref+nullify to g_clear_object
-
-I believe this will address this crasher:
-
-https://retrace.fedoraproject.org/faf/problems/1214348/
-
-https://bugzilla.gnome.org/show_bug.cgi?id=709221
----
-diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c
-index 450ca40..1c7f053 100644
---- a/gnome-session/gsm-shell.c
-+++ b/gnome-session/gsm-shell.c
-@@ -534,11 +534,7 @@ static void
- on_end_session_dialog_proxy_destroyed (DBusGProxy *proxy,
-                                        GsmShell   *shell)
- {
--        /* FIXME - is this right? */
--        if (shell->priv->end_session_dialog_proxy != NULL) {
--                g_object_unref (shell->priv->proxy);
--                shell->priv->end_session_dialog_proxy = NULL;
--        }
-+        g_clear_object (&shell->priv->end_session_dialog_proxy);
- }
- 
- static gboolean
-
 
=== added file 'debian/patches/revert_remove_gnome_session_properties.patch'
--- debian/patches/revert_remove_gnome_session_properties.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert_remove_gnome_session_properties.patch	2014-10-31 04:52:33 +0000
@@ -0,0 +1,3992 @@
+From 172a7377d00be077c96e9951941c070d491b0b4b Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Fri, 31 Oct 2014 09:23:49 +1100
+Subject: [PATCH] Revert "Remove gnome-session-properties"
+
+This reverts commit ea285af9962313ee2675fff27d3a852bb61e936a.
+---
+ Makefile.am                                 |    1 +
+ capplet/Makefile.am                         |   31 +
+ capplet/gsm-app-dialog.c                    |  540 +++++++++++++
+ capplet/gsm-app-dialog.h                    |   66 ++
+ capplet/gsm-properties-dialog.c             |  774 +++++++++++++++++++
+ capplet/gsm-properties-dialog.h             |   57 ++
+ capplet/gsp-app-manager.c                   |  593 ++++++++++++++
+ capplet/gsp-app-manager.h                   |   81 ++
+ capplet/gsp-app.c                           | 1102 +++++++++++++++++++++++++++
+ capplet/gsp-app.h                           |  108 +++
+ capplet/gsp-keyfile.c                       |  201 +++++
+ capplet/gsp-keyfile.h                       |   65 ++
+ capplet/main.c                              |  108 +++
+ configure.ac                                |    2 +
+ data/Makefile.am                            |    6 +
+ data/gnome-session-properties.desktop.in.in |   15 +
+ doc/man/Makefile.am                         |    1 +
+ doc/man/gnome-session-properties.1          |   24 +
+ po/POTFILES.in                              |    5 +
+ 19 files changed, 3780 insertions(+)
+ create mode 100644 capplet/Makefile.am
+ create mode 100644 capplet/gsm-app-dialog.c
+ create mode 100644 capplet/gsm-app-dialog.h
+ create mode 100644 capplet/gsm-properties-dialog.c
+ create mode 100644 capplet/gsm-properties-dialog.h
+ create mode 100644 capplet/gsp-app-manager.c
+ create mode 100644 capplet/gsp-app-manager.h
+ create mode 100644 capplet/gsp-app.c
+ create mode 100644 capplet/gsp-app.h
+ create mode 100644 capplet/gsp-keyfile.c
+ create mode 100644 capplet/gsp-keyfile.h
+ create mode 100644 capplet/main.c
+ create mode 100644 data/gnome-session-properties.desktop.in.in
+ create mode 100644 doc/man/gnome-session-properties.1
+
+Index: gnome-session/Makefile.am
+===================================================================
+--- gnome-session.orig/Makefile.am
++++ gnome-session/Makefile.am
+@@ -1,5 +1,6 @@
+ SUBDIRS =			\
+ 	gnome-session		\
++	capplet			\
+ 	tools			\
+ 	data			\
+ 	doc			\
+Index: gnome-session/capplet/Makefile.am
+===================================================================
+--- /dev/null
++++ gnome-session/capplet/Makefile.am
+@@ -0,0 +1,31 @@
++bin_PROGRAMS = gnome-session-properties
++
++AM_CPPFLAGS =						\
++	$(SESSION_PROPERTIES_CFLAGS)			\
++	$(GCONF_CFLAGS)					\
++	-I$(top_srcdir)/gnome-session			\
++	-DLOCALE_DIR=\""$(datadir)/locale"\"		\
++	-DGTKBUILDER_DIR=\""$(pkgdatadir)"\"		\
++	$(DISABLE_DEPRECATED_CFLAGS)
++
++AM_CFLAGS = $(WARN_CFLAGS)
++
++gnome_session_properties_SOURCES =			\
++	main.c						\
++	gsm-properties-dialog.h				\
++	gsm-properties-dialog.c				\
++	gsm-app-dialog.h				\
++	gsm-app-dialog.c				\
++	gsp-app.h					\
++	gsp-app.c					\
++	gsp-app-manager.h				\
++	gsp-app-manager.c				\
++	gsp-keyfile.h					\
++	gsp-keyfile.c
++
++gnome_session_properties_LDADD =			\
++	$(SESSION_PROPERTIES_LIBS)			\
++	$(top_builddir)/gnome-session/libgsmutil.la 	\
++	$(GCONF_LIBS)
++
++-include $(top_srcdir)/git.mk
+Index: gnome-session/capplet/gsm-app-dialog.c
+===================================================================
+--- /dev/null
++++ gnome-session/capplet/gsm-app-dialog.c
+@@ -0,0 +1,540 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#include "config.h"
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
++
++#include "gsm-util.h"
++
++#include "gsm-app-dialog.h"
++
++#define GTKBUILDER_FILE "session-properties.ui"
++
++#define CAPPLET_NAME_ENTRY_WIDGET_NAME    "session_properties_name_entry"
++#define CAPPLET_COMMAND_ENTRY_WIDGET_NAME "session_properties_command_entry"
++#define CAPPLET_COMMENT_ENTRY_WIDGET_NAME "session_properties_comment_entry"
++#define CAPPLET_BROWSE_WIDGET_NAME        "session_properties_browse_button"
++
++
++#define GSM_APP_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_APP_DIALOG, GsmAppDialogPrivate))
++
++struct GsmAppDialogPrivate
++{
++        GtkWidget *name_entry;
++        GtkWidget *command_entry;
++        GtkWidget *comment_entry;
++        GtkWidget *browse_button;
++        char      *name;
++        char      *command;
++        char      *comment;
++};
++
++static void     gsm_app_dialog_class_init  (GsmAppDialogClass *klass);
++static void     gsm_app_dialog_init        (GsmAppDialog      *app_dialog);
++static void     gsm_app_dialog_finalize    (GObject           *object);
++
++enum {
++        PROP_0,
++        PROP_NAME,
++        PROP_COMMAND,
++        PROP_COMMENT
++};
++
++G_DEFINE_TYPE (GsmAppDialog, gsm_app_dialog, GTK_TYPE_DIALOG)
++
++static char *
++make_exec_uri (const char *exec)
++{
++        GString    *str;
++        const char *c;
++
++        if (exec == NULL) {
++                return g_strdup ("");
++        }
++
++        if (strchr (exec, ' ') == NULL) {
++                return g_strdup (exec);
++        }
++
++        str = g_string_new_len (NULL, strlen (exec));
++
++        str = g_string_append_c (str, '"');
++        for (c = exec; *c != '\0'; c++) {
++                /* FIXME: GKeyFile will add an additional backslach so we'll
++                 * end up with toto\\" instead of toto\"
++                 * We could use g_key_file_set_value(), but then we don't
++                 * benefit from the other escaping that glib is doing...
++                 */
++                if (*c == '"') {
++                        str = g_string_append (str, "\\\"");
++                } else {
++                        str = g_string_append_c (str, *c);
++                }
++        }
++        str = g_string_append_c (str, '"');
++
++        return g_string_free (str, FALSE);
++}
++
++static void
++on_browse_button_clicked (GtkWidget    *widget,
++                          GsmAppDialog *dialog)
++{
++        GtkWidget *chooser;
++        int        response;
++
++        chooser = gtk_file_chooser_dialog_new ("",
++                                               GTK_WINDOW (dialog),
++                                               GTK_FILE_CHOOSER_ACTION_OPEN,
++                                               GTK_STOCK_CANCEL,
++                                               GTK_RESPONSE_CANCEL,
++                                               GTK_STOCK_OPEN,
++                                               GTK_RESPONSE_ACCEPT,
++                                               NULL);
++
++        gtk_window_set_transient_for (GTK_WINDOW (chooser),
++                                      GTK_WINDOW (dialog));
++
++        gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser), TRUE);
++
++        gtk_window_set_title (GTK_WINDOW (chooser), _("Select Command"));
++
++        gtk_widget_show (chooser);
++
++        response = gtk_dialog_run (GTK_DIALOG (chooser));
++
++        if (response == GTK_RESPONSE_ACCEPT) {
++                char *text;
++                char *uri;
++
++                text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
++
++                uri = make_exec_uri (text);
++
++                g_free (text);
++
++                gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), uri);
++
++                g_free (uri);
++        }
++
++        gtk_widget_destroy (chooser);
++}
++
++static void
++on_entry_activate (GtkEntry     *entry,
++                   GsmAppDialog *dialog)
++{
++        gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
++}
++
++static void
++setup_dialog (GsmAppDialog *dialog)
++{
++        GtkWidget  *content_area;
++        GtkWidget  *widget;
++        GtkBuilder *xml;
++        GError     *error;
++
++        xml = gtk_builder_new ();
++        gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE);
++
++        error = NULL;
++        if (!gtk_builder_add_from_file (xml,
++                                        GTKBUILDER_DIR "/" GTKBUILDER_FILE,
++                                        &error)) {
++                if (error) {
++                        g_warning ("Could not load capplet UI file: %s",
++                                   error->message);
++                        g_error_free (error);
++                } else {
++                        g_warning ("Could not load capplet UI file.");
++                }
++        }
++
++        content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
++        widget = GTK_WIDGET (gtk_builder_get_object (xml, "main-table"));
++        gtk_container_add (GTK_CONTAINER (content_area), widget);
++
++        gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
++        gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties");
++
++        g_object_set (dialog,
++                      "allow-shrink", FALSE,
++                      "allow-grow", FALSE,
++                      NULL);
++
++        gtk_dialog_add_button (GTK_DIALOG (dialog),
++                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
++
++        if (dialog->priv->name == NULL
++            && dialog->priv->command == NULL
++            && dialog->priv->comment == NULL) {
++                gtk_window_set_title (GTK_WINDOW (dialog), _("Add Startup Program"));
++                gtk_dialog_add_button (GTK_DIALOG (dialog),
++                                       GTK_STOCK_ADD, GTK_RESPONSE_OK);
++        } else {
++                gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Startup Program"));
++                gtk_dialog_add_button (GTK_DIALOG (dialog),
++                                       GTK_STOCK_SAVE, GTK_RESPONSE_OK);
++        }
++
++        dialog->priv->name_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_NAME_ENTRY_WIDGET_NAME));
++        g_signal_connect (dialog->priv->name_entry,
++                          "activate",
++                          G_CALLBACK (on_entry_activate),
++                          dialog);
++        if (dialog->priv->name != NULL) {
++                gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), dialog->priv->name);
++        }
++
++        dialog->priv->browse_button = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_BROWSE_WIDGET_NAME));
++        g_signal_connect (dialog->priv->browse_button,
++                          "clicked",
++                          G_CALLBACK (on_browse_button_clicked),
++                          dialog);
++
++        dialog->priv->command_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMAND_ENTRY_WIDGET_NAME));
++        g_signal_connect (dialog->priv->command_entry,
++                          "activate",
++                          G_CALLBACK (on_entry_activate),
++                          dialog);
++        if (dialog->priv->command != NULL) {
++                gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), dialog->priv->command);
++        }
++
++        dialog->priv->comment_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMENT_ENTRY_WIDGET_NAME));
++        g_signal_connect (dialog->priv->comment_entry,
++                          "activate",
++                          G_CALLBACK (on_entry_activate),
++                          dialog);
++        if (dialog->priv->comment != NULL) {
++                gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), dialog->priv->comment);
++        }
++
++        if (xml != NULL) {
++                g_object_unref (xml);
++        }
++}
++
++static GObject *
++gsm_app_dialog_constructor (GType                  type,
++                            guint                  n_construct_app,
++                            GObjectConstructParam *construct_app)
++{
++        GsmAppDialog *dialog;
++
++        dialog = GSM_APP_DIALOG (G_OBJECT_CLASS (gsm_app_dialog_parent_class)->constructor (type,
++                                                                                                                  n_construct_app,
++                                                                                                                  construct_app));
++
++        setup_dialog (dialog);
++
++        gtk_widget_show_all (GTK_WIDGET (dialog));
++
++        return G_OBJECT (dialog);
++}
++
++static void
++gsm_app_dialog_dispose (GObject *object)
++{
++        GsmAppDialog *dialog;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (GSM_IS_APP_DIALOG (object));
++
++        dialog = GSM_APP_DIALOG (object);
++
++        g_free (dialog->priv->name);
++        dialog->priv->name = NULL;
++        g_free (dialog->priv->command);
++        dialog->priv->command = NULL;
++        g_free (dialog->priv->comment);
++        dialog->priv->comment = NULL;
++
++        G_OBJECT_CLASS (gsm_app_dialog_parent_class)->dispose (object);
++}
++
++static void
++gsm_app_dialog_set_name (GsmAppDialog *dialog,
++                         const char   *name)
++{
++        g_return_if_fail (GSM_IS_APP_DIALOG (dialog));
++
++        g_free (dialog->priv->name);
++
++        dialog->priv->name = g_strdup (name);
++        g_object_notify (G_OBJECT (dialog), "name");
++}
++
++static void
++gsm_app_dialog_set_command (GsmAppDialog *dialog,
++                            const char   *name)
++{
++        g_return_if_fail (GSM_IS_APP_DIALOG (dialog));
++
++        g_free (dialog->priv->command);
++
++        dialog->priv->command = g_strdup (name);
++        g_object_notify (G_OBJECT (dialog), "command");
++}
++
++static void
++gsm_app_dialog_set_comment (GsmAppDialog *dialog,
++                            const char   *name)
++{
++        g_return_if_fail (GSM_IS_APP_DIALOG (dialog));
++
++        g_free (dialog->priv->comment);
++
++        dialog->priv->comment = g_strdup (name);
++        g_object_notify (G_OBJECT (dialog), "comment");
++}
++
++const char *
++gsm_app_dialog_get_name (GsmAppDialog *dialog)
++{
++        g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL);
++        return gtk_entry_get_text (GTK_ENTRY (dialog->priv->name_entry));
++}
++
++const char *
++gsm_app_dialog_get_command (GsmAppDialog *dialog)
++{
++        g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL);
++        return gtk_entry_get_text (GTK_ENTRY (dialog->priv->command_entry));
++}
++
++const char *
++gsm_app_dialog_get_comment (GsmAppDialog *dialog)
++{
++        g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL);
++        return gtk_entry_get_text (GTK_ENTRY (dialog->priv->comment_entry));
++}
++
++static void
++gsm_app_dialog_set_property (GObject        *object,
++                             guint           prop_id,
++                             const GValue   *value,
++                             GParamSpec     *pspec)
++{
++        GsmAppDialog *dialog = GSM_APP_DIALOG (object);
++
++        switch (prop_id) {
++        case PROP_NAME:
++                gsm_app_dialog_set_name (dialog, g_value_get_string (value));
++                break;
++        case PROP_COMMAND:
++                gsm_app_dialog_set_command (dialog, g_value_get_string (value));
++                break;
++        case PROP_COMMENT:
++                gsm_app_dialog_set_comment (dialog, g_value_get_string (value));
++                break;
++        default:
++                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
++                break;
++        }
++}
++
++static void
++gsm_app_dialog_get_property (GObject        *object,
++                             guint           prop_id,
++                             GValue         *value,
++                             GParamSpec     *pspec)
++{
++        GsmAppDialog *dialog = GSM_APP_DIALOG (object);
++
++        switch (prop_id) {
++        case PROP_NAME:
++                g_value_set_string (value, dialog->priv->name);
++                break;
++        case PROP_COMMAND:
++                g_value_set_string (value, dialog->priv->command);
++                break;
++        case PROP_COMMENT:
++                g_value_set_string (value, dialog->priv->comment);
++                break;
++        default:
++                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
++                break;
++        }
++}
++
++static void
++gsm_app_dialog_class_init (GsmAppDialogClass *klass)
++{
++        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
++
++        object_class->get_property = gsm_app_dialog_get_property;
++        object_class->set_property = gsm_app_dialog_set_property;
++        object_class->constructor = gsm_app_dialog_constructor;
++        object_class->dispose = gsm_app_dialog_dispose;
++        object_class->finalize = gsm_app_dialog_finalize;
++
++        g_object_class_install_property (object_class,
++                                         PROP_NAME,
++                                         g_param_spec_string ("name",
++                                                              "name",
++                                                              "name",
++                                                              NULL,
++                                                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
++        g_object_class_install_property (object_class,
++                                         PROP_COMMAND,
++                                         g_param_spec_string ("command",
++                                                              "command",
++                                                              "command",
++                                                              NULL,
++                                                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
++        g_object_class_install_property (object_class,
++                                         PROP_COMMENT,
++                                         g_param_spec_string ("comment",
++                                                              "comment",
++                                                              "comment",
++                                                              NULL,
++                                                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
++
++        g_type_class_add_private (klass, sizeof (GsmAppDialogPrivate));
++}
++
++static void
++gsm_app_dialog_init (GsmAppDialog *dialog)
++{
++
++        dialog->priv = GSM_APP_DIALOG_GET_PRIVATE (dialog);
++}
++
++static void
++gsm_app_dialog_finalize (GObject *object)
++{
++        GsmAppDialog *dialog;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (GSM_IS_APP_DIALOG (object));
++
++        dialog = GSM_APP_DIALOG (object);
++
++        g_return_if_fail (dialog->priv != NULL);
++
++        G_OBJECT_CLASS (gsm_app_dialog_parent_class)->finalize (object);
++}
++
++GtkWidget *
++gsm_app_dialog_new (const char *name,
++                    const char *command,
++                    const char *comment)
++{
++        GObject *object;
++
++        object = g_object_new (GSM_TYPE_APP_DIALOG,
++                               "name", name,
++                               "command", command,
++                               "comment", comment,
++                               NULL);
++
++        return GTK_WIDGET (object);
++}
++
++gboolean
++gsm_app_dialog_run (GsmAppDialog  *dialog,
++                    char         **name_p,
++                    char         **command_p,
++                    char         **comment_p)
++{
++        gboolean retval;
++
++        retval = FALSE;
++
++        while (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
++                const char *name;
++                const char *exec;
++                const char *comment;
++                const char *error_msg;
++                GError     *error;
++                char      **argv;
++                int         argc;
++
++                name = gsm_app_dialog_get_name (GSM_APP_DIALOG (dialog));
++                exec = gsm_app_dialog_get_command (GSM_APP_DIALOG (dialog));
++                comment = gsm_app_dialog_get_comment (GSM_APP_DIALOG (dialog));
++
++                error = NULL;
++                error_msg = NULL;
++
++                if (gsm_util_text_is_blank (exec)) {
++                        error_msg = _("The startup command cannot be empty");
++                } else {
++                        if (!g_shell_parse_argv (exec, &argc, &argv, &error)) {
++                                if (error != NULL) {
++                                        error_msg = error->message;
++                                } else {
++                                        error_msg = _("The startup command is not valid");
++                                }
++                        }
++                }
++
++                if (error_msg != NULL) {
++                        GtkWidget *msgbox;
++
++                        msgbox = gtk_message_dialog_new (GTK_WINDOW (dialog),
++                                                         GTK_DIALOG_MODAL,
++                                                         GTK_MESSAGE_ERROR,
++                                                         GTK_BUTTONS_CLOSE,
++                                                         "%s", error_msg);
++
++                        if (error != NULL) {
++                                g_error_free (error);
++                        }
++
++                        gtk_dialog_run (GTK_DIALOG (msgbox));
++
++                        gtk_widget_destroy (msgbox);
++
++                        continue;
++                }
++
++                if (gsm_util_text_is_blank (name)) {
++                        name = argv[0];
++                }
++
++                if (name_p) {
++                        *name_p = g_strdup (name);
++                }
++
++                g_strfreev (argv);
++
++                if (command_p) {
++                        *command_p = g_strdup (exec);
++                }
++
++                if (comment_p) {
++                        *comment_p = g_strdup (comment);
++                }
++
++                retval = TRUE;
++                break;
++        }
++
++        gtk_widget_destroy (GTK_WIDGET (dialog));
++
++        return retval;
++}
+Index: gnome-session/capplet/gsm-app-dialog.h
+===================================================================
+--- /dev/null
++++ gnome-session/capplet/gsm-app-dialog.h
+@@ -0,0 +1,66 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#ifndef __GSM_APP_DIALOG_H
++#define __GSM_APP_DIALOG_H
++
++#include <glib-object.h>
++#include <gtk/gtk.h>
++
++G_BEGIN_DECLS
++
++#define GSM_TYPE_APP_DIALOG         (gsm_app_dialog_get_type ())
++#define GSM_APP_DIALOG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_APP_DIALOG, GsmAppDialog))
++#define GSM_APP_DIALOG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_APP_DIALOG, GsmAppDialogClass))
++#define GSM_IS_APP_DIALOG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_APP_DIALOG))
++#define GSM_IS_APP_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_APP_DIALOG))
++#define GSM_APP_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_APP_DIALOG, GsmAppDialogClass))
++
++typedef struct GsmAppDialogPrivate GsmAppDialogPrivate;
++
++typedef struct
++{
++        GtkDialog            parent;
++        GsmAppDialogPrivate *priv;
++} GsmAppDialog;
++
++typedef struct
++{
++        GtkDialogClass   parent_class;
++} GsmAppDialogClass;
++
++GType                  gsm_app_dialog_get_type           (void);
++
++GtkWidget            * gsm_app_dialog_new                (const char   *name,
++                                                          const char   *command,
++                                                          const char   *comment);
++
++gboolean               gsm_app_dialog_run               (GsmAppDialog  *dialog,
++                                                         char         **name_p,
++                                                         char         **command_p,
++                                                         char         **comment_p);
++
++const char *           gsm_app_dialog_get_name           (GsmAppDialog *dialog);
++const char *           gsm_app_dialog_get_command        (GsmAppDialog *dialog);
++const char *           gsm_app_dialog_get_comment        (GsmAppDialog *dialog);
++
++G_END_DECLS
++
++#endif /* __GSM_APP_DIALOG_H */
+Index: gnome-session/capplet/gsm-properties-dialog.c
+===================================================================
+--- /dev/null
++++ gnome-session/capplet/gsm-properties-dialog.c
+@@ -0,0 +1,774 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 1999 Free Software Foundation, Inc.
++ * Copyright (C) 2007 Vincent Untz.
++ * Copyright (C) 2008 Lucas Rocha.
++ * Copyright (C) 2008 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#include "config.h"
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
++
++#include "gsm-properties-dialog.h"
++#include "gsm-app-dialog.h"
++#include "gsm-util.h"
++#include "gsp-app.h"
++#include "gsp-app-manager.h"
++
++#define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
++
++#define GTKBUILDER_FILE "session-properties.ui"
++
++#define CAPPLET_TREEVIEW_WIDGET_NAME      "session_properties_treeview"
++#define CAPPLET_ADD_WIDGET_NAME           "session_properties_add_button"
++#define CAPPLET_DELETE_WIDGET_NAME        "session_properties_delete_button"
++#define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"
++#define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"
++#define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
++
++#define STARTUP_APP_ICON     "system-run"
++
++#define SPC_SETTINGS_SCHEMA          "org.gnome.SessionManager"
++#define SPC_SETTINGS_AUTOSAVE_KEY    "auto-save-session"
++
++struct GsmPropertiesDialogPrivate
++{
++        GtkBuilder        *xml;
++        GtkListStore      *list_store;
++        GtkTreeModel      *tree_filter;
++
++        GtkTreeView       *treeview;
++        GtkWidget         *add_button;
++        GtkWidget         *delete_button;
++        GtkWidget         *edit_button;
++
++        GSettings         *settings;
++
++        GspAppManager     *manager;
++};
++
++enum {
++        STORE_COL_VISIBLE = 0,
++        STORE_COL_ENABLED,
++        STORE_COL_GICON,
++        STORE_COL_DESCRIPTION,
++        STORE_COL_APP,
++        STORE_COL_SEARCH,
++        NUMBER_OF_COLUMNS
++};
++
++static void     gsm_properties_dialog_class_init  (GsmPropertiesDialogClass *klass);
++static void     gsm_properties_dialog_init        (GsmPropertiesDialog      *properties_dialog);
++static void     gsm_properties_dialog_finalize    (GObject                  *object);
++
++G_DEFINE_TYPE (GsmPropertiesDialog, gsm_properties_dialog, GTK_TYPE_DIALOG)
++
++static gboolean
++find_by_app (GtkTreeModel *model,
++             GtkTreeIter  *iter,
++             GspApp       *app)
++{
++        GspApp *iter_app = NULL;
++
++        if (!gtk_tree_model_get_iter_first (model, iter)) {
++                return FALSE;
++        }
++
++        do {
++                gtk_tree_model_get (model, iter,
++                                    STORE_COL_APP, &iter_app,
++                                    -1);
++
++                if (iter_app == app) {
++                        g_object_unref (iter_app);
++                        return TRUE;
++                }
++        } while (gtk_tree_model_iter_next (model, iter));
++
++        return FALSE;
++}
++
++static void
++_fill_iter_from_app (GtkListStore *list_store,
++                     GtkTreeIter  *iter,
++                     GspApp       *app)
++{
++        gboolean    hidden;
++        gboolean    display;
++        gboolean    enabled;
++        gboolean    shown;
++        GIcon      *icon;
++        const char *description;
++        const char *app_name;
++
++        hidden      = gsp_app_get_hidden (app);
++        display     = gsp_app_get_display (app);
++        enabled     = gsp_app_get_enabled (app);
++        shown       = gsp_app_get_shown (app);
++        icon        = gsp_app_get_icon (app);
++        description = gsp_app_get_description (app);
++        app_name    = gsp_app_get_name (app);
++
++        if (G_IS_THEMED_ICON (icon)) {
++                GtkIconTheme       *theme;
++                const char * const *icon_names;
++
++                theme = gtk_icon_theme_get_default ();
++                icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
++                if (icon_names[0] == NULL ||
++                    !gtk_icon_theme_has_icon (theme, icon_names[0])) {
++                        g_object_unref (icon);
++                        icon = NULL;
++                }
++        } else if (G_IS_FILE_ICON (icon)) {
++                GFile *iconfile;
++
++                iconfile = g_file_icon_get_file (G_FILE_ICON (icon));
++                if (!g_file_query_exists (iconfile, NULL)) {
++                        g_object_unref (icon);
++                        icon = NULL;
++                }
++        }
++
++        if (icon == NULL) {
++                icon = g_themed_icon_new (STARTUP_APP_ICON);
++        }
++
++        gtk_list_store_set (list_store, iter,
++                            STORE_COL_VISIBLE, !hidden && shown && display,
++                            STORE_COL_ENABLED, enabled,
++                            STORE_COL_GICON, icon,
++                            STORE_COL_DESCRIPTION, description,
++                            STORE_COL_APP, app,
++                            STORE_COL_SEARCH, app_name,
++                            -1);
++        g_object_unref (icon);
++}
++
++static void
++_app_changed (GsmPropertiesDialog *dialog,
++              GspApp              *app)
++{
++        GtkTreeIter iter;
++
++        if (!find_by_app (GTK_TREE_MODEL (dialog->priv->list_store),
++                          &iter, app)) {
++                return;
++        }
++
++        _fill_iter_from_app (dialog->priv->list_store, &iter, app);
++}
++
++static void
++append_app (GsmPropertiesDialog *dialog,
++            GspApp              *app)
++{
++        GtkTreeIter   iter;
++
++        gtk_list_store_append (dialog->priv->list_store, &iter);
++        _fill_iter_from_app (dialog->priv->list_store, &iter, app);
++
++        g_signal_connect_swapped (app, "changed",
++                                  G_CALLBACK (_app_changed), dialog);
++}
++
++static void
++_app_added (GsmPropertiesDialog *dialog,
++            GspApp              *app,
++            GspAppManager       *manager)
++{
++        append_app (dialog, app);
++}
++
++static void
++_app_removed (GsmPropertiesDialog *dialog,
++              GspApp              *app,
++              GspAppManager       *manager)
++{
++        GtkTreeIter iter;
++
++        if (!find_by_app (GTK_TREE_MODEL (dialog->priv->list_store),
++                          &iter, app)) {
++                return;
++        }
++
++        g_signal_handlers_disconnect_by_func (app,
++                                              _app_changed,
++                                              dialog);
++        gtk_list_store_remove (dialog->priv->list_store, &iter);
++}
++
++static void
++populate_model (GsmPropertiesDialog *dialog)
++{
++        GSList *apps;
++        GSList *l;
++
++        apps = gsp_app_manager_get_apps (dialog->priv->manager);
++        for (l = apps; l != NULL; l = l->next) {
++                append_app (dialog, GSP_APP (l->data));
++        }
++        g_slist_free (apps);
++}
++
++static void
++on_selection_changed (GtkTreeSelection    *selection,
++                      GsmPropertiesDialog *dialog)
++{
++        gboolean sel;
++
++        sel = gtk_tree_selection_get_selected (selection, NULL, NULL);
++
++        gtk_widget_set_sensitive (dialog->priv->edit_button, sel);
++        gtk_widget_set_sensitive (dialog->priv->delete_button, sel);
++}
++
++static void
++on_startup_enabled_toggled (GtkCellRendererToggle *cell_renderer,
++                            char                  *path,
++                            GsmPropertiesDialog   *dialog)
++{
++        GtkTreeIter iter;
++        GspApp     *app;
++        gboolean    active;
++
++        if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (dialog->priv->tree_filter),
++                                                  &iter, path)) {
++                return;
++        }
++
++        app = NULL;
++        gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter),
++                            &iter,
++                            STORE_COL_APP, &app,
++                            -1);
++
++        active = gtk_cell_renderer_toggle_get_active (cell_renderer);
++        active = !active;
++
++        if (app) {
++                gsp_app_set_enabled (app, active);
++                g_object_unref (app);
++        }
++}
++
++static void
++on_drag_data_received (GtkWidget           *widget,
++                       GdkDragContext      *drag_context,
++                       gint                 x,
++                       gint                 y,
++                       GtkSelectionData    *data,
++                       guint                info,
++                       guint                time,
++                       GsmPropertiesDialog *dialog)
++{
++        gboolean dnd_success;
++
++        dnd_success = FALSE;
++
++        if (data != NULL) {
++                char **filenames;
++                int    i;
++
++                filenames = gtk_selection_data_get_uris (data);
++
++                for (i = 0; filenames[i] && filenames[i][0]; i++) {
++                        /* Return success if at least one file succeeded */
++                        gboolean file_success;
++                        file_success = gsp_app_copy_desktop_file (filenames[i]);
++                        dnd_success = dnd_success || file_success;
++                }
++
++                g_strfreev (filenames);
++        }
++
++        gtk_drag_finish (drag_context, dnd_success, FALSE, time);
++        g_signal_stop_emission_by_name (widget, "drag_data_received");
++}
++
++static void
++on_drag_begin (GtkWidget           *widget,
++               GdkDragContext      *context,
++               GsmPropertiesDialog *dialog)
++{
++        GtkTreePath *path;
++        GtkTreeIter  iter;
++        GspApp      *app;
++
++        gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, NULL);
++        gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog->priv->tree_filter),
++                                 &iter, path);
++        gtk_tree_path_free (path);
++
++        gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter),
++                            &iter,
++                            STORE_COL_APP, &app,
++                            -1);
++
++        if (app) {
++                g_object_set_data_full (G_OBJECT (context), "gsp-app",
++                                        g_object_ref (app), g_object_unref);
++                g_object_unref (app);
++        }
++
++}
++
++static void
++on_drag_data_get (GtkWidget           *widget,
++                  GdkDragContext      *context,
++                  GtkSelectionData    *selection_data,
++                  guint                info,
++                  guint                time,
++                  GsmPropertiesDialog *dialog)
++{
++        GspApp *app;
++
++        app = g_object_get_data (G_OBJECT (context), "gsp-app");
++        if (app) {
++                const char *uris[2];
++                char       *uri;
++
++                uri = g_filename_to_uri (gsp_app_get_path (app), NULL, NULL);
++
++                uris[0] = uri;
++                uris[1] = NULL;
++                gtk_selection_data_set_uris (selection_data, (char **) uris);
++
++                g_free (uri);
++        }
++}
++
++static void
++on_add_app_clicked (GtkWidget           *widget,
++                    GsmPropertiesDialog *dialog)
++{
++        GtkWidget  *add_dialog;
++        char       *name;
++        char       *exec;
++        char       *comment;
++
++        add_dialog = gsm_app_dialog_new (NULL, NULL, NULL);
++        gtk_window_set_transient_for (GTK_WINDOW (add_dialog),
++                                      GTK_WINDOW (dialog));
++
++        if (gsm_app_dialog_run (GSM_APP_DIALOG (add_dialog),
++                                &name, &exec, &comment)) {
++                gsp_app_create (name, comment, exec);
++                g_free (name);
++                g_free (exec);
++                g_free (comment);
++        }
++}
++
++static void
++on_delete_app_clicked (GtkWidget           *widget,
++                       GsmPropertiesDialog *dialog)
++{
++        GtkTreeSelection *selection;
++        GtkTreeIter       iter;
++        GspApp           *app;
++
++        selection = gtk_tree_view_get_selection (dialog->priv->treeview);
++
++        if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
++                return;
++        }
++
++        app = NULL;
++        gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter),
++                            &iter,
++                            STORE_COL_APP, &app,
++                            -1);
++
++        if (app) {
++                gsp_app_delete (app);
++                g_object_unref (app);
++        }
++}
++
++static void
++on_edit_app_clicked (GtkWidget           *widget,
++                     GsmPropertiesDialog *dialog)
++{
++        GtkTreeSelection *selection;
++        GtkTreeIter       iter;
++        GspApp           *app;
++
++        selection = gtk_tree_view_get_selection (dialog->priv->treeview);
++
++        if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
++                return;
++        }
++
++        app = NULL;
++        gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter),
++                            &iter,
++                            STORE_COL_APP, &app,
++                            -1);
++
++        if (app) {
++                GtkWidget  *edit_dialog;
++                char       *name;
++                char       *exec;
++                char       *comment;
++
++                edit_dialog = gsm_app_dialog_new (gsp_app_get_name (app),
++                                                  gsp_app_get_exec (app),
++                                                  gsp_app_get_comment (app));
++                gtk_window_set_transient_for (GTK_WINDOW (edit_dialog),
++                                              GTK_WINDOW (dialog));
++
++                if (gsm_app_dialog_run (GSM_APP_DIALOG (edit_dialog),
++                                        &name, &exec, &comment)) {
++                        gsp_app_update (app, name, comment, exec);
++                        g_free (name);
++                        g_free (exec);
++                        g_free (comment);
++                }
++
++                g_object_unref (app);
++        }
++}
++
++static void
++on_row_activated (GtkTreeView         *tree_view,
++                  GtkTreePath         *path,
++                  GtkTreeViewColumn   *column,
++                  GsmPropertiesDialog *dialog)  
++{
++        on_edit_app_clicked (NULL, dialog);
++}
++
++static void
++on_save_session_clicked (GtkWidget           *widget,
++                         GsmPropertiesDialog *dialog)
++{
++        g_debug ("Session saving is not implemented yet!");
++}
++
++static void
++setup_dialog (GsmPropertiesDialog *dialog)
++{
++        GtkTreeView       *treeview;
++        GtkWidget         *button;
++        GtkTreeModel      *tree_filter;
++        GtkTreeViewColumn *column;
++        GtkCellRenderer   *renderer;
++        GtkTreeSelection  *selection;
++        GtkTargetList     *targetlist;
++
++        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
++                                GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
++                                NULL);
++
++        dialog->priv->list_store = gtk_list_store_new (NUMBER_OF_COLUMNS,
++                                                       G_TYPE_BOOLEAN,
++                                                       G_TYPE_BOOLEAN,
++                                                       G_TYPE_ICON,
++                                                       G_TYPE_STRING,
++                                                       G_TYPE_OBJECT,
++                                                       G_TYPE_STRING);
++        tree_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->priv->list_store),
++                                                 NULL);
++        g_object_unref (dialog->priv->list_store);
++        dialog->priv->tree_filter = tree_filter;
++
++        gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (tree_filter),
++                                                  STORE_COL_VISIBLE);
++
++        treeview = GTK_TREE_VIEW (gtk_builder_get_object (dialog->priv->xml,
++                                                          CAPPLET_TREEVIEW_WIDGET_NAME));
++        dialog->priv->treeview = treeview;
++
++        gtk_tree_view_set_model (treeview, tree_filter);
++        g_object_unref (tree_filter);
++
++        gtk_tree_view_set_headers_visible (treeview, FALSE);
++        g_signal_connect (treeview,
++                          "row-activated",
++                          G_CALLBACK (on_row_activated),
++                          dialog);
++
++        selection = gtk_tree_view_get_selection (treeview);
++        gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
++        g_signal_connect (selection,
++                          "changed",
++                          G_CALLBACK (on_selection_changed),
++                          dialog);
++
++        /* CHECKBOX COLUMN */
++        renderer = gtk_cell_renderer_toggle_new ();
++        column = gtk_tree_view_column_new_with_attributes (_("Enabled"),
++                                                           renderer,
++                                                           "active", STORE_COL_ENABLED,
++                                                           NULL);
++        gtk_tree_view_append_column (treeview, column);
++        g_signal_connect (renderer,
++                          "toggled",
++                          G_CALLBACK (on_startup_enabled_toggled),
++                          dialog);
++
++        /* ICON COLUMN */
++        renderer = gtk_cell_renderer_pixbuf_new ();
++        column = gtk_tree_view_column_new_with_attributes (_("Icon"),
++                                                           renderer,
++                                                           "gicon", STORE_COL_GICON,
++                                                           "sensitive", STORE_COL_ENABLED,
++                                                           NULL);
++        g_object_set (renderer,
++                      "stock-size", GSM_PROPERTIES_ICON_SIZE,
++                      NULL);
++        gtk_tree_view_append_column (treeview, column);
++
++        /* NAME COLUMN */
++        renderer = gtk_cell_renderer_text_new ();
++        column = gtk_tree_view_column_new_with_attributes (_("Program"),
++                                                           renderer,
++                                                           "markup", STORE_COL_DESCRIPTION,
++                                                           "sensitive", STORE_COL_ENABLED,
++                                                           NULL);
++        g_object_set (renderer,
++                      "ellipsize", PANGO_ELLIPSIZE_END,
++                      NULL);
++        gtk_tree_view_append_column (treeview, column);
++
++
++        gtk_tree_view_column_set_sort_column_id (column, STORE_COL_DESCRIPTION);
++        gtk_tree_view_set_search_column (treeview, STORE_COL_SEARCH);
++        gtk_tree_view_set_rules_hint (treeview, TRUE);
++
++        gtk_tree_view_enable_model_drag_source (treeview,
++                                                GDK_BUTTON1_MASK|GDK_BUTTON2_MASK,
++                                                NULL, 0,
++                                                GDK_ACTION_COPY);
++        gtk_drag_source_add_uri_targets (GTK_WIDGET (treeview));
++
++        gtk_drag_dest_set (GTK_WIDGET (treeview),
++                           GTK_DEST_DEFAULT_ALL,
++                           NULL, 0,
++                           GDK_ACTION_COPY);
++
++        gtk_drag_dest_add_uri_targets (GTK_WIDGET (treeview));
++        /* we don't want to accept drags coming from this widget */
++        targetlist = gtk_drag_dest_get_target_list (GTK_WIDGET (treeview));
++        if (targetlist != NULL) {
++                GtkTargetEntry *targets;
++                gint n_targets;
++                gint i;
++
++                targets = gtk_target_table_new_from_list (targetlist, &n_targets);
++                for (i = 0; i < n_targets; i++)
++                        targets[i].flags = GTK_TARGET_OTHER_WIDGET;
++
++                targetlist = gtk_target_list_new (targets, n_targets);
++                gtk_drag_dest_set_target_list (GTK_WIDGET (treeview), targetlist);
++                gtk_target_list_unref (targetlist);
++
++                gtk_target_table_free (targets, n_targets);
++        }
++
++        g_signal_connect (treeview, "drag_begin",
++                          G_CALLBACK (on_drag_begin),
++                          dialog);
++        g_signal_connect (treeview, "drag_data_get",
++                          G_CALLBACK (on_drag_data_get),
++                          dialog);
++        g_signal_connect (treeview, "drag_data_received",
++                          G_CALLBACK (on_drag_data_received),
++                          dialog);
++
++        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dialog->priv->list_store),
++                                              STORE_COL_DESCRIPTION,
++                                              GTK_SORT_ASCENDING);
++
++
++        button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml,
++                                                     CAPPLET_ADD_WIDGET_NAME));
++        dialog->priv->add_button = button;
++        g_signal_connect (button,
++                          "clicked",
++                          G_CALLBACK (on_add_app_clicked),
++                          dialog);
++
++        button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml,
++                                                     CAPPLET_DELETE_WIDGET_NAME));
++        dialog->priv->delete_button = button;
++        g_signal_connect (button,
++                          "clicked",
++                          G_CALLBACK (on_delete_app_clicked),
++                          dialog);
++
++        button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml,
++                                                     CAPPLET_EDIT_WIDGET_NAME));
++        dialog->priv->edit_button = button;
++        g_signal_connect (button,
++                          "clicked",
++                          G_CALLBACK (on_edit_app_clicked),
++                          dialog);
++
++        button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml,
++                                                     CAPPLET_REMEMBER_WIDGET_NAME));
++        g_settings_bind (dialog->priv->settings, SPC_SETTINGS_AUTOSAVE_KEY,
++                         button, "active", G_SETTINGS_BIND_DEFAULT);
++
++        button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml,
++                                                     CAPPLET_SAVE_WIDGET_NAME));
++        g_signal_connect (button,
++                          "clicked",
++                          G_CALLBACK (on_save_session_clicked),
++                          dialog);
++
++        dialog->priv->manager = gsp_app_manager_get ();
++        gsp_app_manager_fill (dialog->priv->manager);
++        g_signal_connect_swapped (dialog->priv->manager, "added",
++                                  G_CALLBACK (_app_added), dialog);
++        g_signal_connect_swapped (dialog->priv->manager, "removed",
++                                  G_CALLBACK (_app_removed), dialog);
++
++        populate_model (dialog);
++}
++
++static GObject *
++gsm_properties_dialog_constructor (GType                  type,
++                                guint                  n_construct_properties,
++                                GObjectConstructParam *construct_properties)
++{
++        GsmPropertiesDialog *dialog;
++
++        dialog = GSM_PROPERTIES_DIALOG (G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->constructor (type,
++                                                                                                                  n_construct_properties,
++                                                                                                                  construct_properties));
++
++        setup_dialog (dialog);
++
++        gtk_widget_show (GTK_WIDGET (dialog));
++
++        return G_OBJECT (dialog);
++}
++
++static void
++gsm_properties_dialog_dispose (GObject *object)
++{
++        GsmPropertiesDialog *dialog;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (GSM_IS_PROPERTIES_DIALOG (object));
++
++        dialog = GSM_PROPERTIES_DIALOG (object);
++
++        if (dialog->priv->xml != NULL) {
++                g_object_unref (dialog->priv->xml);
++                dialog->priv->xml = NULL;
++        }
++
++        if (dialog->priv->settings != NULL) {
++                g_object_unref (dialog->priv->settings);
++                dialog->priv->settings = NULL;
++        }
++
++        G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->dispose (object);
++
++        /* it's important to do this after chaining to the parent dispose
++         * method because we want to make sure the treeview has been disposed
++         * and removed all its references to GspApp objects */
++        if (dialog->priv->manager != NULL) {
++                g_object_unref (dialog->priv->manager);
++                dialog->priv->manager = NULL;
++        }
++}
++
++static void
++gsm_properties_dialog_class_init (GsmPropertiesDialogClass *klass)
++{
++        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
++
++        object_class->constructor = gsm_properties_dialog_constructor;
++        object_class->dispose = gsm_properties_dialog_dispose;
++        object_class->finalize = gsm_properties_dialog_finalize;
++
++        g_type_class_add_private (klass, sizeof (GsmPropertiesDialogPrivate));
++}
++
++static void
++gsm_properties_dialog_init (GsmPropertiesDialog *dialog)
++{
++        GtkWidget   *content_area;
++        GtkWidget   *widget;
++        GError      *error;
++
++        dialog->priv = GSM_PROPERTIES_DIALOG_GET_PRIVATE (dialog);
++
++        dialog->priv->settings = g_settings_new (SPC_SETTINGS_SCHEMA);
++
++        dialog->priv->xml = gtk_builder_new ();
++        gtk_builder_set_translation_domain (dialog->priv->xml, GETTEXT_PACKAGE);
++
++        error = NULL;
++        if (!gtk_builder_add_from_file (dialog->priv->xml,
++                                        GTKBUILDER_DIR "/" GTKBUILDER_FILE,
++                                        &error)) {
++                if (error) {
++                        g_warning ("Could not load capplet UI file: %s",
++                                   error->message);
++                        g_error_free (error);
++                } else {
++                        g_warning ("Could not load capplet UI file.");
++                }
++        }
++
++        content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
++        widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml,
++                                                     "main-notebook"));
++        gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
++
++        gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 450);
++        gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
++        gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
++        gtk_box_set_spacing (GTK_BOX (content_area), 2);
++        gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties");
++        gtk_window_set_title (GTK_WINDOW (dialog), _("Startup Applications Preferences"));
++}
++
++static void
++gsm_properties_dialog_finalize (GObject *object)
++{
++        GsmPropertiesDialog *dialog;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (GSM_IS_PROPERTIES_DIALOG (object));
++
++        dialog = GSM_PROPERTIES_DIALOG (object);
++
++        g_return_if_fail (dialog->priv != NULL);
++
++        G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->finalize (object);
++}
++
++GtkWidget *
++gsm_properties_dialog_new (void)
++{
++        GObject *object;
++
++        object = g_object_new (GSM_TYPE_PROPERTIES_DIALOG,
++                               NULL);
++
++        return GTK_WIDGET (object);
++}
+Index: gnome-session/capplet/gsm-properties-dialog.h
+===================================================================
+--- /dev/null
++++ gnome-session/capplet/gsm-properties-dialog.h
+@@ -0,0 +1,57 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#ifndef __GSM_PROPERTIES_DIALOG_H
++#define __GSM_PROPERTIES_DIALOG_H
++
++#include <glib-object.h>
++#include <gtk/gtk.h>
++
++G_BEGIN_DECLS
++
++#define GSM_TYPE_PROPERTIES_DIALOG         (gsm_properties_dialog_get_type ())
++#define GSM_PROPERTIES_DIALOG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialog))
++#define GSM_PROPERTIES_DIALOG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogClass))
++#define GSM_IS_PROPERTIES_DIALOG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_PROPERTIES_DIALOG))
++#define GSM_IS_PROPERTIES_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_PROPERTIES_DIALOG))
++#define GSM_PROPERTIES_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogClass))
++
++typedef struct GsmPropertiesDialogPrivate GsmPropertiesDialogPrivate;
++
++typedef struct
++{
++        GtkDialog                   parent;
++        GsmPropertiesDialogPrivate *priv;
++} GsmPropertiesDialog;
++
++typedef struct
++{
++        GtkDialogClass   parent_class;
++} GsmPropertiesDialogClass;
++
++GType                  gsm_properties_dialog_get_type           (void);
++
++GtkWidget            * gsm_properties_dialog_new                (void);
++
++#define GSM_PROPERTIES_ICON_SIZE GTK_ICON_SIZE_LARGE_TOOLBAR
++
++G_END_DECLS
++
++#endif /* __GSM_PROPERTIES_DIALOG_H */
+Index: gnome-session/capplet/gsp-app-manager.c
+===================================================================
+--- /dev/null
++++ gnome-session/capplet/gsp-app-manager.c
+@@ -0,0 +1,593 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 1999 Free Software Foundation, Inc.
++ * Copyright (C) 2007, 2009 Vincent Untz.
++ * Copyright (C) 2008 Lucas Rocha.
++ * Copyright (C) 2008 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#include <string.h>
++
++#include "gsm-util.h"
++#include "gsp-app.h"
++
++#include "gsp-app-manager.h"
++
++static GspAppManager *manager = NULL;
++
++typedef struct {
++        char         *dir;
++        int           index;
++        GFileMonitor *monitor;
++} GspXdgDir;
++
++struct _GspAppManagerPrivate {
++        GSList *apps;
++        GSList *dirs;
++};
++
++#define GSP_APP_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSP_TYPE_APP_MANAGER, GspAppManagerPrivate))
++
++
++enum {
++        ADDED,
++        REMOVED,
++        LAST_SIGNAL
++};
++
++static guint gsp_app_manager_signals[LAST_SIGNAL] = { 0 };
++
++
++G_DEFINE_TYPE (GspAppManager, gsp_app_manager, G_TYPE_OBJECT)
++
++static void     gsp_app_manager_dispose      (GObject       *object);
++static void     gsp_app_manager_finalize     (GObject       *object);
++static void     _gsp_app_manager_app_unref   (GspApp        *app,
++                                              GspAppManager *manager);
++static void     _gsp_app_manager_app_removed (GspAppManager *manager,
++                                              GspApp        *app);
++
++static GspXdgDir *
++_gsp_xdg_dir_new (const char *dir,
++                  int         index)
++{
++        GspXdgDir *xdgdir;
++
++        xdgdir = g_slice_new (GspXdgDir);
++
++        xdgdir->dir = g_strdup (dir);
++        xdgdir->index = index;
++        xdgdir->monitor = NULL;
++
++        return xdgdir;
++}
++
++static void
++_gsp_xdg_dir_free (GspXdgDir *xdgdir)
++{
++        if (xdgdir->dir) {
++                g_free (xdgdir->dir);
++                xdgdir->dir = NULL;
++        }
++
++        if (xdgdir->monitor) {
++                g_file_monitor_cancel (xdgdir->monitor);
++                g_object_unref (xdgdir->monitor);
++                xdgdir->monitor = NULL;
++        }
++
++        g_slice_free (GspXdgDir, xdgdir);
++}
++
++static void
++gsp_app_manager_class_init (GspAppManagerClass *class)
++{
++        GObjectClass *gobject_class = G_OBJECT_CLASS (class);
++
++        gobject_class->dispose  = gsp_app_manager_dispose;
++        gobject_class->finalize = gsp_app_manager_finalize;
++
++        gsp_app_manager_signals[ADDED] =
++                g_signal_new ("added",
++                              G_TYPE_FROM_CLASS (gobject_class),
++                              G_SIGNAL_RUN_LAST,
++                              G_STRUCT_OFFSET (GspAppManagerClass,
++                                               added),
++                              NULL,
++                              NULL,
++                              g_cclosure_marshal_VOID__OBJECT,
++                              G_TYPE_NONE, 1, G_TYPE_OBJECT);
++
++        gsp_app_manager_signals[REMOVED] =
++                g_signal_new ("removed",
++                              G_TYPE_FROM_CLASS (gobject_class),
++                              G_SIGNAL_RUN_LAST,
++                              G_STRUCT_OFFSET (GspAppManagerClass,
++                                               removed),
++                              NULL,
++                              NULL,
++                              g_cclosure_marshal_VOID__OBJECT,
++                              G_TYPE_NONE, 1, G_TYPE_OBJECT);
++
++        g_type_class_add_private (class, sizeof (GspAppManagerPrivate));
++}
++
++static void
++gsp_app_manager_init (GspAppManager *manager)
++{
++        manager->priv = GSP_APP_MANAGER_GET_PRIVATE (manager);
++
++        memset (manager->priv, 0, sizeof (GspAppManagerPrivate));
++}
++
++static void
++gsp_app_manager_dispose (GObject *object)
++{
++        GspAppManager *manager;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (GSP_IS_APP_MANAGER (object));
++
++        manager = GSP_APP_MANAGER (object);
++
++        /* we unref GspApp objects in dispose since they might need to
++         * reference us during their dispose/finalize */
++        g_slist_foreach (manager->priv->apps,
++                         (GFunc) _gsp_app_manager_app_unref, manager);
++        g_slist_free (manager->priv->apps);
++        manager->priv->apps = NULL;
++
++        G_OBJECT_CLASS (gsp_app_manager_parent_class)->dispose (object);
++}
++
++static void
++gsp_app_manager_finalize (GObject *object)
++{
++        GspAppManager *manager;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (GSP_IS_APP_MANAGER (object));
++
++        manager = GSP_APP_MANAGER (object);
++
++        g_slist_foreach (manager->priv->dirs,
++                         (GFunc) _gsp_xdg_dir_free, NULL);
++        g_slist_free (manager->priv->dirs);
++        manager->priv->dirs = NULL;
++
++        G_OBJECT_CLASS (gsp_app_manager_parent_class)->finalize (object);
++
++        manager = NULL;
++}
++
++static void
++_gsp_app_manager_emit_added (GspAppManager *manager,
++                             GspApp        *app)
++{
++        g_signal_emit (G_OBJECT (manager), gsp_app_manager_signals[ADDED],
++                       0, app);
++}
++
++static void
++_gsp_app_manager_emit_removed (GspAppManager *manager,
++                               GspApp        *app)
++{
++        g_signal_emit (G_OBJECT (manager), gsp_app_manager_signals[REMOVED],
++                       0, app);
++}
++
++/*
++ * Directories
++ */
++
++static int
++gsp_app_manager_get_dir_index (GspAppManager *manager,
++                               const char    *dir)
++{
++        GSList    *l;
++        GspXdgDir *xdgdir;
++
++        g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), -1);
++        g_return_val_if_fail (dir != NULL, -1);
++
++        for (l = manager->priv->dirs; l != NULL; l = l->next) {
++                xdgdir = l->data;
++                if (strcmp (dir, xdgdir->dir) == 0) {
++                        return xdgdir->index;
++                }
++        }
++
++        return -1;
++}
++
++const char *
++gsp_app_manager_get_dir (GspAppManager *manager,
++                         unsigned int   index)
++{
++        GSList    *l;
++        GspXdgDir *xdgdir;
++
++        g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL);
++
++        for (l = manager->priv->dirs; l != NULL; l = l->next) {
++                xdgdir = l->data;
++                if (index == xdgdir->index) {
++                        return xdgdir->dir;
++                }
++        }
++
++        return NULL;
++}
++
++static int
++_gsp_app_manager_find_dir_with_basename (GspAppManager *manager,
++                                         const char    *basename,
++                                         int            minimum_index)
++{
++        GSList    *l;
++        GspXdgDir *xdgdir;
++        char      *path;
++        GKeyFile  *keyfile;
++        int        result = -1;
++
++        path = NULL;
++        keyfile = g_key_file_new ();
++
++        for (l = manager->priv->dirs; l != NULL; l = l->next) {
++                xdgdir = l->data;
++
++                if (xdgdir->index <= minimum_index) {
++                        continue;
++                }
++
++                g_free (path);
++                path = g_build_filename (xdgdir->dir, basename, NULL);
++                if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
++                        continue;
++                }
++
++                if (!g_key_file_load_from_file (keyfile, path,
++                                                G_KEY_FILE_NONE, NULL)) {
++                        continue;
++                }
++
++                /* the file exists and is readable */
++                if (result == -1) {
++                        result = xdgdir->index;
++                } else {
++                        result = MIN (result, xdgdir->index);
++                }
++        }
++
++        g_key_file_free (keyfile);
++        g_free (path);
++
++        return result;
++}
++
++static void
++_gsp_app_manager_handle_delete (GspAppManager *manager,
++                                GspApp        *app,
++                                const char    *basename,
++                                int            index)
++{
++        unsigned int position;
++        unsigned int system_position;
++
++        position = gsp_app_get_xdg_position (app);
++        system_position = gsp_app_get_xdg_system_position (app);
++
++        if (system_position < index) {
++                /* it got deleted, but we don't even care about it */
++                return;
++        }
++
++        if (index < position) {
++                /* it got deleted, but in a position earlier than the current
++                 * one. This happens when the user file was changed and became
++                 * identical to the system file; in this case, the user file is
++                 * simply removed. */
++                 g_assert (index == 0);
++                 return;
++        }
++
++        if (position == index &&
++            (system_position == index || system_position == G_MAXUINT)) {
++                /* the file used by the user was deleted, and there's no other
++                 * file in system directories. So it really got deleted. */
++                _gsp_app_manager_app_removed (manager, app);
++                return;
++        }
++
++        if (system_position == index) {
++                /* then we know that position != index; we just hae to tell
++                 * GspApp if there's still a system directory containing this
++                 * basename */
++                int new_system;
++
++                new_system = _gsp_app_manager_find_dir_with_basename (manager,
++                                                                      basename,
++                                                                      index);
++                if (new_system < 0) {
++                        gsp_app_set_xdg_system_position (app, G_MAXUINT);
++                } else {
++                        gsp_app_set_xdg_system_position (app, new_system);
++                }
++
++                return;
++        }
++
++        if (position == index) {
++                /* then we know that system_position != G_MAXUINT; we need to
++                 * tell GspApp to change position to system_position */
++                const char *dir;
++
++                dir = gsp_app_manager_get_dir (manager, system_position);
++                if (dir) {
++                        char *path;
++
++                        path = g_build_filename (dir, basename, NULL);
++                        gsp_app_reload_at (app, path,
++                                           (unsigned int) system_position);
++                        g_free (path);
++                } else {
++                        _gsp_app_manager_app_removed (manager, app);
++                }
++
++                return;
++        }
++
++        g_assert_not_reached ();
++}
++
++static gboolean
++gsp_app_manager_xdg_dir_monitor (GFileMonitor      *monitor,
++                                 GFile             *child,
++                                 GFile             *other_file,
++                                 GFileMonitorEvent  flags,
++                                 gpointer           data)
++{
++        GspAppManager *manager;
++        GspApp        *old_app;
++        GspApp        *app;
++        GFile         *parent;
++        char          *basename;
++        char          *dir;
++        char          *path;
++        int            index;
++
++        manager = GSP_APP_MANAGER (data);
++
++        basename = g_file_get_basename (child);
++        if (!g_str_has_suffix (basename, ".desktop")) {
++                /* not a desktop file, we can ignore */
++                g_free (basename);
++                return TRUE;
++        }
++        old_app = gsp_app_manager_find_app_with_basename (manager, basename);
++
++        parent = g_file_get_parent (child);
++        dir = g_file_get_path (parent);
++        g_object_unref (parent);
++
++        index = gsp_app_manager_get_dir_index (manager, dir);
++        if (index < 0) {
++                /* not a directory we know; should never happen, though */
++                g_free (dir);
++                return TRUE;
++        }
++
++        path = g_file_get_path (child);
++
++        switch (flags) {
++        case G_FILE_MONITOR_EVENT_CHANGED:
++        case G_FILE_MONITOR_EVENT_CREATED:
++                /* we just do as if it was a new file: GspApp is clever enough
++                 * to do the right thing */
++                app = gsp_app_new (path, (unsigned int) index);
++
++                /* we didn't have this app before, so add it */
++                if (old_app == NULL && app != NULL) {
++                        gsp_app_manager_add (manager, app);
++                        g_object_unref (app);
++                }
++                /* else: it was just updated, GspApp took care of
++                 * sending the event */
++                break;
++        case G_FILE_MONITOR_EVENT_DELETED:
++                if (!old_app) {
++                        /* it got deleted, but we don't know about it, so
++                         * nothing to do */
++                        break;
++                }
++
++                _gsp_app_manager_handle_delete (manager, old_app,
++                                                basename, index);
++                break;
++        default:
++                break;
++        }
++
++        g_free (path);
++        g_free (dir);
++        g_free (basename);
++
++        return TRUE;
++}
++
++/*
++ * Initialization
++ */
++
++static void
++_gsp_app_manager_fill_from_dir (GspAppManager *manager,
++                                GspXdgDir     *xdgdir)
++{
++        GFile      *file;
++        GDir       *dir;
++        const char *name;
++
++        file = g_file_new_for_path (xdgdir->dir);
++        xdgdir->monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE,
++                                                    NULL, NULL);
++        g_object_unref (file);
++
++        if (xdgdir->monitor) {
++                g_signal_connect (xdgdir->monitor, "changed",
++                                  G_CALLBACK (gsp_app_manager_xdg_dir_monitor),
++                                  manager);
++        }
++
++        dir = g_dir_open (xdgdir->dir, 0, NULL);
++        if (!dir) {
++                return;
++        }
++
++        while ((name = g_dir_read_name (dir))) {
++                GspApp *app;
++                char   *desktop_file_path;
++
++                if (!g_str_has_suffix (name, ".desktop")) {
++                        continue;
++                }
++
++                desktop_file_path = g_build_filename (xdgdir->dir, name, NULL);
++                app = gsp_app_new (desktop_file_path, xdgdir->index);
++
++                if (app != NULL) {
++                        gsp_app_manager_add (manager, app);
++                        g_object_unref (app);
++                }
++
++                g_free (desktop_file_path);
++        }
++
++        g_dir_close (dir);
++}
++
++void
++gsp_app_manager_fill (GspAppManager *manager)
++{
++        char **autostart_dirs;
++        int    i;
++
++        if (manager->priv->apps != NULL)
++                return;
++
++        autostart_dirs = gsm_util_get_autostart_dirs ();
++        /* we always assume that the first directory is the user one */
++        g_assert (g_str_has_prefix (autostart_dirs[0],
++                                    g_get_user_config_dir ()));
++
++        for (i = 0; autostart_dirs[i] != NULL; i++) {
++                GspXdgDir *xdgdir;
++
++                if (gsp_app_manager_get_dir_index (manager,
++                                                   autostart_dirs[i]) >= 0) {
++                        continue;
++                }
++
++                xdgdir = _gsp_xdg_dir_new (autostart_dirs[i], i);
++                manager->priv->dirs = g_slist_prepend (manager->priv->dirs,
++                                                       xdgdir);
++
++                _gsp_app_manager_fill_from_dir (manager, xdgdir);
++        }
++
++        g_strfreev (autostart_dirs);
++}
++
++/*
++ * App handling
++ */
++
++static void
++_gsp_app_manager_app_unref (GspApp        *app,
++                            GspAppManager *manager)
++{
++        g_signal_handlers_disconnect_by_func (app,
++                                              _gsp_app_manager_app_removed,
++                                              manager);
++        g_object_unref (app);
++}
++
++static void
++_gsp_app_manager_app_removed (GspAppManager *manager,
++                              GspApp        *app)
++{
++        _gsp_app_manager_emit_removed (manager, app);
++        manager->priv->apps = g_slist_remove (manager->priv->apps, app);
++        _gsp_app_manager_app_unref (app, manager);
++}
++
++void
++gsp_app_manager_add (GspAppManager *manager,
++                     GspApp        *app)
++{
++        g_return_if_fail (GSP_IS_APP_MANAGER (manager));
++        g_return_if_fail (GSP_IS_APP (app));
++
++        manager->priv->apps = g_slist_prepend (manager->priv->apps,
++                                               g_object_ref (app));
++        g_signal_connect_swapped (app, "removed",
++                                  G_CALLBACK (_gsp_app_manager_app_removed),
++                                  manager);
++        _gsp_app_manager_emit_added (manager, app);
++}
++
++GspApp *
++gsp_app_manager_find_app_with_basename (GspAppManager *manager,
++                                        const char    *basename)
++{
++        GSList *l;
++        GspApp *app;
++
++        g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL);
++        g_return_val_if_fail (basename != NULL, NULL);
++
++        for (l = manager->priv->apps; l != NULL; l = l->next) {
++                app = GSP_APP (l->data);
++                if (strcmp (basename, gsp_app_get_basename (app)) == 0)
++                        return app;
++        }
++
++        return NULL;
++}
++
++/*
++ * Singleton
++ */
++
++GspAppManager *
++gsp_app_manager_get (void)
++{
++        if (manager == NULL) {
++                manager = g_object_new (GSP_TYPE_APP_MANAGER, NULL);
++                return manager;
++        } else {
++                return g_object_ref (manager);
++        }
++}
++
++GSList *
++gsp_app_manager_get_apps (GspAppManager *manager)
++{
++        g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL);
++
++        return g_slist_copy (manager->priv->apps);
++}
+Index: gnome-session/capplet/gsp-app-manager.h
+===================================================================
+--- /dev/null
++++ gnome-session/capplet/gsp-app-manager.h
+@@ -0,0 +1,81 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 1999 Free Software Foundation, Inc.
++ * Copyright (C) 2007, 2009 Vincent Untz.
++ * Copyright (C) 2008 Lucas Rocha.
++ * Copyright (C) 2008 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#ifndef __GSP_APP_MANAGER_H
++#define __GSP_APP_MANAGER_H
++
++#include <glib-object.h>
++
++#include <gsp-app.h>
++
++G_BEGIN_DECLS
++
++#define GSP_TYPE_APP_MANAGER            (gsp_app_manager_get_type ())
++#define GSP_APP_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSP_TYPE_APP_MANAGER, GspAppManager))
++#define GSP_APP_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSP_TYPE_APP_MANAGER, GspAppManagerClass))
++#define GSP_IS_APP_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSP_TYPE_APP_MANAGER))
++#define GSP_IS_APP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSP_TYPE_APP_MANAGER))
++#define GSP_APP_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSP_TYPE_APP_MANAGER, GspAppManagerClass))
++
++typedef struct _GspAppManager        GspAppManager;
++typedef struct _GspAppManagerClass   GspAppManagerClass;
++
++typedef struct _GspAppManagerPrivate GspAppManagerPrivate;
++
++struct _GspAppManagerClass
++{
++        GObjectClass parent_class;
++
++        void (* added)   (GspAppManager *manager,
++                          GspApp        *app);
++        void (* removed) (GspAppManager *manager,
++                          GspApp        *app);
++};
++
++struct _GspAppManager
++{
++        GObject parent_instance;
++
++        GspAppManagerPrivate *priv;
++};
++
++GType           gsp_app_manager_get_type               (void);
++
++GspAppManager  *gsp_app_manager_get                    (void);
++
++void            gsp_app_manager_fill                   (GspAppManager *manager);
++
++GSList         *gsp_app_manager_get_apps               (GspAppManager *manager);
++
++GspApp         *gsp_app_manager_find_app_with_basename (GspAppManager *manager,
++                                                        const char    *basename);
++
++const char     *gsp_app_manager_get_dir                (GspAppManager *manager,
++                                                        unsigned int   index);
++
++void            gsp_app_manager_add                    (GspAppManager *manager,
++                                                        GspApp        *app);
++
++G_END_DECLS
++
++#endif /* __GSP_APP_MANAGER_H */
+Index: gnome-session/capplet/gsp-app.c
+===================================================================
+--- /dev/null
++++ gnome-session/capplet/gsp-app.c
+@@ -0,0 +1,1129 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 1999 Free Software Foundation, Inc.
++ * Copyright (C) 2007, 2009 Vincent Untz.
++ * Copyright (C) 2008 Lucas Rocha.
++ * Copyright (C) 2008 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <string.h>
++#include <sys/stat.h>
++
++#include <glib/gi18n.h>
++#include <glib/gstdio.h>
++
++#include "gsm-app-dialog.h"
++#include "gsm-properties-dialog.h"
++#include "gsm-util.h"
++#include "gsp-app-manager.h"
++#include "gsp-keyfile.h"
++
++#include "gsp-app.h"
++
++#define GSP_APP_SAVE_DELAY 2
++
++#define GSP_ASP_SAVE_MASK_HIDDEN     0x0001
++#define GSP_ASP_SAVE_MASK_ENABLED    0x0002
++#define GSP_ASP_SAVE_MASK_NAME       0x0004
++#define GSP_ASP_SAVE_MASK_EXEC       0x0008
++#define GSP_ASP_SAVE_MASK_COMMENT    0x0010
++#define GSP_ASP_SAVE_MASK_NO_DISPLAY 0x0020
++#define GSP_ASP_SAVE_MASK_ALL        0xffff
++
++struct _GspAppPrivate {
++        char         *basename;
++        char         *path;
++
++        gboolean      hidden;
++        gboolean      no_display;
++        gboolean      enabled;
++        gboolean      shown;
++
++        char         *name;
++        char         *exec;
++        char         *comment;
++        char         *icon;
++
++        GIcon        *gicon;
++        char         *description;
++
++        /* position of the directory in the XDG environment variable */
++        unsigned int  xdg_position;
++        /* position of the first system directory in the XDG env var containing
++         * this autostart app too (G_MAXUINT means none) */
++        unsigned int  xdg_system_position;
++
++        unsigned int  save_timeout;
++        /* mask of what has changed */
++        unsigned int  save_mask;
++        /* path that contains the original file that needs to be saved */
++        char         *old_system_path;
++        /* after writing to file, we skip the next file monitor event of type
++         * CHANGED */
++        gboolean      skip_next_monitor_event;
++};
++
++#define GSP_APP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSP_TYPE_APP, GspAppPrivate))
++
++
++enum {
++        CHANGED,
++        REMOVED,
++        LAST_SIGNAL
++};
++
++static guint gsp_app_signals[LAST_SIGNAL] = { 0 };
++
++
++G_DEFINE_TYPE (GspApp, gsp_app, G_TYPE_OBJECT)
++
++static void     gsp_app_dispose  (GObject *object);
++static void     gsp_app_finalize (GObject *object);
++static gboolean _gsp_app_save    (gpointer data);
++
++
++static gboolean
++_gsp_str_equal (const char *a,
++                const char *b)
++{
++        if (g_strcmp0 (a, b) == 0) {
++                return TRUE;
++        }
++
++        if (a && !b && a[0] == '\0') {
++                return TRUE;
++        }
++
++        if (b && !a && b[0] == '\0') {
++                return TRUE;
++        }
++
++        return FALSE;
++}
++
++
++static void
++gsp_app_class_init (GspAppClass *class)
++{
++        GObjectClass *gobject_class = G_OBJECT_CLASS (class);
++
++        gobject_class->dispose  = gsp_app_dispose;
++        gobject_class->finalize = gsp_app_finalize;
++
++        gsp_app_signals[CHANGED] =
++                g_signal_new ("changed",
++                              G_TYPE_FROM_CLASS (gobject_class),
++                              G_SIGNAL_RUN_LAST,
++                              G_STRUCT_OFFSET (GspAppClass,
++                                               changed),
++                              NULL,
++                              NULL,
++                              g_cclosure_marshal_VOID__VOID,
++                              G_TYPE_NONE, 0);
++
++        gsp_app_signals[REMOVED] =
++                g_signal_new ("removed",
++                              G_TYPE_FROM_CLASS (gobject_class),
++                              G_SIGNAL_RUN_LAST,
++                              G_STRUCT_OFFSET (GspAppClass,
++                                               removed),
++                              NULL,
++                              NULL,
++                              g_cclosure_marshal_VOID__VOID,
++                              G_TYPE_NONE, 0);
++
++        g_type_class_add_private (class, sizeof (GspAppPrivate));
++}
++
++static void
++gsp_app_init (GspApp *app)
++{
++        app->priv = GSP_APP_GET_PRIVATE (app);
++
++        memset (app->priv, 0, sizeof (GspAppPrivate));
++        app->priv->xdg_position        = G_MAXUINT;
++        app->priv->xdg_system_position = G_MAXUINT;
++}
++
++static void
++_gsp_app_free_reusable_data (GspApp *app)
++{
++        if (app->priv->path) {
++                g_free (app->priv->path);
++                app->priv->path = NULL;
++        }
++
++        if (app->priv->name) {
++                g_free (app->priv->name);
++                app->priv->name = NULL;
++        }
++
++        if (app->priv->exec) {
++                g_free (app->priv->exec);
++                app->priv->exec = NULL;
++        }
++
++        if (app->priv->comment) {
++                g_free (app->priv->comment);
++                app->priv->comment = NULL;
++        }
++
++        if (app->priv->icon) {
++                g_free (app->priv->icon);
++                app->priv->icon = NULL;
++        }
++
++        if (app->priv->gicon) {
++                g_object_unref (app->priv->gicon);
++                app->priv->gicon = NULL;
++        }
++
++        if (app->priv->description) {
++                g_free (app->priv->description);
++                app->priv->description = NULL;
++        }
++
++        if (app->priv->old_system_path) {
++                g_free (app->priv->old_system_path);
++                app->priv->old_system_path = NULL;
++        }
++}
++
++static void
++gsp_app_dispose (GObject *object)
++{
++        GspApp *app;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (GSP_IS_APP (object));
++
++        app = GSP_APP (object);
++
++        /* we save in dispose since we might need to reference GspAppManager */
++        if (app->priv->save_timeout) {
++                g_source_remove (app->priv->save_timeout);
++                app->priv->save_timeout = 0;
++
++                /* save now */
++                _gsp_app_save (app);
++        }
++
++        G_OBJECT_CLASS (gsp_app_parent_class)->dispose (object);
++}
++
++static void
++gsp_app_finalize (GObject *object)
++{
++        GspApp *app;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (GSP_IS_APP (object));
++
++        app = GSP_APP (object);
++
++        if (app->priv->basename) {
++                g_free (app->priv->basename);
++                app->priv->basename = NULL;
++        }
++
++        _gsp_app_free_reusable_data (app);
++
++        G_OBJECT_CLASS (gsp_app_parent_class)->finalize (object);
++}
++
++static void
++_gsp_app_emit_changed (GspApp *app)
++{
++        g_signal_emit (G_OBJECT (app), gsp_app_signals[CHANGED], 0);
++}
++
++static void
++_gsp_app_emit_removed (GspApp *app)
++{
++        g_signal_emit (G_OBJECT (app), gsp_app_signals[REMOVED], 0);
++}
++
++static void
++_gsp_app_update_description (GspApp *app)
++{
++        const char *primary;
++        const char *secondary;
++
++        if (!gsm_util_text_is_blank (app->priv->name)) {
++                primary = app->priv->name;
++        } else if (!gsm_util_text_is_blank (app->priv->exec)) {
++                primary = app->priv->exec;
++        } else {
++                primary = _("No name");
++        }
++
++        if (!gsm_util_text_is_blank (app->priv->comment)) {
++                secondary = app->priv->comment;
++        } else {
++                secondary = _("No description");
++        }
++
++        g_free (app->priv->description);
++        app->priv->description = g_markup_printf_escaped ("<b>%s</b>\n%s",
++                                                          primary,
++                                                          secondary);
++}
++
++/*
++ * Saving
++ */
++
++static void
++_gsp_ensure_user_autostart_dir (void)
++{
++        char *dir;
++
++        dir = g_build_filename (g_get_user_config_dir (), "autostart", NULL);
++        g_mkdir_with_parents (dir, S_IRWXU);
++
++        g_free (dir);
++}
++
++static char *
++_gsp_get_current_desktop ()
++{
++        static char *current_desktop = NULL;
++
++        /* Support XDG_CURRENT_DESKTOP environment variable; this can be used
++         * to abuse gnome-session in non-GNOME desktops. */
++        if (!current_desktop) {
++               const char *desktop;
++
++                desktop = g_getenv ("XDG_CURRENT_DESKTOP");
++
++                /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it
++                 * was not set */
++                if (!desktop || desktop[0] == '\0')
++                        current_desktop = g_strdup ("GNOME");
++                else
++                        current_desktop = g_strdup (desktop);
++        }
++
++        /* Using "*" means skipping desktop-related checks */
++        if (g_strcmp0 (current_desktop, "*") == 0)
++                return NULL;
++
++        return current_desktop;
++}