Merge lp:~3v1n0/bamf/lib-factory-xids-matching into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfFactory: be more smart to re-associate a dbus path to a view using windows xid

BamfFactory has been improved adding the new bamf_factory_view_for_path_type that allows to get a view from a path with the defined type. This allows to avoid (when the type is known) to create a temporary view, only to query via dbus the type of the object.

Also now the factory now has been improved to re-associate the opened views to the new ones using the related windows xids. So basically when a new application has been opened, we initially try to re-associate it to the opened view with the same desktop file; if that check fails we fallback to the children windows xid comparison (if a view has at least a xid that matches the ones of the new application, then we consider them the same).

So, thanks to this both applications with .desktop files associated and applications with no desktop file can be re-used avoiding memory duplication and double launcher icon instances.

Tests covered by: lp:~3v1n0/unity/launcher-double-icons-tests

[Michal Hruby (mhr3)]

It seems to be working fine, although it seems to be causing some assertions:

(bamfdaemon:26376): GLib-CRITICAL **: g_str_has_prefix: assertion `str != NULL' failed

Backtrace:

#0 g_log (log_domain=0x7ffff632370e "GLib", log_level=G_LOG_LEVEL_CRITICAL,
    format=0x7ffff632cb2a "%s: assertion `%s' failed")
    at /build/buildd/glib2.0-2.32.1/./glib/gmessages.c:788
#1 0x00007ffff63014f2 in g_str_has_prefix (str=0x0,
    prefix=0x43e931 "libreoffice")
    at /build/buildd/glib2.0-2.32.1/./glib/gstrfuncs.c:2771
#2 0x000000000042f265 in is_open_office_window (window=0x7ac1e0,
    self=<optimized out>)
    at /home/miso-work/unity/source/bamf/src/bamf-matcher.c:1378
#3 handle_window_opened (screen=<optimized out>, window=0x7ac1e0,
    self=0x7861b0) at /home/miso-work/unity/source/bamf/src/bamf-matcher.c:2081
#4 0x00007ffff67b6354 in g_cclosure_marshal_VOID__OBJECTv (closure=0x7b2630,
    return_value=<optimized out>, instance=0x777a80, args=<optimized out>,
    marshal_data=<optimized out>, n_params=<optimized out>,
    param_types=0x79bf50)
    at /build/buildd/glib2.0-2.32.1/./gobject/gmarshal.c:1312
#5 0x00007ffff67b2eca in _g_closure_invoke_va (closure=0x7b2630,
    return_value=0x0, instance=0x777a80, args=0x7fffffffd348, n_params=1,
    param_types=<optimized out>)
    at /build/buildd/glib2.0-2.32.1/./gobject/gclosure.c:840
#6 0x00007ffff67cb741 in g_signal_emit_valist (instance=0x777a80,
    signal_id=<optimized out>, detail=0, var_args=<optimized out>)
---Type <return> to continue, or q <return> to quit---
    at /build/buildd/glib2.0-2.32.1/./gobject/gsignal.c:3207
#7 0x00007ffff67cc242 in g_signal_emit (instance=<optimized out>,
    signal_id=<optimized out>, detail=<optimized out>)
    at /build/buildd/glib2.0-2.32.1/./gobject/gsignal.c:3352
#8 0x00007ffff67b6354 in g_cclosure_marshal_VOID__OBJECTv (closure=0x7b2590,
    return_value=<optimized out>, instance=0x79a390, args=<optimized out>,
    marshal_data=<optimized out>, n_params=<optimized out>,
    param_types=0x7b0f30)
    at /build/buildd/glib2.0-2.32.1/./gobject/gmarshal.c:1312
#9 0x00007ffff67b2eca in _g_closure_invoke_va (closure=0x7b2590,
    return_value=0x0, instance=0x79a390, args=0x7fffffffd718, n_params=1,
    param_types=<optimized out>)
    at /build/buildd/glib2.0-2.32.1/./gobject/gclosure.c:840
#10 0x00007ffff67cb741 in g_signal_emit_valist (instance=0x79a390,
    signal_id=<optimized out>, detail=0, var_args=<optimized out>)
    at /build/buildd/glib2.0-2.32.1/./gobject/gsignal.c:3207
#11 0x00007ffff67cc242 in g_signal_emit (instance=<optimized out>,
    signal_id=<optimized out>, detail=<optimized out>)
    at /build/buildd/glib2.0-2.32.1/./gobject/gsignal.c:3352
#12 0x00007ffff787e339 in ?? () from /usr/lib/libwnck-3.so.0
#13 0x00007ffff787ea24 in ?? () from /usr/lib/libwnck-3.so.0
#14 0x00007ffff62e4c9a in g_main_dispatch (context=0x666a80)
    at /build/buildd/glib2.0-2.32.1/./glib/gmain.c:2515
#15 g_main_context_dispatch (context=0x666a80)
    at /build/buildd/glib2.0-2.32.1/./glib/gmain.c:3052
#16 0x00007ffff62e5060 in g_main_context_iterate (dispatch=1,
    block=<optimized out>, context=0x666a80, self=<optimized out>)
    at ...

[Michal Hruby (mhr3)]

And unity also just complained about:

ERROR 2012-04-26 10:42:25 unity <unknown>:0 on_view_proxy_destroyed: assertion `BAMF_IS_VIEW (view)' failed

[Michal Hruby (mhr3)]

And one more thing - wouldn't it be better to use an enum in the bamf_factory_view_for_path_type() method?

[lp:~3v1n0/bamf/lib-factory-xids-matching]

479. By Marco Trevisan (Treviño) on 2012-04-26

libbamf, bamfview: disconect to the destroyed signal when needed

480. By Marco Trevisan (Treviño) on 2012-04-26

BamfFactory: use BamfFactoryViewType instead of strings comparisons when possible.

This cleans the code and is for sure more safe.

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

Ok, updated ;)

[Michal Hruby (mhr3)]

Looking good to me, do we want to have this in SRU1?

review: Approve

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

Well... I'd like to.

=== modified file 'lib/libbamf/Makefile.am'
--- lib/libbamf/Makefile.am	2012-01-20 15:33:59 +0000
+++ lib/libbamf/Makefile.am	2012-04-26 17:14:21 +0000
@@ -40,6 +40,7 @@
 
 libbamf_la_SOURCES = \
   bamf-factory.h \
+  bamf-application-private.h \
   bamf-view-private.h \
   $(sources_h) \
   $(libbamf_sources) \
 
=== added file 'lib/libbamf/bamf-application-private.h'
--- lib/libbamf/bamf-application-private.h	1970-01-01 00:00:00 +0000
+++ lib/libbamf/bamf-application-private.h	2012-04-26 17:14:21 +0000
@@ -0,0 +1,30 @@
+/*
+ * bamf-application-private.h
+ * This file is part of BAMF
+ *
+ * Copyright (C) 2012 - Marco Trevisan (Treviño)
+ *
+ * BAMF is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * BAMF is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with BAMF; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, 
+ * Boston, MA  02110-1301  USA
+ */
+
+#ifndef _BAMF_APPLICATION_PRIVATE_H_
+#define _BAMF_APPLICATION_PRIVATE_H_
+
+#include <libbamf/bamf-application.h>
+
+GList *bamf_application_get_cached_xids (BamfApplication *app);
+
+#endif
 
=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2012-04-10 08:57:06 +0000
+++ lib/libbamf/bamf-application.c	2012-04-26 17:14:21 +0000
@@ -37,6 +37,7 @@
 #include "bamf-application.h"
 #include "bamf-window.h"
 #include "bamf-factory.h"
+#include "bamf-application-private.h"
 #include "bamf-view-private.h"
 
 #include <gio/gdesktopappinfo.h>
@@ -66,6 +67,7 @@
   DBusGProxy      *proxy;
   gchar           *application_type;
   gchar           *desktop_file;
+  GList           *cached_xids;
   int              show_stubs;
 };
 
@@ -98,6 +100,12 @@
       return NULL;
     }
 
+  if (file && file[0] == '\0')
+    {
+      g_free (file);
+      file = NULL;
+    }
+
   priv->desktop_file = file;
   return file;
 }
@@ -185,6 +193,7 @@
         }
     }
 
+  g_list_free (children);
   return windows;
 }
 
@@ -238,20 +247,48 @@
 bamf_application_on_window_added (DBusGProxy *proxy, char *path, BamfApplication *self)
 {
   BamfView *view;
-
-  view = bamf_factory_view_for_path (bamf_factory_get_default (), path);
-
-  g_signal_emit (G_OBJECT (self), application_signals[WINDOW_ADDED], 0, view);
+  BamfFactory *factory;
+
+  factory = bamf_factory_get_default ();
+  view = bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
+
+  if (BAMF_IS_WINDOW (view))
+    {
+      guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
+
+      if (!g_list_find (self->priv->cached_xids, GUINT_TO_POINTER (xid)))
+      {
+        self->priv->cached_xids = g_list_prepend (self->priv->cached_xids, GUINT_TO_POINTER (xid));
+      }
+
+      g_signal_emit (G_OBJECT (self), application_signals[WINDOW_ADDED], 0, view);
+    }
 }
 
 static void
 bamf_application_on_window_removed (DBusGProxy *proxy, char *path, BamfApplication *self)
 {
   BamfView *view;
-
-  view = bamf_factory_view_for_path (bamf_factory_get_default (), path);
-
-  g_signal_emit (G_OBJECT (self), application_signals[WINDOW_REMOVED], 0, view);
+  BamfFactory *factory;
+
+  factory = bamf_factory_get_default ();
+  view = bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
+
+  if (BAMF_IS_WINDOW (view))
+    {
+      guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
+      self->priv->cached_xids = g_list_remove (self->priv->cached_xids, GUINT_TO_POINTER (xid));
+
+      g_signal_emit (G_OBJECT (self), application_signals[WINDOW_REMOVED], 0, view);
+    }
+}
+
+GList *
+bamf_application_get_cached_xids (BamfApplication *self)
+{
+  g_return_val_if_fail (BAMF_IS_APPLICATION (self), NULL);
+
+  return self->priv->cached_xids;
 }
 
 static void
@@ -291,6 +328,12 @@
       priv->proxy = NULL;
     }
 
+  if (priv->cached_xids)
+    {
+      g_list_free (priv->cached_xids);
+      priv->cached_xids = NULL;
+    }
+
   if (G_OBJECT_CLASS (bamf_application_parent_class)->dispose)
     G_OBJECT_CLASS (bamf_application_parent_class)->dispose (object);
 }
@@ -335,6 +378,26 @@
                                (GCallback) bamf_application_on_window_removed,
                                self,
                                NULL);
+
+  GList *children, *l;
+  children = bamf_view_get_children (view);
+
+  if (priv->cached_xids)
+    {
+      g_list_free (priv->cached_xids);
+      priv->cached_xids = NULL;
+    }
+
+  for (l = children; l; l = l->next)
+    {
+      if (!BAMF_IS_WINDOW (l->data))
+        continue;
+
+      guint32 xid = bamf_window_get_xid (BAMF_WINDOW (l->data));
+      priv->cached_xids = g_list_prepend (priv->cached_xids, GUINT_TO_POINTER (xid));
+    }
+
+  g_list_free (children);
 }
 
 static void
 
=== modified file 'lib/libbamf/bamf-factory.c'
--- lib/libbamf/bamf-factory.c	2012-04-18 12:28:41 +0000
+++ lib/libbamf/bamf-factory.c	2012-04-26 17:14:21 +0000
@@ -39,6 +39,7 @@
 #include "bamf-view-private.h"
 #include "bamf-window.h"
 #include "bamf-application.h"
+#include "bamf-application-private.h"
 #include "bamf-indicator.h"
 
 #include <dbus/dbus.h>
@@ -159,68 +160,181 @@
   return result;
 }
 
-BamfView * 
-bamf_factory_view_for_path (BamfFactory * factory,
-                            const char * path)
+static
+BamfFactoryViewType compute_factory_type_by_str (const char *type)
+{
+  BamfFactoryViewType factory_type = BAMF_FACTORY_NONE;
+
+  if (type && type[0] != '\0')
+    {
+      if (g_strcmp0 (type, "window") == 0)
+        {
+          factory_type = BAMF_FACTORY_WINDOW;
+        }
+      else if (g_strcmp0 (type, "application") == 0)
+        {
+          factory_type = BAMF_FACTORY_APPLICATION;
+        }
+      else if (g_strcmp0 (type, "indicator") == 0)
+        {
+          factory_type = BAMF_FACTORY_INDICATOR;
+        }
+      else if (g_strcmp0 (type, "view") == 0)
+        {
+          factory_type = BAMF_FACTORY_VIEW;
+        }
+    }
+
+  return factory_type;
+}
+
+BamfView * 
+bamf_factory_view_for_path (BamfFactory * factory, const char * path)
+{
+  return bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_NONE);
+}
+
+BamfView * 
+bamf_factory_view_for_path_type_str (BamfFactory * factory, const char * path,
+                                                            const char * type)
+{
+  g_return_val_if_fail (BAMF_IS_FACTORY (factory), NULL);
+  BamfFactoryViewType factory_type = compute_factory_type_by_str (type);
+
+  return bamf_factory_view_for_path_type (factory, path, factory_type);
+}
+
+BamfView * 
+bamf_factory_view_for_path_type (BamfFactory * factory, const char * path,
+                                                        BamfFactoryViewType type)
 {
   GHashTable *views;
   BamfView *view;
   GList *l;
-  gchar *type;
   gboolean created = FALSE;
 
   g_return_val_if_fail (BAMF_IS_FACTORY (factory), NULL);
   
-  if (!path || strlen (path) == 0)
+  if (!path || path[0] == '\0')
     return NULL;
   
   views = factory->priv->views;
-
   view = g_hash_table_lookup (views, path);
   
   if (BAMF_IS_VIEW (view))
     return view;
-  
-  view = g_object_new (BAMF_TYPE_VIEW, NULL);
-  bamf_view_set_path (view, path);
-  type = g_strdup (bamf_view_get_view_type (view));
-  g_object_unref (view);
-  
-  view = NULL;
-  if (g_strcmp0 (type, "application") == 0)
-    view = BAMF_VIEW (bamf_application_new (path));
-  else if (g_strcmp0 (type, "window") == 0)
-    view = BAMF_VIEW (bamf_window_new (path));
-  else if (g_strcmp0 (type, "indicator") == 0)
-    view = BAMF_VIEW (bamf_indicator_new (path));
-  
+
+  if (type == BAMF_FACTORY_NONE)
+    {
+      view = g_object_new (BAMF_TYPE_VIEW, NULL);
+      bamf_view_set_path (view, path);
+      type = compute_factory_type_by_str (bamf_view_get_view_type (view));
+      g_object_unref (view);
+      view = NULL;
+    }
+
+  switch (type)
+  {
+    case BAMF_FACTORY_VIEW:
+      view = g_object_new (BAMF_TYPE_VIEW, NULL);
+      break;
+    case BAMF_FACTORY_WINDOW:
+      view = BAMF_VIEW (bamf_window_new (path));
+      break;
+    case BAMF_FACTORY_APPLICATION:
+      view = BAMF_VIEW (bamf_application_new (path));
+      break;
+    case BAMF_FACTORY_INDICATOR:
+      view = BAMF_VIEW (bamf_indicator_new (path));
+      break;
+    case BAMF_FACTORY_NONE:
+      view = NULL;
+  }
+
   created = TRUE;
-  
+  BamfView *matched_view = NULL;
+
   if (BAMF_IS_APPLICATION (view))
     {
       /* handle case where a favorite exists and this matches it */
       const char *local_desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
-      for (l = factory->priv->local_views; l; l = l->next)
-        {
-          /* remote ready views are already matched */
-          if (bamf_view_remote_ready (BAMF_VIEW (l->data)) || !BAMF_IS_APPLICATION (l->data))
-            continue;
-          
-          const char *list_desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (l->data));
-          
-          if (g_strcmp0 (local_desktop_file, list_desktop_file) == 0)
-            {
-              created = FALSE;
-              g_object_unref (view);
-
-              view = BAMF_VIEW (l->data);
-              bamf_view_set_path (view, path);
-              g_object_ref_sink (view);
-              break;
-            }
-        }
-    }
-  
+      GList *local_children = bamf_view_get_children (view);
+
+      for (l = factory->priv->local_views; l; l = l->next)
+        {
+          if (!BAMF_IS_APPLICATION (l->data))
+            continue;
+
+          BamfView *list_view = BAMF_VIEW (l->data);
+          BamfApplication *list_app = BAMF_APPLICATION (l->data);
+
+          const char *list_desktop_file = bamf_application_get_desktop_file (list_app);
+
+          /* We try to match applications by desktop files */
+          if (local_desktop_file && g_strcmp0 (local_desktop_file, list_desktop_file) == 0)
+            {
+              matched_view = list_view;
+              break;
+            }
+
+          /* If the primary search doesn't give out any result, we fallback
+           * to children window comparison */
+          if (!matched_view)
+            {
+              GList *list_children, *ll;
+              list_children = bamf_application_get_cached_xids (list_app);
+
+              for (ll = local_children; ll; ll = ll->next)
+                {
+                  if (!BAMF_IS_WINDOW (ll->data))
+                    continue;
+
+                  guint32 local_xid = bamf_window_get_xid (BAMF_WINDOW (ll->data));
+
+                  if (g_list_find (list_children, GUINT_TO_POINTER (local_xid)))
+                    {
+                      matched_view = list_view;
+                      break;
+                    }
+                }
+            }
+        }
+
+      g_list_free (local_children);
+    }
+  else if (BAMF_IS_WINDOW (view))
+    {
+      guint32 local_xid = bamf_window_get_xid (BAMF_WINDOW (view));
+
+      for (l = factory->priv->local_views; l; l = l->next)
+        {
+          if (!BAMF_IS_WINDOW (l->data))
+            continue;
+
+          BamfView *list_view = BAMF_VIEW (l->data);
+          BamfWindow *list_win = BAMF_WINDOW (l->data);
+
+          guint32 list_xid = bamf_window_get_xid (list_win);
+
+          /* We try to match windows by xid */
+          if (local_xid != 0 && local_xid == list_xid)
+            {
+              matched_view = list_view;
+              break;
+            }
+        }
+    }
+
+  if (matched_view)
+    {
+      created = FALSE;
+      g_object_unref (view);
+
+      view = matched_view;
+      bamf_view_set_path (view, path);
+      g_object_ref_sink (view);
+    }
+
   if (view)
     {
       bamf_factory_register_view (factory, view, path);
@@ -231,8 +345,7 @@
           g_object_ref_sink (view);
         }
     }
-  
-  g_free (type);
+
   return view;
 }
 
 
=== modified file 'lib/libbamf/bamf-factory.h'
--- lib/libbamf/bamf-factory.h	2010-10-26 03:48:12 +0000
+++ lib/libbamf/bamf-factory.h	2012-04-26 17:14:21 +0000
@@ -54,6 +54,15 @@
 typedef struct _BamfFactoryClass   BamfFactoryClass;
 typedef struct _BamfFactoryPrivate BamfFactoryPrivate;
 
+typedef enum
+{
+  BAMF_FACTORY_VIEW,
+  BAMF_FACTORY_WINDOW,
+  BAMF_FACTORY_APPLICATION,
+  BAMF_FACTORY_INDICATOR,
+  BAMF_FACTORY_NONE
+} BamfFactoryViewType;
+
 struct _BamfFactory
 {
   GObject parent;
@@ -71,6 +80,14 @@
 BamfView        * bamf_factory_view_for_path        (BamfFactory * factory,
                                                      const char * path);
 
+BamfView        * bamf_factory_view_for_path_type   (BamfFactory * factory,
+                                                     const char * path,
+                                                     BamfFactoryViewType type);
+
+BamfView        * bamf_factory_view_for_path_type_str (BamfFactory * factory,
+                                                       const char * path,
+                                                       const char * type);
+
 BamfApplication * bamf_factory_app_for_file         (BamfFactory * factory,
                                                      const char * path,
                                                      gboolean create);
 
=== modified file 'lib/libbamf/bamf-matcher.c'
--- lib/libbamf/bamf-matcher.c	2012-04-24 14:14:44 +0000
+++ lib/libbamf/bamf-matcher.c	2012-04-26 17:14:21 +0000
@@ -144,8 +144,12 @@
                              BamfMatcher *matcher)
 {
   BamfView *view;
-
-  view = bamf_factory_view_for_path (bamf_factory_get_default (), path);
+  BamfFactory *factory = bamf_factory_get_default ();
+
+  view = bamf_factory_view_for_path_type_str (factory, path, type);
+
+  if (!BAMF_IS_VIEW (view))
+    return;
 
   g_signal_emit (matcher, matcher_signals[VIEW_OPENED], 0, view);
 }
@@ -157,8 +161,9 @@
                              BamfMatcher *matcher)
 {
   BamfView *view;
+  BamfFactory *factory = bamf_factory_get_default ();
 
-  view = bamf_factory_view_for_path (bamf_factory_get_default (), path);
+  view = bamf_factory_view_for_path_type_str (factory, path, type);
 
   if (!BAMF_IS_VIEW (view))
     return;
@@ -172,14 +177,12 @@
                                             char *new_path,
                                             BamfMatcher *matcher)
 {
-  BamfView *old_view = NULL;
-  BamfView *new_view = NULL;
-
-  if (old_path && strlen (old_path) > 0)
-    old_view = bamf_factory_view_for_path (bamf_factory_get_default (), old_path);
-
-  if (new_path && strlen (new_path) > 0)
-    new_view = bamf_factory_view_for_path (bamf_factory_get_default (), new_path);
+  BamfView *old_view;
+  BamfView *new_view;
+
+  BamfFactory *factory = bamf_factory_get_default ();
+  old_view = bamf_factory_view_for_path_type (factory, old_path, BAMF_FACTORY_APPLICATION);
+  new_view = bamf_factory_view_for_path_type (factory, new_path, BAMF_FACTORY_APPLICATION);
 
   g_signal_emit (matcher, matcher_signals[ACTIVE_APPLICATION_CHANGED], 0, old_view, new_view);
 }
@@ -190,14 +193,12 @@
                                        char *new_path,
                                        BamfMatcher *matcher)
 {
-  BamfView *old_view = NULL;
-  BamfView *new_view = NULL;
-
-  if (old_path && strlen (old_path) > 0)
-    old_view = bamf_factory_view_for_path (bamf_factory_get_default (), old_path);
-
-  if (new_path && strlen (new_path) > 0)
-    new_view = bamf_factory_view_for_path (bamf_factory_get_default (), new_path);
+  BamfView *old_view;
+  BamfView *new_view;
+
+  BamfFactory *factory = bamf_factory_get_default ();
+  old_view = bamf_factory_view_for_path_type (factory, old_path, BAMF_FACTORY_WINDOW);
+  new_view = bamf_factory_view_for_path_type (factory, new_path, BAMF_FACTORY_WINDOW);
 
   g_signal_emit (matcher, matcher_signals[ACTIVE_WINDOW_CHANGED], 0, old_view, new_view);
 }
@@ -373,10 +374,17 @@
       return NULL;
     }
 
+  if (app && app[0] == '\0')
+    {
+      g_free (app);
+      return NULL;
+    }
+
   if (!app)
     return NULL;
 
-  view = bamf_factory_view_for_path (bamf_factory_get_default (), app);
+  BamfFactory *factory = bamf_factory_get_default ();
+  view = bamf_factory_view_for_path_type (factory, app, BAMF_FACTORY_APPLICATION);
   g_free (app);
 
   if (!BAMF_IS_APPLICATION (view))
@@ -390,7 +398,7 @@
 {
   BamfMatcherPrivate *priv;
   BamfView *view;
-  char *app = NULL;
+  char *win = NULL;
   GError *error = NULL;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
@@ -400,7 +408,7 @@
                           "ActiveWindow",
                           &error,
                           G_TYPE_INVALID,
-                          G_TYPE_STRING, &app,
+                          G_TYPE_STRING, &win,
                           G_TYPE_INVALID))
     {
       g_warning ("Failed to fetch path: %s", error->message);
@@ -408,11 +416,18 @@
       return NULL;
     }
 
-  if (!app)
+  if (win && win[0] == '\0')
+    {
+      g_free (win);
+      return NULL;
+    }
+
+  if (!win)
     return NULL;
 
-  view = bamf_factory_view_for_path (bamf_factory_get_default (), app);
-  g_free (app);
+  BamfFactory *factory = bamf_factory_get_default ();
+  view = bamf_factory_view_for_path_type (factory, win, BAMF_FACTORY_WINDOW);
+  g_free (win);
 
   if (!BAMF_IS_WINDOW (view))
     return NULL;
@@ -455,10 +470,17 @@
       return NULL;
     }
 
+  if (app && app[0] == '\0')
+    {
+      g_free (app);
+      return NULL;
+    }
+
   if (!app)
     return NULL;
 
-  view = bamf_factory_view_for_path (bamf_factory_get_default (), app);
+  BamfFactory *factory = bamf_factory_get_default ();
+  view = bamf_factory_view_for_path_type (factory, app, BAMF_FACTORY_APPLICATION);
   
   g_free (app);
 
@@ -522,14 +544,16 @@
       return NULL;
     }
 
-  g_return_val_if_fail (array, NULL);
+  if (!array)
+    return NULL;
 
+  BamfFactory *factory = bamf_factory_get_default ();
   len = g_strv_length (array);
   for (i = len-1; i >= 0; i--)
     {
-      view = bamf_factory_view_for_path (bamf_factory_get_default (), array[i]);
+      view = bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_APPLICATION);
 
-      if (view)
+      if (BAMF_IS_APPLICATION (view))
         result = g_list_prepend (result, view);
     }
   
@@ -563,14 +587,16 @@
       return NULL;
     }
 
-  g_return_val_if_fail (array, NULL);
+  if (!array)
+    return NULL;
 
+  BamfFactory *factory = bamf_factory_get_default ();
   len = g_strv_length (array);
   for (i = len-1; i >= 0; i--)
     {
-      view = bamf_factory_view_for_path (bamf_factory_get_default (), array[i]);
+      view = bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_WINDOW);
 
-      if (view)
+      if (BAMF_IS_WINDOW (view))
         result = g_list_prepend (result, view);
     }
   
@@ -606,14 +632,16 @@
       return NULL;
     }
 
-  g_return_val_if_fail (array, NULL);
+  if (!array)
+    return NULL;
 
+  BamfFactory *factory = bamf_factory_get_default ();
   len = g_strv_length (array);
   for (i = len-1; i >= 0; i--)
     {
-      view = bamf_factory_view_for_path (bamf_factory_get_default (), array[i]);
+      view = bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_WINDOW);
 
-      if (view)
+      if (BAMF_IS_WINDOW (view))
         result = g_list_prepend (result, view);
     }
   
@@ -664,14 +692,16 @@
       return NULL;
     }
 
-  g_return_val_if_fail (array, NULL);
+  if (!array)
+    return NULL;
 
+  BamfFactory *factory = bamf_factory_get_default ();
   len = g_strv_length (array);
   for (i = len-1; i >= 0; i--)
     {
-      view = bamf_factory_view_for_path (bamf_factory_get_default (), array[i]);
+      view = bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_APPLICATION);
 
-      if (view)
+      if (BAMF_IS_APPLICATION (view))
         result = g_list_prepend (result, view);
     }
 
 
=== modified file 'lib/libbamf/bamf-view-private.h'
--- lib/libbamf/bamf-view-private.h	2010-11-01 05:07:11 +0000
+++ lib/libbamf/bamf-view-private.h	2012-04-26 17:14:21 +0000
@@ -31,6 +31,8 @@
 
 gboolean bamf_view_remote_ready (BamfView *view);
 
+void bamf_view_reset_flags (BamfView *view);
+
 void bamf_view_set_name (BamfView *view, const char *name);
 
 void bamf_view_set_icon (BamfView *view, const char *icon);
 
=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2012-04-22 15:10:47 +0000
+++ lib/libbamf/bamf-view.c	2012-04-26 17:14:21 +0000
@@ -111,7 +111,7 @@
   if (value)
     priv->set_flags |= flag;
   else
-    priv->set_flags = priv->set_flags & ~flag;
+    priv->set_flags &= ~flag;
   
   priv->checked_flags |= flag;
 }
@@ -386,7 +386,7 @@
     return BAMF_VIEW_GET_CLASS (self)->get_name (self);
 
   if (!bamf_view_remote_ready (self))
-    return g_strdup(priv->local_name);
+    return g_strdup (priv->local_name);
     
   if (!dbus_g_proxy_call (priv->proxy,
                           "Name",
@@ -439,7 +439,7 @@
                           G_TYPE_STRING, &type,
                           G_TYPE_INVALID))
     {
-      g_warning ("Failed to fetch view type at %s: %s", dbus_g_proxy_get_path (priv->proxy), error->message);
+      g_warning ("Failed to fetch view type at %s: %s", dbus_g_proxy_get_path (priv->proxy), error ? error->message : "");
       g_error_free (error);
       return NULL;
     }
@@ -543,6 +543,16 @@
 }
 
 static void
+on_view_proxy_destroyed (GObject *proxy, gpointer user_data)
+{
+  BamfView *view = user_data;
+  g_return_if_fail (BAMF_IS_VIEW (view));
+
+  view->priv->checked_flags = 0x0;
+  view->priv->proxy = NULL;
+}
+
+static void
 bamf_view_on_closed (DBusGProxy *proxy, BamfView *self)
 {
   BamfViewPrivate *priv;
@@ -593,6 +603,8 @@
                                      "UserVisibleChanged",
                                      (GCallback) bamf_view_on_user_visible_changed,
                                      self);
+
+      g_signal_handlers_disconnect_by_func (priv->proxy, on_view_proxy_destroyed, self);
       g_object_unref (priv->proxy);
       priv->proxy = NULL;
     }
@@ -737,6 +749,7 @@
                                      (GCallback) bamf_view_on_name_changed,
                                      view);
 
+      g_signal_handlers_disconnect_by_func (priv->proxy, on_view_proxy_destroyed, view);
       g_object_unref (priv->proxy);
       priv->proxy = NULL;
     }
@@ -753,6 +766,40 @@
 }
 
 void
+bamf_view_reset_flags (BamfView *view)
+{
+  BamfViewPrivate *priv;
+  g_return_if_fail (BAMF_IS_VIEW (view));
+
+  priv = view->priv;
+  priv->checked_flags = 0x0;
+
+  if (bamf_view_user_visible (view))
+    {
+      g_signal_emit (G_OBJECT(view), view_signals[VISIBLE_CHANGED], 0, TRUE);
+      g_object_notify (G_OBJECT (view), "user-visible");
+    }
+  
+  if (bamf_view_is_active (view))
+    {
+      g_signal_emit (G_OBJECT(view), view_signals[ACTIVE_CHANGED], 0, TRUE);
+      g_object_notify (G_OBJECT (view), "active");
+    }
+  
+  if (bamf_view_is_running (view))
+    {
+      g_signal_emit (G_OBJECT(view), view_signals[RUNNING_CHANGED], 0, TRUE);
+      g_object_notify (G_OBJECT (view), "running");
+    }
+    
+  if (bamf_view_is_urgent (view))
+    {
+      g_signal_emit (G_OBJECT(view), view_signals[URGENT_CHANGED], 0, TRUE);
+      g_object_notify (G_OBJECT (view), "urgent");
+    }
+}
+
+void
 bamf_view_set_path (BamfView *view, const char *path)
 {
   BamfViewPrivate *priv;
@@ -766,18 +813,27 @@
     {
       g_free (priv->path);
     }
-  
+
+  if (priv->proxy)
+    {
+      g_signal_handlers_disconnect_by_func (priv->proxy, on_view_proxy_destroyed, view);
+      g_object_unref (priv->proxy);
+    }
+
   priv->path = g_strdup (path);
   priv->proxy = dbus_g_proxy_new_for_name (priv->connection,
                                            "org.ayatana.bamf",
                                            priv->path,
                                            "org.ayatana.bamf.view");
+
   if (priv->proxy == NULL)
     {
       g_critical ("Unable to get org.ayatana.bamf.view view");
       return;
     }
 
+  g_signal_connect (priv->proxy, "destroy", G_CALLBACK (on_view_proxy_destroyed), view);
+
   dbus_g_proxy_add_signal (priv->proxy,
                            "ActiveChanged",
                            G_TYPE_BOOLEAN,
@@ -868,32 +924,9 @@
 
   if (bamf_view_is_sticky (view))
     {
-      priv->checked_flags = 0x0;
-      
-      if (bamf_view_user_visible (view))
-        {
-          g_signal_emit (G_OBJECT(view), view_signals[VISIBLE_CHANGED], 0, TRUE);
-          g_object_notify (G_OBJECT (view), "user-visible");
-        }
-      
-      if (bamf_view_is_active (view))
-        {
-          g_signal_emit (G_OBJECT(view), view_signals[ACTIVE_CHANGED], 0, TRUE);
-          g_object_notify (G_OBJECT (view), "active");
-        }
-      
-      if (bamf_view_is_running (view))
-        {
-          g_signal_emit (G_OBJECT(view), view_signals[RUNNING_CHANGED], 0, TRUE);
-          g_object_notify (G_OBJECT (view), "running");
-        }
-        
-      if (bamf_view_is_urgent (view))
-        {
-          g_signal_emit (G_OBJECT(view), view_signals[URGENT_CHANGED], 0, TRUE);
-          g_object_notify (G_OBJECT (view), "urgent");
-        }
+      bamf_view_reset_flags (view);
     }
+
   if (BAMF_VIEW_GET_CLASS (view)->set_path)
     BAMF_VIEW_GET_CLASS (view)->set_path (view, path);
 }
 
=== modified file 'lib/libbamf/bamf-window.c'
--- lib/libbamf/bamf-window.c	2012-02-27 18:34:30 +0000
+++ lib/libbamf/bamf-window.c	2012-04-26 17:14:21 +0000
@@ -103,7 +103,8 @@
   if (!path)
     return NULL;
 
-  transient = bamf_factory_view_for_path (bamf_factory_get_default (), path);
+  BamfFactory *factory = bamf_factory_get_default ();
+  transient = bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
   g_free (path);  
 
   if (!BAMF_IS_WINDOW (transient))