Merge lp:~ken-vandine/ubuntu-system-settings/lp1365408 into lp:ubuntu-system-settings

[Ken VanDine]

Include an icon instead of using the themed icon (LP: #1365408)

Include an icon instead of using the themed icon (LP: #1365408)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1052
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1485/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4843
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/677
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6095
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6095/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13246
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3851
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3851/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1485/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1052
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1486/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4859
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6111
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13266
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3857
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3857/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1486/rebuild

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1052
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1490/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3562
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6123
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2951
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3871
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3871/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1490/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-15 13:54:30 +0000
+++ CMakeLists.txt	2014-09-16 04:24:01 +0000
@@ -88,6 +88,7 @@
 
 install(FILES ubuntu-system-settings.url-dispatcher DESTINATION share/url-dispatcher/urls)
 install(FILES screenshot.png DESTINATION ${SETTINGS_SHARE_DIR})
+install(FILES system-settings.png DESTINATION ${SETTINGS_SHARE_DIR})
 install(PROGRAMS push-helper/software_updates_helper.py DESTINATION ${PUSH_HELPER_DIR} RENAME ubuntu-system-settings)
 
 if(cmake_build_type_lower MATCHES coverage)

=== added file 'system-settings.png'
Binary files system-settings.png	1970-01-01 00:00:00 +0000 and system-settings.png	2014-09-16 04:24:01 +0000 differ
=== modified file 'ubuntu-system-settings.desktop.in.in'
--- ubuntu-system-settings.desktop.in.in	2014-09-11 16:08:04 +0000
+++ ubuntu-system-settings.desktop.in.in	2014-09-16 04:24:01 +0000
@@ -2,7 +2,7 @@
 _Name=System Settings
 _Categories=System;
 _Keywords=Preferences;Settings;
-Icon=system-settings
+Icon=@SETTINGS_SHARE_DIR@/system-settings.png
 Exec=system-settings %u
 Terminal=false
 Type=Application