Merge lp:~ted/ubuntu-app-launch/disable-only-show-in into lp:ubuntu-app-launch/16.10

[Ted Gould]

Allow invalid desktop files for OTA11 quick fix

[Larry Price (larryprice)]

Should the comments say OTA10 or OTA11 like the commit message?

I'm also curious - what apps were these breaking?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/52/rebuild

review: Approve (continuous-integration)

[lp:~ted/ubuntu-app-launch/disable-only-show-in]

230. By Ted Gould on 2016-05-10

Fixing comment

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/53/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

+1

review: Approve

=== modified file 'libubuntu-app-launch/application-info-desktop.cpp'
--- libubuntu-app-launch/application-info-desktop.cpp	2016-05-04 20:12:50 +0000
+++ libubuntu-app-launch/application-info-desktop.cpp	2016-05-10 19:09:58 +0000
@@ -181,7 +181,9 @@
             if (stringlistFromKeyfileContains(keyfile, "NotShowIn", xdg_current_desktop, false) ||
                 !stringlistFromKeyfileContains(keyfile, "OnlyShowIn", xdg_current_desktop, true))
             {
-                throw std::runtime_error("Application is not shown in Unity");
+                g_warning("Application is not shown in Unity");
+                // Exception removed for OTA11 as a temporary fix
+                // throw std::runtime_error("Application is not shown in Unity");
             }
         }
 

=== modified file 'tests/application-info-desktop.cpp'
--- tests/application-info-desktop.cpp	2016-04-26 13:13:51 +0000
+++ tests/application-info-desktop.cpp	2016-05-10 19:09:58 +0000
@@ -112,6 +112,8 @@
     g_key_file_set_string(hidden.get(), DESKTOP, "Hidden", "true");
     EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(hidden, "/"), std::runtime_error);
 
+	/* Disabling for OTA11 */
+#if 0
     // not shown in Unity
     auto notshowin = defaultKeyfile();
     g_key_file_set_string(notshowin.get(), DESKTOP, "NotShowIn", ("Gnome;" + test_dekstop_env + ";").c_str());
@@ -121,6 +123,7 @@
     auto onlyshowin = defaultKeyfile();
     g_key_file_set_string(onlyshowin.get(), DESKTOP, "OnlyShowIn", "KDE;Gnome;");
     EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(onlyshowin, "/"), std::runtime_error);
+#endif
 }
 
 TEST_F(ApplicationInfoDesktop, KeyfileShowListEdgeCases)