Merge lp:~saviq/address-book-app/new-icon into lp:address-book-app

[Michał Sawicz]

New icon. Also drop difference between click mode and not, as both support theme-sourced icons.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/591/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1024/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1995/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1167/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/591/rebuild

review: Needs Fixing (continuous-integration)

[lp:~saviq/address-book-app/new-icon]

216. By Michał Sawicz on 2014-06-24

Fix CMake.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:216
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/592/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1033
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1512
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2012
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2012/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1176
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1176/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/592/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

apprvoed

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-06-05 16:35:45 +0000
+++ data/CMakeLists.txt	2014-06-24 18:09:09 +0000
@@ -1,7 +1,4 @@
-if (CLICK_MODE)
-    set(ADDRESSBOOK_APP_ICON "share/icons/hicolor/scalable/apps/contacts-app.svg")
-else()
-    set(ADDRESSBOOK_APP_ICON "contacts-app")
+if (NOT CLICK_MODE)
     set(XSCREENSHOT "X-Screenshot=${ADDRESS_BOOK_APP_FULL_DIR}/artwork/address-book-app-preview.png")
 endif()
 

=== modified file 'data/address-book-app.desktop.in'
--- data/address-book-app.desktop.in	2014-01-10 22:09:07 +0000
+++ data/address-book-app.desktop.in	2014-06-24 18:09:09 +0000
@@ -7,7 +7,7 @@
 GenericName=tr("Contacts")
 Comment=tr("Contacts Address Book")
 Exec=@DESKTOP_EXEC@ %u
-Icon=@ADDRESSBOOK_APP_ICON@
+Icon=address-book-app
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
 X-Ubuntu-Gettext-Domain=address-book-app