Merge lp:~3v1n0/bamf/javaws-matching into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfMatcher: Don't associate .desktopless applications with different exec string, fix JavaWS apps

Don't associate to the similar application, windows that have different execution path. Also add some rules to fix Java Web Start applications matching.

[Brandon Schaefer (brandontschaefer)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:529
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/30/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/30/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/30//rebuild/?

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/53/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/53/console

review: Needs Fixing (continuous-integration)

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2013-01-08 13:29:11 +0000
+++ src/bamf-legacy-window.c	2013-01-10 00:24:22 +0000
@@ -48,10 +48,6 @@
 {
   WnckWindow * legacy_window;
   char       * mini_icon_path;
-  gulong       closed_id;
-  gulong       name_changed_id;
-  gulong       state_changed_id;
-  gulong       geometry_changed_id;
   gboolean     is_closed;
 };
 
@@ -203,9 +199,9 @@
   WnckWindow *window;
   GdkPixbuf *pbuf;
   char *tmp;
-  
+
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
-  
+
   if (self->priv->mini_icon_path)
     {
       if (g_file_test (self->priv->mini_icon_path, G_FILE_TEST_EXISTS))
@@ -213,23 +209,23 @@
       else
         g_free (self->priv->mini_icon_path);
     }
-  
+
   window = self->priv->legacy_window;
-  
+
   if (!window)
     return NULL;
-  
+
   if (wnck_window_get_icon_is_fallback (window))
     return NULL;
-  
+
   tmp = tmpnam (NULL);
   if (!tmp)
     return NULL;
-  
+
   pbuf = wnck_window_get_icon (window);
   if (!gdk_pixbuf_save (pbuf, tmp, "png", NULL, NULL))
     return NULL;
-  
+
   self->priv->mini_icon_path = g_strdup (tmp);
   return self->priv->mini_icon_path;
 }
@@ -301,12 +297,12 @@
 bamf_legacy_window_get_stacking_position (BamfLegacyWindow *self)
 {
   BamfLegacyScreen *screen;
-  
+
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), -1);
 
   screen = bamf_legacy_screen_get_default ();
   g_return_val_if_fail (BAMF_IS_LEGACY_SCREEN (screen), -1);
-  
+
   return g_list_index (bamf_legacy_screen_get_windows (screen), self);
 }
 
@@ -494,8 +490,6 @@
 
   self = BAMF_LEGACY_WINDOW (object);
 
-  g_signal_handler_disconnect (wnck_screen_get_default (),
-                               self->priv->closed_id);
 
   if (self->priv->mini_icon_path)
     {
@@ -507,16 +501,11 @@
       self->priv->mini_icon_path = NULL;
     }
 
+  g_signal_handlers_disconnect_by_data (wnck_screen_get_default (), self);
+
   if (self->priv->legacy_window)
     {
-      g_signal_handler_disconnect (self->priv->legacy_window,
-                                   self->priv->name_changed_id);
-
-      g_signal_handler_disconnect (self->priv->legacy_window,
-                                   self->priv->state_changed_id);
-
-      g_signal_handler_disconnect (self->priv->legacy_window,
-                                   self->priv->geometry_changed_id);
+      g_signal_handlers_disconnect_by_data (self->priv->legacy_window, self);
     }
 
   G_OBJECT_CLASS (bamf_legacy_window_parent_class)->dispose (object);
@@ -525,15 +514,10 @@
 static void
 bamf_legacy_window_init (BamfLegacyWindow * self)
 {
-  WnckScreen *screen;
-
-  BamfLegacyWindowPrivate *priv;
-  priv = self->priv = BAMF_LEGACY_WINDOW_GET_PRIVATE (self);
-
-  screen = wnck_screen_get_default ();
-
-  priv->closed_id = g_signal_connect (G_OBJECT (screen), "window-closed",
-                                      (GCallback) handle_window_closed, self);
+  self->priv = BAMF_LEGACY_WINDOW_GET_PRIVATE (self);
+
+  g_signal_connect (wnck_screen_get_default (), "window-closed",
+                    (GCallback) handle_window_closed, self);
 }
 
 static void
@@ -590,14 +574,14 @@
 
   self->priv->legacy_window = legacy_window;
 
-  self->priv->name_changed_id = g_signal_connect (G_OBJECT (legacy_window), "name-changed",
-                                                  (GCallback) handle_name_changed, self);
-
-  self->priv->state_changed_id = g_signal_connect (G_OBJECT (legacy_window), "state-changed",
-                                                   (GCallback) handle_state_changed, self);
-
-  self->priv->geometry_changed_id = g_signal_connect (G_OBJECT (legacy_window), "geometry-changed",
-                                                      (GCallback) handle_geometry_changed, self);
+  g_signal_connect (G_OBJECT (legacy_window), "name-changed",
+                    (GCallback) handle_name_changed, self);
+
+  g_signal_connect (G_OBJECT (legacy_window), "state-changed",
+                    (GCallback) handle_state_changed, self);
+
+  g_signal_connect (G_OBJECT (legacy_window), "geometry-changed",
+                    (GCallback) handle_geometry_changed, self);
 
   return self;
 }
 
=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-01-08 22:42:09 +0000
+++ src/bamf-matcher.c	2013-01-10 00:24:22 +0000
@@ -56,7 +56,8 @@
 {
   "^gksu(do)?$", "^sudo$", "^su-to-root$", "^amdxdg-su$", "^java(ws)?$",
   "^mono$", "^ruby$", "^padsp$", "^aoss$", "^python(\\d.\\d)?$", "^(ba)?sh$",
-  "^perl$", "^env$", "^xdg-open$"
+  "^perl$", "^env$", "^xdg-open$",
+  /* javaws strings: */ "^net\\.sourceforge\\.jnlp\\.runtime\\.Boot$", "^rt.jar$"
 };
 
 // Prefixes that must be considered starting point of exec strings
@@ -995,7 +996,6 @@
       if (!enumerator)
         continue;
 
-
       info = g_file_enumerator_next_file (enumerator, NULL, NULL);
 
       while (info)
@@ -1075,7 +1075,7 @@
 
   dirs = list_prepend_desktop_file_env_directories (dirs, "XDG_DATA_HOME");
 
-  //If this doesn't exist, we need to track .local or the home itself!
+  /* If XDG_DATA_HOME doesn't exist, we need to track .local or the home itself! */
   path = g_build_filename (g_get_home_dir (), ".local/share/applications", NULL);
 
   if (!g_list_find_custom (dirs, path, (GCompareFunc) g_strcmp0))
@@ -1860,6 +1860,36 @@
 
           if (bamf_application_contains_similar_to_window (app, bamf_window))
             {
+              char *exec_string = bamf_legacy_window_get_exec_string (window);
+              char *trimmed_exec = bamf_matcher_get_trimmed_exec (self, exec_string);
+              g_free (exec_string);
+
+              GList *ll;
+              gboolean found_exec = FALSE;
+              for (ll = bamf_view_get_children (BAMF_VIEW (app)); ll && !found_exec; ll = ll->next)
+                {
+                  if (!BAMF_IS_WINDOW (ll->data))
+                    continue;
+
+                  BamfLegacyWindow *w = bamf_window_get_window (BAMF_WINDOW (ll->data));
+                  char *wexec = bamf_legacy_window_get_exec_string (w);
+                  char *wtrimmed = bamf_matcher_get_trimmed_exec (self, wexec);
+                  g_free (wexec);
+
+                  if (g_strcmp0 (trimmed_exec, wtrimmed) == 0)
+                    {
+                      best = BAMF_APPLICATION (view);
+                      found_exec = TRUE;
+                    }
+
+                  g_free (wtrimmed);
+                }
+
+              g_free (trimmed_exec);
+
+              if (!found_exec)
+                continue;
+
               app_desktop_class = bamf_application_get_wmclass (app);
 
               if (target_class && g_strcmp0 (target_class, app_desktop_class) == 0)
@@ -2033,7 +2063,7 @@
 
   if (role)
     {
-      gchar *exec = g_strdup_printf ("gnome-control-center %s", role);
+      gchar *exec = g_strconcat ("gnome-control-center ", role, NULL);
       list = g_hash_table_lookup (self->priv->desktop_file_table, exec);
       g_free (exec);
       g_free (role);
 
=== modified file 'tests/bamfdaemon/test-matcher.c'
--- tests/bamfdaemon/test-matcher.c	2013-01-08 18:55:38 +0000
+++ tests/bamfdaemon/test-matcher.c	2013-01-10 00:24:22 +0000
@@ -33,6 +33,7 @@
 static void test_match_desktop_application (void);
 static void test_match_libreoffice_windows (void);
 static void test_match_gnome_control_center_panels (void);
+static void test_match_javaws_windows (void);
 static void test_new_desktop_matches_unmatched_windows (void);
 static void test_match_transient_windows (void);
 static void test_trim_exec_string (void);
@@ -55,6 +56,7 @@
   g_test_add_func (DOMAIN"/Matching/Application/Desktop", test_match_desktop_application);
   g_test_add_func (DOMAIN"/Matching/Application/LibreOffice", test_match_libreoffice_windows);
   g_test_add_func (DOMAIN"/Matching/Application/GnomeControlCenter", test_match_gnome_control_center_panels);
+  g_test_add_func (DOMAIN"/Matching/Application/JavaWebStart", test_match_javaws_windows);
   g_test_add_func (DOMAIN"/Matching/Windows/UnmatchedOnNewDesktop", test_new_desktop_matches_unmatched_windows);
   g_test_add_func (DOMAIN"/Matching/Windows/Transient", test_match_transient_windows);
   g_test_add_func (DOMAIN"/ExecStringTrimming", test_trim_exec_string);
@@ -559,6 +561,73 @@
 }
 
 static void
+test_match_javaws_windows (void)
+{
+  BamfMatcher *matcher;
+  BamfLegacyScreen *screen;
+  BamfLegacyWindowTest *test_win;
+  BamfApplication *app1, *app2, *app3;
+  GList *app_children;
+
+  screen = bamf_legacy_screen_get_default ();
+  matcher = bamf_matcher_get_default ();
+  const char *exec_prefix = "/usr/lib/jvm/java-6-openjdk-amd64/jre/bin/java " \
+                            "-Xbootclasspath/a:/usr/share/icedtea-web/netx.jar " \
+                            "-Xms8m -Djava.security.manager " \
+                            "-Djava.security.policy=/etc/icedtea-web/javaws.policy " \
+                            "-classpath /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/rt.jar " \
+                            "-Dicedtea-web.bin.name=javaws " \
+                            "-Dicedtea-web.bin.location=/usr/bin/javaws "\
+                            "net.sourceforge.jnlp.runtime.Boot";
+  const char *class_name = "sun-awt-X11-XFramePeer";
+  const char *class_instance = "net-sourceforge-jnlp-runtime-Boot";
+
+  cleanup_matcher_tables (matcher);
+  export_matcher_on_bus (matcher);
+
+  guint xid = g_random_int ();
+  char *exec = g_strconcat (exec_prefix, " Notepad.jnlp", NULL);
+  test_win = bamf_legacy_window_test_new (xid, "Notepad", NULL, exec);
+  bamf_legacy_window_test_set_wmclass (test_win, class_name, class_instance);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+  g_free (exec);
+  app1 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (BAMF_IS_APPLICATION (app1));
+  app_children = bamf_view_get_children (BAMF_VIEW (app1));
+  g_assert_cmpuint (g_list_length (app_children), ==, 1);
+  g_assert (find_window_in_app (app1, BAMF_LEGACY_WINDOW (test_win)));
+
+  xid = g_random_int ();
+  exec = g_strconcat (exec_prefix, " Draw.jnlp", NULL);
+  test_win = bamf_legacy_window_test_new (xid, "Draw", NULL, exec);
+  bamf_legacy_window_test_set_wmclass (test_win, class_name, class_instance);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+  g_free (exec);
+  app2 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (BAMF_IS_APPLICATION (app2));
+  g_assert (app1 != app2);
+  app_children = bamf_view_get_children (BAMF_VIEW (app2));
+  g_assert_cmpuint (g_list_length (app_children), ==, 1);
+  g_assert (find_window_in_app (app2, BAMF_LEGACY_WINDOW (test_win)));
+
+  xid = g_random_int ();
+  exec = g_strconcat (exec_prefix, " Notepad.jnlp", NULL);
+  test_win = bamf_legacy_window_test_new (xid, "Notepad Subwin", NULL, exec);
+  bamf_legacy_window_test_set_wmclass (test_win, class_name, class_instance);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+  g_free (exec);
+  app3 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (app3 == app1);
+  g_assert (BAMF_IS_APPLICATION (app3));
+  app_children = bamf_view_get_children (BAMF_VIEW (app3));
+  g_assert_cmpuint (g_list_length (app_children), ==, 2);
+  g_assert (find_window_in_app (app3, BAMF_LEGACY_WINDOW (test_win)));
+
+  g_object_unref (matcher);
+  g_object_unref (screen);
+}
+
+static void
 test_match_transient_windows (void)
 {
   BamfMatcher *matcher;
@@ -660,5 +729,17 @@
   g_assert_cmpstr (trimmed, ==, "myprog");
   g_free (trimmed);
 
+  const char *exec = "/usr/lib/jvm/java-6-openjdk-amd64/jre/bin/java " \
+                     "-Xbootclasspath/a:/usr/share/icedtea-web/netx.jar " \
+                     "-Xms8m -Djava.security.manager " \
+                     "-Djava.security.policy=/etc/icedtea-web/javaws.policy " \
+                     "-classpath /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/rt.jar " \
+                     "-Dicedtea-web.bin.name=javaws " \
+                     "-Dicedtea-web.bin.location=/usr/bin/javaws "\
+                     "net.sourceforge.jnlp.runtime.Boot Notepad.jnlp";
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, exec);
+  g_assert_cmpstr (trimmed, ==, "notepad.jnlp");
+  g_free (trimmed);
+
   g_object_unref (matcher);
 }