Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1219644-cont into lp:~online-accounts/ubuntu-system-settings-online-accounts/master

[Alberto Mardegan]

Create ~/.cache/online-accounts-ui, don't query apparmor for self

These fixes the issues described here:
https://bugs.launchpad.net/ubuntu-system-settings-online-accounts/+bug/1219644/comments/13

Create ~/.cache/online-accounts-ui, don't query apparmor for self

These fixes the issues described here:
https://bugs.launchpad.net/ubuntu-system-settings-online-accounts/+bug/1219644/comments/13

[Justin McPherson (justinmcp)]

review: Approve

=== modified file 'online-accounts-service/ui-proxy.cpp'
--- online-accounts-service/ui-proxy.cpp	2015-01-14 09:31:14 +0000
+++ online-accounts-service/ui-proxy.cpp	2015-02-09 13:15:11 +0000
@@ -246,6 +246,13 @@
         setupPromptSession();
     }
 
+    /* We also create ~/cache/online-accounts-ui/, since the plugin might not
+     * have permissions to do that. */
+    QString userCacheDir =
+        QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
+    QDir cacheDir(userCacheDir + "/online-accounts-ui");
+    if (!cacheDir.exists()) cacheDir.mkpath(".");
+
     return true;
 }
 

=== modified file 'online-accounts-ui/signonui-request.cpp'
--- online-accounts-ui/signonui-request.cpp	2015-01-14 09:31:14 +0000
+++ online-accounts-ui/signonui-request.cpp	2015-02-09 13:15:11 +0000
@@ -33,6 +33,8 @@
 #include <SignOn/uisessiondata.h>
 #include <SignOn/uisessiondata_priv.h>
 #include <sys/apparmor.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 using namespace SignOnUi;
 
@@ -135,6 +137,13 @@
     if (profile == "unconfined" &&
         parameters.contains(SSOUI_KEY_PID)) {
         pid_t pid = parameters.value(SSOUI_KEY_PID).toUInt();
+        if (pid == getpid()) {
+            /* If the request was initiated by our own process, we might not
+             * have the rights to call the aa_* functions (we might be
+             * confined). */
+            return QString();
+        }
+
         char *con = NULL, *mode = NULL;
         int ret = aa_gettaskcon(pid, &con, &mode);
         if (Q_LIKELY(ret >= 0)) {

=== added file 'po/oc.po'
--- po/oc.po	1970-01-01 00:00:00 +0000
+++ po/oc.po	2015-02-09 13:15:11 +0000
@@ -0,0 +1,108 @@
+# Occitan (post 1500) translation for ubuntu-system-settings-online-accounts
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the ubuntu-system-settings-online-accounts package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-system-settings-online-accounts\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
+"PO-Revision-Date: 2015-02-06 06:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-02-07 07:31+0000\n"
+"X-Generator: Launchpad (build 17331)\n"
+
+#: ../plugins/example/Main.qml:33
+msgid "User name"
+msgstr "Nom d'utilizaire"
+
+#: ../plugins/example/Main.qml:39
+msgid "Password"
+msgstr "Senhal"
+
+#: ../system-settings-plugin/AccountsPage.qml:51
+msgid "Add account…"
+msgstr "Apondre un compte…"
+
+#: ../system-settings-plugin/AddAccountLabel.qml:27
+msgid ""
+"Storing account details here lets apps use the accounts without you having "
+"to sign in for each app."
+msgstr ""
+
+#: ../system-settings-plugin/MainPage.qml:29
+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
+msgid "Accounts"
+msgstr "Comptes"
+
+#: ../system-settings-plugin/NewAccountPage.qml:23
+msgid "Add account"
+msgstr "Apondre un compte"
+
+#: ../system-settings-plugin/NoAccountsPage.qml:36
+msgid "No accounts"
+msgstr ""
+
+#: ../system-settings-plugin/NoAccountsPage.qml:44
+msgid "Add account:"
+msgstr ""
+
+#: ../online-accounts-ui/module/OAuth.qml:119
+msgid "Loading…"
+msgstr "Cargament…"
+
+#: ../online-accounts-ui/module/OAuth.qml:149
+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
+msgid "Cancel"
+msgstr "Abandonar"
+
+#: ../online-accounts-ui/module/Options.qml:36
+msgid "ID"
+msgstr "Identificant"
+
+#: ../online-accounts-ui/module/Options.qml:48
+msgid "Remove account…"
+msgstr "Suprimir lo compte..."
+
+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
+msgid "Remove account"
+msgstr "Suprimir lo compte"
+
+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
+#, qt-format
+msgid ""
+"The %1 account will be removed only from your phone. You can add it again "
+"later."
+msgstr ""
+
+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
+msgid "Remove"
+msgstr "Suprimir"
+
+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
+msgid "Access to this account:"
+msgstr ""
+
+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
+#, qt-format
+msgid "%1 wants to access your %2 account"
+msgstr ""
+
+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
+msgid "Allow"
+msgstr "Autorizar"
+
+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
+msgid "Don't allow"
+msgstr "Refusar"
+
+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
+msgid "Add another"
+msgstr ""