Online Accounts setup for Ubuntu Touch

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

  1. lp1219644-cont
  2. Merge into master
Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 230
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/lp1219644-cont
Merge into: lp:~online-accounts/ubuntu-system-settings-online-accounts/master
Diff against target: 157 lines (+124/-0)
3 files modified
online-accounts-service/ui-proxy.cpp (+7/-0)
online-accounts-ui/signonui-request.cpp (+9/-0)
po/oc.po (+108/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1219644-cont
Reviewer Review Type Date Requested Status
Justin McPherson Approve
Review via email: mp+249070@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Justin McPherson (justinmcp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
246 setupPromptSession();246 setupPromptSession();
247 }247 }
248248
249 /* We also create ~/cache/online-accounts-ui/, since the plugin might not
250 * have permissions to do that. */
251 QString userCacheDir =
252 QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
253 QDir cacheDir(userCacheDir + "/online-accounts-ui");
254 if (!cacheDir.exists()) cacheDir.mkpath(".");
255
249 return true;256 return true;
250}257}
251258
252259
=== 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 @@
33#include <SignOn/uisessiondata.h>33#include <SignOn/uisessiondata.h>
34#include <SignOn/uisessiondata_priv.h>34#include <SignOn/uisessiondata_priv.h>
35#include <sys/apparmor.h>35#include <sys/apparmor.h>
36#include <sys/types.h>
37#include <unistd.h>
3638
37using namespace SignOnUi;39using namespace SignOnUi;
3840
@@ -135,6 +137,13 @@
135 if (profile == "unconfined" &&137 if (profile == "unconfined" &&
136 parameters.contains(SSOUI_KEY_PID)) {138 parameters.contains(SSOUI_KEY_PID)) {
137 pid_t pid = parameters.value(SSOUI_KEY_PID).toUInt();139 pid_t pid = parameters.value(SSOUI_KEY_PID).toUInt();
140 if (pid == getpid()) {
141 /* If the request was initiated by our own process, we might not
142 * have the rights to call the aa_* functions (we might be
143 * confined). */
144 return QString();
145 }
146
138 char *con = NULL, *mode = NULL;147 char *con = NULL, *mode = NULL;
139 int ret = aa_gettaskcon(pid, &con, &mode);148 int ret = aa_gettaskcon(pid, &con, &mode);
140 if (Q_LIKELY(ret >= 0)) {149 if (Q_LIKELY(ret >= 0)) {
141150
=== 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 @@
1# Occitan (post 1500) translation for ubuntu-system-settings-online-accounts
2# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3# This file is distributed under the same license as the ubuntu-system-settings-online-accounts package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: ubuntu-system-settings-online-accounts\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-08-26 10:31+0200\n"
11"PO-Revision-Date: 2015-02-06 06:22+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Occitan (post 1500) <oc@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2015-02-07 07:31+0000\n"
18"X-Generator: Launchpad (build 17331)\n"
19
20#: ../plugins/example/Main.qml:33
21msgid "User name"
22msgstr "Nom d'utilizaire"
23
24#: ../plugins/example/Main.qml:39
25msgid "Password"
26msgstr "Senhal"
27
28#: ../system-settings-plugin/AccountsPage.qml:51
29msgid "Add account…"
30msgstr "Apondre un compte…"
31
32#: ../system-settings-plugin/AddAccountLabel.qml:27
33msgid ""
34"Storing account details here lets apps use the accounts without you having "
35"to sign in for each app."
36msgstr ""
37
38#: ../system-settings-plugin/MainPage.qml:29
39#: ../online-accounts-ui/qml/ProviderRequest.qml:51
40#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
41msgid "Accounts"
42msgstr "Comptes"
43
44#: ../system-settings-plugin/NewAccountPage.qml:23
45msgid "Add account"
46msgstr "Apondre un compte"
47
48#: ../system-settings-plugin/NoAccountsPage.qml:36
49msgid "No accounts"
50msgstr ""
51
52#: ../system-settings-plugin/NoAccountsPage.qml:44
53msgid "Add account:"
54msgstr ""
55
56#: ../online-accounts-ui/module/OAuth.qml:119
57msgid "Loading…"
58msgstr "Cargament…"
59
60#: ../online-accounts-ui/module/OAuth.qml:149
61#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
62#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
63msgid "Cancel"
64msgstr "Abandonar"
65
66#: ../online-accounts-ui/module/Options.qml:36
67msgid "ID"
68msgstr "Identificant"
69
70#: ../online-accounts-ui/module/Options.qml:48
71msgid "Remove account…"
72msgstr "Suprimir lo compte..."
73
74#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
75msgid "Remove account"
76msgstr "Suprimir lo compte"
77
78#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
79#, qt-format
80msgid ""
81"The %1 account will be removed only from your phone. You can add it again "
82"later."
83msgstr ""
84
85#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
86msgid "Remove"
87msgstr "Suprimir"
88
89#: ../online-accounts-ui/module/ServiceSwitches.qml:33
90msgid "Access to this account:"
91msgstr ""
92
93#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
94#, qt-format
95msgid "%1 wants to access your %2 account"
96msgstr ""
97
98#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
99msgid "Allow"
100msgstr "Autorizar"
101
102#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
103msgid "Don't allow"
104msgstr "Refusar"
105
106#: ../online-accounts-ui/qml/ProviderRequest.qml:87
107msgid "Add another"
108msgstr ""

Subscribers

People subscribed via source and target branches