Merge lp:~3v1n0/bamf/better-lib-caching into lp:bamf

[Marco Trevisan (Treviño)]

libBAMF: cache active{window,application} and be smarter in reusing known resources

Add new methods in matcher, view and application.

Reduce DBus chatting between libbamf and bamfdaemon for retrieving informations that have been already sent using signals or previous calls.

Try to reduce the data usage, and include new methods to implement some common features that clients had to do by hand so far.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:631
http://jenkins.qa.ubuntu.com/job/bamf-ci/111/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/7/console

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

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/bamf/better-lib-caching]

632. By Marco Trevisan (Treviño) on 2015-04-22

configure.ac: define LIBBAMF_SONAME in a global place

633. By Marco Trevisan (Treviño) on 2015-04-22

debian: bump version to 0.5.2~bzr and SONAME

634. By Marco Trevisan (Treviño) on 2015-04-22

gir1.2-bamf-3.install: work with both multi-arch and not

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/bamf/better-lib-caching]

635. By Marco Trevisan (Treviño) on 2015-04-22

Makefile.am: tests, use realpath to fix tests when using builddir != srcdir

636. By Marco Trevisan (Treviño) on 2015-04-22

debian/control: add hicolor-icon-theme ad build dependency

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:634
http://jenkins.qa.ubuntu.com/job/bamf-ci/113/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/10/console
    None: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/9/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:636
http://jenkins.qa.ubuntu.com/job/bamf-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/10/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~3v1n0/bamf/better-lib-caching]

637. By Marco Trevisan (Treviño) on 2015-04-22

BamfApplication: fix a typo in Return annotation

638. By Marco Trevisan (Treviño) on 2015-04-22

BamfView: fix virtual annotation to respect new standard

[Christopher Townsend (townsend)]

Ok, seems fine to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:638
http://jenkins.qa.ubuntu.com/job/bamf-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

debian/changelog entry is in the wrong format to be picked up by the ci-train merger. See https://wiki.ubuntu.com/citrain/FAQ#I_don.27t_like_the_auto-generated_changelog_coming_from_CI_Train and the inline comment.

review: Needs Fixing

[lp:~3v1n0/bamf/better-lib-caching]

639. By Marco Trevisan (Treviño) on 2015-05-29

debian/changelog: setting distro as UNRELEASED

640. By Marco Trevisan (Treviño) on 2015-06-12

libbamf, BamfMatcher: use a g_warning not to crash if matcher can't be reached

641. By Marco Trevisan (Treviño) on 2015-10-28

Libbamf: revert soname change

642. By Marco Trevisan (Treviño) on 2015-10-28

Merging with trunk

643. By Marco Trevisan (Treviño) on 2015-11-03

debian/gir1.2-bamf-3.install: only support multi-arch

=== modified file 'configure.ac'
--- configure.ac	2015-04-21 11:11:10 +0000
+++ configure.ac	2015-11-03 10:05:35 +0000
@@ -4,6 +4,7 @@
 AC_INIT(bamf, 0.5.2, [e-mail])
 AC_PREREQ(2.69)
 AC_SUBST(LIBBAMF_VER, 3)
+AC_SUBST(LIBBAMF_SONAME, 2:0:0)
 
 AC_CONFIG_SRCDIR(src/main.c)
 AC_CONFIG_HEADERS(config.h)

=== modified file 'debian/control'
--- debian/control	2015-06-27 04:40:27 +0000
+++ debian/control	2015-11-03 10:05:35 +0000
@@ -8,6 +8,7 @@
                dh-autoreconf,
                gobject-introspection (>= 1.41.4-1~),
                gtk-doc-tools,
+               hicolor-icon-theme,
                libglib2.0-dev (>= 2.32.0),
                libgtop2-dev,
                libgtk-3-dev (>= 3.0.0),

=== modified file 'debian/libbamf3-2.symbols'
--- debian/libbamf3-2.symbols	2013-08-09 15:24:39 +0000
+++ debian/libbamf3-2.symbols	2015-11-03 10:05:35 +0000
@@ -7,6 +7,7 @@
  bamf_application_get_supported_mime_types@Base 0.3.0
  bamf_application_get_type@Base 0.2.20
  bamf_application_get_windows@Base 0.2.20
+ bamf_application_get_window_for_xid@Base 0.5.2~bzr0
  bamf_application_get_xids@Base 0.2.20
  bamf_application_new@Base 0.2.20
  bamf_application_new_favorite@Base 0.2.60
@@ -27,6 +28,7 @@
  bamf_matcher_get_running_applications@Base 0.2.20
  bamf_matcher_get_tabs@Base 0.2.20
  bamf_matcher_get_type@Base 0.2.20
+ bamf_matcher_get_window_for_xid@Base 0.5.2~bzr0
  bamf_matcher_get_window_stack_for_monitor@Base 0.2.108
  bamf_matcher_get_windows@Base 0.2.46
  bamf_matcher_get_xids_for_application@Base 0.2.20
@@ -47,12 +49,14 @@
  bamf_view_get_type@Base 0.2.20
  bamf_view_get_view_type@Base 0.2.20
  bamf_view_is_active@Base 0.2.20
+ bamf_view_has_child@Base 0.5.2~bzr0
  bamf_view_is_closed@Base 0.2.54
  bamf_view_is_running@Base 0.2.20
  bamf_view_is_sticky@Base 0.2.60
  bamf_view_is_urgent@Base 0.2.20
  bamf_view_is_user_visible@Base 0.4.0
  bamf_view_set_sticky@Base 0.2.60
+ bamf_view_peek_children@Base 0.5.2~bzr0
  bamf_view_user_visible@Base 0.2.20
  bamf_window_get_monitor@Base 0.2.108
  bamf_window_get_pid@Base 0.2.112

=== modified file 'lib/libbamf/Makefile.am'
--- lib/libbamf/Makefile.am	2013-08-09 15:42:38 +0000
+++ lib/libbamf/Makefile.am	2015-11-03 10:05:35 +0000
@@ -57,7 +57,7 @@
 libbamf_la_LDFLAGS = \
 	-shared \
 	-export-symbols-regex "^bamf_" \
-	-version-info 2:0:0 \
+	-version-info $(LIBBAMF_SONAME) \
 	$(COVERAGE_LDFLAGS) \
 	$(NULL)
 

=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2014-03-07 17:22:20 +0000
+++ lib/libbamf/bamf-application.c	2015-11-03 10:05:35 +0000
@@ -251,6 +251,7 @@
   GVariantIter *iter;
   GVariant *xids_variant;
   GArray *xids;
+  GList *children, *l;
   guint32 xid;
   GError *error = NULL;
 
@@ -260,6 +261,24 @@
   if (!_bamf_view_remote_ready (BAMF_VIEW (application)))
     return NULL;
 
+  children = bamf_view_peek_children (BAMF_VIEW (application));
+
+  if (children)
+    {
+      xids = g_array_new (FALSE, TRUE, sizeof (guint32));
+
+      for (l = children; l; l = l->next)
+        {
+          if (!BAMF_IS_WINDOW (l->data))
+            continue;
+
+          xid = bamf_window_get_xid (BAMF_WINDOW (l->data));
+          g_array_append_val (xids, xid);
+        }
+
+      return xids;
+    }
+
   if (!_bamf_dbus_item_application_call_xids_sync (priv->proxy, &xids_variant,
                                                    CANCELLABLE (application), &error))
     {
@@ -298,26 +317,60 @@
 GList *
 bamf_application_get_windows (BamfApplication *application)
 {
-  GList *children, *l;
-  GList *windows = NULL;
+  GList *children, *l, *next;
   BamfView *view;
 
   g_return_val_if_fail (BAMF_IS_APPLICATION (application), NULL);
 
   children = bamf_view_get_children (BAMF_VIEW (application));
+  l = children;
 
-  for (l = children; l; l = l->next)
+  while (l != NULL)
     {
       view = l->data;
-
-      if (BAMF_IS_WINDOW (view))
-        {
-          windows = g_list_prepend (windows, view);
-        }
-    }
-
-  g_list_free (children);
-  return windows;
+      next = l->next;
+
+      if (!BAMF_IS_WINDOW (view))
+        {
+          children = g_list_delete_link (children, l);
+        }
+      l = next;
+    }
+
+  return children;
+}
+
+/**
+ * bamf_application_get_window_for_xid:
+ * @application: a #BamfApplication
+ * @xid: an X11 Window ID
+ *
+ * Used to fetch the application contains a Window with given @xid.
+ *
+ * Since: 0.5.2
+ * Returns: (transfer none): a #BamfWindow for the passed @xid or %NULL if not found.
+ */
+BamfWindow *
+bamf_application_get_window_for_xid (BamfApplication *application,
+                                     guint32 xid)
+{
+  GList *l;
+  BamfWindow *window;
+
+  g_return_val_if_fail (BAMF_IS_APPLICATION (application), FALSE);
+
+  for (l = bamf_view_peek_children (BAMF_VIEW (application)); l; l = l->next)
+    {
+      if (BAMF_IS_WINDOW (l->data))
+        {
+          window = BAMF_WINDOW (l->data);
+
+          if (bamf_window_get_xid (window) == xid)
+            return window;
+        }
+    }
+
+  return NULL;
 }
 
 /**
@@ -572,7 +625,7 @@
                     G_CALLBACK (bamf_application_on_supported_mime_types_changed), view);
 
   GList *children, *l;
-  children = bamf_view_get_children (view);
+  children = bamf_view_peek_children (view);
 
   if (priv->cached_xids)
     {
@@ -588,8 +641,6 @@
       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-application.h'
--- lib/libbamf/bamf-application.h	2013-08-05 16:18:46 +0000
+++ lib/libbamf/bamf-application.h	2015-11-03 10:05:35 +0000
@@ -30,6 +30,7 @@
 
 #include <glib-object.h>
 #include <libbamf/bamf-view.h>
+#include <libbamf/bamf-window.h>
 
 G_BEGIN_DECLS
 
@@ -94,6 +95,9 @@
 
 gboolean          bamf_application_get_show_menu_stubs  (BamfApplication *application);
 
+BamfWindow      * bamf_application_get_window_for_xid   (BamfApplication *application,
+                                                         guint32 xid);
+
 
 /* Deprecated symbols */
 G_GNUC_DEPRECATED

=== modified file 'lib/libbamf/bamf-factory.c'
--- lib/libbamf/bamf-factory.c	2013-06-21 17:51:51 +0000
+++ lib/libbamf/bamf-factory.c	2015-11-03 10:05:35 +0000
@@ -54,6 +54,7 @@
 static BamfFactory *static_factory = NULL;
 
 static void on_view_weak_unref (BamfFactory *self, BamfView *view_was_here);
+static void on_view_closed (BamfView *view, BamfFactory *self);
 
 static void
 bamf_factory_dispose (GObject *object)
@@ -66,6 +67,7 @@
       for (l = self->priv->allocated_views, next = NULL; l; l = next)
         {
           g_object_weak_unref (G_OBJECT (l->data), (GWeakNotify) on_view_weak_unref, self);
+          g_signal_handlers_disconnect_by_func (l->data, on_view_closed, self);
           next = l->next;
           g_list_free1 (l);
         }
@@ -183,6 +185,33 @@
                           G_CALLBACK (on_view_closed), self);
 }
 
+BamfWindow *
+_bamf_factory_window_for_xid (BamfFactory * factory,
+                              guint32 xid)
+{
+  BamfWindow *result = NULL, *win;
+  GList *l;
+
+  for (l = factory->priv->allocated_views; l; l = l->next)
+    {
+      if (!BAMF_IS_WINDOW (l->data))
+        continue;
+
+      if (bamf_view_is_closed (l->data))
+        continue;
+
+      win = BAMF_WINDOW (l->data);
+
+      if (bamf_window_get_xid (win) == xid)
+        {
+          result = win;
+          break;
+        }
+    }
+
+  return result;
+}
+
 BamfApplication *
 _bamf_factory_app_for_file (BamfFactory * factory,
                             const char * path,
@@ -220,6 +249,34 @@
   return result;
 }
 
+BamfApplication *
+_bamf_factory_app_for_xid (BamfFactory * factory,
+                           guint32 xid)
+{
+  BamfApplication *result = NULL, *app;
+  GList *l, *local_children;
+
+  for (l = factory->priv->allocated_views; l; l = l->next)
+    {
+      if (!BAMF_IS_APPLICATION (l->data))
+        continue;
+
+      if (bamf_view_is_closed (l->data))
+        continue;
+
+      app = BAMF_APPLICATION (l->data);
+      local_children = _bamf_application_get_cached_xids (app);
+
+      if (g_list_find (local_children, GUINT_TO_POINTER (xid)))
+        {
+          result = app;
+          break;
+        }
+    }
+
+  return result;
+}
+
 static
 BamfFactoryViewType compute_factory_type_by_str (const char *type)
 {

=== modified file 'lib/libbamf/bamf-factory.h'
--- lib/libbamf/bamf-factory.h	2013-06-08 13:54:06 +0000
+++ lib/libbamf/bamf-factory.h	2015-11-03 10:05:35 +0000
@@ -30,6 +30,7 @@
 
 #include <glib-object.h>
 #include <libbamf/bamf-view.h>
+#include <libbamf/bamf-window.h>
 #include <libbamf/bamf-application.h>
 
 G_BEGIN_DECLS
@@ -89,9 +90,15 @@
                                                         const char * path,
                                                         const char * type);
 
+BamfWindow      * _bamf_factory_window_for_xid       (BamfFactory * factory,
+                                                      guint32 xid);
+
 BamfApplication * _bamf_factory_app_for_file         (BamfFactory * factory,
-                                                     const char * path,
-                                                     gboolean create);
+                                                      const char * path,
+                                                      gboolean create);
+
+BamfApplication * _bamf_factory_app_for_xid          (BamfFactory * factory,
+                                                      guint32 xid);
 
 BamfFactory     * _bamf_factory_get_default          (void);
 

=== modified file 'lib/libbamf/bamf-matcher.c'
--- lib/libbamf/bamf-matcher.c	2013-06-13 22:20:25 +0000
+++ lib/libbamf/bamf-matcher.c	2015-11-03 10:05:35 +0000
@@ -63,6 +63,9 @@
 {
   BamfDBusMatcher *proxy;
   GCancellable    *cancellable;
+
+  BamfWindow      *active_window;
+  BamfApplication *active_application;
 };
 
 static BamfMatcher * default_matcher = NULL;
@@ -129,6 +132,47 @@
 }
 
 
+static gboolean
+track_ptr (GType wanted_type,
+           BamfView *active,
+           gpointer *cache_pointer)
+{
+  if (G_TYPE_CHECK_INSTANCE_TYPE (active, wanted_type))
+    {
+      if (*cache_pointer == active)
+        return FALSE;
+
+      *cache_pointer = active;
+      g_object_add_weak_pointer (G_OBJECT (active), cache_pointer);
+      return TRUE;
+    }
+  else if (G_TYPE_CHECK_INSTANCE_TYPE (*cache_pointer, wanted_type))
+    {
+      g_object_remove_weak_pointer (G_OBJECT (*cache_pointer), cache_pointer);
+      *cache_pointer = NULL;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+bamf_matcher_on_name_owner_changed (BamfDBusMatcher *proxy,
+                                    GParamSpec *param,
+                                    BamfMatcher *matcher)
+{
+  /* This is called when the bamfdaemon is killed / started */
+  gchar *name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (proxy));
+
+  if (!name_owner)
+    {
+      track_ptr (BAMF_TYPE_APPLICATION, NULL, (gpointer *) &matcher->priv->active_application);
+      track_ptr (BAMF_TYPE_WINDOW, NULL, (gpointer *) &matcher->priv->active_window);
+    }
+
+  g_free (name_owner);
+}
+
 static void
 bamf_matcher_on_view_opened (BamfDBusMatcher *proxy,
                              const char *path,
@@ -175,12 +219,17 @@
 {
   BamfView *old_view;
   BamfView *new_view;
-
-  BamfFactory *factory = _bamf_factory_get_default ();
+  BamfFactory *factory;
+
+  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);
+  if (track_ptr (BAMF_TYPE_APPLICATION, new_view, (gpointer *) &matcher->priv->active_application))
+    {
+      g_signal_emit (matcher, matcher_signals[ACTIVE_APPLICATION_CHANGED], 0, old_view, new_view);
+    }
 }
 
 static void
@@ -191,12 +240,31 @@
 {
   BamfView *old_view;
   BamfView *new_view;
-
-  BamfFactory *factory = _bamf_factory_get_default ();
+  BamfApplication *old_app;
+  BamfApplication *new_app;
+  BamfFactory *factory;
+  BamfMatcherPrivate *priv;
+
+  priv = matcher->priv;
+  old_app = priv->active_application;
+  new_app = old_app;
+  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);
 
+  track_ptr (BAMF_TYPE_WINDOW, new_view, (gpointer *) &priv->active_window);
+
+  if (BAMF_IS_WINDOW (new_view))
+    new_app = _bamf_factory_app_for_xid (factory, bamf_window_get_xid (BAMF_WINDOW (new_view)));
+
+  track_ptr (BAMF_TYPE_APPLICATION, (BamfView *) new_app, (gpointer *) &priv->active_application);
   g_signal_emit (matcher, matcher_signals[ACTIVE_WINDOW_CHANGED], 0, old_view, new_view);
+
+  if (new_app != old_app)
+    {
+      g_signal_emit (matcher, matcher_signals[ACTIVE_APPLICATION_CHANGED], 0, old_app, new_app);
+    }
 }
 
 static void
@@ -221,12 +289,15 @@
 
   if (error)
     {
-      g_error ("Unable to get %s matcher: %s", BAMF_DBUS_SERVICE_NAME, error ? error->message : "");
+      g_warning ("Unable to get %s matcher: %s", BAMF_DBUS_SERVICE_NAME, error ? error->message : "");
       g_error_free (error);
     }
 
   g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (priv->proxy), BAMF_DBUS_DEFAULT_TIMEOUT);
 
+  g_signal_connect (priv->proxy, "notify::g-name-owner",
+                    G_CALLBACK (bamf_matcher_on_name_owner_changed), self);
+
   g_signal_connect (priv->proxy, "view-opened",
                     G_CALLBACK (bamf_matcher_on_view_opened), self);
 
@@ -303,30 +374,30 @@
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
   priv = matcher->priv;
 
+  if (BAMF_IS_APPLICATION (priv->active_application))
+    {
+      if (!bamf_view_is_closed (BAMF_VIEW (priv->active_application)))
+        return priv->active_application;
+    }
+
   if (!_bamf_dbus_matcher_call_active_application_sync (priv->proxy, &app, priv->cancellable, &error))
     {
       g_warning ("Failed to get active application: %s", error ? error->message : "");
       g_error_free (error);
-      return NULL;
-    }
-
-  if (app && app[0] == '\0')
-    {
-      g_free (app);
-      return NULL;
-    }
-
-  if (!app)
-    return NULL;
+      track_ptr (BAMF_TYPE_APPLICATION, NULL, (gpointer *) &priv->active_application);
+      return NULL;
+    }
 
   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))
-    return NULL;
-
-  return BAMF_APPLICATION (view);
+    view = NULL;
+
+  track_ptr (BAMF_TYPE_APPLICATION, view, (gpointer *) &priv->active_application);
+
+  return priv->active_application;
 }
 
 /**
@@ -348,30 +419,60 @@
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
   priv = matcher->priv;
 
+  if (BAMF_IS_APPLICATION (priv->active_window))
+    {
+      if (!bamf_view_is_closed (BAMF_VIEW (priv->active_window)))
+        return priv->active_window;
+    }
+
   if (!_bamf_dbus_matcher_call_active_window_sync (priv->proxy, &win, priv->cancellable, &error))
     {
       g_warning ("Failed to get active window: %s", error ? error->message : "");
       g_error_free (error);
-      return NULL;
-    }
-
-  if (win && win[0] == '\0')
-    {
-      g_free (win);
-      return NULL;
-    }
-
-  if (!win)
-    return NULL;
+      track_ptr (BAMF_TYPE_WINDOW, NULL, (gpointer *) &priv->active_window);
+      return NULL;
+    }
 
   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;
-
-  return BAMF_WINDOW (view);
+    view = NULL;
+
+  track_ptr (BAMF_TYPE_WINDOW, view, (gpointer *) &priv->active_window);
+
+  return priv->active_window;
+}
+
+/**
+ * bamf_matcher_get_window_for_xid:
+ * @matcher: a #BamfMatcher
+ * @xid: The X11 Window ID to search for
+ *
+ * Used to fetch the #BamfWindow that wraps the given @window.
+ *
+ * Returns: (transfer none): The #BamfWindow representing the xid passed, or NULL if none exists.
+ */
+BamfWindow *
+bamf_matcher_get_window_for_xid (BamfMatcher *matcher, guint32 xid)
+{
+  BamfWindow *window;
+  BamfApplication *app;
+
+  g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
+
+  window = _bamf_factory_window_for_xid (_bamf_factory_get_default (), xid);
+
+  if (BAMF_IS_WINDOW (window))
+    return window;
+
+  app = bamf_matcher_get_application_for_xid (matcher, xid);
+
+  if (BAMF_IS_APPLICATION (app))
+    window = bamf_application_get_window_for_xid (app, xid);
+
+  return BAMF_IS_WINDOW (window) ? window : NULL;
 }
 
 /**
@@ -386,7 +487,7 @@
 BamfApplication *
 bamf_matcher_get_application_for_window (BamfMatcher *matcher, BamfWindow *window)
 {
-  g_return_val_if_fail(BAMF_IS_WINDOW(window), NULL);
+  g_return_val_if_fail (BAMF_IS_WINDOW (window), NULL);
   return bamf_matcher_get_application_for_xid (matcher, bamf_window_get_xid(window));
 }
 
@@ -404,11 +505,18 @@
 {
   BamfMatcherPrivate *priv;
   BamfView *view;
+  BamfFactory *factory;
   char *app = NULL;
   GError *error = NULL;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
   priv = matcher->priv;
+  factory = _bamf_factory_get_default ();
+
+  view = (BamfView*) _bamf_factory_app_for_xid (factory, xid);
+
+  if (BAMF_IS_APPLICATION (view))
+    return BAMF_APPLICATION (view);
 
   if (!_bamf_dbus_matcher_call_application_for_xid_sync (priv->proxy, xid, &app, priv->cancellable, &error))
     {
@@ -417,16 +525,6 @@
       return NULL;
     }
 
-  if (app && app[0] == '\0')
-    {
-      g_free (app);
-      return NULL;
-    }
-
-  if (!app)
-    return NULL;
-
-  BamfFactory *factory = _bamf_factory_get_default ();
   view = _bamf_factory_view_for_path_type (factory, app, BAMF_FACTORY_APPLICATION);
   g_free (app);
 
@@ -440,12 +538,18 @@
 bamf_matcher_application_is_running (BamfMatcher *matcher, const gchar *app)
 {
   BamfMatcherPrivate *priv;
+  BamfApplication *view;
   gboolean running = FALSE;
   GError *error = NULL;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), FALSE);
   priv = matcher->priv;
 
+  view = _bamf_factory_app_for_file (_bamf_factory_get_default (), app, FALSE);
+
+  if (BAMF_IS_APPLICATION (view))
+    return bamf_view_is_running (BAMF_VIEW (view));
+
   if (!_bamf_dbus_matcher_call_application_is_running_sync (priv->proxy,
                                                             app ? app : "",
                                                             &running,

=== modified file 'lib/libbamf/bamf-matcher.h'
--- lib/libbamf/bamf-matcher.h	2013-06-08 13:54:06 +0000
+++ lib/libbamf/bamf-matcher.h	2015-11-03 10:05:35 +0000
@@ -89,6 +89,9 @@
 
 BamfWindow      * bamf_matcher_get_active_window        (BamfMatcher *matcher);
 
+BamfWindow      * bamf_matcher_get_window_for_xid       (BamfMatcher *matcher,
+                                                         guint32      xid);
+
 BamfApplication * bamf_matcher_get_application_for_xid  (BamfMatcher *matcher,
                                                          guint32      xid);
 BamfApplication * bamf_matcher_get_application_for_window  (BamfMatcher *matcher,

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2013-10-10 15:04:14 +0000
+++ lib/libbamf/bamf-view.c	2015-11-03 10:05:35 +0000
@@ -105,6 +105,27 @@
 GList *
 bamf_view_get_children (BamfView *view)
 {
+  g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
+
+  if (BAMF_VIEW_GET_CLASS (view)->get_children)
+    return BAMF_VIEW_GET_CLASS (view)->get_children (view);
+
+  return g_list_copy (bamf_view_peek_children (view));
+}
+
+/**
+ * bamf_view_peek_children:
+ * @view: a #BamfView
+ *
+ * Note: Makes sever dbus calls the first time this is called on a view.
+ * Dbus messaging is reduced afterwards.
+ * Since: 0.5.2
+ * Returns: (element-type Bamf.View) (transfer none): Returns a list of #BamfView which
+ *           is owned by the #BamfView and should not freed or modified after usage.
+ */
+GList *
+bamf_view_peek_children (BamfView *view)
+{
   char ** children;
   int i, len;
   GList *results = NULL;
@@ -114,16 +135,13 @@
 
   g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
 
-  if (BAMF_VIEW_GET_CLASS (view)->get_children)
-    return BAMF_VIEW_GET_CLASS (view)->get_children (view);
-
   if (!_bamf_view_remote_ready (view))
     return NULL;
 
   priv = view->priv;
 
   if (priv->cached_children || !priv->reload_children)
-    return g_list_copy (priv->cached_children);
+    return priv->cached_children;
 
   if (!_bamf_dbus_item_view_call_children_sync (priv->proxy, &children, CANCELLABLE (view), &error))
     {
@@ -153,7 +171,30 @@
   priv->reload_children = FALSE;
   priv->cached_children = results;
 
-  return g_list_copy (priv->cached_children);
+  return priv->cached_children;
+}
+
+/**
+ * bamf_view_has_child:
+ * @view: a #BamfView
+ *
+ * Returns: %TRUE whether the #BamfView @view has the specified @child.
+ */
+gboolean
+bamf_view_has_child (BamfView *view, BamfView *child)
+{
+  GList *l;
+
+  g_return_val_if_fail (BAMF_IS_VIEW (view), FALSE);
+  g_return_val_if_fail (BAMF_IS_VIEW (child), FALSE);
+
+  for (l = bamf_view_peek_children (view); l; l = l->next)
+    {
+      if (l->data == child)
+        return TRUE;
+    }
+
+  return FALSE;
 }
 
 /**
@@ -389,13 +430,11 @@
 }
 
 /**
- * bamf_view_get_view_type:
+ * bamf_view_get_view_type: (virtual view_type)
  * @view: a #BamfView
  *
  * The view type of a window is a short string used to represent all views of the same class. These
  * descriptions should not be used to do casting as they are not considered stable.
- *
- * Virtual: view_type
  */
 const gchar *
 bamf_view_get_view_type (BamfView *self)
@@ -481,6 +520,7 @@
 {
   BamfView *view;
   BamfViewPrivate *priv;
+  gboolean was_cached = FALSE;
 
   view = _bamf_factory_view_for_path (_bamf_factory_get_default (), path);
   priv = self->priv;
@@ -499,11 +539,14 @@
       if (l)
         {
           priv->cached_children = g_list_delete_link (priv->cached_children, l);
-          g_object_unref (view);
+          was_cached = TRUE;
         }
     }
 
   g_signal_emit (G_OBJECT (self), view_signals[CHILD_REMOVED], 0, view);
+
+  if (was_cached)
+    g_object_unref (view);
 }
 
 static void

=== modified file 'lib/libbamf/bamf-view.h'
--- lib/libbamf/bamf-view.h	2013-08-09 15:32:46 +0000
+++ lib/libbamf/bamf-view.h	2015-11-03 10:05:35 +0000
@@ -121,6 +121,10 @@
 
 GList    * bamf_view_get_children  (BamfView *view);
 
+GList    * bamf_view_peek_children (BamfView *view);
+
+gboolean   bamf_view_has_child     (BamfView *view, BamfView *child);
+
 gboolean   bamf_view_is_closed     (BamfView *view);
 
 gboolean   bamf_view_is_active     (BamfView *view);

=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am	2014-04-07 21:31:21 +0000
+++ tests/bamfdaemon/Makefile.am	2015-11-03 10:05:35 +0000
@@ -1,3 +1,5 @@
+TESTDIR=$(shell realpath $(abs_top_srcdir)/tests)
+
 noinst_PROGRAMS = \
 	test-bamf
 
@@ -44,7 +46,7 @@
 	-I$(top_srcdir)/lib \
 	-I$(top_builddir)/lib \
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-	-DTESTDIR=\""$(abs_top_srcdir)/tests"\" \
+	-DTESTDIR=\""$(TESTDIR)"\" \
 	$(COVERAGE_CFLAGS) \
 	$(GCC_FLAGS) \
 	$(GLIB_CFLAGS) \

=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am	2013-06-21 18:21:31 +0000
+++ tests/libbamf/Makefile.am	2015-11-03 10:05:35 +0000
@@ -1,3 +1,5 @@
+TESTDIR=$(shell realpath $(abs_top_srcdir)/tests)
+
 noinst_PROGRAMS = \
 	test-libbamf
 
@@ -12,7 +14,7 @@
 	-I$(top_builddir)/lib \
 	-I$(top_srcdir)/lib/libbamf \
 	-I$(top_builddir)/lib/libbamf \
-	-DTESTDIR=\""$(abs_top_srcdir)/tests"\" \
+	-DTESTDIR=\""$(TESTDIR)"\" \
 	$(COVERAGE_CFLAGS) \
 	$(GCC_FLAGS) \
 	$(GLIB_CFLAGS) \