Merge lp:~mardy/ubuntu-system-settings-online-accounts/icon-1289401 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Update icon in System Settings.

Update icon in System Settings

[lp:~mardy/ubuntu-system-settings-online-accounts/icon-1289401]

371. By Alberto Mardegan on 2016-10-25

merge from trunk

* Tests: create runtime directory, fix execution under pbuilder (LP:
  #1614108)
* Build-Depend on upstart to avoid s390x builds on yakkety.
* Properly handle early termination of account access requests (LP:
  #1594944)
* debian/control, debian/libonline-accounts-plugin-dev.install:
  - Don't depend on main package, don't allow linking to
    libonline-accounts-plugin.so (LP: #1612299)
[ Alberto Mardegan ]
* debian/rules:
  - Don't run tests on powerpc (LP: #1606927)
[ Gary.Wzl ]
* add a new property "userAgent" for OAuth item. (LP: #1587282)
[ Timo Jyrinki ]
* Add qttools5-dev-tools build dependency (LP: #1608814)
[ Alberto Mardegan ]
* Fix desktop file name for scopes: they use their short app ID (LP:
  #1541717)
[ Florian Boucault ]
* Crossbuilding fixes
* Read time from symlink file, not target (LP: #1596478)

=== modified file 'system-settings-plugin/online-accounts.settings'
--- system-settings-plugin/online-accounts.settings	2015-01-23 17:15:37 +0000
+++ system-settings-plugin/online-accounts.settings	2016-10-25 11:55:25 +0000
@@ -1,6 +1,6 @@
 {
     "name": "Accounts",
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-accounts.svg",
+    "icon": "preferences-desktop-accounts-symbolic",
     "translations": "ubuntu-system-settings-online-accounts",
     "category": "personal",
     "priority": 3,

=== removed file 'system-settings-plugin/settings-accounts.svg'
--- system-settings-plugin/settings-accounts.svg	2014-06-24 14:48:29 +0000
+++ system-settings-plugin/settings-accounts.svg	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg4874"
-   version="1.1"
-   inkscape:version="0.48+devel r"
-   viewBox="0 0 90 90.000001"
-   sodipodi:docname="contact-group.svg">
-  <defs
-     id="defs4876" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.947598"
-     inkscape:cx="22.78942"
-     inkscape:cy="38.732046"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4780"
-     showgrid="true"
-     showborder="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid5451"
-       empspacing="6" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="6,77"
-       id="guide4063" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="3,78"
-       id="guide4065" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="55,84"
-       id="guide4067" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="53,87"
-       id="guide4069" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="20,3"
-       id="guide4071" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="20,6"
-       id="guide4073" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="87,7"
-       id="guide4075" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="84,7"
-       id="guide4077" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="58,81"
-       id="guide4074" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="9,74"
-       id="guide4076" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="21,9"
-       id="guide4078" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="81,4"
-       id="guide4080" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4879">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(67.857146,-84.50504)">
-    <g
-       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
-       id="g4845"
-       style="display:inline">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="next01.png"
-         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
-         id="g4778"
-         inkscape:label="Layer 1">
-        <g
-           transform="matrix(-1,0,0,1,575.99999,611)"
-           id="g4780"
-           style="display:inline">
-          <rect
-             transform="scale(-1,1)"
-             y="351.36221"
-             x="-432"
-             height="90"
-             width="90"
-             id="rect4120"
-             style="color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cccccccccccccccccc"
-             inkscape:connector-curvature="0"
-             id="path4122"
-             d="m 382.94991,365.19669 c -3.07887,2.13061 -5.74697,4.44959 -8.0274,6.66029 l 0,-0.008 c -3.99967,4.04832 -8.77508,9.49192 -8.77508,9.49192 0,0 4.69091,5.76968 8.76906,9.5265 l 0,-0.008 c 2.27742,2.20795 4.94139,4.52544 8.01536,6.65427 -0.0363,0.0951 -0.0668,0.19244 -0.10377,0.28723 -1.94472,5.12874 -4.53071,9.65753 -7.75811,13.58679 l -21.13197,0 0,-21.25757 0,-0.0271 0,-17.48606 0,-21.28464 21.13197,0 c 3.2274,3.92924 5.81339,8.43624 7.75811,13.52358 0.0434,0.1122 0.0793,0.22731 0.12186,0.33987 z"
-             style="font-size:15.00296783px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
-          <path
-             style="font-size:121.62958527px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-             d="m 419.99538,381.36243 c -4.2e-4,4.75381 -1.99124,9.35043 -5.50399,12.71154 -3.51328,3.36163 -8.31664,5.26477 -13.28361,5.26477 l -0.0151,0 c -1.91234,-0.008 -4.11305,-0.18068 -6.34532,-1.08874 -5.81958,-2.36734 -10.33868,-5.91672 -13.83146,-9.15808 l 0,0.007 c -1.01511,-0.89511 -2.04594,-1.91539 -3.03721,-2.93238 l 0,-9.48741 c 0.99968,-1.02979 2.03673,-2.08206 3.04323,-3.0572 l 0,0.008 c 3.49197,-3.24035 8.008,-6.78859 13.82544,-9.15507 2.23203,-0.90797 4.43243,-1.08164 6.34532,-1.08875 l 0.0151,0 c 4.96783,0 9.77075,1.90505 13.28361,5.26628 3.51231,3.3607 5.50357,7.95622 5.50399,12.71003 l 0,0.001 z"
-             id="path4124"
-             inkscape:connector-curvature="0" />
-          <path
-             style="font-size:15.00296783px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-             d="m 388.25039,430.34074 c -0.0289,0.0758 -0.0527,0.15303 -0.0821,0.22851 -1.54846,4.08363 -3.60849,7.68784 -6.17823,10.81641 l -15.04696,0 0,-16.92578 0,-0.0215 0,-7.07618 8.03442,0 c -0.003,0.003 -0.0918,0.10156 -0.0918,0.10156 0,0 3.73612,4.59271 6.98323,7.58399 l 0,-0.006 c 1.81334,1.75802 3.93385,3.6038 6.38143,5.29882 z"
-             id="path4115"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccccccccc" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4117"
-             d="m 417.76167,417.481 c -3.3e-4,3.7851 -1.60092,7.44505 -4.4251,10.12125 -2.82464,2.67661 -6.68644,4.19195 -10.6798,4.19195 l -0.012,0 c -1.53749,-0.007 -3.30682,-0.14386 -5.10151,-0.86688 -4.67884,-1.88494 -8.31211,-4.71104 -11.12027,-7.2919 l 0,0.006 c -0.81613,-0.71271 -1.64489,-1.52508 -2.44186,-2.33484 l 0,-7.55411 c 0.80374,-0.81995 1.6375,-1.6578 2.44671,-2.43423 l 0,0.007 c 2.80749,-2.58005 6.43827,-5.40525 11.11542,-7.28949 1.7945,-0.72295 3.56358,-0.86123 5.10151,-0.8669 l 0.012,0 c 3.99405,0 7.85552,1.51685 10.6798,4.19315 2.82382,2.67587 4.42477,6.33494 4.4251,10.12005 l 0,8e-4 z"
-             style="font-size:121.62958527px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>

=== modified file 'system-settings-plugin/system-settings-plugin.pro'
--- system-settings-plugin/system-settings-plugin.pro	2015-01-23 17:15:37 +0000
+++ system-settings-plugin/system-settings-plugin.pro	2016-10-25 11:55:25 +0000
@@ -42,10 +42,6 @@
 target.path = $${PLUGIN_MODULE_DIR}
 INSTALLS += target
 
-image.files = settings-accounts.svg
-image.path = $${PLUGIN_MANIFEST_DIR}/icons
-INSTALLS += image
-
 qml.files = $${QML_SOURCES}
 qml.path = $${PLUGIN_QML_DIR}/online-accounts
 INSTALLS += qml