Merge lp:~ted/indicator-network/final-icons into lp:indicator-network/13.10

[Ted Gould]

Remove final temporary icons

My beautiful icons! They're gone! They're gone!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/74/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-network-ci/84/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-09-16 04:17:20 +0000
+++ data/CMakeLists.txt	2013-10-14 17:59:50 +0000
@@ -1,6 +1,4 @@
 
-add_subdirectory(icons)
-
 ###########################
 # Indicator-network service
 ###########################

=== removed directory 'data/icons'
=== removed file 'data/icons/CMakeLists.txt'
--- data/icons/CMakeLists.txt	2013-09-30 15:43:49 +0000
+++ data/icons/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-
-install(
-  FILES
-    network-airplane.svg
-    network-roaming.svg
-  DESTINATION
-    "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/status/"
-)
-

=== removed file 'data/icons/network-airplane.svg'
--- data/icons/network-airplane.svg	2013-08-23 04:12:26 +0000
+++ data/icons/network-airplane.svg	1970-01-01 00:00:00 +0000
@@ -1,72 +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="22"
-   height="22"
-   id="svg4628"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 10">
-  <defs
-     id="defs4630" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.727273"
-     inkscape:cx="11"
-     inkscape:cy="11"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:showpageshadow="false"
-     showborder="true"
-     inkscape:window-width="639"
-     inkscape:window-height="383"
-     inkscape:window-x="1039"
-     inkscape:window-y="491"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4633">
-    <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(0,-1030.3622)">
-    <g
-       transform="translate(-22.05548,-22.1596)"
-       id="g3096">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 27.623425,1063.8796 0,-0.3125 0.28125,-0.039 -0.5,-1.7031 0.78125,0 1.140625,1.5703 c 0.760413,-0.068 1.885412,-0.1276 3.375,-0.1797 -0.276048,-1.4375 -0.85938,-3.099 -1.75,-4.9844 l 0.960937,0 0.898438,1.1719 1.15625,0 0,0.625 -0.671875,0 0.78125,1.0156 1.203125,0 0,0.625 -0.726563,0 1.1875,1.5469 2.0625,0 c 0.364572,0 0.671863,0.068 0.921875,0.2031 0.166655,0.089 0.249988,0.1901 0.25,0.3047 -1.2e-5,0.1146 -0.08335,0.2161 -0.25,0.3047 -0.250012,0.1354 -0.557303,0.2031 -0.921875,0.2031 l -2.0625,0 -1.1875,1.5469 0.726563,0 0,0.625 -1.203125,0 -0.78125,1.0156 0.671875,0 0,0.625 -1.15625,0 -0.898438,1.1719 -0.960937,0 c 0.89062,-1.8334 1.473952,-3.4948 1.75,-4.9844 -1.489588,-0.057 -2.614587,-0.1172 -3.375,-0.1797 l -1.140625,1.5703 -0.78125,0 0.5,-1.7031 -0.28125,-0.039"
-         id="path3150-9"
-         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:0.36529685;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 27.354723,1063.4764 0,-0.3125 0.28125,-0.039 -0.5,-1.7031 0.78125,0 1.140625,1.5703 c 0.760413,-0.068 1.885412,-0.1276 3.375,-0.1797 -0.276048,-1.4375 -0.85938,-3.099 -1.75,-4.9844 l 0.960937,0 0.898438,1.1719 1.15625,0 0,0.625 -0.671875,0 0.78125,1.0156 1.203125,0 0,0.625 -0.726563,0 1.1875,1.5469 2.0625,0 c 0.364572,0 0.671863,0.068 0.921875,0.2031 0.166655,0.089 0.249988,0.1901 0.25,0.3047 -1.2e-5,0.1146 -0.08335,0.2161 -0.25,0.3047 -0.250012,0.1354 -0.557303,0.2031 -0.921875,0.2031 l -2.0625,0 -1.1875,1.5469 0.726563,0 0,0.625 -1.203125,0 -0.78125,1.0156 0.671875,0 0,0.625 -1.15625,0 -0.898438,1.1719 -0.960937,0 c 0.89062,-1.8334 1.473952,-3.4948 1.75,-4.9844 -1.489588,-0.057 -2.614587,-0.1172 -3.375,-0.1797 l -1.140625,1.5703 -0.78125,0 0.5,-1.7031 -0.28125,-0.039"
-         id="path3150"
-         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#dfdbd3;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
-    </g>
-  </g>
-</svg>

=== removed file 'data/icons/network-roaming.svg'
--- data/icons/network-roaming.svg	2013-08-23 04:12:26 +0000
+++ data/icons/network-roaming.svg	1970-01-01 00:00:00 +0000
@@ -1,72 +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="22"
-   height="22"
-   id="svg4628"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 28">
-  <defs
-     id="defs4630" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.727273"
-     inkscape:cx="11"
-     inkscape:cy="11"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:showpageshadow="false"
-     showborder="true"
-     inkscape:window-width="639"
-     inkscape:window-height="383"
-     inkscape:window-x="990"
-     inkscape:window-y="357"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4633">
-    <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(0,-1030.3622)">
-    <g
-       transform="translate(21.921715,21.9807)"
-       id="g3080">
-      <path
-         inkscape:connector-curvature="0"
-         d="m -5.2545828,1019.5831 c -1.2e-5,1.5273 -0.540322,2.8312 -1.6209323,3.9119 -1.0806301,1.0806 -2.3845785,1.6209 -3.9118489,1.6209 -1.527283,0 -2.831231,-0.5403 -3.91185,-1.6209 -1.080622,-1.0807 -1.620932,-2.3846 -1.620932,-3.9119 0,-1.5273 0.54031,-2.8312 1.620932,-3.9118 1.080619,-1.0806 2.384567,-1.621 3.91185,-1.621 1.5272704,0 2.8312188,0.5404 3.9118489,1.621 1.0806103,1.0806 1.6209203,2.3845 1.6209323,3.9118 m -2.009956,-3.847 c -0.6735961,-0.6159 -1.4498416,-1.0266 -2.3287389,-1.2319 0.4214347,0.6556 0.7744373,1.3526 1.0590089,2.091 0.4682605,-0.2413 0.8915035,-0.5277 1.26973,-0.8591 m 1.696575,3.6903 c -0.03963,-1.3435 -0.527714,-2.4998 -1.4642414,-3.4688 -0.4106454,0.3638 -0.8735111,0.6754 -1.3885984,0.9348 0.3133716,0.8933 0.4808677,1.738 0.5024889,2.534 l 2.3503509,0 m -3.2580728,-2.6961 c -0.3169898,-0.8357 -0.7186204,-1.6065 -1.2048934,-2.3126 -0.212528,-0.032 -0.412443,-0.05 -0.599744,-0.054 l 0,2.8258 c 0.579926,-0.025 1.1814718,-0.1783 1.8046374,-0.4592 m -2.1234214,0.4592 0,-2.8258 c -0.183711,0 -0.381825,0.022 -0.594341,0.054 -0.482683,0.7061 -0.884313,1.4769 -1.204893,2.3126 0.623154,0.2809 1.222898,0.434 1.799234,0.4592 m 2.71236,2.2369 c -0.021621,-0.7456 -0.1801118,-1.5435 -0.4754733,-2.3936 -0.6555844,0.2918 -1.2949517,0.4503 -1.9181027,0.4755 l 0,1.9181 2.393576,0 m 2.6691342,0.3188 -2.3503509,0 c -0.021621,0.7925 -0.1891173,1.6354 -0.5024889,2.5287 0.5150873,0.2629 0.977953,0.5745 1.3885984,0.9347 0.9365274,-0.9654 1.4246084,-2.1198 1.4642414,-3.4634 m -6.4134872,-5.241 c -0.878909,0.2053 -1.655155,0.616 -2.328739,1.2319 0.378215,0.3314 0.801458,0.6178 1.26973,0.8591 0.28456,-0.7348 0.637562,-1.4318 1.059009,-2.091 m 1.031993,4.9222 0,-1.9181 c -0.619561,-0.025 -1.257127,-0.1837 -1.912699,-0.4755 -0.295374,0.8501 -0.453865,1.648 -0.475474,2.3936 l 2.388173,0 m 2.71236,0.3188 -2.393576,0 0,1.9127 c 0.623151,0.025 1.2625183,0.1837 1.9181027,0.4755 0.2953615,-0.8501 0.4538524,-1.6462 0.4754733,-2.3882 m 0.9725592,3.6849 c -0.3782265,-0.3314 -0.8014695,-0.6177 -1.26973,-0.8591 -0.2845716,0.7349 -0.6375742,1.4319 -1.0590089,2.091 0.8788973,-0.2053 1.6551428,-0.6159 2.3287389,-1.2319 m -5.8893862,-6.5377 c -0.515099,-0.263 -0.977965,-0.5746 -1.388599,-0.9348 -0.936539,0.9654 -1.424619,2.1217 -1.464241,3.4688 l 2.350351,0 c 0.02161,-0.796 0.189105,-1.6407 0.502489,-2.534 m 2.204467,4.7655 0,-1.9127 -2.388173,0 c 0.02161,0.742 0.1801,1.5381 0.475474,2.3882 0.655572,-0.2918 1.293138,-0.4503 1.912699,-0.4755 m 2.1234214,0.7781 c -0.6231656,-0.281 -1.2247114,-0.4341 -1.8046374,-0.4593 l 0,2.8258 c 0.187301,0 0.387216,-0.022 0.599744,-0.054 0.482671,-0.706 0.8843015,-1.4769 1.2048934,-2.3125 m -2.1234214,2.3665 0,-2.8258 c -0.576336,0.025 -1.17608,0.1783 -1.799234,0.4593 0.316978,0.8356 0.718608,1.6065 1.204893,2.3125 0.212516,0.032 0.41063,0.05 0.594341,0.054 m -2.204467,-2.5286 c -0.313384,-0.8933 -0.48088,-1.7362 -0.502489,-2.5287 l -2.350351,0 c 0.03962,1.34 0.527702,2.4944 1.464241,3.4634 0.410634,-0.3602 0.8735,-0.6718 1.388599,-0.9347 m 1.172474,2.3881 c -0.421447,-0.6591 -0.774449,-1.3561 -1.059009,-2.091 -0.468272,0.2414 -0.891515,0.5277 -1.26973,0.8591 0.673584,0.616 1.44983,1.0266 2.328739,1.2319"
-         style="font-size:11.06556225px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:0.36529685;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium"
-         id="path3130-3" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m -5.5232853,1019.1799 c -1.15e-5,1.5273 -0.5403217,2.8312 -1.620932,3.9119 -1.0806301,1.0806 -2.3845785,1.6209 -3.9118487,1.6209 -1.527283,0 -2.831231,-0.5403 -3.91185,-1.6209 -1.080622,-1.0807 -1.620932,-2.3846 -1.620932,-3.9119 0,-1.5273 0.54031,-2.8312 1.620932,-3.9118 1.080619,-1.0806 2.384567,-1.621 3.91185,-1.621 1.5272702,0 2.8312186,0.5404 3.9118487,1.621 1.0806103,1.0806 1.6209205,2.3845 1.620932,3.9118 m -2.0099557,-3.847 c -0.6735961,-0.6159 -1.4498416,-1.0266 -2.3287389,-1.2319 0.4214347,0.6556 0.7744373,1.3526 1.0590089,2.091 0.4682605,-0.2413 0.8915035,-0.5277 1.26973,-0.8591 m 1.6965755,3.6903 c -0.039634,-1.3435 -0.5277141,-2.4998 -1.4642419,-3.4688 -0.4106454,0.3638 -0.8735111,0.6754 -1.3885984,0.9348 0.3133716,0.8933 0.4808677,1.738 0.5024889,2.534 l 2.3503514,0 m -3.2580733,-2.6961 c -0.3169898,-0.8357 -0.7186204,-1.6065 -1.2048932,-2.3126 -0.212528,-0.032 -0.412443,-0.05 -0.599744,-0.054 l 0,2.8258 c 0.579926,-0.025 1.1814716,-0.1783 1.8046372,-0.4592 m -2.1234212,0.4592 0,-2.8258 c -0.183711,0 -0.381825,0.022 -0.594341,0.054 -0.482683,0.7061 -0.884313,1.4769 -1.204893,2.3126 0.623154,0.2809 1.222898,0.434 1.799234,0.4592 m 2.7123598,2.2369 c -0.021621,-0.7456 -0.1801118,-1.5435 -0.4754733,-2.3936 -0.6555844,0.2918 -1.2949515,0.4503 -1.9181025,0.4755 l 0,1.9181 2.3935758,0 m 2.6691347,0.3188 -2.3503514,0 c -0.021621,0.7925 -0.1891173,1.6354 -0.5024889,2.5287 0.5150873,0.2629 0.977953,0.5745 1.3885984,0.9347 0.9365278,-0.9654 1.424608,-2.1198 1.4642419,-3.4634 m -6.4134875,-5.241 c -0.878909,0.2053 -1.655155,0.616 -2.328739,1.2319 0.378215,0.3314 0.801458,0.6178 1.26973,0.8591 0.28456,-0.7348 0.637562,-1.4318 1.059009,-2.091 m 1.031993,4.9222 0,-1.9181 c -0.619561,-0.025 -1.257127,-0.1837 -1.912699,-0.4755 -0.295374,0.8501 -0.453865,1.648 -0.475474,2.3936 l 2.388173,0 m 2.7123598,0.3188 -2.3935758,0 0,1.9127 c 0.623151,0.025 1.2625181,0.1837 1.9181025,0.4755 0.2953615,-0.8501 0.4538524,-1.6462 0.4754733,-2.3882 m 0.9725592,3.6849 c -0.3782265,-0.3314 -0.8014695,-0.6177 -1.26973,-0.8591 -0.2845716,0.7349 -0.6375742,1.4319 -1.0590089,2.091 0.8788973,-0.2053 1.6551428,-0.6159 2.3287389,-1.2319 m -5.889386,-6.5377 c -0.515099,-0.263 -0.977965,-0.5746 -1.388599,-0.9348 -0.936539,0.9654 -1.424619,2.1217 -1.464241,3.4688 l 2.350351,0 c 0.02161,-0.796 0.189105,-1.6407 0.502489,-2.534 m 2.204467,4.7655 0,-1.9127 -2.388173,0 c 0.02161,0.742 0.1801,1.5381 0.475474,2.3882 0.655572,-0.2918 1.293138,-0.4503 1.912699,-0.4755 m 2.1234212,0.7781 c -0.6231656,-0.281 -1.2247112,-0.4341 -1.8046372,-0.4593 l 0,2.8258 c 0.187301,0 0.387216,-0.022 0.599744,-0.054 0.4826708,-0.706 0.8843013,-1.4769 1.2048932,-2.3125 m -2.1234212,2.3665 0,-2.8258 c -0.576336,0.025 -1.17608,0.1783 -1.799234,0.4593 0.316978,0.8356 0.718608,1.6065 1.204893,2.3125 0.212516,0.032 0.41063,0.05 0.594341,0.054 m -2.204467,-2.5286 c -0.313384,-0.8933 -0.48088,-1.7362 -0.502489,-2.5287 l -2.350351,0 c 0.03962,1.34 0.527702,2.4944 1.464241,3.4634 0.410634,-0.3602 0.8735,-0.6718 1.388599,-0.9347 m 1.172474,2.3881 c -0.421447,-0.6591 -0.774449,-1.3561 -1.059009,-2.091 -0.468272,0.2414 -0.891515,0.5277 -1.26973,0.8591 0.673584,0.616 1.44983,1.0266 2.328739,1.2319"
-         style="font-size:11.06556225px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#dfdbd3;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium"
-         id="path3130" />
-    </g>
-  </g>
-</svg>

=== modified file 'debian/control'
--- debian/control	2013-10-09 17:33:53 +0000
+++ debian/control	2013-10-14 17:59:50 +0000
@@ -33,6 +33,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         ubuntu-mobile-icons (>= 13.04+13.10.20131014),
 # For apport hook
          python3-xdg,
          unity8 (>= 7.82),

=== modified file 'network/network-action-manager.vala'
--- network/network-action-manager.vala	2013-10-10 19:09:11 +0000
+++ network/network-action-manager.vala	2013-10-14 17:59:50 +0000
@@ -325,7 +325,7 @@
 			   captured connection information, we need more than one icon. */
 			if (modemdev != null) {
 				if (airplane_mode) {
-					var icon = icon_serialize("network-airplane");
+					var icon = icon_serialize("airplane-mode");
 					if (icon != null) {
 						icons.append_val(icon);
 						multiicon = true;
@@ -366,7 +366,7 @@
 
 			/* Look for the first icon if we need it */
 			if (roaming) {
-				var icon = icon_serialize("network-roaming");
+				var icon = icon_serialize("network-cellular-roaming");
 				if (icon != null) {
 					icons.append_val(icon);
 					multiicon = true;