Merge tag 'upstream/0.23.1'

Upstream version 0.23.1

1 files changed, 0 insertions, 237 deletions

diff --git a/icons/shotwell.svg b/icons/shotwell.svg
deleted file mode 100644
index 1a0c067..0000000
--- a/icons/shotwell.svg
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="120"
-   height="120"
-   viewBox="0 0 120 120"
-   enable-background="new 0 0 180 180"
-   xml:space="preserve"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="shotwell.svg"><metadata
-   id="metadata9"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs7"><linearGradient
-     id="linearGradient3710"><stop
-       style="stop-color:#c9332e;stop-opacity:1;"
-       offset="0"
-       id="stop3712" /><stop
-       style="stop-color:#87231f;stop-opacity:1;"
-       offset="1"
-       id="stop3714" /></linearGradient><linearGradient
-     id="linearGradient3665"><stop
-       style="stop-color:#667f2e;stop-opacity:1;"
-       offset="0"
-       id="stop3667" /><stop
-       style="stop-color:#94b641;stop-opacity:1;"
-       offset="1"
-       id="stop3669" /></linearGradient><linearGradient
-     id="linearGradient3628"><stop
-       style="stop-color:#099bd1;stop-opacity:1;"
-       offset="0"
-       id="stop3630" /><stop
-       style="stop-color:#035fa9;stop-opacity:1;"
-       offset="1"
-       id="stop3632" /></linearGradient><linearGradient
-     id="linearGradient3607"><stop
-       style="stop-color:#fffbf7;stop-opacity:1;"
-       offset="0"
-       id="stop3609" /><stop
-       style="stop-color:#fed697;stop-opacity:1;"
-       offset="1"
-       id="stop3611" /></linearGradient><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3710"
-     id="linearGradient2906"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.66249999,0,0,0.66249999,155.6125,-4.0249993)"
-     x1="-124.5"
-     y1="101.26834"
-     x2="-124.5"
-     y2="73.998131" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3628"
-     id="linearGradient2918"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(1.0131827,0,0,1.0031202,113.23728,-0.21917682)"
-     x1="-43.661713"
-     y1="60.388466"
-     x2="-43.661713"
-     y2="31.618958" /><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3607"
-     id="radialGradient2920"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(0.82352939,-6.1355775e-8,5.2590677e-8,0.7058825,-29.1752,17.22328)"
-     cx="-165.3261"
-     cy="58.559208"
-     fx="-165.3261"
-     fy="58.559208"
-     r="8.9683418" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient3665"
-     id="linearGradient2922"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(1.025641,0,0,1.0126582,136.85898,-4.28481)"
-     x1="-17.5"
-     y1="22"
-     x2="-17.5"
-     y2="62.152832" /><filter
-     inkscape:collect="always"
-     id="filter3702"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="1.5975"
-       id="feGaussianBlur3704" /></filter><filter
-     inkscape:collect="always"
-     id="filter3706"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="1.5975"
-       id="feGaussianBlur3708" /></filter><filter
-     inkscape:collect="always"
-     id="filter3710"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="1.5975"
-       id="feGaussianBlur3712" /></filter></defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#e7e7e7"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1024"
-   inkscape:window-height="719"
-   id="namedview5"
-   showgrid="false"
-   inkscape:zoom="1"
-   inkscape:cx="36.341145"
-   inkscape:cy="36.952073"
-   inkscape:window-x="1024"
-   inkscape:window-y="24"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   showguides="true"
-   inkscape:guide-bbox="true"
-   inkscape:snap-grids="false"
-   inkscape:showpageshadow="false"><inkscape:grid
-     type="xygrid"
-     id="grid2819"
-     empspacing="5"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
-
-<rect
-   style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999981999999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3702);opacity:0.6"
-   id="rect2924"
-   width="62.000004"
-   height="71"
-   x="50.5"
-   y="5.5"
-   rx="0"
-   ry="0" /><rect
-   style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999981999999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3706);opacity:0.6"
-   id="rect2926"
-   width="65"
-   height="74"
-   x="34.5"
-   y="39.5"
-   rx="0"
-   ry="0" /><rect
-   ry="0"
-   rx="0"
-   y="15.5"
-   x="7.5"
-   height="88"
-   width="78"
-   id="rect2928"
-   style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999994000000003;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3710);opacity:0.6" /><rect
-   ry="0"
-   rx="0"
-   y="5.5"
-   x="50.5"
-   height="71"
-   width="62.000004"
-   id="rect2823"
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999982;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
-   id="g3686"
-   transform="matrix(0.6625,0,0,0.6625,0.34375,-2.25625)"><rect
-     y="18.5"
-     x="82.5"
-     height="80"
-     width="80"
-     id="rect3663"
-     style="fill:url(#linearGradient2922);fill-opacity:1;stroke:none" /><path
-     sodipodi:nodetypes="cssssccccccc"
-     id="path3677"
-     d="m 162.5,69.403979 c -2.22852,-1.237376 -4.46994,-5.451512 -7.40236,-4.460717 -0.76829,0.259584 -1.95022,1.365871 -2.68935,0.99127 -1.35731,-0.687906 -3.00597,-2.303485 -4.03401,-3.345538 -0.78598,-0.79668 -4.59841,0.166751 -5.74542,-0.123909 -3.38574,-0.857971 -6.51258,-3.166053 -8.06803,-6.319349 l -2.32261,-3.965082 c -1.68346,-0.895603 -3.17504,-1.982541 -4.4552,-1.982541 l 0,48.301887 10.4451,0 24.27188,0 0,-29.096021 z"
-     style="fill:#6a8430;fill-opacity:1;stroke:none" /><path
-     sodipodi:nodetypes="csscccc"
-     d="m 162.5,79.027822 c -3.20911,-0.269797 -5.387,-0.247653 -8.30096,0.664119 -2.27389,0.711495 -3.38028,2.781181 -6.04365,3.138337 -3.68484,0.494134 -7.69403,0.120706 -11.31577,0.120706 l 0.12858,15.450277 25.5318,0.09874 0,-19.472178 z"
-     style="fill:#526726;fill-opacity:1;stroke:none"
-     id="path3681" /><path
-     sodipodi:nodetypes="csscccc"
-     d="m 162.5,90.952978 c -2.45799,0.432601 -3.53926,-5.677772 -6.08832,-4.335286 -2.55957,1.348017 -4.48039,3.606282 -7.49452,4.399992 -2.46939,0.650265 -5.52753,-0.517646 -7.54924,-0.194118 l 0,7.676434 21.13208,0 0,-7.547022 z"
-     style="fill:#384619;fill-opacity:1;stroke:none"
-     id="path3679" /></g><rect
-   ry="0"
-   rx="0"
-   y="39.5"
-   x="34.5"
-   height="74"
-   width="65"
-   id="rect2821"
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999982;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><rect
-   style="fill:url(#linearGradient2906);fill-opacity:1;stroke:none"
-   id="rect3700"
-   width="53"
-   height="53"
-   x="41"
-   y="45" /><path
-   style="fill:#4e1413;fill-opacity:1;stroke:none"
-   d="m 86.549183,74.081477 c 0.886193,-0.310035 1.749359,0.314783 2.143319,1.029989 0.05979,0.10859 -0.09092,0.432448 0,0.514995 0.279367,0.253582 0.843247,-0.471893 1.449895,0.629429 0.38218,0.693827 -1.133497,1.946613 -0.756471,2.288853 0.282161,0.256125 1.078114,-0.280248 1.323818,-0.05721 0.178461,0.161993 0.02823,1.100004 0.126077,1.14443 0.597812,0.271316 1.189475,-0.365825 1.449896,0.343329 0.2502,0.681328 -1.563042,0.767351 -1.008621,1.773859 0.107211,0.194647 1.755465,0.416218 2.137051,0.531672 0.06578,0.01985 0.197844,0.521889 0.160786,0.555535 -0.601263,0.545772 -0.784906,0.195587 -0.784906,1.258864 0,0.647559 0.822487,0.05987 1.197486,0.400301 0.02795,0.02536 2.48e-4,3.005357 2.48e-4,3.547977 L 93.987513,98 82,97.999967 l 0,-23.918486 4.549183,0 z"
-   id="path3698"
-   sodipodi:nodetypes="cssssssssssssccccc" /><rect
-   style="fill:#ffffff;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-   id="rect2817"
-   width="78"
-   height="88"
-   x="7.5"
-   y="15.5"
-   rx="0"
-   ry="0" /><g
-   id="g3636"
-   transform="matrix(0.65656596,0,0,0.66151013,0.69694898,0.83443815)"><rect
-     y="32"
-     x="19"
-     height="98"
-     width="100"
-     id="rect3618"
-     style="fill:url(#linearGradient2918);fill-opacity:1;stroke:none" /><path
-     transform="matrix(0.90221167,0,0,0.89546848,202.92837,6.7683671)"
-     d="m -156.8853,58.559208 c 0,4.661721 -3.77907,8.440792 -8.4408,8.440792 -4.66172,0 -8.44079,-3.779071 -8.44079,-8.440792 0,-4.661721 3.77907,-8.440792 8.44079,-8.440792 4.66173,0 8.4408,3.779071 8.4408,8.440792 z"
-     sodipodi:ry="8.4407921"
-     sodipodi:rx="8.4407921"
-     sodipodi:cy="58.559208"
-     sodipodi:cx="-165.3261"
-     id="path2825"
-     style="fill:url(#radialGradient2920);fill-opacity:1;stroke:none"
-     sodipodi:type="arc" /><path
-     sodipodi:nodetypes="csssssssssssssssssssssssssssssccssssssssccsssssssssssssssssssssccccc"
-     id="path3615"
-     d="m 21.519059,93.213403 c 1.061673,-0.524535 0.990657,-2.386339 2.573658,-1.864938 2.214885,0.729528 1.268186,1.168354 1.973138,1.864937 0.149149,0.147381 1.557573,0.205316 1.801566,0.08477 1.503461,-0.742803 1.66455,-2.52602 3.345756,-1.695399 0.902974,0.446126 0.911928,1.494492 1.458404,2.034479 0.666705,0.658786 1.930453,0.254702 2.487873,1.356318 0.476127,0.940945 -0.368466,2.433317 0.428949,3.221258 0.07088,0.06998 1.86652,0.04117 1.887352,0 0.437183,-0.863997 -0.193818,-10.150414 0.171571,-10.511472 0.933044,-0.921965 2.755155,-0.503719 3.603123,-0.08477 0.991189,0.489709 2.7929,-1.648306 5.318904,0.8477 0.218916,0.216316 1.83165,0 2.144719,0 2.672417,0 4.805567,0.08523 7.120463,0.8477 0.157786,0.05197 0.661043,-0.10973 0.772089,0 0.646315,0.638631 -0.408444,2.648119 0.428948,3.475566 0.208023,0.205556 1.806665,0.04323 2.058923,0.08477 1.485011,0.244562 0.486304,-1.158679 1.115253,-1.780169 0.08737,-0.08631 0.713443,0 0.857896,0 0.695002,0 3.39789,-0.287565 3.86049,0.16954 0.0643,0.06355 -0.153469,0.285393 -0.171582,0.33908 -0.190411,0.56445 -0.311756,4.454567 0,4.916656 0.07529,0.111549 1.878451,1.775769 1.887354,1.780168 1.481993,0.732198 1.204308,-4.254669 1.372618,-5.086196 0.678776,-3.353592 -0.827896,-5.008833 3.259972,-6.018664 0.673175,-0.166298 1.010831,-0.93247 1.629986,-0.93247 0.361736,0 0.459296,-4.300201 0.681996,-4.300201 0.403686,0 0.529852,4.295772 1.019056,4.537471 2.110196,1.042569 1.627893,1.271979 1.987856,1.627669 0.12711,0.125596 1.98402,0.360573 2.402087,1.186779 0.565113,1.116807 0.257366,8.672665 0.257366,10.596246 l -0.003,0.218489 c 0.0321,0.39045 -0.03036,0.78263 -0.03036,1.16885 0,0.52154 1.35142,0.0532 1.486209,-0.47953 0.08113,-0.32055 0.204238,-0.64739 0.24265,-0.989033 0.07416,-0.65908 -0.127878,-3.110471 0.333644,-3.566513 0.04144,-0.041 0.142094,0.0234 0.181981,0.02997 0.769289,0.126692 1.52297,0.119882 2.305152,0.119882 0.393871,0 2.580428,0.267459 2.881434,-0.02997 0.214116,-0.211576 -0.02799,-1.209927 -0.06072,-1.468564 -0.155806,-1.23163 -0.06061,-2.530874 -0.06061,-3.776308 l -0.303288,-0.599412 c 0.378611,-1.072711 0.0062,-8.817379 0.727946,-9.530682 0.535093,-0.528731 0.788757,-0.509578 1.091909,-0.659354 1.199211,-0.592482 0.909938,-1.076307 0.909938,-2.337715 0,-0.928595 0.636426,-10.489742 0.909916,-10.489742 0.229418,0 0.970585,9.449524 0.970585,10.669567 0,0.261359 0.851034,2.099693 0.970594,2.21783 0.258279,0.255212 0.524507,0.458346 0.727935,0.659358 0.594817,0.587751 -0.227222,7.567856 0.363974,8.152028 0.331592,0.327653 0.810233,0.969748 1.2739,1.198827 0.531369,0.26253 0.994306,-0.258017 1.516538,0 0.747423,0.369271 1.571082,-0.491649 2.062502,0.479531 0.882358,1.743754 -0.121692,4.195166 0.727947,5.874257 0.09958,0.196736 0.423871,0.119883 0.60661,0.119883 2.513101,0 0.45497,-5.095015 1.334551,-6.833319 0.0553,-0.109174 7.44065,-0.08045 7.64341,0.119883 1.07893,1.066138 -0.11895,5.516963 0.48527,6.114022 0.19517,0.192832 1.72935,0 2.06251,0 0.34967,0 1.24005,0.453039 1.45588,0.239764 1.1015,-1.088415 2.62968,-2.28078 3.15441,-3.836248 0.19793,-0.58671 -0.31419,-1.509289 -0.6066,-1.798242 -0.39154,-0.386872 0,-3.06741 0,-3.716366 0,-5.186847 -1.02054,-8.695037 3.88234,-10.309919 l 0,52.628545 -99,0 0,-36.201827 c 0.637751,-0.02902 1.761294,-0.075 2.019059,-0.08477 z"
-     style="fill:#01131a;fill-opacity:1;stroke:#01131a;stroke-width:1.5173738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></svg>
\ No newline at end of file