diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2016-11-28 15:29:24 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2016-11-28 15:29:24 +1300 |
| commit | 04659fc24d22b73f0be3009634a25927c1d5f994 (patch) | |
| tree | da0f4f30bb7be8193905183b79c787361fee8110 | |
| parent | 960444b539adec771de34d520e0edab872eb9f62 (diff) | |
| parent | 6b2ca735456a3ba1ab37beb6379d7e4aac1bb261 (diff) | |
| download | lightdm-git-04659fc24d22b73f0be3009634a25927c1d5f994.tar.gz | |
Merge with trunk
121 files changed, 494 insertions, 243 deletions
@@ -1,3 +1,10 @@ +Overview of changes in lightdm 1.21.1 + + * Fix greeters crashing with unknown configuration keys (regression from + 1.21.0) + * Add an API verison to the greeter-daemon protocol for future enhancements + * More regression tests + Overview of changes in lightdm 1.21.0 * Add liblightdm functions for getting OS release information and the diff --git a/common/configuration.c b/common/configuration.c index 2eba2d3c..02c34ce9 100644 --- a/common/configuration.c +++ b/common/configuration.c @@ -86,7 +86,7 @@ config_load_from_file (Configuration *config, const gchar *path, GList **message known_keys = config->priv->xdmcp_keys; else if (strcmp (group, "VNCServer") == 0) known_keys = config->priv->vnc_keys; - else + else if (messages) *messages = g_list_append (*messages, g_strdup_printf (" Unknown group [%s] in configuration", group)); keys = g_key_file_get_keys (key_file, groups[i], NULL, error); @@ -102,10 +102,14 @@ config_load_from_file (Configuration *config, const gchar *path, GList **message KeyStatus status; status = GPOINTER_TO_INT (g_hash_table_lookup (known_keys, keys[j])); - if (status == KEY_UNKNOWN) - *messages = g_list_append (*messages, g_strdup_printf (" [%s] contains unknown option %s", group, keys[j])); - else if (status == KEY_DEPRECATED) - *messages = g_list_append (*messages, g_strdup_printf (" [%s] contains deprecated option %s, this can be safely removed", group, keys[j])); + if (status == KEY_UNKNOWN) { + if (messages != NULL) + *messages = g_list_append (*messages, g_strdup_printf (" [%s] contains unknown option %s", group, keys[j])); + } + else if (status == KEY_DEPRECATED) { + if (messages != NULL) + *messages = g_list_append (*messages, g_strdup_printf (" [%s] contains deprecated option %s, this can be safely removed", group, keys[j])); + } } value = g_key_file_get_value (key_file, groups[i], keys[j], NULL); diff --git a/configure.ac b/configure.ac index ae29e461..40a79e22 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.21.0) +AC_INIT(lightdm, 1.21.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/debian/changelog b/debian/changelog index 7871ba05..b443bfb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +lightdm (1.21.1-0ubuntu1) zesty; urgency=medium + + * New upstream release: + - Fix greeters crashing with unknown configuration keys (regression from + 1.21.0) (LP: #1643276) + - Add an API verison to the greeter-daemon protocol for future enhancements + - More regression tests + + -- Robert Ancell <robert.ancell@canonical.com> Wed, 23 Nov 2016 09:47:00 +1300 + lightdm (1.21.0-0ubuntu1) zesty; urgency=medium * New upstream release: diff --git a/debian/po/af.po b/debian/po/af.po index f586bf3e..cfeae58a 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/am.po b/debian/po/am.po index f1d20354..ddd73e7e 100644 --- a/debian/po/am.po +++ b/debian/po/am.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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/an.po b/debian/po/an.po index 3781c6ad..f9d20764 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ar.po b/debian/po/ar.po index f7c41474..a9beb556 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ast.po b/debian/po/ast.po index 5ad53dc2..5fff0f15 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/az.po b/debian/po/az.po index 3675f3f4..7c30c003 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/be.po b/debian/po/be.po index 4d62b142..06d08935 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/bg.po b/debian/po/bg.po index 7a65c8c1..6303ec89 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/bn.po b/debian/po/bn.po index 5566234c..36416245 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/bo.po b/debian/po/bo.po index 693e742e..c4be5e9a 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/br.po b/debian/po/br.po index 0d18d369..66ab2304 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: 2016-11-03 05:28+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/bs.po b/debian/po/bs.po index ea0a25c1..f67d2fd0 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ca.po b/debian/po/ca.po index d0dcff55..c83afe52 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ca@valencia.po b/debian/po/ca@valencia.po index fdb6c6bc..e6c1ba93 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ce.po b/debian/po/ce.po index 5a86eff2..b7e2bcb8 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ckb.po b/debian/po/ckb.po index 8e6191a0..ff513425 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/co.po b/debian/po/co.po index 0ec233c4..f89c8189 100644 --- a/debian/po/co.po +++ b/debian/po/co.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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/cs.po b/debian/po/cs.po index 9f97dbf4..7ef80053 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/cy.po b/debian/po/cy.po index 8a3df406..18d1b94c 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/da.po b/debian/po/da.po index 0743b82e..ce5d2f12 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/de.po b/debian/po/de.po index e32d2d22..b2983f53 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/el.po b/debian/po/el.po index a3a5cc22..363cfdda 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/en_AU.po b/debian/po/en_AU.po index 7b590538..2fcfb98a 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/en_CA.po b/debian/po/en_CA.po index 32b5b45d..fe68b0c8 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po index e757610c..ec5c7663 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/eo.po b/debian/po/eo.po index 8fae6cba..de65c9ca 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/es.po b/debian/po/es.po index fe66b9f9..61eace8b 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/et.po b/debian/po/et.po index 59f0f3d5..c200bcda 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/eu.po b/debian/po/eu.po index fbbeb508..dc8b6df8 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/fa.po b/debian/po/fa.po index 5c199920..3829831e 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/fi.po b/debian/po/fi.po index cbeed6ab..96830eaa 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/fo.po b/debian/po/fo.po index 59023e2f..dfd1460d 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/fr.po b/debian/po/fr.po index 1f194fcc..6c2d0e6a 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/fr_CA.po b/debian/po/fr_CA.po index ace5b388..7a51739d 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/fy.po b/debian/po/fy.po index fe9b9846..2ee6801e 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ga.po b/debian/po/ga.po index c3451ee7..6aec6df8 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/gd.po b/debian/po/gd.po index 8f6af4cd..1c4ebf4c 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/gl.po b/debian/po/gl.po index 19341a0e..17b62b8e 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/gu.po b/debian/po/gu.po index 0c921652..77768f9c 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/he.po b/debian/po/he.po index 818192e5..29aaee06 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/hi.po b/debian/po/hi.po index 20147a48..9a7f7c7d 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/hr.po b/debian/po/hr.po index 4e54069b..47c7f199 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ht.po b/debian/po/ht.po index 25dc0b5b..b48198c6 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/hu.po b/debian/po/hu.po index 4337fdc3..c82d86a0 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/hy.po b/debian/po/hy.po index 00d01eac..dd75b5b1 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ia.po b/debian/po/ia.po index 2db065eb..2ae41dc3 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/id.po b/debian/po/id.po index 9f09f5ff..c067b61a 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/is.po b/debian/po/is.po index df216251..7152cc1e 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/it.po b/debian/po/it.po index 824ac694..2d943bf8 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ja.po b/debian/po/ja.po index 42d5bf0a..8f2dadee 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/jv.po b/debian/po/jv.po index 19d011dc..1021c499 100644 --- a/debian/po/jv.po +++ b/debian/po/jv.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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/kk.po b/debian/po/kk.po index 595d1144..09d776cf 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/kl.po b/debian/po/kl.po index be5f0068..ad3f2cbc 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/km.po b/debian/po/km.po index d2c1af21..67212b66 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/kn.po b/debian/po/kn.po index ad2c3067..50312456 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ko.po b/debian/po/ko.po index 170906e5..a0136266 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ku.po b/debian/po/ku.po index a9ae1a59..e1c7076a 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/lb.po b/debian/po/lb.po index c06daa5a..186f3abc 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ln.po b/debian/po/ln.po index 99395016..d6611841 100644 --- a/debian/po/ln.po +++ b/debian/po/ln.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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/lt.po b/debian/po/lt.po index 697f0990..ba9978ef 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/lv.po b/debian/po/lv.po index 61be0996..94c11d0e 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/mhr.po b/debian/po/mhr.po index 4e53129b..17db6e75 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/mi.po b/debian/po/mi.po index 0a757587..9552c90b 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ml.po b/debian/po/ml.po index 50f618da..a86ca03a 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/mr.po b/debian/po/mr.po index 3401bd36..c97f884d 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ms.po b/debian/po/ms.po index 396731e4..4c92a437 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/my.po b/debian/po/my.po index ec3bab32..327601b1 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/nb.po b/debian/po/nb.po index 56bbda70..ab4e8566 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ne.po b/debian/po/ne.po index 281ecb37..3aeedbe0 100644 --- a/debian/po/ne.po +++ b/debian/po/ne.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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/nl.po b/debian/po/nl.po index 496f7cef..e0f5ed0e 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/nn.po b/debian/po/nn.po index 257b6d7c..7d6eaeb8 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/oc.po b/debian/po/oc.po index b08686cf..bb83192a 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/pa.po b/debian/po/pa.po index 73987a44..6732915f 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/pl.po b/debian/po/pl.po index d9a8ac95..954884bd 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/pt.po b/debian/po/pt.po index 366719a7..d74c78c0 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 7e48551b..6d71b44f 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ro.po b/debian/po/ro.po index 9af8b719..1e2f90c6 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ru.po b/debian/po/ru.po index 457f5665..100b616a 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/sc.po b/debian/po/sc.po index c32597f8..b7f5ddc7 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/sd.po b/debian/po/sd.po index 57851538..783a9f7d 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/shn.po b/debian/po/shn.po index d41b6210..de473c1c 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/si.po b/debian/po/si.po index fc38475d..40e6bd33 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/sk.po b/debian/po/sk.po index 5659307b..1da436f1 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/sl.po b/debian/po/sl.po index 743c8da7..8c8e9cd8 100644 --- a/debian/po/sl.po +++ b/debian/po/sl.po @@ -8,20 +8,20 @@ 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: 2012-10-31 17:34+0000\n" -"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" +"PO-Revision-Date: 2016-11-16 16:11+0000\n" +"Last-Translator: renato <Unknown>\n" "Language-Team: Slovenian <sl@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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-18 05:54+0000\n" +"X-Generator: Launchpad (build 18269)\n" #. Type: select #. Description #: ../lightdm.templates:2001 msgid "Default display manager:" -msgstr "" +msgstr "Privzeti upravitelj zaslona:" #. Type: select #. Description @@ -30,6 +30,8 @@ msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." msgstr "" +"Upravitelj zaslona je program, ki nam omogoča grafično prijavo v X okenski " +"sistem." #. Type: select #. Description @@ -39,6 +41,9 @@ msgid "" "manager packages are installed. Please select which display manager should " "run by default." msgstr "" +"Le en upravitelj zaslona lahko upravlja dani X strežnik, a je nameščenih več " +"paketov upraviteljev zaslona. Prosimo, izberite kateri upravitelj zaslona " +"naj se privzeto zažene." #. Type: select #. Description @@ -49,6 +54,10 @@ msgid "" "accordingly, edit each of their init scripts in /etc/init.d, and disable the " "check for a default display manager." msgstr "" +"Več upraviteljev zaslona lahko teče istočasno, če so nastavljeni za " +"upravljanje različnih strežnikov; da to storite, nastavite upravitelje " +"zaslona po tem, uredite vse njihove skripte init v /etc/init.d in " +"onemogočite preverjanje za privzetim upraviteljem zaslona." #~ msgid "Large Font" #~ msgstr "Velika pisava" diff --git a/debian/po/sq.po b/debian/po/sq.po index c80c9a42..84b7be88 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: 2016-11-02 06:09+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/sr.po b/debian/po/sr.po index 8464db0b..8bafda51 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" "Language: sr\n" #. Type: select diff --git a/debian/po/sv.po b/debian/po/sv.po index d010203e..b2f91357 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ta.po b/debian/po/ta.po index 101b7e88..5ac79640 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/te.po b/debian/po/te.po index 8a45509d..7ba9efef 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/tg.po b/debian/po/tg.po index 83c9091c..e053eb3e 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/th.po b/debian/po/th.po index 2b2d596b..7b0574c7 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/tl.po b/debian/po/tl.po index 811d96f1..b8458cb6 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/tr.po b/debian/po/tr.po index 69e92c6d..fb716a00 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ug.po b/debian/po/ug.po index 8f42c77c..fbe9fa5b 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/uk.po b/debian/po/uk.po index 1863148f..35f2d8db 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/ur.po b/debian/po/ur.po index 917fea53..310bbde7 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/uz.po b/debian/po/uz.po index 90dfaefe..511ff419 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/vi.po b/debian/po/vi.po index 743cfa6f..0db82658 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/wae.po b/debian/po/wae.po index 43e72041..0a5f4947 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index 85f46f7c..69a91d68 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/zh_HK.po b/debian/po/zh_HK.po index 7cf3409a..9f20402e 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po index 38dc5337..7482bb55 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: 2016-11-02 06:10+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"X-Launchpad-Export-Date: 2016-11-15 05:52+0000\n" +"X-Generator: Launchpad (build 18261)\n" #. Type: select #. Description diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c index 9a74a572..38eac052 100644 --- a/liblightdm-gobject/greeter.c +++ b/liblightdm-gobject/greeter.c @@ -117,6 +117,9 @@ static guint signals[LAST_SIGNAL] = { 0 }; typedef struct { + /* API version the daemon is using */ + guint32 api_version; + /* TRUE if the daemon can reuse this greeter */ gboolean resettable; @@ -168,6 +171,7 @@ G_DEFINE_TYPE (LightDMGreeter, lightdm_greeter, G_TYPE_OBJECT); #define HEADER_SIZE 8 #define MAX_MESSAGE_LENGTH 1024 +#define API_VERSION 1 /* Messages from the greeter to the server */ typedef enum @@ -193,6 +197,7 @@ typedef enum SERVER_MESSAGE_SHARED_DIR_RESULT, SERVER_MESSAGE_IDLE, SERVER_MESSAGE_RESET, + SERVER_MESSAGE_CONNECTED_V2, } ServerMessage; /* Request sent to server */ @@ -582,30 +587,57 @@ send_message (LightDMGreeter *greeter, guint8 *message, gsize message_length, GE } static void -handle_connected (LightDMGreeter *greeter, guint8 *message, gsize message_length, gsize *offset) +handle_connected (LightDMGreeter *greeter, gboolean v2, guint8 *message, gsize message_length, gsize *offset) { LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); - gchar *version; - GString *hint_string; + GString *debug_string; int timeout; Request *request; - version = read_string (message, message_length, offset); - hint_string = g_string_new (""); - while (*offset < message_length) + debug_string = g_string_new ("Connected"); + if (v2) { - gchar *name, *value; + guint32 i, n_env; + gchar *version; + + priv->api_version = read_int (message, message_length, offset); + g_string_append_printf (debug_string, " api=%u", priv->api_version); + version = read_string (message, message_length, offset); + g_string_append_printf (debug_string, " version=%s", version); + g_free (version); + n_env = read_int (message, message_length, offset); + for (i = 0; i < n_env; i++) + { + gchar *name, *value; - name = read_string (message, message_length, offset); - value = read_string (message, message_length, offset); - g_hash_table_insert (priv->hints, name, value); - g_string_append_printf (hint_string, " %s=%s", name, value); + name = read_string (message, message_length, offset); + value = read_string (message, message_length, offset); + g_hash_table_insert (priv->hints, name, value); + g_string_append_printf (debug_string, " %s=%s", name, value); + } + } + else + { + gchar *version; + + priv->api_version = 0; + version = read_string (message, message_length, offset); + g_string_append_printf (debug_string, " version=%s", version); + g_free (version); + while (*offset < message_length) + { + gchar *name, *value; + + name = read_string (message, message_length, offset); + value = read_string (message, message_length, offset); + g_hash_table_insert (priv->hints, name, value); + g_string_append_printf (debug_string, " %s=%s", name, value); + } } priv->connected = TRUE; - g_debug ("Connected version=%s%s", version, hint_string->str); - g_free (version); - g_string_free (hint_string, TRUE); + g_debug ("%s", debug_string->str); + g_string_free (debug_string, TRUE); /* Set timeout for default login */ timeout = lightdm_greeter_get_autologin_timeout_hint (greeter); @@ -821,7 +853,7 @@ handle_message (LightDMGreeter *greeter, guint8 *message, gsize message_length) switch (id) { case SERVER_MESSAGE_CONNECTED: - handle_connected (greeter, message, message_length, &offset); + handle_connected (greeter, FALSE, message, message_length, &offset); break; case SERVER_MESSAGE_PROMPT_AUTHENTICATION: handle_prompt_authentication (greeter, message, message_length, &offset); @@ -841,6 +873,9 @@ handle_message (LightDMGreeter *greeter, guint8 *message, gsize message_length) case SERVER_MESSAGE_RESET: handle_reset (greeter, message, message_length, &offset); break; + case SERVER_MESSAGE_CONNECTED_V2: + handle_connected (greeter, TRUE, message, message_length, &offset); + break; default: g_warning ("Unknown message from server: %d", id); break; @@ -957,9 +992,10 @@ send_connect (LightDMGreeter *greeter, gboolean resettable, GError **error) gsize offset = 0; g_debug ("Connecting to display manager..."); - return write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_CONNECT, string_length (VERSION) + int_length (), &offset, error) && + return write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_CONNECT, string_length (VERSION) + int_length () * 2, &offset, error) && write_string (message, MAX_MESSAGE_LENGTH, VERSION, &offset, error) && write_int (message, MAX_MESSAGE_LENGTH, resettable ? 1 : 0, &offset, error) && + write_int (message, MAX_MESSAGE_LENGTH, API_VERSION, &offset, error) && send_message (greeter, message, offset, error); } diff --git a/src/greeter.c b/src/greeter.c index 1ec5bd9c..0d07762f 100644 --- a/src/greeter.c +++ b/src/greeter.c @@ -60,6 +60,9 @@ struct GreeterPrivate /* PAM session being constructed by the greeter */ Session *authentication_session; + /* API version the client can speak */ + guint32 api_version; + /* TRUE if a the greeter can handle a reset; else we will just kill it instead */ gboolean resettable; @@ -82,6 +85,8 @@ struct GreeterPrivate G_DEFINE_TYPE (Greeter, greeter, G_TYPE_OBJECT); +#define API_VERSION 1 + /* Messages from the greeter to the server */ typedef enum { @@ -106,6 +111,7 @@ typedef enum SERVER_MESSAGE_SHARED_DIR_RESULT, SERVER_MESSAGE_IDLE, SERVER_MESSAGE_RESET, + SERVER_MESSAGE_CONNECTED_V2, } ServerMessage; static gboolean read_cb (GIOChannel *source, GIOCondition condition, gpointer data); @@ -294,30 +300,46 @@ string_length (const gchar *value) } static void -handle_connect (Greeter *greeter, const gchar *version, gboolean resettable) +handle_connect (Greeter *greeter, const gchar *version, gboolean resettable, guint32 api_version) { guint8 message[MAX_MESSAGE_LENGTH]; gsize offset = 0; - guint32 length; + guint32 env_length = 0; GHashTableIter iter; gpointer key, value; - g_debug ("Greeter connected version=%s resettable=%s", version, resettable ? "true" : "false"); + g_debug ("Greeter connected version=%s api=%u resettable=%s", version, api_version, resettable ? "true" : "false"); + greeter->priv->api_version = api_version; greeter->priv->resettable = resettable; - length = string_length (VERSION); g_hash_table_iter_init (&iter, greeter->priv->hints); while (g_hash_table_iter_next (&iter, &key, &value)) - length += string_length (key) + string_length (value); + env_length += string_length (key) + string_length (value); - write_header (message, MAX_MESSAGE_LENGTH, SERVER_MESSAGE_CONNECTED, length, &offset); - write_string (message, MAX_MESSAGE_LENGTH, VERSION, &offset); - g_hash_table_iter_init (&iter, greeter->priv->hints); - while (g_hash_table_iter_next (&iter, &key, &value)) + if (api_version == 0) { - write_string (message, MAX_MESSAGE_LENGTH, key, &offset); - write_string (message, MAX_MESSAGE_LENGTH, value, &offset); + write_header (message, MAX_MESSAGE_LENGTH, SERVER_MESSAGE_CONNECTED, string_length (VERSION) + env_length, &offset); + write_string (message, MAX_MESSAGE_LENGTH, VERSION, &offset); + g_hash_table_iter_init (&iter, greeter->priv->hints); + while (g_hash_table_iter_next (&iter, &key, &value)) + { + write_string (message, MAX_MESSAGE_LENGTH, key, &offset); + write_string (message, MAX_MESSAGE_LENGTH, value, &offset); + } + } + else + { + write_header (message, MAX_MESSAGE_LENGTH, SERVER_MESSAGE_CONNECTED_V2, string_length (VERSION) + int_length () * 2 + env_length, &offset); + write_int (message, MAX_MESSAGE_LENGTH, api_version <= API_VERSION ? api_version : API_VERSION, &offset); + write_string (message, MAX_MESSAGE_LENGTH, VERSION, &offset); + write_int (message, MAX_MESSAGE_LENGTH, g_hash_table_size (greeter->priv->hints), &offset); + g_hash_table_iter_init (&iter, greeter->priv->hints); + while (g_hash_table_iter_next (&iter, &key, &value)) + { + write_string (message, MAX_MESSAGE_LENGTH, key, &offset); + write_string (message, MAX_MESSAGE_LENGTH, value, &offset); + } } write_message (greeter, message, offset); @@ -830,6 +852,7 @@ read_cb (GIOChannel *source, GIOCondition condition, gpointer data) gchar *version, *username, *session_name, *language; gchar **secrets; gboolean resettable = FALSE; + guint32 api_version = 0; GError *error = NULL; if (condition == G_IO_HUP) @@ -894,7 +917,9 @@ read_cb (GIOChannel *source, GIOCondition condition, gpointer data) version = read_string (greeter, &offset); if (offset < length) resettable = read_int (greeter, &offset) != 0; - handle_connect (greeter, version, resettable); + if (offset < length) + api_version = read_int (greeter, &offset); + handle_connect (greeter, version, resettable, api_version); g_free (version); break; case GREETER_MESSAGE_AUTHENTICATE: diff --git a/tests/Makefile.am b/tests/Makefile.am index 54d1c2aa..e424c2d7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,6 +13,8 @@ TESTS = \ test-greeter-show-manual-login \ test-greeter-show-remote-login \ test-no-config \ + test-unknown-config \ + test-deprecated-config \ test-additional-config \ test-additional-config-priority \ test-additional-system-config \ @@ -70,6 +72,7 @@ TESTS = \ test-xauthority \ test-corrupt-xauthority \ test-system-xauthority \ + test-sessions-gobject \ test-user-renamed \ test-user-renamed-invalid \ test-user-name \ @@ -281,6 +284,7 @@ TESTS = \ TESTS += \ test-cancel-authentication-python \ + test-sessions-python \ test-users-python \ test-login-python \ test-login-manual-python \ @@ -344,6 +348,7 @@ TESTS += \ test-login-guest-fail-setup-script-qt4 \ test-login-guest-logout-qt4 \ test-login-remote-session-qt4 \ + test-sessions-qt4 \ test-users-qt4 \ test-power-qt4 \ test-power-no-console-kit-qt4 \ @@ -381,6 +386,7 @@ TESTS += \ test-login-guest-fail-setup-script-qt5 \ test-login-guest-logout-qt5 \ test-login-remote-session-qt5 \ + test-sessions-qt5 \ test-users-qt5 \ test-power-qt5 \ test-power-no-console-kit-qt5 \ @@ -452,6 +458,7 @@ EXTRA_DIST = \ scripts/cred-unavail.conf \ scripts/dbus.conf \ scripts/denied.conf \ + scripts/deprecated-config.conf \ scripts/expired.conf \ scripts/greeter-allow-guest.conf \ scripts/greeter-crash.conf \ @@ -561,6 +568,8 @@ EXTRA_DIST = \ scripts/script-hook-greeter-setup-missing.conf \ scripts/script-hook-session-setup-fail.conf \ scripts/script-hook-session-setup-missing.conf \ + scripts/seatdefaults-still-supported.conf \ + scripts/sessions.conf \ scripts/session-greeter.conf \ scripts/session-greeter-allow-guest.conf \ scripts/session-greeter-autologin.conf \ @@ -621,6 +630,7 @@ EXTRA_DIST = \ scripts/unity-plymouth.conf \ scripts/unity-script-hooks.conf \ scripts/unity-switch.conf \ + scripts/unknown-config.conf \ scripts/upstart-autologin.conf \ scripts/upstart-login.conf \ scripts/users.conf \ @@ -678,5 +688,4 @@ EXTRA_DIST = \ scripts/xremote-login.conf \ scripts/xserver-config.conf \ scripts/xserver-fail-start.conf \ - scripts/xserver-no-share.conf \ - scripts/seatdefaults-still-supported.conf + scripts/xserver-no-share.conf diff --git a/tests/scripts/deprecated-config.conf b/tests/scripts/deprecated-config.conf new file mode 100644 index 00000000..3b827077 --- /dev/null +++ b/tests/scripts/deprecated-config.conf @@ -0,0 +1,32 @@ +# +# Check handles deprecated configuration item +# + +[Seat:*] +xdg-seat=no-longer-used +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 + +# Greeter starts +#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 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 + +# Cleanup +#?*STOP-DAEMON +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/sessions.conf b/tests/scripts/sessions.conf new file mode 100644 index 00000000..fa25652d --- /dev/null +++ b/tests/scripts/sessions.conf @@ -0,0 +1,41 @@ +# +# Check can list available sessions +# + +[Seat:*] +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 + +# Greeter starts +#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 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 + +# List sessions +#?*GREETER-X-0 LOG-SESSIONS +#?GREETER-X-0 LOG-SESSION KEY=alternative +#?GREETER-X-0 LOG-SESSION KEY=default +#?GREETER-X-0 LOG-SESSION KEY=mir +#?GREETER-X-0 LOG-SESSION KEY=named-legacy +#?GREETER-X-0 LOG-SESSION KEY=named +#?GREETER-X-0 LOG-SESSION KEY=wayland +#?GREETER-X-0 LOG-SESSION KEY=greeter + +# Cleanup +#?*STOP-DAEMON +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/unknown-config.conf b/tests/scripts/unknown-config.conf new file mode 100644 index 00000000..2777908a --- /dev/null +++ b/tests/scripts/unknown-config.conf @@ -0,0 +1,35 @@ +# +# Check handles unknown configuration item +# + +[Seat:*] +not-an-option=does-not-exist +user-session=default + +[NOT-A-SECTION] +some-key=some-value + +#?*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 + +# Greeter starts +#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 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 + +# Cleanup +#?*STOP-DAEMON +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c index 6479f4c0..94ebf519 100644 --- a/tests/src/test-gobject-greeter.c +++ b/tests/src/test-gobject-greeter.c @@ -357,6 +357,18 @@ request_cb (const gchar *name, GHashTable *params) } } + else if (strcmp (name, "LOG-SESSIONS") == 0) + { + GList *sessions, *link; + + sessions = lightdm_get_sessions (); + for (link = sessions; link; link = link->next) + { + LightDMSession *session = link->data; + status_notify ("%s LOG-SESSION KEY=%s", greeter_id, lightdm_session_get_key (session)); + } + } + else if (strcmp (name, "GET-CAN-SUSPEND") == 0) { gboolean can_suspend = lightdm_get_can_suspend (); diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter index 6c8fa79b..63865418 100755 --- a/tests/src/test-python-greeter +++ b/tests/src/test-python-greeter @@ -104,6 +104,12 @@ def request_cb (channel, condition): for user in users: status_notify ('%s LOG-USER USERNAME=%s' % (greeter_id, user.get_name ())) + r = '%s LOG-SESSIONS' % greeter_id + if request == r: + sessions = LightDM.get_sessions (); + for session in sessions: + status_notify ('%s LOG-SESSION KEY=%s' % (greeter_id, session.get_key ())) + r = '%s LOG-LAYOUT' % greeter_id if request == r: layout = LightDM.get_layout ().get_name () diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp index 5df66b49..d2c7602a 100644 --- a/tests/src/test-qt-greeter.cpp +++ b/tests/src/test-qt-greeter.cpp @@ -7,6 +7,7 @@ #include <QLightDM/Greeter> #include <QLightDM/Power> #include <QLightDM/UsersModel> +#include <QLightDM/SessionsModel> #include <QtCore/QSettings> #include <QtCore/QDebug> #include <QtCore/QCoreApplication> @@ -20,6 +21,7 @@ static QSettings *config = NULL; static QLightDM::PowerInterface *power = NULL; static TestGreeter *greeter = NULL; static QLightDM::UsersModel *users_model = NULL; +static QLightDM::SessionsModel *sessions_model = NULL; TestGreeter::TestGreeter () { @@ -193,6 +195,15 @@ request_cb (const gchar *name, GHashTable *params) } } + else if (strcmp (name, "LOG-SESSIONS") == 0) + { + for (int i = 0; i < sessions_model->rowCount (QModelIndex ()); i++) + { + QString key = sessions_model->data (sessions_model->index (i, 0), QLightDM::SessionsModel::KeyRole).toString (); + status_notify ("%s LOG-SESSION KEY=%s", greeter_id, qPrintable (key)); + } + } + else if (strcmp (name, "GET-CAN-SUSPEND") == 0) { gboolean can_suspend = power->canSuspend (); @@ -322,6 +333,8 @@ main(int argc, char *argv[]) QObject::connect (users_model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex&, int, int)), greeter, SLOT(userRowsRemoved(const QModelIndex&, int, int))); } + sessions_model = new QLightDM::SessionsModel(); + status_notify ("%s CONNECT-TO-DAEMON", greeter_id); if (!greeter->connectSync()) { diff --git a/tests/test-deprecated-config b/tests/test-deprecated-config new file mode 100755 index 00000000..8450a2bc --- /dev/null +++ b/tests/test-deprecated-config @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner deprecated-config test-gobject-greeter diff --git a/tests/test-sessions-gobject b/tests/test-sessions-gobject new file mode 100755 index 00000000..b66b5b3a --- /dev/null +++ b/tests/test-sessions-gobject @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner sessions test-gobject-greeter diff --git a/tests/test-sessions-python b/tests/test-sessions-python new file mode 100755 index 00000000..80afc423 --- /dev/null +++ b/tests/test-sessions-python @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner sessions test-python-greeter diff --git a/tests/test-sessions-qt4 b/tests/test-sessions-qt4 new file mode 100755 index 00000000..db339f87 --- /dev/null +++ b/tests/test-sessions-qt4 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner sessions test-qt4-greeter diff --git a/tests/test-sessions-qt5 b/tests/test-sessions-qt5 new file mode 100755 index 00000000..c1ee070f --- /dev/null +++ b/tests/test-sessions-qt5 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner sessions test-qt5-greeter diff --git a/tests/test-unknown-config b/tests/test-unknown-config new file mode 100755 index 00000000..a32b1c8f --- /dev/null +++ b/tests/test-unknown-config @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner unknown-config test-gobject-greeter |