Merge lp:~abreu-alexandre/bamf/remove-old-webapps-mode into lp:bamf

[Alexandre Abreu]

Remove old webapp related code since now we dont use browser tab matching anymore.

Remove old webapp related code since now we dont use browser tab matching anymore.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:595
http://jenkins.qa.ubuntu.com/job/bamf-ci/100/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-trusty-amd64-ci/8
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-trusty-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/bamf-trusty-armhf-ci/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/100/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/bamf/remove-old-webapps-mode]

596. By Alexandre Abreu on 2014-03-07

remove webpp test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:596
http://jenkins.qa.ubuntu.com/job/bamf-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/bamf-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/101/rebuild

review: Approve (continuous-integration)

[David Barth (dbarth)]

+1, webapps should be special cased anymore

review: Approve

[David Barth (dbarth)]

should *not*

[Marco Trevisan (Treviño) (3v1n0)]

+1, thanks

review: Approve

=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2013-08-05 16:18:46 +0000
+++ lib/libbamf/bamf-application.c	2014-03-07 18:21:16 +0000
@@ -663,14 +663,7 @@
   self->priv->cached_mimes = g_key_file_get_string_list (keyfile, G_KEY_FILE_DESKTOP_GROUP,
                                                          G_KEY_FILE_DESKTOP_KEY_MIME_TYPE, NULL, NULL);
 
-  if (g_strcmp0 (g_app_info_get_executable (G_APP_INFO (desktop_info)), "unity-webapps-runner") == 0)
-    {
-      self->priv->application_type = g_strdup ("webapp");
-    }
-  else
-    {
-      self->priv->application_type = g_strdup ("system");
-    }
+  self->priv->application_type = g_strdup ("system");
 
   g_free (icon);
   g_free (name);
 
=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-08-07 16:45:26 +0000
+++ src/bamf-matcher.c	2014-03-07 18:21:16 +0000
@@ -61,6 +61,7 @@
   "^gksu(do)?$", "^sudo$", "^su-to-root$", "^amdxdg-su$", "^java(ws)?$", "^cli$",
   "^mono$", "^ruby$", "^padsp$", "^aoss$", "^python(\\d.\\d)?$", "^(ba)?sh$",
   "^perl$", "^env$", "^xdg-open$", "^qmlscene$", "^qmlviewer$",
+  "^unity-webapps-runner$", "^webapp-container$",
   /* javaws strings: */ "^net\\.sourceforge\\.jnlp\\.runtime\\.Boot$", "^rt\\.jar$",
                         "^com\\.sun\\.javaws\\.Main$", "^deploy\\.jar$"
 };
 
=== modified file 'tests/libbamf/test-application.c'
--- tests/libbamf/test-application.c	2013-06-19 16:56:49 +0000
+++ tests/libbamf/test-application.c	2014-03-07 18:21:16 +0000
@@ -93,17 +93,6 @@
 }
 
 static void
-test_favorite_valid_desktop_file_webapp (void)
-{
-  BamfApplication *application;
-
-  application = bamf_application_new_favorite (DATA_DIR"/ubuntu-web-app.desktop");
-  g_assert_cmpstr (bamf_application_get_application_type (application), ==, "webapp");
-
-  g_object_unref (application);
-}
-
-static void
 test_favorite_mime_type_filled (void)
 {
   BamfApplication *application;
@@ -150,5 +139,4 @@
   g_test_add_func (DOMAIN"/Favorite/NoIcon", test_favorite_no_icon);
   g_test_add_func (DOMAIN"/Favorite/MimeType/Filled", test_favorite_mime_type_filled);
   g_test_add_func (DOMAIN"/Favorite/MimeType/Empty", test_favorite_mime_type_empty);
-  g_test_add_func (DOMAIN"/Favorite/DesktopFile/Valid/WebApp", test_favorite_valid_desktop_file_webapp);
 }