Hello community, here is the log from the commit of package lxdm for openSUSE:Factory checked in at Fri Mar 19 15:14:03 CET 2010. -------- --- lxdm/lxdm.changes 2010-03-01 13:33:13.000000000 +0100 +++ lxdm/lxdm.changes 2010-03-18 08:31:22.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Mar 18 07:33:12 UTC 2010 - andrea@opensuse.org + +- fixed missin exec bit to lxdm scripts + +------------------------------------------------------------------- +Wed Mar 17 19:55:19 UTC 2010 - andrea@opensuse.org + +- added lxdm-common.patch to fix bnc#586555 + +------------------------------------------------------------------- +Wed Mar 17 08:02:49 UTC 2010 - andrea@opensuse.org + +- restored lxdm-stderr_stdout_log.patch, it wasn't really fixed + +------------------------------------------------------------------- +Sat Mar 13 10:35:10 UTC 2010 - andrea@opensuse.org + +- add PreShutdown and PreRebot support + +------------------------------------------------------------------- +Fri Mar 12 17:46:04 UTC 2010 - andrea@opensuse.org + +- new git version 2010 03 12 +- add PostLogin,PreLogin,LoginReady,PostLogout steps support +- removed lxdm-stderr_stdout_log.patch, fixed upstream + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lxdm-common.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxdm.spec ++++++ --- /var/tmp/diff_new_pack.l1YneW/_old 2010-03-19 15:13:04.000000000 +0100 +++ /var/tmp/diff_new_pack.l1YneW/_new 2010-03-19 15:13:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package lxdm (Version 0.2.0+git20100225) +# spec file for package lxdm (Version 0.2.0+git20100317) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: lxdm Summary: LXDE Display Manager -Version: 0.2.0+git20100225 +Version: 0.2.0+git20100317 Release: 1 License: GPLv2 and LGPLv2 Group: System/X11/Displaymanagers @@ -34,6 +34,8 @@ # this patch allow lxdm to read system settings from /etc/sysconfig Patch3: %{name}-use-sysconfig.patch Patch4: %{name}-stderr_stdout_log.patch +# FIX BUG BNC#586555 +Patch5: %{name}-common.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake gcc gcc-c++ gettext-tools make BuildRequires: ConsoleKit-devel gettext-runtime gtk2-devel intltool @@ -54,6 +56,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 %__cp %{SOURCE1} . %build @@ -64,9 +67,14 @@ %install %makeinstall %__mkdir_p %buildroot/%_bindir -%__rm %buildroot/%_sbindir/lxdm +%__rm %buildroot/%_sbindir/%name %__rm -rf %buildroot/%_datadir/locale/frp -ln -sf %_sbindir/lxdm-binary %buildroot%_bindir/lxdm +ln -sf %_sbindir/%{name}-binary %buildroot%_bindir/%{name} +%__cp data/LoginReady data/PostLogout data/PreLogin %buildroot/%{_sysconfdir}/%{name}/ +chmod +x %buildroot/%{_sysconfdir}/%{name}/PreLogin +chmod +x %buildroot/%{_sysconfdir}/%{name}/PostLogout +chmod +x %buildroot/%{_sysconfdir}/%{name}/LoginReady + %fdupes %buildroot%{_datadir} %find_lang %{name} %__mkdir_p %buildroot/%{_localstatedir}/run @@ -79,15 +87,22 @@ %files -f %{name}.lang %defattr (-,root,root,-) %doc AUTHORS README COPYING README.SUSE -%dir %{_datadir}/lxdm/ -%{_datadir}/lxdm/* -%dir %{_sysconfdir}/lxdm/ -%{_bindir}/lxdm -%{_sbindir}/lxdm-binary -%{_libexecdir}/lxdm-greeter-gtk -%config(noreplace) %{_sysconfdir}/lxdm/Xsession -%config(noreplace) %{_sysconfdir}/lxdm/lxdm.conf -%config(noreplace) %{_sysconfdir}/pam.d/lxdm +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/* +%dir %{_sysconfdir}/%{name}/ +%{_bindir}/%{name} +%{_sbindir}/%{name}-binary +%{_libexecdir}/%{name}-greeter-gtk +%config(noreplace) %{_sysconfdir}/%{name}/Xsession +#%config(noreplace) %{_sysconfdir}/%{name}/PreReboot +#%config(noreplace) %{_sysconfdir}/%{name}/PreShutdown +%config(noreplace) %{_sysconfdir}/%{name}/PreLogin +#%config(noreplace) %{_sysconfdir}/%{name}/PostLogin +%config(noreplace) %{_sysconfdir}/%{name}/PostLogout +%config(noreplace) %{_sysconfdir}/%{name}/LoginReady + +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %{_sysconfdir}/pam.d/%{name} %ghost %{_localstatedir}/run/%{name}.pid %changelog ++++++ lxdm-common.patch ++++++ --- data/LoginReady +++ data/LoginReady 2010-03-17 10:16:06.540126607 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +test -x /etc/X11/xdm/Xsetup && exec /etc/X11/xdm/Xsetup --- data/PostLogout +++ data/PostLogout 2010-03-17 10:13:08.541090500 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +test -x /etc/X11/xdm/Xreset && exec /etc/X11/xdm/Xreset --- data/PreLogin +++ data/PreLogin 2010-03-17 10:11:41.272626486 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +test -x /etc/X11/xdm/Xstartup && exec /etc/X11/xdm/Xstartup --- data/Xsession +++ data/Xsession 2010-03-17 10:29:35.988626463 +0000 @@ -1,43 +1,26 @@ #!/bin/bash -# use bash for "exec -l", howto run login shell by /bin/sh ? +failsafe="xterm -ls -T Failsafe -geometry 80x24+0+0" +trap "exec $failsafe" EXIT SIGHUP SIGINT SIGPIPE SIGTERM SIGIO +shopt -s execfail -if [ $# -eq 1 -a -n "$1" ]; then - LXSESSION=$1 -else # default session - LXSESSION=/usr/bin/startlxde -fi +LXSESSION=/usr/bin/startlxde +test $# -eq 1 -a -n "$1" && LXSESSION=$1 + +export WINDOWMANAGER=$LXSESSION +test -x /etc/X11/xdm/Xsession && exec /etc/X11/xdm/Xsession +test -x /etc/X11/xinit/xinitrc && exec -l $SHELL -c /etc/X11/xinit/xinitrc -if [ -x /etc/X11/xinit/xinitrc-common ]; then -# fedora - . /etc/X11/xinit/xinitrc-common - if ! [ -z "$XDG_SESSION_COOKIE" ]; then - CK_XINIT_SESSION= - elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then - CK_XINIT_SESSION="/usr/bin/ck-launch-session" - fi - exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" -elif [ -x /etc/X11/xinit/Xsession ]; then -# fedora - exec /etc/X11/xinit/Xsession $LXSESSION -elif [ -x /etc/X11/Xsession ]; then -# mandriva, debian, ubuntu - exec /etc/X11/Xsession $LXSESSION -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION - exec -l $SHELL -c /etc/X11/xinit/xinitrc -else # unknown, user should custom /etc/lxdm/xinitrc self - if [ -x /etc/lxdm/xinitrc ]; then - . /etc/lxdm/xinitrc - fi - if ! [ -z "$XDG_SESSION_COOKIE" ]; then - CK_XINIT_SESSION= - elif [ -x /usr/bin/ck-launch-session ]; then - CK_XINIT_SESSION="/usr/bin/ck-launch-session" - fi - exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" +test -s /etc/lxdm/xinitrc && . /etc/lxdm/xinitrc + +if ! test -z "$XDG_SESSION_COOKIE" ; then + CK_XINIT_SESSION= +elif test -x /usr/bin/ck-launch-session ; then + CK_XINIT_SESSION="/usr/bin/ck-launch-session" fi +exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" +# failsafe +exit 1 ++++++ lxdm-stderr_stdout_log.patch ++++++ --- /var/tmp/diff_new_pack.l1YneW/_old 2010-03-19 15:13:04.000000000 +0100 +++ /var/tmp/diff_new_pack.l1YneW/_new 2010-03-19 15:13:04.000000000 +0100 @@ -1,7 +1,7 @@ diff -uNr old-lxdm//src/lxdm.c lxdm/src/lxdm.c ---- old-lxdm//src/lxdm.c 2010-03-01 13:24:09.427252931 +0100 -+++ lxdm/src/lxdm.c 2010-03-01 13:24:29.443281609 +0100 -@@ -224,16 +224,30 @@ +--- old-lxdm//src/lxdm.c 2010-03-17 08:59:21.625505719 +0100 ++++ lxdm/src/lxdm.c 2010-03-17 08:59:30.214257893 +0100 +@@ -222,16 +222,30 @@ exit(0); } @@ -32,7 +32,7 @@ } GSList *do_scan_xsessions(void) -@@ -615,6 +629,7 @@ +@@ -624,6 +638,7 @@ if( !getenv("DISPLAY") ) putenv("DISPLAY=:0"); @@ -40,7 +40,7 @@ create_server_auth(); arg = g_key_file_get_string(config, "server", "arg", 0); -@@ -1098,6 +1113,7 @@ +@@ -1079,6 +1094,7 @@ set_signal(); lxdm_get_tty(); ++++++ lxdm-use-sysconfig.patch ++++++ --- /var/tmp/diff_new_pack.l1YneW/_old 2010-03-19 15:13:04.000000000 +0100 +++ /var/tmp/diff_new_pack.l1YneW/_new 2010-03-19 15:13:04.000000000 +0100 @@ -1,6 +1,6 @@ diff -uNr old-lxdm//data/lxdm.conf.in lxdm/data/lxdm.conf.in ---- old-lxdm//data/lxdm.conf.in 2010-03-01 13:21:12.020281337 +0100 -+++ lxdm/data/lxdm.conf.in 2010-03-01 13:21:25.961002559 +0100 +--- old-lxdm//data/lxdm.conf.in 2010-03-17 08:58:48.493536524 +0100 ++++ lxdm/data/lxdm.conf.in 2010-03-17 08:59:01.436507715 +0100 @@ -1,6 +1,4 @@ [base] -# autologin=dgod @@ -10,7 +10,7 @@ diff -uNr old-lxdm//src/gdm/gdm-sysconfig.c lxdm/src/gdm/gdm-sysconfig.c --- old-lxdm//src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm/src/gdm/gdm-sysconfig.c 2010-03-01 13:21:25.962002547 +0100 ++++ lxdm/src/gdm/gdm-sysconfig.c 2010-03-17 08:59:01.438507761 +0100 @@ -0,0 +1,439 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -453,7 +453,7 @@ +} diff -uNr old-lxdm//src/gdm/gdm-sysconfig.h lxdm/src/gdm/gdm-sysconfig.h --- old-lxdm//src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm/src/gdm/gdm-sysconfig.h 2010-03-01 13:21:25.963002395 +0100 ++++ lxdm/src/gdm/gdm-sysconfig.h 2010-03-17 08:59:01.439508446 +0100 @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -497,9 +497,9 @@ + +#endif /* __GDM_SYSCONFIG_H */ diff -uNr old-lxdm//src/lxdm.c lxdm/src/lxdm.c ---- old-lxdm//src/lxdm.c 2010-03-01 13:21:12.018281640 +0100 -+++ lxdm/src/lxdm.c 2010-03-01 13:21:25.965002231 +0100 -@@ -71,6 +71,14 @@ +--- old-lxdm//src/lxdm.c 2010-03-17 08:58:48.491537596 +0100 ++++ lxdm/src/lxdm.c 2010-03-17 08:59:01.441537406 +0100 +@@ -69,6 +69,14 @@ #include "lxdm.h" @@ -514,7 +514,7 @@ GKeyFile *config; static pid_t server; static guint server_watch; -@@ -788,7 +796,7 @@ +@@ -800,7 +808,7 @@ char *name=NULL,*exec=NULL; if(!session || !session[0]) { @@ -523,7 +523,7 @@ if(!name && getenv("PREFERRED")) name = g_strdup(getenv("PREFERRED")); if(!session && getenv("DESKTOP")) -@@ -826,7 +834,7 @@ +@@ -838,7 +846,7 @@ if(!strcmp(name,"LXDE")) exec = g_strdup("startlxde"); else if( !strcmp(name, "GNOME") ) @@ -532,25 +532,7 @@ else if( !strcmp(name, "KDE") ) exec = g_strdup("startkde"); else if( !strcmp(name, "XFCE") ) -@@ -916,7 +924,7 @@ - - #if 0 - if( !session || !session[0] ) /* this means use default session */ -- session = g_key_file_get_string(config, "base", "session", 0); -+ session = gdm_sysconfig_load_value(SYSCONFIG_SESSION_FILE, SYSCONFIG_SESSION_KEY); - if( !session && getenv("PREFERRED") ) - session = g_strdup( getenv("PREFERRED") ); - if( !session && getenv("DESKTOP") ) -@@ -925,7 +933,7 @@ - if( !strcmp(p, "LXDE") ) - session = g_find_program_in_path("startlxde"); - else if( !strcmp(p, "GNOME") ) -- session = g_find_program_in_path("gnome-session"); -+ session = g_find_program_in_path("gnome"); - else if( !strcmp(p, "KDE") ) - session = g_find_program_in_path("startkde"); - else if( !strcmp(p, "XFCE") ) -@@ -979,7 +987,7 @@ +@@ -960,7 +968,7 @@ struct passwd *pw; char *user; @@ -560,8 +542,8 @@ return 0; if( AUTH_SUCCESS != lxdm_auth_user(user, 0, &pw) ) diff -uNr old-lxdm//src/Makefile.am lxdm/src/Makefile.am ---- old-lxdm//src/Makefile.am 2010-03-01 13:21:12.018281640 +0100 -+++ lxdm/src/Makefile.am 2010-03-01 13:21:25.966002428 +0100 +--- old-lxdm//src/Makefile.am 2010-03-17 08:58:48.491537596 +0100 ++++ lxdm/src/Makefile.am 2010-03-17 08:59:01.442537045 +0100 @@ -21,6 +21,7 @@ lxdm_binary_SOURCES = \ lxdm.c lxdm.h \ ++++++ lxdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/INSTALL new/lxdm/INSTALL --- old/lxdm/INSTALL 2010-02-13 19:05:36.000000000 +0100 +++ new/lxdm/INSTALL 2010-03-12 18:37:49.000000000 +0100 @@ -1,10 +1,26 @@ -1 modify data/Xsession.am as your distribution - -2 compile and install +1 compile and install ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec make make install -here libexecdir should change as you system path. +libexecdir should change as you system path. +sysconfdir must be /etc + + +2 custom + +modify data/Xsession.in as your distribution + +/etc/lxdm/PreLogin +before login, have root's context + +/etc/lxdm/PostLogin +login, before Xsession, user's context + +/etc/lxdm/PostLogout +when session logout done and ui ready + +/etc/lxdm/LoginReady +lxdm start done, called after ui ready diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/TODO new/lxdm/TODO --- old/lxdm/TODO 2010-02-13 19:05:36.000000000 +0100 +++ new/lxdm/TODO 2010-03-17 08:50:55.000000000 +0100 @@ -2,4 +2,4 @@ 1. user list in greeter ui 2. lxdm-config tool to custom the lxdm - +3. remove xauth dependency and let login to desktop faster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/configure.ac new/lxdm/configure.ac --- old/lxdm/configure.ac 2010-02-25 14:53:37.000000000 +0100 +++ new/lxdm/configure.ac 2010-03-12 18:37:49.000000000 +0100 @@ -14,7 +14,6 @@ AM_PROG_CC_C_O # Checks for libraries. -AC_CHECK_LIB([Xmu], [XmuClientWindow]) AC_CHECK_LIB([crypt], [crypt]) AC_CHECK_LIB([pam], [pam_open_session]) AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) @@ -69,7 +68,7 @@ po/Makefile.in pam/Makefile data/Makefile - data/lxdm.conf + data/lxdm.conf ]) AC_CONFIG_FILES([data/lxdm], [chmod +x data/lxdm]) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/lxdm.spec.in new/lxdm/lxdm.spec.in --- old/lxdm/lxdm.spec.in 2010-02-13 19:05:36.000000000 +0100 +++ new/lxdm/lxdm.spec.in 2010-03-14 12:23:50.000000000 +0100 @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} -BuildRequires: gtk2-devel libXmu-devel pam-devel intltool +BuildRequires: gtk2-devel pam-devel intltool %description Light weight X11 display manager @@ -28,10 +28,6 @@ %configure -# a make macro should be used here -# even a "job based" make if possible -# %__make %{?jobs:-j%{jobs}} - %__make %install @@ -50,7 +46,6 @@ %postun -# exactly as "%find_lang" macro %files -f %{name}.lang %defattr (-,root,root,-) %doc AUTHORS NEWS README COPYING INSTALL ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/po/bg.po new/lxdm/po/bg.po --- old/lxdm/po/bg.po 2010-02-13 19:05:36.000000000 +0100 +++ new/lxdm/po/bg.po 2010-03-15 22:50:58.000000000 +0100 @@ -3,51 +3,55 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: lxdm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2010-03-12 18:51+0200\n" +"Last-Translator: Радослав Иванов <rec_ku@hotmail.com>\n" +"Language-Team: " "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" -msgstr "" +msgstr "Работен плот:" #: ../data/lxdm.glade.h:2 msgid "Keyboard Layout:" -msgstr "" +msgstr "Клавиатурна подредба:" #: ../data/lxdm.glade.h:3 msgid "Language:" -msgstr "" +msgstr "Език:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 +#: ../src/greeter.c:116 +#: ../src/greeter.c:165 msgid "User:" -msgstr "" +msgstr "Потребител:" #: ../src/gdm/gdm-languages.c:609 msgid "Unspecified" -msgstr "" +msgstr "Незададен" #: ../src/greeter.c:87 msgid "Password:" -msgstr "" +msgstr "Парола:" #: ../src/greeter.c:211 msgid "Default" -msgstr "" +msgstr "По подразбиране" #: ../src/greeter.c:260 msgid "_Reboot" -msgstr "" +msgstr "_Рестартирай" #: ../src/greeter.c:264 msgid "_Shutdown" -msgstr "" +msgstr "_Изключи" + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/po/fo.po new/lxdm/po/fo.po --- old/lxdm/po/fo.po 1970-01-01 01:00:00.000000000 +0100 +++ new/lxdm/po/fo.po 2010-03-15 08:24:35.000000000 +0100 @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-01-24 21:50+0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/lxdm.glade.h:1 +msgid "Desktop:" +msgstr "" + +#: ../data/lxdm.glade.h:2 +msgid "Keyboard Layout:" +msgstr "" + +#: ../data/lxdm.glade.h:3 +msgid "Language:" +msgstr "" + +#: ../data/lxdm.glade.h:4 ../src/greeter.c:132 ../src/greeter.c:181 +msgid "User:" +msgstr "" + +#: ../src/gdm/gdm-languages.c:609 +msgid "Unspecified" +msgstr "" + +#: ../src/greeter.c:103 +msgid "Password:" +msgstr "" + +#: ../src/greeter.c:232 +msgid "Default" +msgstr "" + +#: ../src/greeter.c:285 +msgid "_Reboot" +msgstr "" + +#: ../src/greeter.c:289 +msgid "_Shutdown" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/po/gl.po new/lxdm/po/gl.po --- old/lxdm/po/gl.po 2010-02-13 19:05:36.000000000 +0100 +++ new/lxdm/po/gl.po 2010-03-15 08:24:35.000000000 +0100 @@ -3,51 +3,53 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2010-03-09 10:22+0200\n" +"Last-Translator: Indalecio <ifreiria@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" -msgstr "" +msgstr "Escritorio:" #: ../data/lxdm.glade.h:2 msgid "Keyboard Layout:" -msgstr "" +msgstr "Disposición de teclado:" #: ../data/lxdm.glade.h:3 msgid "Language:" -msgstr "" +msgstr "Idioma:" #: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 msgid "User:" -msgstr "" +msgstr "Usuario:" #: ../src/gdm/gdm-languages.c:609 msgid "Unspecified" -msgstr "" +msgstr "Sen especificar" #: ../src/greeter.c:87 msgid "Password:" -msgstr "" +msgstr "Contrasinal:" #: ../src/greeter.c:211 msgid "Default" -msgstr "" +msgstr "Predefinido" #: ../src/greeter.c:260 msgid "_Reboot" -msgstr "" +msgstr "_Reiniciar" #: ../src/greeter.c:264 msgid "_Shutdown" -msgstr "" +msgstr "_Apagar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/po/sl.po new/lxdm/po/sl.po --- old/lxdm/po/sl.po 2010-02-13 19:05:36.000000000 +0100 +++ new/lxdm/po/sl.po 2010-03-15 08:24:35.000000000 +0100 @@ -3,51 +3,54 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2010-02-17 15:23+0200\n" +"Last-Translator: Matej <paxmanpwnz@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" +"X-Generator: Pootle 2.0.1\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" -msgstr "" +msgstr "Namizje:" #: ../data/lxdm.glade.h:2 msgid "Keyboard Layout:" -msgstr "" +msgstr "Razpored tipk:" #: ../data/lxdm.glade.h:3 msgid "Language:" -msgstr "" +msgstr "Jezik:" #: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 msgid "User:" -msgstr "" +msgstr "Uporabnik:" #: ../src/gdm/gdm-languages.c:609 msgid "Unspecified" -msgstr "" +msgstr "Nedoločeno" #: ../src/greeter.c:87 msgid "Password:" -msgstr "" +msgstr "Geslo:" #: ../src/greeter.c:211 msgid "Default" -msgstr "" +msgstr "Privzeto" #: ../src/greeter.c:260 msgid "_Reboot" -msgstr "" +msgstr "_Ponovni zagon" #: ../src/greeter.c:264 msgid "_Shutdown" -msgstr "" +msgstr "_Izklop" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/src/greeter.c new/lxdm/src/greeter.c --- old/lxdm/src/greeter.c 2010-02-13 19:05:36.000000000 +0100 +++ new/lxdm/src/greeter.c 2010-03-12 18:37:49.000000000 +0100 @@ -571,7 +571,6 @@ void set_root_background(void) { - char *p; GdkWindow *root = gdk_get_default_root_window(); /* set background */ @@ -655,6 +654,7 @@ /* use line buffered stdout for inter-process-communcation of * single-line-commands */ setvbuf(stdout, NULL, _IOLBF, 0 ); + gtk_main(); if( config_changed ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/src/lxdm.c new/lxdm/src/lxdm.c --- old/lxdm/src/lxdm.c 2010-02-25 14:53:37.000000000 +0100 +++ new/lxdm/src/lxdm.c 2010-03-17 08:50:55.000000000 +0100 @@ -57,9 +57,7 @@ #include <execinfo.h> -#if HAVE_LIBXMU -#include <X11/Xmu/WinUtil.h> -#endif +#include <utmp.h> #if HAVE_LIBPAM #include <security/pam_appl.h> @@ -469,11 +467,22 @@ void switch_user(struct passwd *pw, char *run, char **env) { + int fd; + + g_spawn_command_line_sync ("/etc/lxdm/PreLogin",NULL,NULL,NULL,NULL); + if( !pw || initgroups(pw->pw_name, pw->pw_gid) || setgid(pw->pw_gid) || setuid(pw->pw_uid) || setsid() == -1 ) exit(EXIT_FAILURE); chdir(pw->pw_dir); + fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR); + if(fd!=-1) + { + dup2(fd,STDERR_FILENO); + close(fd); + } create_client_auth(pw->pw_dir); + g_spawn_command_line_async ("/etc/lxdm/PostLogin",NULL); execle("/etc/lxdm/Xsession", "/etc/lxdm/Xsession", run, NULL, env); exit(EXIT_FAILURE); } @@ -692,13 +701,12 @@ my_xid = 0; } -void stop_clients(int top) +static void stop_clients(void) { Window dummy, parent; Window *children; unsigned int nchildren; unsigned int i; - XWindowAttributes attr; Display *Dpy = gdk_x11_get_default_xdisplay(); Window Root = gdk_x11_get_default_root_xwindow(); @@ -707,43 +715,43 @@ nchildren = 0; XQueryTree(Dpy, Root, &dummy, &parent, &children, &nchildren); - if( !top ) - { - for( i = 0; i < nchildren; i++ ) - { - if( XGetWindowAttributes(Dpy, children[i], &attr) && (attr.map_state == IsViewable) ) -#if HAVE_LIBXMU - children[i] = XmuClientWindow(Dpy, children[i]); -#else - children[i] = children[i]; -#endif - else - children[i] = 0; - } - } for( i = 0; i < nchildren; i++ ) if( children[i] && !is_my_id(children[i]) ) XKillClient(Dpy, children[i]); + //printf("kill %d\n",i); XFree( (char *)children ); XSync(Dpy, 0); XSetErrorHandler(NULL); } -static void on_session_stop(GPid pid, gint status, gpointer data) +static int get_run_level(void) { - int code = WEXITSTATUS(status); + int res=0; + struct utmp *ut,tmp; + setutent(); + tmp.ut_type=RUN_LVL; + ut=getutid(&tmp); + if(!ut) return 0; + res=ut->ut_pid & 0xff; + endutent(); + //log_print("runlevel %c\n",res); + return res; +} + +static void on_session_stop(GPid pid, gint status, gpointer data) +{ killpg(pid, SIGHUP); stop_pid(pid); child = -1; + int level; if( server > 0 ) { /* FIXME just work around lxde bug of focus can't set */ - //stop_clients(0); - stop_clients(1); + stop_clients(); free_my_xid(); } #if HAVE_LIBPAM @@ -758,13 +766,17 @@ unsetenv("XDG_SESSION_COOKIE"); } #endif - if( code == 0 ) - /* xterm will quit use this, but we shul not quit here */ - /* so wait someone to kill me may better */ - //lxdm_quit_self(); - sleep(2); - + level=get_run_level(); + if(level=='0' || level=='6') + { + if(level=='0') + g_spawn_command_line_sync("/etc/lxdm/PreShutdown",0,0,0,0); + else + g_spawn_command_line_sync("/etc/lxdm/PreReboot",0,0,0,0); + lxdm_quit_self(0); + } ui_prepare(); + g_spawn_command_line_async("/etc/lxdm/PostLogout",NULL); } static void replace_env(char** env, const char* name, const char* new_val) @@ -895,10 +907,10 @@ /* override $PATH if needed */ path = g_key_file_get_string(config, "base", "path", 0); - if( G_UNLIKELY(path) && path[0] ) - replace_env(env, "PATH=", path); - else - replace_env(env, "PATH=","/usr/local/bin:/bin:/usr/bin"); + if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ + replace_env(env, "PATH=", path); /* override current $PATH with config value */ + else /* don't use the global env, they are bad for user */ + replace_env(env, "PATH=", "/usr/local/bin:/bin:/usr/bin"); /* set proper default */ g_free(path); /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ if( lang && lang[0] ) @@ -906,42 +918,9 @@ replace_env(env, "LANG=", lang); replace_env(env, "LC_MESSAGES=", lang); replace_env(env, "LANGUAGE=", lang); - } - -#if HAVE_LIBPAM -#if 0 - append_pam_environ(env); -#endif -#endif - -#if 0 - if( !session || !session[0] ) /* this means use default session */ - session = g_key_file_get_string(config, "base", "session", 0); - if( !session && getenv("PREFERRED") ) - session = g_strdup( getenv("PREFERRED") ); - if( !session && getenv("DESKTOP") ) - { - char *p = getenv("DESKTOP"); - if( !strcmp(p, "LXDE") ) - session = g_find_program_in_path("startlxde"); - else if( !strcmp(p, "GNOME") ) - session = g_find_program_in_path("gnome-session"); - else if( !strcmp(p, "KDE") ) - session = g_find_program_in_path("startkde"); - else if( !strcmp(p, "XFCE") ) - session = g_strdup("startxfce4"); - else - session = g_strdup(p); - } - if( !session ) - session = g_strdup(""); - - switch_user(pw, session, env); -#else - switch_user(pw, session_exec, env); -#endif - reason = 4; - exit(EXIT_FAILURE); + } + switch_user(pw, session_exec, env); + lxdm_quit_self(4); } g_free(session_name); g_free(session_exec); @@ -953,7 +932,8 @@ char *cmd; cmd = g_key_file_get_string(config, "cmd", "reboot", 0); if( !cmd ) cmd = g_strdup("reboot"); - system(cmd); + g_spawn_command_line_sync("/etc/lxdm/PreReboot",0,0,0,0); + g_spawn_command_line_async(cmd,0); g_free(cmd); lxdm_quit_self(0); } @@ -963,8 +943,9 @@ char *cmd; cmd = g_key_file_get_string(config, "cmd", "shutdown", 0); if( !cmd ) cmd = g_strdup("shutdown -h now"); + g_spawn_command_line_sync("/etc/lxdm/PreReboot",0,0,0,0); reason = 1; - system(cmd); + g_spawn_command_line_async(cmd,0); g_free(cmd); lxdm_quit_self(0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxdm/src/ui.c new/lxdm/src/ui.c --- old/lxdm/src/ui.c 2010-02-19 21:41:48.000000000 +0100 +++ new/lxdm/src/ui.c 2010-03-12 18:37:49.000000000 +0100 @@ -372,13 +372,6 @@ static void greeter_setup(gpointer user) { - struct passwd *pw; - if( AUTH_SUCCESS == lxdm_auth_user("lxdm", NULL, &pw) ) - { - initgroups(pw->pw_name, pw->pw_gid); - setgid(pw->pw_gid); - setuid(pw->pw_uid); - } } static gchar *greeter_param(char *str, char *name) @@ -470,6 +463,8 @@ dpy = gdk_x11_get_default_xdisplay(); root = gdk_get_default_root_window(); + XSetInputFocus(dpy,GDK_WINDOW_XWINDOW(root),RevertToNone,CurrentTime); + /* if session is running */ if( lxdm_cur_session() > 0 ) return; @@ -590,7 +585,8 @@ /* draw the first time */ gdk_window_show(win); - gdk_window_focus(win, 0); + //gdk_window_focus(win, GDK_CURRENT_TIME); + XSetInputFocus(dpy,GDK_WINDOW_XWINDOW(win),RevertToNone,CurrentTime); } void ui_add_cursor(void) @@ -605,10 +601,11 @@ int ui_main(void) { GMainLoop *loop = g_main_loop_new(NULL, 0); - ui_add_cursor(); ui_prepare(); + ui_add_cursor(); if(greeter == -1) /* if greeter is not used */ gdk_event_handler_set(ui_event_cb, 0, 0); + g_spawn_command_line_async("/etc/lxdm/LoginReady",NULL); g_main_loop_run(loop); return 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org