]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merged changes from parent branch
authorJesús González <jgonzalez@gdr-sistemas.com>
Fri, 21 Nov 2014 07:45:05 +0000 (08:45 +0100)
committerJesús González <jgonzalez@gdr-sistemas.com>
Fri, 21 Nov 2014 07:45:05 +0000 (08:45 +0100)
128 files changed:
NEWS
configure.ac
debian/changelog
debian/config-error-dialog.sh [new file with mode: 0644]
debian/lightdm-session
debian/lightdm.install
debian/patches/04_language_handling.patch
debian/patches/05_translate_debian_files.patch
debian/po/af.po
debian/po/an.po
debian/po/ar.po
debian/po/ast.po
debian/po/az.po
debian/po/be.po
debian/po/bg.po
debian/po/bn.po
debian/po/bo.po
debian/po/br.po
debian/po/bs.po
debian/po/ca.po
debian/po/ca@valencia.po
debian/po/ce.po
debian/po/ckb.po
debian/po/cs.po
debian/po/cy.po
debian/po/da.po
debian/po/de.po
debian/po/el.po
debian/po/en_AU.po
debian/po/en_CA.po
debian/po/en_GB.po
debian/po/eo.po
debian/po/es.po
debian/po/et.po
debian/po/eu.po
debian/po/fa.po
debian/po/fi.po
debian/po/fo.po
debian/po/fr.po
debian/po/fr_CA.po
debian/po/fy.po
debian/po/gd.po
debian/po/gl.po
debian/po/gu.po
debian/po/he.po
debian/po/hi.po
debian/po/hr.po
debian/po/ht.po
debian/po/hu.po
debian/po/hy.po [new file with mode: 0644]
debian/po/ia.po
debian/po/id.po
debian/po/is.po
debian/po/it.po
debian/po/ja.po
debian/po/kk.po
debian/po/kl.po
debian/po/km.po
debian/po/kn.po
debian/po/ko.po
debian/po/ku.po
debian/po/lb.po
debian/po/lt.po
debian/po/lv.po
debian/po/mhr.po
debian/po/mi.po
debian/po/ml.po
debian/po/mr.po
debian/po/ms.po
debian/po/my.po
debian/po/nb.po
debian/po/nl.po
debian/po/nn.po
debian/po/oc.po
debian/po/pa.po
debian/po/pl.po
debian/po/pt.po
debian/po/pt_BR.po
debian/po/ro.po
debian/po/ru.po
debian/po/sc.po
debian/po/sd.po
debian/po/shn.po
debian/po/si.po
debian/po/sk.po
debian/po/sl.po
debian/po/sq.po
debian/po/sr.po
debian/po/sv.po
debian/po/ta.po
debian/po/te.po
debian/po/tg.po
debian/po/th.po
debian/po/tl.po
debian/po/tr.po
debian/po/ug.po
debian/po/uk.po
debian/po/ur.po
debian/po/uz.po
debian/po/vi.po
debian/po/wae.po
debian/po/zh_CN.po
debian/po/zh_HK.po
debian/po/zh_TW.po
src/seat-xremote.c
src/seat.c
src/session-config.c
src/session-config.h
src/session.c
tests/Makefile.am
tests/data/sessions/named-legacy.desktop [new file with mode: 0644]
tests/data/sessions/named.desktop
tests/scripts/vnc-command.conf
tests/scripts/vnc-dimensions.conf
tests/scripts/vnc-login.conf
tests/scripts/vnc-open-file-descriptors.conf
tests/scripts/xdg-current-desktop-legacy.conf [new file with mode: 0644]
tests/scripts/xdg-current-desktop.conf
tests/scripts/xdmcp-client.conf
tests/scripts/xdmcp-server-autologin.conf
tests/scripts/xdmcp-server-double-login.conf
tests/scripts/xdmcp-server-login.conf
tests/scripts/xdmcp-server-open-file-descriptors.conf
tests/src/libsystem.c
tests/src/test-runner.c
tests/src/vnc-client.c
tests/src/xdmcp-client.c
tests/test-xdg-current-desktop-legacy [new file with mode: 0755]

diff --git a/NEWS b/NEWS
index 6f6ba42b4284ccad41847468041542be606d9063..828eeb68d3b1ae9e3de41eda3d42e5a98c59fb9d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Overview of changes in lightdm 1.13.0
+
+    * Fix crash when having configuration keys defined in multiple places
+    * Fix pipe file descriptor leak for each session login / authentication
+    * Use correct syntax for DesktopNames key in session files
+    * Match seat configuration with globbing
+    * Allow user switching in multi-seat until bug stopping greeter showing on
+      logout is fixed
+    * Disable log message when AccountsService users change
+    * Update AppArmor scripts, requires AppArmor 2.9
+    * Update tests to run better on servers
+
 Overview of changes in lightdm 1.12.0
 
     * Fix assumption that the display server is X when running scripts.
index 01a32509c0d9ef64dbee24cfea15d2184ccdd719..ca820a9d0698a46873355ee3b94dc86f0681e7ef 100644 (file)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(lightdm, 1.12.0)
+AC_INIT(lightdm, 1.13.0)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
index a5dfb77a517ef8eea03f8c2e13cc961dc479908a..c9758dbdb06e7d40ddb1aa5dac241da7a0687f82 100644 (file)
@@ -1,3 +1,23 @@
+lightdm (1.13.0-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release:
+    - Fix crash when having configuration keys defined in multiple places
+      (LP: #1377373)
+    - Fix pipe file descriptor leak for each session login / authentication
+      (LP: #1190344)
+    - Use correct syntax for DesktopNames key in session files (LP: #1383321)
+    - Match seat configuration with globbing (LP: #1364911)
+    - Allow user switching in multi-seat until bug stopping greeter showing on
+      logout is fixed
+    - Disable log message when AccountsService users change (LP: #1376357)
+    - Update AppArmor scripts, requires AppArmor 2.9
+    - Update tests to run better on servers
+  * debian/config-error-dialog.sh:
+    - Show warning dialog instead of interrupted login if syntax error in
+      ~/.profile etc (LP: #678421)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 13 Nov 2014 11:08:17 +1300
+
 lightdm (1.12.0-0ubuntu2) utopic; urgency=medium
 
   * Restore 1.11.9-0ubuntu2, it was reverted by error in the previous upload
diff --git a/debian/config-error-dialog.sh b/debian/config-error-dialog.sh
new file mode 100644 (file)
index 0000000..da62087
--- /dev/null
@@ -0,0 +1,35 @@
+# Copyright (C) 2014 Canonical Ltd
+# Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 3 of the License.
+#
+# See http://www.gnu.org/copyleft/gpl.html the full text of the license.
+
+# This file may be sourced by the function source_with_error_check() in
+# /usr/sbin/lightdm-session
+
+export TEXTDOMAIN=lightdm
+. /usr/bin/gettext.sh
+
+if $SYNTAX; then
+       PARA1=$(eval_gettext 'The configuration file $CONFIG_FILE contains
+invalid syntax and could not be loaded:')
+else
+       PARA1=$(eval_gettext 'Error found when loading $CONFIG_FILE:')
+fi
+
+PARA2=$(gettext 'As a result the session will not be configured correctly.
+You should fix the problem as soon as feasible.')
+
+TEXT="$PARA1\n\n$(fold -s $ERR)\n\n$PARA2"
+
+if [ -x /usr/bin/kdialog ]; then
+       TEXT_FILE=$(mktemp --tmpdir config-err-kdialog-XXXXXX)
+       echo -n "$TEXT" > "$TEXT_FILE"
+       kdialog --textbox "$TEXT_FILE" 500 300
+       rm -f "$TEXT_FILE"
+elif [ -x /usr/bin/zenity ]; then
+       zenity --warning --no-wrap --text="$TEXT"
+fi
index 2a86cbf60b2c3aaa3fe18706758f0bc08003d843..172af59e65020f61748531e7b454461ddfca6a33 100644 (file)
@@ -20,11 +20,30 @@ errormsg () {
   exit 1
 }
 
+# temporary storage of error messages
+ERR=$(mktemp --tmpdir config-err-XXXXXX)
+
+source_with_error_check () {
+    CONFIG_FILE="$1"
+    if sh -n "$CONFIG_FILE" 2>"$ERR"; then
+        echo "Loading $CONFIG_FILE";
+        . "$CONFIG_FILE" 2>"$ERR"
+        if [ -s "$ERR" ]; then
+            SYNTAX=false
+            . /usr/lib/lightdm/config-error-dialog.sh
+        fi
+    else
+        SYNTAX=true
+        . /usr/lib/lightdm/config-error-dialog.sh
+    fi
+    cat "$ERR" >>/dev/stderr
+    truncate -s 0 "$ERR"
+}
+
 # Load profile
 for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
     if [ -f "$file" ]; then
-        echo "Loading profile from $file";
-        . "$file"
+        source_with_error_check "$file"
     fi
 done
 
index 1da4aeb97cfca6078e43dac192b2f2ef7f0651d4..27d46b65ac46756bf7f7eca4d2674f90a88d9ecb 100644 (file)
@@ -9,6 +9,7 @@ etc/lightdm/lightdm.conf usr/share/doc/lightdm/
 etc/lightdm/keys.conf usr/share/doc/lightdm/
 etc/apparmor.d
 debian/lightdm-session usr/sbin
+debian/config-error-dialog.sh usr/lib/lightdm
 debian/guest-session-auto.sh usr/lib/lightdm
 debian/lightdm-greeter-session usr/lib/lightdm
 debian/source_lightdm.py usr/share/apport/package-hooks
index 7547f9192cd1425f1e265cc9808def12b3d07f0b..6c840712944c54e5c518b83d6746b0b77ad297d8 100644 (file)
@@ -75,8 +75,8 @@ Index: trunk/src/seat.c
 ===================================================================
 --- trunk.orig/src/seat.c
 +++ trunk/src/seat.c
-@@ -944,7 +944,7 @@ configure_session (Session *session, Ses
-         session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
+@@ -949,7 +949,7 @@ configure_session (Session *session, Ses
+     }
      if (language && language[0] != '\0')
      {
 -        session_set_env (session, "LANG", language);
index 382192c53d67f5195f44674a1429634704dc134f..5c322aa8102b297aa7796176f2e2b05cb6da23d4 100644 (file)
@@ -3,12 +3,13 @@ Description: Grab translatable strings from debian/* files
 Forwarded: not-needed
 Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
 
---- lightdm.orig/po/POTFILES.in        2014-01-23 19:17:23.143894000 +0100
-+++ lightdm/po/POTFILES.in     2014-07-24 23:28:19.519106226 +0200
-@@ -1,5 +1,7 @@
+--- lightdm.orig/po/POTFILES.in        2014-09-30 05:00:39.000000000 +0200
++++ lightdm/po/POTFILES.in     2014-10-19 18:08:09.576134427 +0200
+@@ -1,5 +1,8 @@
  # List of source files containing translatable strings.
  # Please keep this file sorted alphabetically.
  [encoding: UTF-8]
++debian/config-error-dialog.sh
 +debian/guest-account.sh
 +debian/guest-session-auto.sh
  src/lightdm.c
index 453386e2bf6df79bbc28765cc5f4cf7d70f14a17..af739a8a448d9dc3d4c786de71047beb8ab90c62 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index af1c3b96a7ff3c6e8ae9a05322105e81c3a82009..83959056f8bc51285462b373027b2bce257c9c7e 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 6c611e9e1aaa3a66c53f31332a34d6bc45066f0f..a2d97f3e2671130ef5372e91ca92aabbbe30219f 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 4c20bfaaba1373f2e360495ab8038dce1e6e0b24..7acb7b83c57e76aae9afc4440361cd83d77d2c5d 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index b9b8f8e8103e0ac78fd373d06ea808c01c8bf426..5e4790f974ed10c73c56a8dc86636fafb909b9ec 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 1cbf413afa60941db81540d012e80b51f56f6e8f..5ce722c8a01dd3b99d47b523d99648d95e5e7c48 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index bf8f5f3659bc634f8ea875be6e7c9dab63fe3d62..c6cf323bc1f8bc41e4433bc4842fce27e912dc3b 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 534c817af7f70d948425cb7d09382b19d9d2e31c..1f1c964664ff684c1f390680f0a18d9c989575d1 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 5c16772ae0c14d875959afa3585510ab672dd447..0e5e2649069ea21510468634edfbcd80a931aee3 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index bf4c24374f52ba1909d5e694184eeb335832d929..8a384708d62af7bfb9603ba3c15479c849fff8bb 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index dfa155ff474d6becaa19eb7783dc7f0bd1e1e39d..d11a398412cdae15e41ecfb498c31896d2b87a14 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 4f2847627b7e2bbec2c02b0ddbecbae1c88289fb..10c09bd43fd91da30e7b68949587869b11eb4bd5 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index b6bb13fa084509eedb13098a956141af8781de95..d096bb99abdefefd7ea1ce8879d364a66484cf70 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index e2b2af9b885c4fbaa62c9412d6506af81095072e..10f821978b39073faba57cf4e1946c80cb021a4f 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 794bdea902e47b85c71e98b1d154f360af9b8664..088ce90be6094ac8d0a60f85941b33582883fad4 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 99bc614c7d2dec931d2125957501677e8d6275db..ac10222169a411bcae150af365c995d59aafec62 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 754e272e8d518872fc27c344f51639adf5a1eeb7..32bc2255e2fc91f7517ccd197b07ccfe7ec6bd39 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 777899dfb995582d8092360906b321a0785b342d..8bf774bdb4734da6476e3c8ce26495b8282238e6 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index c6b00323d05900d0d92a3b68fe9a6d45833c05cb..6cf393ac1bf1d25ee570f2193a926d51c7b1f494 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index d253b6eadf141bda2127ff7740374516b6703480..2cd2768d4313cea2e3929cddccfb3a46ac4ee5b7 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 3afa6c447a664299c0354d2fa89b76858aafdd07..3857643f38ba3845ac6009b40617eac1e3a92b1f 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 8b38b98e1aff02efcf00fdb99f0ce543f6b4e195..2d26d2fd802dbaf54c3d8172934ba9345eab3c46 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 89252ae7a05c17db8f5afd3fbf037fc8a364fdb6..0266f5da9b781f272817422165bf990d2c0bd62b 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 877ca65c471a58e0ef9a98a751e2a1e29afeb5a1..430a05a127b796cd8faaaa0648f6f7e50e0e21cf 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index ea2405bc00abeb429a206ec611c20e4388d3f62d..b492c251ad9aabfa7b461f551e561cdb319b025a 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index ee7ef1be789a0a4f8dcb148467898ef7e4f610f9..64d74216c7a87e928b353ca27747ab022ac2ed1c 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 2d767ac447a595e104f0d6a0ef1b16c7e8f47fb6..daf349d7ed84f10784d9375d5040fbb3f3747893 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index ba9841f239d76b9a566455aba5e345df64779a2c..9570a04939b426a3718513a0e35f0f7857177a44 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 74c5dbc4fa12d4e9b26f2a7b89b6d3371fcf03fa..5e50231287e63ce2565f850e90384d7a67b627e1 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 3b34ffcc93139e16e8371e2a13b491a66bae0ac3..2cf38c2741614d70ae0eee3448e5c395d6c2453d 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 84ee32a78c12535212208bee4608eee6c3ac7eed..0d0246a8724c483b12080e0aac80b47390fcfc5d 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 781e24bfaa2adc180248e5d6ce938782eff0c6a6..54af4fe314703a6445d0a5247c0dac123924142b 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index bdb6d683950e2f0551dcba46b5cf666e44b25206..3cfff4f35a8d854d505be2730ff1522f2beef1da 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index be128f4d0a86a086066e0d0ed88c928a9afa310b..6f286a4cb16ef37fca6cd26e2cb16881a4da55f4 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 46a9de0278b340b631b26a8cd66e74b18312170d..79f5ca335fa508a8187dd81ed4d519f2beabd105 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 9766b1df142bee5f0dc12d26caeb07cdbf8051c2..82286d1f3854f565718d69ff6b9ecbe0e2e7331e 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 98fe403cb353b1d0667e21b62d5650b4d05226f7..dce8076f3cbde7b1d3df19b19f0fb9be2c07590b 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 20bf51f48a23d1fef1633566263e3cb5b4ca05cc..010a8ed7cbd1640df18a1cbea1a67a5373ab16e8 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 99de3b63c5b11997bd5173b89b30999c584c2627..490ec2e6212db452a23051f4c9b7caf44437ec0f 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 5d08ebc9aecc70547d51e5b256c1bf0f870d7aba..f83c6c01e2e7978cf09c5804d9b22bfe5a784787 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 2f3d1903618985f330ca0046c22c6860a260dfb9..e2c1ac487cedd92d661056ba203e3676722e87d9 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
diff --git a/debian/po/hy.po b/debian/po/hy.po
new file mode 100644 (file)
index 0000000..62ab303
--- /dev/null
@@ -0,0 +1,51 @@
+# Armenian translation for lightdm
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the lightdm package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+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: 2014-10-27 11:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Armenian <hy@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: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\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 ""
index 58ac8a303511bcf8d0fc5c38767dc846f49599bb..1d8580c727718ae0769ea29f3f65ee5c1c8c0e44 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index eea45fc7abaf0933b17dc3b65ce9c1a5510db63b..cb90e400e3264ed4d4344994d7f1f9f2c7d8bb73 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 84308aaa4a72d3224a5281834329982a234d954e..e16bc4e4c05e09824611637744410014b4fb1640 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index ccd9a8a032c7925c4f5f26a3028691f077c3bcfb..739143fa228e034119ff5b4d60ad8795a7d98926 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 24546268e9788689cad4e10bbb98231d6f1cd9a0..964c82600fa5a948dd24285d59d012eda59eb611 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 964a1fc20cbcb31753207214de1effd2fb1051b9..284bba70589c5520ba03e54b8cd4bfb286d27eec 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 071765148f13ce01839e47418546ba2d45bc0646..cac85e152e2f428ec5a6797fc11685ddcb1f6a76 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 0e68fea43803ffb71f56c033912ed24f312b89e3..e61a983b30962ad8bb79d20fffd337e4c2ffd798 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 7677939f6002af3fe776f521ca45a00dd8026b99..e7351f8f997ca58bd809507fd2b65b07b5ccc58d 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index c3d7d5704e3fd6e2fe0feb18ed5c48c6299245ca..1b00e50d37d0821684b4d7d03ef6445d60e95c09 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index eb3952aa59a63e656f92544d2f78259a159430a7..3e1bf0a978dea6c1e467aac304cc9a11e3c6a4f3 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 8929feaccc2d4796910f33f18f730d39ae633071..d6a2714af55d02a5b13e47fe19c94e9774955066 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 32f134a4f812856f13b67710fb26c135ecf03c02..a5b421c8cb821aa4ea0d03c25456a6b049181ca1 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 7907f30592c5856642226921141767e1e33371d9..38eac8c70c7e8b6e28efdad437ce165818519c7e 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 232c960c5b37a09668f082eea6d6414ff9ac998b..061bc6214fa5fe59cfe659a257089a18b7aea2c1 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 9355edc5f9399173e27a7754737666d7bd7e447d..74b5877d45c89cea526931449f68726d77a9d65e 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 4f046380170d018051caa20261cb499059619e94..ede3d26c014d29d0980ea951c65da80d5b5489d8 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 0d05a2e14271eedc83fa86db57386e142ee44c76..fb4572541ff7442d162e94850231c27a7ee483da 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 20f1b3e3dc60bcf481fb37a617635713cf53a269..851057774394d1c4737121d527967b03d5538c65 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 2121144c1ae9cabd401864d15917241ce424b89e..edc648aa39a2acd1ba8e6c6dc8d1053895e3f232 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 76e2258391758c753856eda2c3a4c7729b1a8527..b6917206628170bc29900d4956ab142b847ff04b 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index f20f842b67382c4aa112d2c6482f2ac046e3b3e5..4f42b0fdba051352922c6c9e8bdc545a64f57d48 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 49ed70561876bef57c5b483161f5251ed98e0c29..18dd12a93bc6e526efa041416655413d802d4469 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index c7a81f05526aee8ab742d0307a8316df564422bd..32553f559c9e227b70ef8e6daff953345c74bb86 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 77b233284b1cab3a23ba529a09c0036ac8f6b26c..b6ded40c883e970aabd0be8c449322643d74ca67 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 12d7debab4140d3c7b807ab7b190feffb52089c8..2a786fa03d98f853d13895442508301005bca624 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index a99c01c151dbaf7d7c17c40f1fc3e4bcd506ef18..b23d7f5e825b215d48ea0ebaf7cf5cf09d0fd2aa 100644 (file)
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2007-05-31 08:04+0200\n"
 "PO-Revision-Date: 2011-06-16 23:16+0000\n"
-"Last-Translator: J. Andre Neto <Unknown>\n"
+"Last-Translator: Andre Carneiro <Unknown>\n"
 "Language-Team: Portuguese <pt@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: 2014-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 9863bab06623d5225bc138ac966dbbdad1642a2e..a93ab863b4916b642b5aad89974bd8cbcd71347c 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index b5dba4df11b28f4264e2a41feb7b607ee554ba17..5243443dcabf9d5a90c7c2d562f9135ad54d5dfd 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index f6d46a3645ca6985e2579228d50797937a70a049..0df457c4e95ebfdf3ac61e2dedc3b6e351b85f02 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 9e9661a67c9ff5b0af5e59466c57f4533d89a6e6..7e69df76a00f991072bf0c66a96a941296db4877 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index a9bf5429b206eb19d68488b8fa93e327fa0bd0ba..40b6069d446fe1c448ccb66490d31a04d49b020f 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index d0d5b0978f321fba2924ed4fc5a77076cb716e52..cb9595555ea4486d45cc21997b92b0169bbcd65a 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 7862aa8d25e1b887c0bf2579780381c648b0c858..f52cba35da9aacd7d6fe640c55128239d307a2d0 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 0eb65932bbd8e285bbc516fc2bcf75c773ac7c45..33cd10e929b67990ae957224c0da3ab506ba894d 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index c66bdca0acca817f58450c1f51a88a8986e29141..9389636d9e4f98332b6b867e4b735b11b6556431 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 40c77e6248c61d50aed2d4f75ae692628d12f9c9..0022ebce062969fb007c3ad4c9039e0339054786 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:41+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 02be1a1747d5113fbe2267b76e66b994fffcabfc..dc9426baa145ccf1dc9ed1eda88cfb91e6b31f09 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 "Language: sr\n"
 
 #. Type: select
index e925e7d51d7d4d0fd96abc3e064f93c3085d84a9..0bb33f2e90f7108d254f42482dfc3556e548d58b 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 0ffdbe1c21114a54d671a485f45364906153499a..3044b321a160a4b3ed2add9710bc743f6e3296f9 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index ea5a93da3c85fd34a579b85c45597cd95d2fc229..6235962228a0831cf9aebe0e7ea6ca452aaf8988 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index ea24bd1b395fc2d9fc8decdf93777c2d7f0ea566..41a280190dc48b089d802c5bd04bedbb4664f41d 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 30759ff4190afd09805a278b989de84e12c52ff2..8db43020d51427bf47dc06b368607068b8c51543 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 4f7d391aa8d6b7b340e177c41ffa5389909333aa..a2ef72470c2a24d8dd5816fb2ba8443939394fed 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 8c2eab1829392d63a053faf291cb96de96877bf1..a8bbdf0053c41d17acfb64a9aeb5739ccdf3b6f4 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index c74e72f299ec22add079399bf66b824d5401df5b..45f6c56782d41b05893adfc4106e1c209a8ee0e1 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index fb73dd5cd2cfc24359154181c3fcb0d027b42a7e..3b64511ea19f4760be9d0c3315d515218aa0e219 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 3637a99f756bbb98d5704b43b367ea7f79ed9a2d..4d261cbfe4fa136d6c0672be6a9f6144103b7fe4 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 11e9266c75bc5dce295a5d73fc405bfb148403a9..ad019cc4c42700035c625591bd722a0fe7dd1657 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 08d523e2f5a4774e2bcca2a470bd5f5441f4bb85..1137538be90ded56ecf62426b4252b3dd2c2096c 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 02c6fa751b077d72c540c0975a68766c5a26e815..1e4b2aace55768b8b67a60574452e6a8b05a7f1a 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 6593f1876fa22cf9682770a40ea018696ef57e53..7c37adfec35bc21eb7c811828e91a2568f342ca1 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index a5b109527dfb81f681e09944df4a6723c58f9bbb..493ffe6dab54dbb95700c1531c04b4d0d6e531ee 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 4218185379ca42dcef42efa4a791958189cf5ba3..ca72c49ea92b14bac5c5737103a56f3e1fbfe19d 100644 (file)
@@ -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-10-08 06:43+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-17 05:42+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
 
 #. Type: select
 #. Description
index 1a46f4010b7cbd6bfb808bda999287a0ee430428..e860e9f3f6cac8c2d9d2899db84b54fb37dc9e7d 100644 (file)
@@ -41,7 +41,7 @@ seat_xremote_create_display_server (Seat *seat, Session *session)
 
     hostname = seat_get_string_property (seat, "xserver-hostname");
     if (!hostname)
-        hostname = "localhost";
+        hostname = "127.0.0.1";
     number = seat_get_integer_property (seat, "xserver-display-number");
 
     l_debug (seat, "Starting remote X display %s:%d", hostname, number);
index 829e7d74151b46928f275d03af685ae1f573c0fd..1e813e8b14af712894611712cef6164c265837ec 100644 (file)
@@ -984,15 +984,20 @@ find_session_config (Seat *seat, const gchar *sessions_dir, const gchar *session
 static void
 configure_session (Session *session, SessionConfig *config, const gchar *session_name, const gchar *language)
 {
-    const gchar *desktop_name;
+    gchar **desktop_names;
 
     session_set_config (session, config);
     session_set_env (session, "XDG_SESSION_DESKTOP", session_name);
     session_set_env (session, "DESKTOP_SESSION", session_name);
     session_set_env (session, "GDMSESSION", session_name);
-    desktop_name = session_config_get_desktop_name (config);
-    if (desktop_name)
-        session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
+    desktop_names = session_config_get_desktop_names (config);
+    if (desktop_names)
+    {
+        gchar *value;
+        value = g_strjoinv (":", desktop_names);
+        session_set_env (session, "XDG_CURRENT_DESKTOP", value);
+        g_free (value);
+    }
     if (language && language[0] != '\0')
     {
         session_set_env (session, "LANG", language);
index f80e7e66676f57918fc6ab2d2b9351a470566873..b5ea7228cf02cd54df676f9c174abf04c736cdea 100644 (file)
@@ -16,8 +16,8 @@ struct SessionConfigPrivate
     /* Session type */
     gchar *session_type;
 
-    /* Desktop name */
-    gchar *desktop_name;
+    /* Desktop names */
+    gchar **desktop_names;
 
     /* Command to run */
     gchar *command;
@@ -54,9 +54,19 @@ session_config_new_from_file (const gchar *filename, GError **error)
     if (!config->priv->session_type)
         config->priv->session_type = g_strdup ("x");
 
-    config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL);
-    if (!config->priv->desktop_name)
-        config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL);
+    config->priv->desktop_names = g_key_file_get_string_list (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL, NULL);
+    if (!config->priv->desktop_names)
+    {
+        gchar *name;
+
+        name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL);
+        if (name)
+        {
+            config->priv->desktop_names = g_malloc (sizeof (gchar *) * 2);
+            config->priv->desktop_names[0] = name;
+            config->priv->desktop_names[1] = NULL;
+        }
+    }
     config->priv->compositor_command = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-System-Compositor-Command", NULL);
 
     g_key_file_free (desktop_file);
@@ -78,11 +88,11 @@ session_config_get_session_type (SessionConfig *config)
     return config->priv->session_type;
 }
 
-const gchar *
-session_config_get_desktop_name (SessionConfig *config)
+gchar **
+session_config_get_desktop_names (SessionConfig *config)
 {
     g_return_val_if_fail (config != NULL, NULL);
-    return config->priv->desktop_name;
+    return config->priv->desktop_names;
 }
 
 const gchar *
@@ -104,7 +114,7 @@ session_config_finalize (GObject *object)
     SessionConfig *self = SESSION_CONFIG (object);
 
     g_free (self->priv->session_type);
-    g_free (self->priv->desktop_name);
+    g_strfreev (self->priv->desktop_names);
     g_free (self->priv->command);
     g_free (self->priv->compositor_command);
 
index a86dc56d95d1d26e8b89f1f61d00d785bb45f7d1..2d3d52885f36a6c04415bdcd63145ea9ab3ce876 100644 (file)
@@ -42,7 +42,7 @@ const gchar *session_config_get_command (SessionConfig *config);
 
 const gchar *session_config_get_session_type (SessionConfig *config);
 
-const gchar *session_config_get_desktop_name (SessionConfig *config);
+gchar **session_config_get_desktop_names (SessionConfig *config);
 
 const gchar *session_config_get_compositor_command (SessionConfig *config);
 
index c8ac06f51592f018c73c7f26f276fe2380375464..26d0ce9752f9993760fa761d55efdeb96a97e501 100644 (file)
@@ -924,6 +924,8 @@ session_finalize (GObject *object)
         g_object_unref (self->priv->display_server);
     if (self->priv->pid)
         kill (self->priv->pid, SIGKILL);
+    close (self->priv->to_child_input);
+    close (self->priv->from_child_output);
     if (self->priv->from_child_channel)
         g_io_channel_unref (self->priv->from_child_channel);
     if (self->priv->from_child_watch)
index 2f0087d3a3e3bb14c6c1575247fd5ec0859ec009..8bfd1add07bafc6794de98837b6923d504ad4bfd 100644 (file)
@@ -56,6 +56,7 @@ TESTS = \
        test-login-guest-session-config \
        test-group-membership \
        test-xdg-current-desktop \
+       test-xdg-current-desktop-legacy \
        test-language-env \
        test-session-stdout \
        test-session-stderr \
@@ -347,6 +348,7 @@ EXTRA_DIST = \
        data/sessions/mir.desktop \
        data/sessions/mir-container.desktop \
        data/sessions/named.desktop \
+       data/sessions/named-legacy.desktop \
        scripts/0-additional.conf \
        scripts/1-additional.conf \
        scripts/additional-config.conf \
@@ -557,6 +559,7 @@ EXTRA_DIST = \
        scripts/vnc-open-file-descriptors.conf \
        scripts/xauthority.conf \
        scripts/xdg-current-desktop.conf \
+       scripts/xdg-current-desktop-legacy.conf \
        scripts/xdmcp-client.conf \
        scripts/xdmcp-server-autologin.conf \
        scripts/xdmcp-server-double-login.conf \
diff --git a/tests/data/sessions/named-legacy.desktop b/tests/data/sessions/named-legacy.desktop
new file mode 100644 (file)
index 0000000..3c0870d
--- /dev/null
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Test Session
+Comment=LightDM test session
+Exec=test-session
+X-LightDM-DesktopName=TestDesktop
index 3c0870d7088940ccf97f1c8350f67190fb5870a6..bab172f56cb877382a1ff7126eac8e30835b8238 100644 (file)
@@ -2,4 +2,4 @@
 Name=Test Session
 Comment=LightDM test session
 Exec=test-session
-X-LightDM-DesktopName=TestDesktop
+DesktopNames=TestDesktop1;TestDesktop2;
index a99cec7b0e22a49cc266af006493579f606c7f6d..3a974b1039a0e1d8a0baf739cf0800fe756b8159 100644 (file)
@@ -7,7 +7,6 @@ start-default-seat=false
 
 [VNCServer]
 enabled=true
-port=9999
 command=Xvnc -option
 
 #?*START-DAEMON
@@ -15,9 +14,9 @@ command=Xvnc -option
 #?*WAIT
 
 # Start a VNC client
-#?*START-VNC-CLIENT ARGS="::9999"
+#?*START-VNC-CLIENT
 #?VNC-CLIENT START
-#?VNC-CLIENT CONNECT SERVER=::9999
+#?VNC-CLIENT CONNECT
 
 # Xvnc server starts
 #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE
index e1edba07139ad75945bbce4ab53c619457fb0f22..8acfff16746c44dbe1b498ee85eaead1f04868ca 100644 (file)
@@ -7,7 +7,6 @@ start-default-seat=false
 
 [VNCServer]
 enabled=true
-port=9999
 width=1440
 height=900
 depth=16
@@ -17,9 +16,9 @@ depth=16
 #?*WAIT
 
 # Start a VNC client
-#?*START-VNC-CLIENT ARGS="::9999"
+#?*START-VNC-CLIENT
 #?VNC-CLIENT START
-#?VNC-CLIENT CONNECT SERVER=::9999
+#?VNC-CLIENT CONNECT
 
 # Xvnc server starts
 #?XSERVER-0 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE
index 8f03eb8d6a45559633c8baefbb8238526702679c..793399732619e15cd2865c076afe48006eb90e7e 100644 (file)
@@ -7,7 +7,6 @@ start-default-seat=false
 
 [VNCServer]
 enabled=true
-port=9999
 
 [SeatDefaults]
 user-session=default
@@ -17,9 +16,9 @@ user-session=default
 #?*WAIT
 
 # Start a VNC client
-#?*START-VNC-CLIENT ARGS="::9999"
+#?*START-VNC-CLIENT
 #?VNC-CLIENT START
-#?VNC-CLIENT CONNECT SERVER=::9999
+#?VNC-CLIENT CONNECT
 
 # Xvnc server starts
 #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
index aeba6f890ae222884f8bfe5657224a1e06aa5188..d77582c641d9d800c7c3bba7d38720996910c0b4 100644 (file)
@@ -7,7 +7,6 @@ start-default-seat=false
 
 [VNCServer]
 enabled=true
-port=9999
 
 [SeatDefaults]
 user-session=default
@@ -17,9 +16,9 @@ user-session=default
 #?*WAIT
 
 # Start a VNC client
-#?*START-VNC-CLIENT ARGS="::9999"
+#?*START-VNC-CLIENT
 #?VNC-CLIENT START
-#?VNC-CLIENT CONNECT SERVER=::9999
+#?VNC-CLIENT CONNECT
 
 # Xvnc server starts
 #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
diff --git a/tests/scripts/xdg-current-desktop-legacy.conf b/tests/scripts/xdg-current-desktop-legacy.conf
new file mode 100644 (file)
index 0000000..1e01288
--- /dev/null
@@ -0,0 +1,30 @@
+#
+# Check XDG_CURRENT_DESKTOP is set for sessions that support it using the legacy key name
+#
+
+[SeatDefaults]
+autologin-user=have-password1
+user-session=named-legacy
+
+#?*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_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=named-legacy USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
index a3845043e880c3b1e74ba68683d855c2e6733fbe..00f6d8a330b49b81ee3f2b0351b0a78175a3acc4 100644 (file)
@@ -18,7 +18,7 @@ user-session=named
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=named USER=have-password1
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop1:TestDesktop2 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=named USER=have-password1
 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
 #?XSERVER-0 ACCEPT-CONNECT
 #?SESSION-X-0 CONNECT-XSERVER
index 08ef4af300c1ea45dee560fee5d42c63999bec52..e700a7c0da8ef0d0bab5f2b633e7a6056077526a 100644 (file)
@@ -3,8 +3,7 @@
 #
 
 [SeatDefaults]
-xdmcp-manager=localhost
-xdmcp-port=9999
+xdmcp-manager=127.0.0.1
 
 #?*START-DAEMON
 #?RUNNER DAEMON-START
index c4c49af9b105daa9557dbfedc1af5b73b7c159cf..dd4308db4dd27a02c3daaa16fe200b1db405fbf4 100644 (file)
@@ -7,7 +7,6 @@ start-default-seat=false
 
 [XDMCPServer]
 enabled=true
-port=9999
 
 [SeatDefaults]
 user-session=default
@@ -18,7 +17,7 @@ autologin-user=have-password1
 #?*WAIT
 
 # Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query localhost -port 9999 -nolisten unix"
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-98 START
 
 # Start sending XDMCP queries
index 68f24f5aa6cf5204a6d4e6f3bf9e40d9112a19e9..e64541af41ce7b9c05e9154f19041c542a50e294 100644 (file)
@@ -7,7 +7,6 @@ start-default-seat=false
 
 [XDMCPServer]
 enabled=true
-port=9999
 
 [SeatDefaults]
 user-session=default
@@ -17,7 +16,7 @@ user-session=default
 #?*WAIT
 
 # Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query localhost -port 9999 -nolisten unix"
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-98 START
 
 # Start sending XDMCP queries
@@ -56,7 +55,7 @@ user-session=default
 #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
 
 # Start a second remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":99 -query localhost -port 9999 -nolisten unix"
+#?*START-XSERVER ARGS=":99 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-99 START
 
 # Start sending XDMCP queries
index 17c4d9193d3f88f251aeff9532a75c77f30ace21..c2e25b0fd59e2d920e9a009845a22468cbb9b996 100644 (file)
@@ -7,7 +7,6 @@ start-default-seat=false
 
 [XDMCPServer]
 enabled=true
-port=9999
 
 [SeatDefaults]
 user-session=default
@@ -17,7 +16,7 @@ user-session=default
 #?*WAIT
 
 # Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query localhost -port 9999 -nolisten unix"
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-98 START
 
 # Start sending XDMCP queries
index fee895f09631ae2a3ce97a62a9d7eb49427fda53..670701dc4ba23bd14029bd5b94d00771be99072a 100644 (file)
@@ -7,7 +7,6 @@ start-default-seat=false
 
 [XDMCPServer]
 enabled=true
-port=9999
 
 [SeatDefaults]
 user-session=default
@@ -17,7 +16,7 @@ user-session=default
 #?*WAIT
 
 # Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query localhost -port 9999 -nolisten unix"
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-98 START
 
 # Start sending XDMCP queries
index d83a954d35c6276b70b5b16a71c4171a4c13dbe5..a5cbb37fbff705bac6d747aa68818632a40a2bfc 100644 (file)
@@ -8,6 +8,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <dirent.h>
@@ -196,6 +198,9 @@ redirect_path (const gchar *path)
     if (g_str_has_prefix (path, "/tmp"))
         return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", path + strlen ("/tmp"), NULL);
 
+    if (g_str_has_prefix (path, "/run"))
+        return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "run", path + strlen ("/run"), NULL);
+
     if (g_str_has_prefix (path, "/etc/xdg"))
         return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "etc", "xdg", path + strlen ("/etc/xdg"), NULL);
 
@@ -333,6 +338,11 @@ access (const char *pathname, int mode)
 
     _access = (int (*)(const char *pathname, int mode)) dlsym (RTLD_NEXT, "access");
 
+    if (strcmp (pathname, "/dev/tty0") == 0)
+        return F_OK;
+    if (strcmp (pathname, "/sys/class/tty/tty0/active") == 0)
+        return F_OK;
+
     new_path = redirect_path (pathname);
     ret = _access (new_path, mode);
     g_free (new_path);
@@ -539,6 +549,188 @@ ioctl (int d, unsigned long request, ...)
     }
 }
 
+static void
+add_port_redirect (int requested_port, int redirected_port)
+{
+    GKeyFile *file;
+    gchar *path, *name, *data;
+
+    file = g_key_file_new ();
+    path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), ".port-redirects", NULL);
+    g_key_file_load_from_file (file, path, G_KEY_FILE_NONE, NULL);
+
+    name = g_strdup_printf ("%d", requested_port);
+    g_key_file_set_integer (file, name, "redirected", redirected_port);
+    g_free (name);
+  
+    data = g_key_file_to_data (file, NULL, NULL);
+    g_file_set_contents (path, data, -1, NULL);
+    g_free (data);
+    g_free (path);
+
+    g_key_file_free (file);
+}
+
+static int
+find_port_redirect (int port)
+{
+    GKeyFile *file;
+    gchar *path, *name;
+    int redirected_port;
+
+    file = g_key_file_new ();
+    path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), ".port-redirects", NULL);
+    g_key_file_load_from_file (file, path, G_KEY_FILE_NONE, NULL);
+    g_free (path);
+
+    name = g_strdup_printf ("%d", port);
+    redirected_port = g_key_file_get_integer (file, name, "redirected", NULL);
+    g_free (name);
+    g_key_file_free (file);
+
+    return redirected_port;
+}
+
+int
+bind (int sockfd, const struct sockaddr *addr, socklen_t addrlen)
+{
+    int port = 0, redirected_port = 0;
+    int (*_bind) (int sockfd, const struct sockaddr *addr, socklen_t addrlen);
+    const struct sockaddr *modified_addr = addr;
+    struct sockaddr_in temp_addr;
+    struct sockaddr_in6 temp_addr6;
+    int retval;
+
+    _bind = (int (*)(int sockfd, const struct sockaddr *addr, socklen_t addrlen)) dlsym (RTLD_NEXT, "bind");
+
+    switch (addr->sa_family)
+    {
+    case AF_INET:
+        port = ntohs (((const struct sockaddr_in *) addr)->sin_port);
+        redirected_port = find_port_redirect (port);
+        memcpy (&temp_addr, addr, sizeof (struct sockaddr_in));
+        modified_addr = (struct sockaddr *) &temp_addr;
+        if (redirected_port != 0)
+            temp_addr.sin_port = htons (redirected_port);
+        else
+            temp_addr.sin_port = 0;
+        break;
+    case AF_INET6:
+        port = ntohs (((const struct sockaddr_in6 *) addr)->sin6_port);
+        redirected_port = find_port_redirect (port);
+        memcpy (&temp_addr6, addr, sizeof (struct sockaddr_in6));
+        modified_addr = (struct sockaddr *) &temp_addr6;
+        if (redirected_port != 0)
+            temp_addr6.sin6_port = htons (redirected_port);
+        else
+            temp_addr6.sin6_port = 0;
+        break;
+    }
+
+    retval = _bind (sockfd, modified_addr, addrlen);
+
+    socklen_t temp_addr_len;
+    switch (addr->sa_family)
+    {
+    case AF_INET:
+        temp_addr_len = sizeof (temp_addr);
+        getsockname (sockfd, &temp_addr, &temp_addr_len);
+        if (redirected_port == 0)
+        {
+            redirected_port = ntohs (temp_addr.sin_port);
+            add_port_redirect (port, redirected_port);
+        }
+        break;
+    case AF_INET6:
+        temp_addr_len = sizeof (temp_addr6);
+        getsockname (sockfd, &temp_addr6, &temp_addr_len);
+        if (redirected_port == 0)
+        {
+            redirected_port = ntohs (temp_addr6.sin6_port);
+            add_port_redirect (port, redirected_port);
+        }
+        break;
+    }
+
+    return retval;
+}
+
+int
+connect (int sockfd, const struct sockaddr *addr, socklen_t addrlen)
+{
+    int port, redirected_port;
+    const struct sockaddr *modified_addr = addr;
+    struct sockaddr_in temp_addr;
+    struct sockaddr_in6 temp_addr6;
+    int (*_connect) (int sockfd, const struct sockaddr *addr, socklen_t addrlen);
+
+    _connect = (int (*)(int sockfd, const struct sockaddr *addr, socklen_t addrlen)) dlsym (RTLD_NEXT, "connect");
+
+    switch (addr->sa_family)
+    {
+    case AF_INET:
+        port = ntohs (((const struct sockaddr_in *) addr)->sin_port);
+        redirected_port = find_port_redirect (port);
+        if (redirected_port != 0) 
+        {
+            memcpy (&temp_addr, addr, sizeof (struct sockaddr_in));
+            temp_addr.sin_port = htons (redirected_port);
+            modified_addr = (struct sockaddr *) &temp_addr;
+        }
+        break;
+    case AF_INET6:
+        port = ntohs (((const struct sockaddr_in6 *) addr)->sin6_port);
+        redirected_port = find_port_redirect (port);
+        if (redirected_port != 0) 
+        {
+            memcpy (&temp_addr6, addr, sizeof (struct sockaddr_in6));
+            temp_addr6.sin6_port = htons (redirected_port);
+            modified_addr = (struct sockaddr *) &temp_addr6;
+        }
+        break;
+    }
+
+    return _connect (sockfd, modified_addr, addrlen);
+}
+
+ssize_t
+sendto (int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen)
+{
+    int port, redirected_port;
+    const struct sockaddr *modified_addr = dest_addr;
+    struct sockaddr_in temp_addr;
+    struct sockaddr_in6 temp_addr6;
+    ssize_t (*_sendto) (int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen);
+
+    _sendto = (ssize_t (*)(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen)) dlsym (RTLD_NEXT, "sendto");
+
+    switch (dest_addr->sa_family)
+    {
+    case AF_INET:
+        port = ntohs (((const struct sockaddr_in *) dest_addr)->sin_port);
+        redirected_port = find_port_redirect (port);
+        if (redirected_port != 0) 
+        {
+            memcpy (&temp_addr, dest_addr, sizeof (struct sockaddr_in));
+            temp_addr.sin_port = htons (redirected_port);
+            modified_addr = (struct sockaddr *) &temp_addr;
+        }
+        break;
+    case AF_INET6:
+        port = ntohs (((const struct sockaddr_in6 *) dest_addr)->sin6_port);
+        redirected_port = find_port_redirect (port);
+        if (redirected_port != 0) 
+        {
+            memcpy (&temp_addr6, dest_addr, sizeof (struct sockaddr_in6));
+            temp_addr6.sin6_port = htons (redirected_port);
+            modified_addr = (struct sockaddr *) &temp_addr6;
+        }
+        break;
+    }
+
+    return _sendto (sockfd, buf, len, flags, modified_addr, addrlen);
+}
+
 int
 close (int fd)
 {
index dc12d4755d2716be042559d2b0d347a64673e0e1..abad48651f72b15185574d40d89aa39b770244cc 100644 (file)
@@ -2535,6 +2535,7 @@ main (int argc, char **argv)
 
     /* Set up a skeleton file system */
     g_mkdir_with_parents (g_strdup_printf ("%s/etc", temp_dir), 0755);
+    g_mkdir_with_parents (g_strdup_printf ("%s/run", temp_dir), 0755);
     g_mkdir_with_parents (g_strdup_printf ("%s/usr/share", temp_dir), 0755);
     g_mkdir_with_parents (g_strdup_printf ("%s/usr/share/lightdm/sessions", temp_dir), 0755);
     g_mkdir_with_parents (g_strdup_printf ("%s/usr/share/lightdm/remote-sessions", temp_dir), 0755);
index b19170499b9a21c3659077851e87ab99f0dfbeb5..f70cd568c3da76fa89b253912e3092440ba96949 100644 (file)
@@ -12,13 +12,9 @@ static GKeyFile *config;
 int
 main (int argc, char **argv)
 {
-    gchar *server_address;
-    gchar *hostname, *c;
-    gint port;
     GError *error = NULL;
     GSocket *socket;
-    GSocketConnectable *address;
-    GSocketAddressEnumerator *enumerator;
+    GSocketAddress *address;
     gboolean result;
     gchar buffer[1024];
     gssize n_read, n_sent;
@@ -34,12 +30,7 @@ main (int argc, char **argv)
     config = g_key_file_new ();
     g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL);
 
-    if (argc > 1)
-        server_address = g_strdup (argv[1]);
-    else
-        server_address = g_strdup (":0");
-
-    status_notify ("VNC-CLIENT CONNECT SERVER=%s", server_address);
+    status_notify ("VNC-CLIENT CONNECT");
 
     socket = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_TCP, &error);
     if (error)
@@ -48,48 +39,9 @@ main (int argc, char **argv)
     if (!socket)
         return EXIT_FAILURE;
 
-    hostname = g_strdup (server_address);
-    c = strchr (hostname, ':');
-    if (c)
-    {
-        *c = '\0';
-        gchar *port_string = c + 1;
-        if (g_str_has_prefix (port_string, ":"))
-            port = atoi (port_string + 1);
-        else
-            port = 5900 + atoi (port_string);
-    }
-    else
-        port = 5900;
-    if (strcmp (hostname, "") == 0)
-    {
-        g_free (hostname);
-        hostname = g_strdup ("localhost");
-    }
-
-    address = g_network_address_new (hostname, port);
-    enumerator = g_socket_connectable_enumerate (address);
-    result = FALSE;
-    while (TRUE)
-    {
-        GSocketAddress *socket_address;
-        GError *e = NULL;
-
-        socket_address = g_socket_address_enumerator_next (enumerator, NULL, &e);
-        if (e)
-            g_warning ("Failed to get socket address: %s", e->message);
-        g_clear_error (&e);
-        if (!socket_address)
-            break;
-
-        result = g_socket_connect (socket, socket_address, NULL, error ? NULL : &error);
-        g_object_unref (socket_address);
-        if (result)
-        {
-            g_clear_error (&error);
-            break;
-        }
-    }
+    address = g_inet_socket_address_new (g_inet_address_new_loopback (G_SOCKET_FAMILY_IPV4), 5900);
+    result = g_socket_connect (socket, address, NULL, &error);
+    g_object_unref (address);
     if (error)
         g_warning ("Unable to connect VNC socket: %s", error->message);
     g_clear_error (&error);
index 985745f7012e103937f54a27ce38ede064a5dd5b..eda3c76699ca35a9319ab9058d8082256cc50f1d 100644 (file)
@@ -269,6 +269,7 @@ xdmcp_client_start (XDMCPClient *client)
     client->priv->socket = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &error);
     if (error)
         g_warning ("Error creating XDMCP socket: %s", error->message);
+    g_clear_error (&error);
     if (!client->priv->socket)
         return FALSE;
 
diff --git a/tests/test-xdg-current-desktop-legacy b/tests/test-xdg-current-desktop-legacy
new file mode 100755 (executable)
index 0000000..3ce1d5f
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner xdg-current-desktop-legacy test-gobject-greeter