diff options
| author | Jesús González <jgonzalez@gdr-sistemas.com> | 2015-02-13 11:47:09 +0100 |
|---|---|---|
| committer | Jesús González <jgonzalez@gdr-sistemas.com> | 2015-02-13 11:47:09 +0100 |
| commit | 27a369121fa4fc2146dbc5653139b06ff6301ab2 (patch) | |
| tree | c054e9bb409215f1b2f7dfdbc8a3a8cceda74dec | |
| parent | 850aad05441d414e9bdc9cd80cd8e8bca8bede2b (diff) | |
| parent | 7b6a695d2b5eb47c41d468cbceca256833f0a790 (diff) | |
| download | lightdm-27a369121fa4fc2146dbc5653139b06ff6301ab2.tar.gz | |
Merged changes from parent branch.
Fixed "lock-seat-after-vt-switch" test to expect X server reuse by the new greeter instead of X server reinitiation.
120 files changed, 711 insertions, 214 deletions
@@ -1,3 +1,8 @@ +Overview of changes in lightdm 1.13.1 + + * Don't attempt generate D-Bus seat/session removal signals on shutdown. + * Add missing method QLightDM::Greeter::cancelAutologin + Overview of changes in lightdm 1.13.0 * Fix crash when having configuration keys defined in multiple places diff --git a/configure.ac b/configure.ac index ca820a9d..decd05ec 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.13.0) +AC_INIT(lightdm, 1.13.1) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) diff --git a/data/Makefile.am b/data/Makefile.am index b5601b94..f7f73af9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -12,6 +12,9 @@ dist_pam_DATA = pam/lightdm \ pam/lightdm-autologin \ pam/lightdm-greeter +completionsdir = $(datadir)/bash-completion/completions +dist_completions_DATA = bash-completion/dm-tool bash-completion/lightdm + lightdm-guest-session: $(srcdir)/apparmor/lightdm-guest-session.in sed -e 's|@libexecdir[@]|$(libexecdir)|g' $< >$@ diff --git a/data/bash-completion/dm-tool b/data/bash-completion/dm-tool new file mode 100644 index 00000000..15503959 --- /dev/null +++ b/data/bash-completion/dm-tool @@ -0,0 +1,51 @@ +#-*- mode: shell-script;-*- + +_dm_tool() +{ + local cur prev opts + _init_completion || return + opts='switch-to-greeter switch-to-user switch-to-guest lock list-seats add-nested-seat add-local-x-seat add-seat' + + case "$prev" in + switch-to-greeter) + return 0 + ;; + switch-to-user) + COMPREPLY=($(compgen -u -- "${cur}")) + return 0 + ;; + switch-to-guest) + # FIXME: session name + return 0 + ;; + lock) + return 0 + ;; + list-seats) + return 0 + ;; + add-nested-seat) + # FIXME ... + return 0 + ;; + add-local-x-seat) + # FIXME ... + return 0 + ;; + add-seat) + # FIXME ... + return 0 + ;; + *) + ;; + esac + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) ) + return 0 + fi + + COMPREPLY=($(compgen -W "${opts}" -- "${cur}")) + return 0 +} +complete -F _dm_tool dm-tool diff --git a/data/bash-completion/lightdm b/data/bash-completion/lightdm new file mode 100644 index 00000000..759b0b8b --- /dev/null +++ b/data/bash-completion/lightdm @@ -0,0 +1,13 @@ +#-*- mode: shell-script;-*- + +_lightdm() +{ + local cur prev opts + _init_completion || return + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) ) + return 0 + fi +} +complete -F _lightdm lightdm diff --git a/debian/changelog b/debian/changelog index dc824662..97ce59a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +lightdm (1.13.1-0ubuntu2) vivid; urgency=medium + + * debian/guest-account.sh: + - Rename variables to make script compatible with Bash (LP: #1411100) + * debian/control: + - Set required version of bash + + -- Robert Ancell <robert.ancell@canonical.com> Wed, 21 Jan 2015 12:20:42 +1300 + +lightdm (1.13.1-0ubuntu1) vivid; urgency=medium + + * New upstream release: + - Don't attempt generate D-Bus seat/session removal signals on shutdown. + - Add missing method QLightDM::Greeter::cancelAutologin + + -- Robert Ancell <robert.ancell@canonical.com> Wed, 14 Jan 2015 14:00:02 +1300 + lightdm (1.13.0-0ubuntu2) vivid; urgency=medium * debian/config-error-dialog.sh: diff --git a/debian/control b/debian/control index 04a2a383..cf40588f 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,7 @@ Depends: ${misc:Depends}, libglib2.0-bin, dbus, plymouth (>= 0.8.8-0ubuntu18), - bash, + bash (>= 4.3), Recommends: xserver-xorg, unity-greeter | lightdm-greeter | lightdm-kde-greeter, Conflicts: liblightdm-gobject-0-0, diff --git a/debian/guest-account.sh b/debian/guest-account.sh index 60908984..6da56878 100644 --- a/debian/guest-account.sh +++ b/debian/guest-account.sh @@ -119,46 +119,46 @@ add_account () remove_account () { - USER=$1 + GUEST_USER=$1 - PWENT=`getent passwd "$USER"` || { - echo "Error: invalid user $USER" + PWENT=`getent passwd "$GUEST_USER"` || { + echo "Error: invalid user $GUEST_USER" exit 1 } - UID=`echo "$PWENT" | cut -f3 -d:` - HOME=`echo "$PWENT" | cut -f6 -d:` + GUEST_UID=`echo "$PWENT" | cut -f3 -d:` + GUEST_HOME=`echo "$PWENT" | cut -f6 -d:` - if [ "$UID" -ge 500 ]; then - echo "Error: user $USER is not a system user." + if [ "$GUEST_UID" -ge 500 ]; then + echo "Error: user $GUEST_USER is not a system user." exit 1 fi - if [ "${HOME}" = "${HOME#/tmp/}" ]; then - echo "Error: home directory $HOME is not in /tmp/." + if [ "${GUEST_HOME}" = "${GUEST_HOME#/tmp/}" ]; then + echo "Error: home directory $GUEST_HOME is not in /tmp/." exit 1 fi # kill all remaining processes - while ps h -u "$USER" >/dev/null; do - killall -9 -u "$USER" || true + while ps h -u "$GUEST_USER" >/dev/null; do + killall -9 -u "$GUEST_USER" || true sleep 0.2; done - umount "$HOME" || umount -l "$HOME" || true - rm -rf "$HOME" + umount "$GUEST_HOME" || umount -l "$GUEST_HOME" || true + rm -rf "$GUEST_HOME" # remove leftovers in /tmp - find /tmp -mindepth 1 -maxdepth 1 -uid "$UID" -print0 | xargs -0 rm -rf || true + find /tmp -mindepth 1 -maxdepth 1 -uid "$GUEST_UID" -print0 | xargs -0 rm -rf || true # remove possible /media/guest-XXXXXX folder - if [ -d /media/"$USER" ]; then - for dir in $( find /media/"$USER" -mindepth 1 -maxdepth 1 ); do + if [ -d /media/"$GUEST_USER" ]; then + for dir in $( find /media/"$GUEST_USER" -mindepth 1 -maxdepth 1 ); do umount "$dir" || true done - rmdir /media/"$USER" || true + rmdir /media/"$GUEST_USER" || true fi - deluser --system "$USER" + deluser --system "$GUEST_USER" } case "$1" in diff --git a/debian/po/af.po b/debian/po/af.po index 7719249e..26ba5256 100644 --- a/debian/po/af.po +++ b/debian/po/af.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/am.po b/debian/po/am.po new file mode 100644 index 00000000..8b7a67fe --- /dev/null +++ b/debian/po/am.po @@ -0,0 +1,51 @@ +# Amharic translation for lightdm +# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015 +# This file is distributed under the same license as the lightdm package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: lightdm\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2007-05-31 08:04+0200\n" +"PO-Revision-Date: 2015-01-11 23:24+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Amharic <am@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" + +#. Type: select +#. Description +#: ../lightdm.templates:2001 +msgid "Default display manager:" +msgstr "" + +#. Type: select +#. Description +#: ../lightdm.templates:2001 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" + +#. Type: select +#. Description +#: ../lightdm.templates:2001 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" + +#. Type: select +#. Description +#: ../lightdm.templates:2001 +msgid "" +"Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager." +msgstr "" diff --git a/debian/po/an.po b/debian/po/an.po index 90d400b6..5d6e8c06 100644 --- a/debian/po/an.po +++ b/debian/po/an.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ar.po b/debian/po/ar.po index fa535e91..bbb985c0 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ast.po b/debian/po/ast.po index 5745dfd7..8ccd94ab 100644 --- a/debian/po/ast.po +++ b/debian/po/ast.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/az.po b/debian/po/az.po index fe85a572..186247f0 100644 --- a/debian/po/az.po +++ b/debian/po/az.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/be.po b/debian/po/be.po index 9d65692a..71772a20 100644 --- a/debian/po/be.po +++ b/debian/po/be.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/bg.po b/debian/po/bg.po index 6b343571..54e85a93 100644 --- a/debian/po/bg.po +++ b/debian/po/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/bn.po b/debian/po/bn.po index 5bb94471..01d44f41 100644 --- a/debian/po/bn.po +++ b/debian/po/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/bo.po b/debian/po/bo.po index 62eb116c..42138265 100644 --- a/debian/po/bo.po +++ b/debian/po/bo.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/br.po b/debian/po/br.po index 521f0e21..59181632 100644 --- a/debian/po/br.po +++ b/debian/po/br.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/bs.po b/debian/po/bs.po index cdbf4d08..3f394030 100644 --- a/debian/po/bs.po +++ b/debian/po/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ca.po b/debian/po/ca.po index e2f15b78..ea8da83e 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ca@valencia.po b/debian/po/ca@valencia.po index 836cd606..c663550d 100644 --- a/debian/po/ca@valencia.po +++ b/debian/po/ca@valencia.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ce.po b/debian/po/ce.po index 8f208ca5..884154bf 100644 --- a/debian/po/ce.po +++ b/debian/po/ce.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ckb.po b/debian/po/ckb.po index f2e333d6..9893a7f2 100644 --- a/debian/po/ckb.po +++ b/debian/po/ckb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/cs.po b/debian/po/cs.po index 360bb096..5a9c9501 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/cy.po b/debian/po/cy.po index edef1626..c0b6ad4b 100644 --- a/debian/po/cy.po +++ b/debian/po/cy.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/da.po b/debian/po/da.po index 69eadd35..3cd290fb 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/de.po b/debian/po/de.po index 8878130a..5bcc2ed5 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/el.po b/debian/po/el.po index 2e749421..4ebb1f01 100644 --- a/debian/po/el.po +++ b/debian/po/el.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/en_AU.po b/debian/po/en_AU.po index e905ff6b..7206525d 100644 --- a/debian/po/en_AU.po +++ b/debian/po/en_AU.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/en_CA.po b/debian/po/en_CA.po index bded826f..1420eda9 100644 --- a/debian/po/en_CA.po +++ b/debian/po/en_CA.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po index a4f66c83..daa3264d 100644 --- a/debian/po/en_GB.po +++ b/debian/po/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/eo.po b/debian/po/eo.po index b635b3af..0f248f4b 100644 --- a/debian/po/eo.po +++ b/debian/po/eo.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/es.po b/debian/po/es.po index e1bb4397..9e4fb241 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/et.po b/debian/po/et.po index 670cbbda..b217339b 100644 --- a/debian/po/et.po +++ b/debian/po/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/eu.po b/debian/po/eu.po index 0be5e8f1..6b344e81 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/fa.po b/debian/po/fa.po index 02641621..a7baa510 100644 --- a/debian/po/fa.po +++ b/debian/po/fa.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/fi.po b/debian/po/fi.po index d28d94bc..004e544b 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/fo.po b/debian/po/fo.po index a34fd301..bf8a60ef 100644 --- a/debian/po/fo.po +++ b/debian/po/fo.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/fr.po b/debian/po/fr.po index 88318607..aee0c3f7 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/fr_CA.po b/debian/po/fr_CA.po index 9f787ccb..c9d29c9f 100644 --- a/debian/po/fr_CA.po +++ b/debian/po/fr_CA.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/fy.po b/debian/po/fy.po index 40097156..95f78c2c 100644 --- a/debian/po/fy.po +++ b/debian/po/fy.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ga.po b/debian/po/ga.po index 981c852b..96a3f2d5 100644 --- a/debian/po/ga.po +++ b/debian/po/ga.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/gd.po b/debian/po/gd.po index 43fbec55..e2fec4dc 100644 --- a/debian/po/gd.po +++ b/debian/po/gd.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/gl.po b/debian/po/gl.po index 6fac5782..251ba9b8 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/gu.po b/debian/po/gu.po index 33e7875f..9a7e04a0 100644 --- a/debian/po/gu.po +++ b/debian/po/gu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/he.po b/debian/po/he.po index c8ee67dd..6f4a8d84 100644 --- a/debian/po/he.po +++ b/debian/po/he.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/hi.po b/debian/po/hi.po index d5506086..47d4691d 100644 --- a/debian/po/hi.po +++ b/debian/po/hi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/hr.po b/debian/po/hr.po index f5e17312..0867de38 100644 --- a/debian/po/hr.po +++ b/debian/po/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ht.po b/debian/po/ht.po index f11cce69..7d2702f5 100644 --- a/debian/po/ht.po +++ b/debian/po/ht.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/hu.po b/debian/po/hu.po index 7e82e049..fca518a0 100644 --- a/debian/po/hu.po +++ b/debian/po/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/hy.po b/debian/po/hy.po index da57154b..4bcc81c3 100644 --- a/debian/po/hy.po +++ b/debian/po/hy.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ia.po b/debian/po/ia.po index 1c1ac297..de0ac849 100644 --- a/debian/po/ia.po +++ b/debian/po/ia.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/id.po b/debian/po/id.po index c81d124f..995f3856 100644 --- a/debian/po/id.po +++ b/debian/po/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/is.po b/debian/po/is.po index 774bdfd8..ee91c9c2 100644 --- a/debian/po/is.po +++ b/debian/po/is.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/it.po b/debian/po/it.po index ceb66382..9e97e516 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ja.po b/debian/po/ja.po index 4f9b8075..61103607 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/kk.po b/debian/po/kk.po index 0b743d3a..807bac9c 100644 --- a/debian/po/kk.po +++ b/debian/po/kk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/kl.po b/debian/po/kl.po index ff2677bb..ea00a8ec 100644 --- a/debian/po/kl.po +++ b/debian/po/kl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/km.po b/debian/po/km.po index b15087f4..6ea6d3de 100644 --- a/debian/po/km.po +++ b/debian/po/km.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/kn.po b/debian/po/kn.po index 14adc945..43c57c9b 100644 --- a/debian/po/kn.po +++ b/debian/po/kn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ko.po b/debian/po/ko.po index 8fd7ddc3..fbfa9dbe 100644 --- a/debian/po/ko.po +++ b/debian/po/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ku.po b/debian/po/ku.po index 1bb5e09a..045baf1f 100644 --- a/debian/po/ku.po +++ b/debian/po/ku.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/lb.po b/debian/po/lb.po index e7b6857f..0b0238cc 100644 --- a/debian/po/lb.po +++ b/debian/po/lb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/lt.po b/debian/po/lt.po index 90c6abcc..54760a4a 100644 --- a/debian/po/lt.po +++ b/debian/po/lt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/lv.po b/debian/po/lv.po index c98c752b..33ce1b86 100644 --- a/debian/po/lv.po +++ b/debian/po/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/mhr.po b/debian/po/mhr.po index b0104fb9..fab1af5a 100644 --- a/debian/po/mhr.po +++ b/debian/po/mhr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/mi.po b/debian/po/mi.po index 3f4ec0df..3f475594 100644 --- a/debian/po/mi.po +++ b/debian/po/mi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ml.po b/debian/po/ml.po index 9229dc8e..f65edd36 100644 --- a/debian/po/ml.po +++ b/debian/po/ml.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/mr.po b/debian/po/mr.po index 839a9f15..ae268c98 100644 --- a/debian/po/mr.po +++ b/debian/po/mr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ms.po b/debian/po/ms.po index 24dd291e..6c32fd54 100644 --- a/debian/po/ms.po +++ b/debian/po/ms.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/my.po b/debian/po/my.po index 329a4450..54c4d21e 100644 --- a/debian/po/my.po +++ b/debian/po/my.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/nb.po b/debian/po/nb.po index 0d051de1..e5d69cda 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/nl.po b/debian/po/nl.po index 0465168a..59e21d27 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/nn.po b/debian/po/nn.po index aebc777d..dd3ab432 100644 --- a/debian/po/nn.po +++ b/debian/po/nn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/oc.po b/debian/po/oc.po index 2e9d20fc..f32a9fff 100644 --- a/debian/po/oc.po +++ b/debian/po/oc.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/pa.po b/debian/po/pa.po index cf296c60..34eef38f 100644 --- a/debian/po/pa.po +++ b/debian/po/pa.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/pl.po b/debian/po/pl.po index b4c2a695..2d43d680 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/pt.po b/debian/po/pt.po index 675d8699..af0b608f 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 24cfec94..6352aa4b 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ro.po b/debian/po/ro.po index d5dbdd0f..985a712e 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ru.po b/debian/po/ru.po index 86fba5f4..ffffcc4f 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/sc.po b/debian/po/sc.po index 15b25806..e37fa820 100644 --- a/debian/po/sc.po +++ b/debian/po/sc.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/sd.po b/debian/po/sd.po index 57ba7726..c1fb4982 100644 --- a/debian/po/sd.po +++ b/debian/po/sd.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/shn.po b/debian/po/shn.po index 85a5eb50..224e3fdf 100644 --- a/debian/po/shn.po +++ b/debian/po/shn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/si.po b/debian/po/si.po index acf5a788..6219955f 100644 --- a/debian/po/si.po +++ b/debian/po/si.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/sk.po b/debian/po/sk.po index 567d8af7..e1ad0bd4 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/sl.po b/debian/po/sl.po index 3cff81f8..075a225b 100644 --- a/debian/po/sl.po +++ b/debian/po/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/sq.po b/debian/po/sq.po index b22fa805..3324fa10 100644 --- a/debian/po/sq.po +++ b/debian/po/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/sr.po b/debian/po/sr.po index e49483f3..130442aa 100644 --- a/debian/po/sr.po +++ b/debian/po/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:56+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" "Language: sr\n" #. Type: select diff --git a/debian/po/sv.po b/debian/po/sv.po index 5af512a4..6ed59bfc 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ta.po b/debian/po/ta.po index e068654f..bec8ad1c 100644 --- a/debian/po/ta.po +++ b/debian/po/ta.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/te.po b/debian/po/te.po index 83b8a3fd..cd7b0cde 100644 --- a/debian/po/te.po +++ b/debian/po/te.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/tg.po b/debian/po/tg.po index dcef3733..28bd16b4 100644 --- a/debian/po/tg.po +++ b/debian/po/tg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/th.po b/debian/po/th.po index 182d896e..33d3afd2 100644 --- a/debian/po/th.po +++ b/debian/po/th.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/tl.po b/debian/po/tl.po index 9f098ef1..ecc1456e 100644 --- a/debian/po/tl.po +++ b/debian/po/tl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/tr.po b/debian/po/tr.po index 4d370316..4078ed94 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ug.po b/debian/po/ug.po index e4e6e57c..b245f420 100644 --- a/debian/po/ug.po +++ b/debian/po/ug.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/uk.po b/debian/po/uk.po index 15f4d324..9c6faac2 100644 --- a/debian/po/uk.po +++ b/debian/po/uk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/ur.po b/debian/po/ur.po index 3eca2169..d576097f 100644 --- a/debian/po/ur.po +++ b/debian/po/ur.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/uz.po b/debian/po/uz.po index f2c233a1..42552cbe 100644 --- a/debian/po/uz.po +++ b/debian/po/uz.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/vi.po b/debian/po/vi.po index 88cbcd71..010a2ed1 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/wae.po b/debian/po/wae.po index 6ea97252..5f30cb5b 100644 --- a/debian/po/wae.po +++ b/debian/po/wae.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index 3c7343d9..3fc0d64c 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/zh_HK.po b/debian/po/zh_HK.po index 3b4495e8..4ff97516 100644 --- a/debian/po/zh_HK.po +++ b/debian/po/zh_HK.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po index f51b9115..5d529168 100644 --- a/debian/po/zh_TW.po +++ b/debian/po/zh_TW.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-12-26 05:57+0000\n" -"X-Generator: Launchpad (build 17286)\n" +"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n" +"X-Generator: Launchpad (build 17330)\n" #. Type: select #. Description diff --git a/src/lightdm.c b/src/lightdm.c index 48a44ab5..8c52d1e1 100644 --- a/src/lightdm.c +++ b/src/lightdm.c @@ -1081,6 +1081,31 @@ static void login1_active_session_changed_cb (Login1Seat *login1_seat, const gchar *login1_session_id) { g_debug ("Seat %s changes active session to %s", login1_seat_get_id (login1_seat), login1_session_id); + + Seat *seat; + seat = display_manager_get_seat (display_manager, login1_seat_get_id (login1_seat)); + + if (seat) + { + Session *active_session; + active_session = seat_get_expected_active_session (seat); + + if (g_strcmp0 (login1_session_id, session_get_login1_session_id (active_session)) == 0) + { + // Session is already active + g_debug ("Session %s is already active", login1_session_id); + return; + } + + active_session = seat_find_session_by_login1_id (seat, login1_session_id); + if (active_session != NULL) + { + g_debug ("Activating session %s", login1_session_id); + seat_set_externally_activated_session (seat, active_session); + return; + + } + } } static gboolean diff --git a/src/login1.c b/src/login1.c index 8e8340de..af8e8a8e 100644 --- a/src/login1.c +++ b/src/login1.c @@ -140,6 +140,7 @@ seat_properties_changed_cb (GDBusConnection *connection, { g_variant_get (result, "(v)", &value); update_property (seat, name, value); + g_variant_unref (value); g_variant_unref (result); } } @@ -272,6 +272,54 @@ seat_get_next_session (Seat *seat) return seat->priv->next_session; } +/** + * Obtains the active session which lightdm expects to be active. + * + * This function is different from seat_get_active_session() in that the + * later (in the case of xlocal seats) dynamically finds the session that is + * really active (based on the active VT), whereas this function returns the + * session that lightdm activated last by itself, which may not be the actual + * active session (i.e. VT changes). + */ +Session * +seat_get_expected_active_session (Seat *seat) +{ + g_return_val_if_fail (seat != NULL, NULL); + return seat->priv->active_session; +} + +/** + * Sets the active session which lightdm expects to be active. + * + * This function is different from seat_set_active_session() in that the + * later performs an actual session activation, whereas this function just + * updates the active session after the session has been activated by some + * means external to lightdm (i.e. VT changes). + */ +void +seat_set_externally_activated_session (Seat *seat, Session *session) +{ + g_return_if_fail (seat != NULL); + if (seat->priv->active_session) + g_object_unref (seat->priv->active_session); + seat->priv->active_session = g_object_ref (session); +} + +Session * +seat_find_session_by_login1_id (Seat *seat, const gchar *login1_session_id) +{ + GList *session_link; + + for (session_link = seat->priv->sessions; session_link; session_link = session_link->next) + { + Session *session = session_link->data; + if (g_strcmp0 (login1_session_id, session_get_login1_session_id (session)) == 0) + return session; + } + + return NULL; +} + gboolean seat_get_can_switch (Seat *seat) { @@ -93,6 +93,12 @@ Session *seat_get_active_session (Seat *seat); Session *seat_get_next_session (Seat *seat); +void seat_set_externally_activated_session (Seat *seat, Session *session); + +Session *seat_get_expected_active_session (Seat *seat); + +Session *seat_find_session_by_login1_id (Seat *seat, const gchar *login1_session_id); + gboolean seat_get_can_switch (Seat *seat); gboolean seat_get_allow_guest (Seat *seat); diff --git a/src/session.c b/src/session.c index 66d138d8..26d0ce97 100644 --- a/src/session.c +++ b/src/session.c @@ -653,6 +653,13 @@ session_get_username (Session *session) } const gchar * +session_get_login1_session_id (Session *session) +{ + g_return_val_if_fail (session != NULL, NULL); + return session->priv->login1_session_id; +} + +const gchar * session_get_console_kit_cookie (Session *session) { g_return_val_if_fail (session != NULL, NULL); diff --git a/src/session.h b/src/session.h index 513fd12d..c62303e6 100644 --- a/src/session.h +++ b/src/session.h @@ -115,6 +115,8 @@ gboolean session_get_is_started (Session *session); const gchar *session_get_username (Session *session); +const gchar *session_get_login1_session_id (Session *session); + const gchar *session_get_console_kit_cookie (Session *session); void session_respond (Session *session, struct pam_response *response); diff --git a/tests/Makefile.am b/tests/Makefile.am index 2dc06ad7..ec291966 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -129,6 +129,7 @@ TESTS = \ test-upstart-login \ test-dbus \ test-lock-seat \ + test-lock-seat-after-vt-switch \ test-lock-seat-twice \ test-lock-seat-resettable \ test-lock-seat-return-session \ @@ -410,6 +411,7 @@ EXTRA_DIST = \ scripts/language-env.conf \ scripts/language-no-accounts-service.conf \ scripts/lock-seat.conf \ + scripts/lock-seat-after-vt-switch.conf scripts/lock-seat-console-kit.conf \ scripts/lock-seat-resettable.conf \ scripts/lock-seat-return-session.conf \ diff --git a/tests/scripts/lock-seat-after-vt-switch.conf b/tests/scripts/lock-seat-after-vt-switch.conf new file mode 100644 index 00000000..35d7cac8 --- /dev/null +++ b/tests/scripts/lock-seat-after-vt-switch.conf @@ -0,0 +1,84 @@ +# +# Check that a seat is locked properly when it has been unlocked by switching +# back to the user session and using the screensaver to unlock it. +# + +[SeatDefaults] +autologin-user=have-password1 +user-session=default + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 SEAT=seat0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Session starts +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Lock the seat +#?*SESSION-X-0 LOCK-SEAT +#?SESSION-X-0 LOCK-SEAT + +# New X server starts +#?XSERVER-1 START VT=8 SEAT=seat0 + +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY +#?XSERVER-1 ACCEPT-CONNECT + +# Session is locked +#?LOGIN1 LOCK-SESSION SESSION=c0 + +# Greeter starts +#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON +#?GREETER-X-1 LOCK-HINT + +# Session is switched to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?VT ACTIVATE VT=8 + +# External program switches back to the first session +#?*UPDATE-SEAT ID=seat0 ACTIVE-SESSION=c0 + +# Session is unlocked using the screensaver +#?*UNLOCK-SESSION SESSION=c0 +#?RUNNER UNLOCK-SESSION SESSION=c0 + +# Lock the seat again +#?*SESSION-X-0 LOCK-SEAT +#?SESSION-X-0 LOCK-SEAT +#?LOGIN1 LOCK-SESSION SESSION=c0 + +# Old greeter is stopped +#?GREETER-X-1 TERMINATE SIGNAL=15 + +# A new greeter is started and activated on the same X server +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 +#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON +#?GREETER-X-1 LOCK-HINT + +# Cleanup +#?*STOP-DAEMON +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-guest.conf b/tests/scripts/vnc-guest.conf new file mode 100644 index 00000000..820b2324 --- /dev/null +++ b/tests/scripts/vnc-guest.conf @@ -0,0 +1,66 @@ +# +# Check can log into a guest account via VNC +# + +[LightDM] +start-default-seat=false + +[VNCServer] +enabled=true + +[SeatDefaults] +user-session=default + +#?*START-DAEMON +#?RUNNER DAEMON-START +#?*WAIT + +# Start a VNC client +#?*START-VNC-CLIENT +#?VNC-CLIENT START +#?VNC-CLIENT CONNECT + +# Xvnc server starts +#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Negotiate with Xvnc +#?*XSERVER-0 START-VNC +#?VNC-CLIENT CONNECTED VERSION="RFB 003.007" + +# VNC client connects to X server +#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" + +# Greeter starts and connects to remote X server +#?GREETER-X-0 START XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON + +# Log in +#?*GREETER-X-0 AUTHENTICATE-GUEST +#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 + +# Guest account created +#?GUEST-ACCOUNT ADD USERNAME=guest-.* + +# Guest session starts +#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Clean up +#?*STOP-DAEMON +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest-.* +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/xdmcp-server-guest.conf b/tests/scripts/xdmcp-server-guest.conf new file mode 100644 index 00000000..9553a49d --- /dev/null +++ b/tests/scripts/xdmcp-server-guest.conf @@ -0,0 +1,62 @@ +# +# Check can log into a guest account via XDMCP +# + +[LightDM] +start-default-seat=false + +[XDMCPServer] +enabled=true + +[SeatDefaults] +user-session=default + +#?*START-DAEMON +#?RUNNER DAEMON-START +#?*WAIT + +# Start a remote X server to log in with XDMCP +#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix" +#?XSERVER-98 START + +# Start sending XDMCP queries +#?*XSERVER-98 START-XDMCP +#?XSERVER-98 SEND-QUERY + +# Negotiate with daemon +#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS="" +#?XSERVER-98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER" +#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" +#?XSERVER-98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS" + +# LightDM connects to X server +#?XSERVER-98 ACCEPT-CONNECT + +# Greeter starts and connects to remote X server +#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-98 ACCEPT-CONNECT +#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER +#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON +#?GREETER-X-127.0.0.1:98 CONNECTED-TO-DAEMON + +# Log in +#?*GREETER-X-127.0.0.1:98 AUTHENTICATE-GUEST +#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE +#?*GREETER-X-127.0.0.1:98 START-SESSION +#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15 + +# Guest account created +#?GUEST-ACCOUNT ADD USERNAME=guest-.* + +# Guest session starts +#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?XSERVER-98 ACCEPT-CONNECT +#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER + +# Clean up +#?*STOP-DAEMON +#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest-.* +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index abad4865..e66dead8 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -110,6 +110,7 @@ typedef struct gchar *path; gboolean can_graphical; gboolean can_multi_session; + gchar *active_session; } Login1Seat; static GList *login1_seats = NULL; @@ -142,6 +143,7 @@ static void check_status (const gchar *status); static AccountsUser *get_accounts_user_by_uid (guint uid); static AccountsUser *get_accounts_user_by_name (const gchar *username); static void accounts_user_set_hidden (AccountsUser *user, gboolean hidden, gboolean emit_signal); +static Login1Session *find_login1_session (const gchar *id); static gboolean kill_timeout_cb (gpointer data) @@ -567,6 +569,13 @@ handle_command (const gchar *command) seat->can_multi_session = strcmp (v, "TRUE") == 0; g_variant_builder_add (&invalidated_properties, "s", "CanMultiSession"); } + v = g_hash_table_lookup (params, "ACTIVE-SESSION"); + if (v) + { + g_free (seat->active_session); + seat->active_session = g_strdup (v); + g_variant_builder_add (&invalidated_properties, "s", "ActiveSession"); + } g_dbus_connection_emit_signal (g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL), NULL, @@ -917,6 +926,26 @@ handle_command (const gchar *command) check_status (status_text); g_free (status_text); } + else if (strcmp (name, "UNLOCK-SESSION") == 0) + { + gchar *status_text, *id; + Login1Session *session; + + id = g_hash_table_lookup (params, "SESSION"); + session = find_login1_session (id); + if (session) + { + if (!session->locked) + g_warning ("Session %s is not locked", id); + session->locked = FALSE; + } + else + g_warning ("Unknown session %s", id); + + status_text = g_strdup_printf ("RUNNER UNLOCK-SESSION SESSION=%s", id); + check_status (status_text); + g_free (status_text); + } /* Forward to external processes */ else if (g_str_has_prefix (name, "SESSION-") || g_str_has_prefix (name, "GREETER-") || @@ -1481,6 +1510,22 @@ handle_login1_seat_get_property (GDBusConnection *connection, return g_variant_new_boolean (seat->can_multi_session); else if (strcmp (property_name, "Id") == 0) return g_variant_new_string (seat->id); + else if (strcmp (property_name, "ActiveSession") == 0) + { + if (seat->active_session) + { + gchar *path; + GVariant *ret; + + path = g_strdup_printf ("/org/freedesktop/login1/session/%s", seat->active_session); + ret = g_variant_new ("(so)", seat->active_session, path); + g_free (path); + + return ret; + } + else + return NULL; + } else return NULL; } @@ -1497,6 +1542,7 @@ add_login1_seat (GDBusConnection *connection, const gchar *id, gboolean emit_sig " <interface name='org.freedesktop.login1.Seat'>" " <property name='CanGraphical' type='b' access='read'/>" " <property name='CanMultiSession' type='b' access='read'/>" + " <property name='ActiveSession' type='(so)' access='read'/>" " <property name='Id' type='s' access='read'/>" " </interface>" "</node>"; @@ -1512,6 +1558,7 @@ add_login1_seat (GDBusConnection *connection, const gchar *id, gboolean emit_sig seat->path = g_strdup_printf ("/org/freedesktop/login1/seat/%s", seat->id); seat->can_graphical = TRUE; seat->can_multi_session = TRUE; + seat->active_session = NULL; login1_seat_info = g_dbus_node_info_new_for_xml (login1_seat_interface, &error); if (error) @@ -1589,6 +1636,7 @@ remove_login1_seat (GDBusConnection *connection, const gchar *id) login1_seats = g_list_remove (login1_seats, seat); g_free (seat->id); g_free (seat->path); + g_free (seat->active_session); g_free (seat); } diff --git a/tests/test-lock-seat-after-vt-switch b/tests/test-lock-seat-after-vt-switch new file mode 100755 index 00000000..1689fe3d --- /dev/null +++ b/tests/test-lock-seat-after-vt-switch @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner lock-seat-after-vt-switch test-gobject-greeter diff --git a/tests/test-vnc-guest b/tests/test-vnc-guest new file mode 100755 index 00000000..5806cbd4 --- /dev/null +++ b/tests/test-vnc-guest @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner vnc-guest test-gobject-greeter diff --git a/tests/test-xdmcp-server-guest b/tests/test-xdmcp-server-guest new file mode 100755 index 00000000..967098ef --- /dev/null +++ b/tests/test-xdmcp-server-guest @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner xdmcp-server-guest test-gobject-greeter |