diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2017-12-22 12:40:34 +1300 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2017-12-22 12:40:34 +1300 |
commit | bb1a5eb4f94a0dc42adde95bf01514cb79eb11a9 (patch) | |
tree | c89f2c4c86e4f64119d9a61b9f854bf5578273dd | |
parent | 6015bce25f241e7580c03594d846769f8236232f (diff) | |
download | lightdm-git-bb1a5eb4f94a0dc42adde95bf01514cb79eb11a9.tar.gz |
Fix up KeyboardLayouts migration to AccountsService extension
-rw-r--r-- | common/user-list.c | 2 | ||||
-rw-r--r-- | data/org.freedesktop.DisplayManager.AccountsService.xml | 4 | ||||
-rw-r--r-- | po/lightdm.pot | 44 | ||||
-rw-r--r-- | tests/src/test-runner.c | 4 |
4 files changed, 37 insertions, 17 deletions
diff --git a/common/user-list.c b/common/user-list.c index b8e32826..dbb5017d 100644 --- a/common/user-list.c +++ b/common/user-list.c @@ -604,7 +604,7 @@ load_accounts_user (CommonUser *user) } else if (strcmp (name, "HasMessages") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN)) priv->has_messages = g_variant_get_boolean (value); - else if (strcmp (name, "XKeyboardLayouts") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_STRING_ARRAY)) + else if (strcmp (name, "KeyboardLayouts") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_STRING_ARRAY)) { g_strfreev (priv->layouts); priv->layouts = g_variant_dup_strv (value, NULL); diff --git a/data/org.freedesktop.DisplayManager.AccountsService.xml b/data/org.freedesktop.DisplayManager.AccountsService.xml index 07b0dab9..03562f93 100644 --- a/data/org.freedesktop.DisplayManager.AccountsService.xml +++ b/data/org.freedesktop.DisplayManager.AccountsService.xml @@ -18,8 +18,8 @@ <property name="HasMessages" type="b" access="readwrite"> <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/> </property> - <property name="BackgroundFile" type="s" access="readwrite"> - <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/> + <property name="KeyboardLayouts" type="as" access="readwrite"> + <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/> </property> </interface> diff --git a/po/lightdm.pot b/po/lightdm.pot index beb7f630..7f999760 100644 --- a/po/lightdm.pot +++ b/po/lightdm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-07 15:52+1300\n" +"POT-Creation-Date: 2017-12-22 12:38+1300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,58 +17,78 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: ../data/org.freedesktop.DisplayManager.AccountsService.policy.in.h:1 +msgid "Set properties of own user" +msgstr "" + +#: ../data/org.freedesktop.DisplayManager.AccountsService.policy.in.h:2 +msgid "Authentication is required to set one's own greeter properties." +msgstr "" + +#: ../data/org.freedesktop.DisplayManager.AccountsService.policy.in.h:3 +msgid "Set properties of any user" +msgstr "" + +#: ../data/org.freedesktop.DisplayManager.AccountsService.policy.in.h:4 +msgid "Authentication is required to get another user's greeter properties." +msgstr "" + +#: ../data/org.freedesktop.DisplayManager.AccountsService.policy.in.h:5 +msgid "Authentication is required to set another user's greeter properties." +msgstr "" + #. Help string for command line --config flag -#: ../src/lightdm.c:618 +#: ../src/lightdm.c:597 msgid "Use configuration file" msgstr "" #. Help string for command line --debug flag -#: ../src/lightdm.c:621 +#: ../src/lightdm.c:600 msgid "Print debugging messages" msgstr "" #. Help string for command line --test-mode flag -#: ../src/lightdm.c:624 +#: ../src/lightdm.c:603 msgid "Run as unprivileged user, skipping things that require root access" msgstr "" #. Help string for command line --pid-file flag -#: ../src/lightdm.c:627 +#: ../src/lightdm.c:606 msgid "File to write PID into" msgstr "" #. Help string for command line --log-dir flag -#: ../src/lightdm.c:630 +#: ../src/lightdm.c:609 msgid "Directory to write logs to" msgstr "" #. Help string for command line --run-dir flag -#: ../src/lightdm.c:633 +#: ../src/lightdm.c:612 msgid "Directory to store running state" msgstr "" #. Help string for command line --cache-dir flag -#: ../src/lightdm.c:636 +#: ../src/lightdm.c:615 msgid "Directory to cache information" msgstr "" #. Help string for command line --show-config flag -#: ../src/lightdm.c:639 +#: ../src/lightdm.c:618 msgid "Show combined configuration" msgstr "" #. Help string for command line --version flag -#: ../src/lightdm.c:642 +#: ../src/lightdm.c:621 msgid "Show release version" msgstr "" #. Arguments and description for --help test -#: ../src/lightdm.c:667 +#: ../src/lightdm.c:651 msgid "- Display Manager" msgstr "" #. Text printed out when an unknown command-line argument provided -#: ../src/lightdm.c:677 +#: ../src/lightdm.c:660 #, c-format msgid "Run '%s --help' to see a full list of available command line options." msgstr "" diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index 836e24fa..aaa3d550 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -2152,7 +2152,7 @@ handle_user_get_extra_property (GDBusConnection *connection, return g_variant_new_string (user->background ? user->background : ""); else if (strcmp (property_name, "HasMessages") == 0) return g_variant_new_boolean (user->has_messages); - else if (strcmp (property_name, "XKeyboardLayouts") == 0) + else if (strcmp (property_name, "KeyboardLayouts") == 0) { if (user->layouts != NULL) return g_variant_new_strv ((const gchar * const *) user->layouts, -1); @@ -2207,7 +2207,7 @@ accounts_user_set_hidden (AccountsUser *user, gboolean hidden, gboolean emit_sig " <interface name='org.freedesktop.DisplayManager.AccountsService'>" " <property name='BackgroundFile' type='s' access='read'/>" " <property name='HasMessages' type='b' access='read'/>" - " <property name='XKeyboardLayouts' type='as' access='read'/>" + " <property name='KeyboardLayouts' type='as' access='read'/>" " </interface>" "</node>"; g_autoptr(GDBusNodeInfo) user_info = NULL; |