diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | distro/archlinux/PKGBUILD | 2 | ||||
| -rwxr-xr-x | distro/ubuntu/build | 2 | ||||
| -rw-r--r-- | mate-session/gsm-manager.c | 23 |
5 files changed, 30 insertions, 5 deletions
@@ -2,8 +2,10 @@ mate authors ------------ Perberos <[email protected]> +Steve Zesch <[email protected]> +Stefano Karapetsas <[email protected]> -new code base authors +gnome-session new code base authors --------------------- Dan Winship <[email protected]> diff --git a/configure.ac b/configure.ac index 144e0ed..b06d320 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([mate-session], [1.1.0], [http://www.mate-desktop.org/]) +AC_INIT([mate-session], [1.1.1], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR([mate-session]) AC_CONFIG_HEADERS([config.h]) @@ -236,7 +236,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc]) dnl ==================================================================== dnl Language Support dnl ==================================================================== -GETTEXT_PACKAGE=mate-session-2.0 +GETTEXT_PACKAGE=mate-session AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The gettext translation domain]) AC_SUBST(GETTEXT_PACKAGE) diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD index 1ec372b..120d7f9 100644 --- a/distro/archlinux/PKGBUILD +++ b/distro/archlinux/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mate-session-manager -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="The MATE Session Handler" arch=(i686 x86_64) diff --git a/distro/ubuntu/build b/distro/ubuntu/build index 6be251a..f5b2e9f 100755 --- a/distro/ubuntu/build +++ b/distro/ubuntu/build @@ -2,7 +2,7 @@ # fill it pkgname=mate-session-manager -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="The MATE Session Handler" depends=('upower' 'gtk2' 'mate-conf' 'hicolor-icon-theme' 'libxtst6' 'mate-polkit') diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c index cbddf21..eb84b87 100644 --- a/mate-session/gsm-manager.c +++ b/mate-session/gsm-manager.c @@ -72,6 +72,9 @@ #define MDM_FLEXISERVER_COMMAND "mdmflexiserver" #define MDM_FLEXISERVER_ARGS "--startnew Standard" +#define GDM_FLEXISERVER_COMMAND "gdmflexiserver" +#define GDM_FLEXISERVER_ARGS "--startnew Standard" + #define KEY_LOCKDOWN_DIR "/desktop/mate/lockdown" #define KEY_LOCK_DISABLE KEY_LOCKDOWN_DIR "/disable_lock_screen" @@ -935,6 +938,26 @@ manager_switch_user (GsmManager *manager) if (! res) { g_debug ("GsmManager: Unable to start MDM greeter: %s", error->message); g_error_free (error); + + /* MDM not found, so we try to use gdmflexiserver from GDM */ + + char *gdm_command; + + gdm_command = g_strdup_printf ("%s %s", + GDM_FLEXISERVER_COMMAND, + GDM_FLEXISERVER_ARGS); + + error = NULL; + res = gdk_spawn_command_line_on_screen (gdk_screen_get_default (), + gdm_command, + &error); + + g_free (gdm_command); + + if (! res) { + g_debug ("GsmManager: Unable to start GDM greeter: %s", error->message); + g_error_free (error); + } } } |