Merge lp:~larsu/unity8/fallback-icon-theme into lp:unity8

[Lars Karlitski]

Fall back to "ubuntu-mobile" icon theme if $UBUNTU_ICON_THEME is unset

Fall back to "ubuntu-mobile" icon theme if $UBUNTU_ICON_THEME is unset

This is a workaround until bug #1098578 is fixed.

[Sebastien Bacher (seb128)]

Thanks, the Build-Depends seems like it should be a runtime Recommends instead though?

review: Needs Fixing

[Sebastien Bacher (seb128)]

yes, I like it this way! ;-)

review: Approve

[Michael Zanetti (mzanetti)]

I don't think unity8 should depend on ubuntu-mobile-icons.

Also, can you please replace the (deprecated) getenv() with qgetenv()?

review: Needs Fixing

[Sebastien Bacher (seb128)]

> I don't think unity8 should depend on ubuntu-mobile-icons.

it doesn't depends on it, but Recommends (e.g you can remove the theme). Reality is that it uses icons that are specific to that theme, so while that's true we should probably recommends the theme shipping them ...

Of course we can change that and use icons that are available on the desktop as well, then we can drop the recommends

[Michael Zanetti (mzanetti)]

ubuntu-mobile-icons is pulled in by the SDK which we depend on. As the SDK ships all the other theme components, it's also the SDK that should pull in a matching icon theme.

[Lars Karlitski (larsu)]

> ubuntu-mobile-icons is pulled in by the SDK which we depend on. As the SDK
> ships all the other theme components, it's also the SDK that should pull in a
> matching icon theme.

Fair enough, I've removed it in r275.

[Michael Zanetti (mzanetti)]

lgtm.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/unity8-ci/867/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2926
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/494
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/868
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/868/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/867
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2932
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2932/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/496
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/451

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/867/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/346/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/501
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/345
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/345/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2940
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2940/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/503
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/503/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/458

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/unity8-ci/875/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2944
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/876
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/876/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2950
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2950/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2507
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/513
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/513/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/467

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/875/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/351/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2953/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/519/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2959/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/521/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'main.cpp'
--- main.cpp	2013-08-23 11:56:44 +0000
+++ main.cpp	2013-09-03 14:05:54 +0000
@@ -65,9 +65,10 @@
 
 void resolveIconTheme() {
     const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");
-    if (ubuntuIconTheme != NULL) {
-        QIcon::setThemeName(ubuntuIconTheme);
+    if (ubuntuIconTheme == NULL) {
+        ubuntuIconTheme = "ubuntu-mobile";
     }
+    QIcon::setThemeName(ubuntuIconTheme);
 }
 } // namespace {