Merge lp:~3v1n0/ubuntu/precise/bamf/libreoffice-fixes into lp:ubuntu/precise/bamf

[Marco Trevisan (Treviño)]

Mainly fixing bug #842566 that caused libreoffice windows not to be mapped in the unity launcher or alt+tab.
Plus more extra fixes including memory leaks.

Read more on the main branch merge proposal: http://go.3v1n0.net/txtL2i

=== modified file 'Makefile.in'
--- Makefile.in	2011-09-22 15:15:28 +0000
+++ Makefile.in	2011-12-15 22:03:33 +0000
@@ -125,6 +125,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -205,6 +206,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@

=== modified file 'configure'
--- configure	2011-09-26 13:51:22 +0000
+++ configure	2011-12-15 22:03:33 +0000
@@ -621,6 +621,10 @@
 BAMFDAEMON_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
+DBUS_LAUNCH
+XVFB
+ENABLE_HEADLESS_TESTS_FALSE
+ENABLE_HEADLESS_TESTS_TRUE
 GTK_DOC_USE_REBASE_FALSE
 GTK_DOC_USE_REBASE_TRUE
 GTK_DOC_USE_LIBTOOL_FALSE
@@ -803,6 +807,7 @@
 enable_gtk_doc
 enable_gtk_doc_html
 enable_gtk_doc_pdf
+enable_headless_tests
 enable_gtktest
 '
       ac_precious_vars='build_alias
@@ -1468,6 +1473,9 @@
   --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
   --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
+  --enable-headless-tests=[no/yes]
+                          enable headless test suite (requires Xvfb)
+                          [default=no]
   --disable-gtktest       do not try to compile and run a test GTK+ program
 
 Optional Packages:
@@ -12683,12 +12691,12 @@
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12700,12 +12708,12 @@
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12726,14 +12734,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0) were not met:
+	as_fn_error $? "Package requirements (glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -13948,6 +13956,108 @@
 
 
 
+###########################
+# Headless tests
+###########################
+# Check whether --enable-headless-tests was given.
+if test "${enable_headless_tests+set}" = set; then :
+  enableval=$enable_headless_tests;
+else
+  enable_headless_tests=no
+fi
+
+
+ if test "x$enable_headless_tests" != "xno"; then
+  ENABLE_HEADLESS_TESTS_TRUE=
+  ENABLE_HEADLESS_TESTS_FALSE='#'
+else
+  ENABLE_HEADLESS_TESTS_TRUE='#'
+  ENABLE_HEADLESS_TESTS_FALSE=
+fi
+
+
+if test "x$enable_headless_tests" = "xyes"; then
+  # Extract the first word of "Xvfb", so it can be a program name with args.
+set dummy Xvfb; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XVFB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XVFB in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XVFB="$XVFB" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XVFB="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XVFB=$ac_cv_path_XVFB
+if test -n "$XVFB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XVFB" >&5
+$as_echo "$XVFB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  # Extract the first word of "dbus-launch", so it can be a program name with args.
+set dummy dbus-launch; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DBUS_LAUNCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DBUS_LAUNCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DBUS_LAUNCH="$DBUS_LAUNCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DBUS_LAUNCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DBUS_LAUNCH=$ac_cv_path_DBUS_LAUNCH
+if test -n "$DBUS_LAUNCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LAUNCH" >&5
+$as_echo "$DBUS_LAUNCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
 
 #
 # Gnome/GTK checks
@@ -14647,6 +14757,10 @@
   as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_HEADLESS_TESTS_TRUE}" && test -z "${ENABLE_HEADLESS_TESTS_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_HEADLESS_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -16910,4 +17024,6 @@
   Build Environment
     Install Prefix:     ${prefix}
     GTK+ Version:       ${with_gtk}
+    Headless tests:     ${enable_headless_tests}
+
 EOF

=== modified file 'configure.in'
--- configure.in	2011-09-26 13:51:22 +0000
+++ configure.in	2011-12-15 22:03:33 +0000
@@ -56,7 +56,7 @@
 #
 # glib
 #
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0 gio-2.0 gio-unix-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gio-2.0 gio-unix-2.0)
 
 #
 # dbus
@@ -114,6 +114,19 @@
 ###########################
 GTK_DOC_CHECK(1.0)
 
+###########################
+# Headless tests
+###########################
+AC_ARG_ENABLE([headless-tests],
+              AS_HELP_STRING([--enable-headless-tests=@<:@no/yes@:>@],[enable headless test suite (requires Xvfb) @<:@default=no@:>@]),,
+              [enable_headless_tests=no])
+
+AM_CONDITIONAL([ENABLE_HEADLESS_TESTS],[test "x$enable_headless_tests" != "xno"])
+
+if test "x$enable_headless_tests" = "xyes"; then
+  AC_PATH_PROG([XVFB],[Xvfb])
+  AC_PATH_PROG([DBUS_LAUNCH],[dbus-launch])
+fi
 
 #
 # Gnome/GTK checks
@@ -157,4 +170,6 @@
   Build Environment
     Install Prefix:     ${prefix}
     GTK+ Version:       ${with_gtk}
+    Headless tests:     ${enable_headless_tests}
+
 EOF

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2011-09-22 15:15:28 +0000
+++ data/Makefile.in	2011-12-15 22:03:33 +0000
@@ -93,6 +93,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -173,6 +174,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-26 13:51:22 +0000
+++ debian/changelog	2011-12-15 22:03:33 +0000
@@ -1,3 +1,16 @@
+bamf (0.2.104-0ubuntu2) UNRELEASED; urgency=low
+
+  * Importing trunk revision 424 fixing various LibreOffice related bugs:
+    - Unity acts not as a dock for LibreOffice but as a launcher
+      (LP: #741995)
+    - Libreoffice and unity integration broken (LP: #842566)
+    - Libreoffice Calc icon does not appear when opened via Writer
+      (LP: #861355)
+    - Alt-tab and launcher shows floating toolbars in LibreOffice as
+      additional windows (LP: #840000)
+
+ -- Marco Trevisan (Treviño) <[e-mail]> Thu, 15 Dec 2011 22:05:02 +0100
+
 bamf (0.2.104-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.

=== modified file 'doc/Makefile.in'
--- doc/Makefile.in	2011-09-22 15:15:28 +0000
+++ doc/Makefile.in	2011-12-15 22:03:33 +0000
@@ -109,6 +109,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -189,6 +190,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@

=== modified file 'doc/reference/Makefile.in'
--- doc/reference/Makefile.in	2011-09-22 15:15:28 +0000
+++ doc/reference/Makefile.in	2011-12-15 22:03:33 +0000
@@ -109,6 +109,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -189,6 +190,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@

=== modified file 'doc/reference/libbamf/Makefile.in'
--- doc/reference/libbamf/Makefile.in	2011-09-22 15:15:28 +0000
+++ doc/reference/libbamf/Makefile.in	2011-12-15 22:03:33 +0000
@@ -76,6 +76,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -156,6 +157,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@

=== modified file 'lib/libbamf/Makefile.in'
--- lib/libbamf/Makefile.in	2011-09-22 15:15:28 +0000
+++ lib/libbamf/Makefile.in	2011-12-15 22:03:33 +0000
@@ -163,6 +163,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -243,6 +244,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@

=== modified file 'lib/libbamf/bamf-matcher.c'
--- lib/libbamf/bamf-matcher.c	2011-03-17 17:51:00 +0000
+++ lib/libbamf/bamf-matcher.c	2011-12-15 22:03:33 +0000
@@ -128,8 +128,7 @@
   view = bamf_factory_view_for_path (bamf_factory_get_default (), path);
   g_object_ref (view);
   
-  if (!bamf_view_is_sticky (view))
-    g_signal_emit (matcher, matcher_signals[VIEW_OPENED],0, view);
+  g_signal_emit (matcher, matcher_signals[VIEW_OPENED], 0, view);
 }
 
 static void
@@ -145,8 +144,7 @@
   if (!BAMF_IS_VIEW (view))
     return;
 
-  if (!bamf_view_is_sticky (view))
-    g_signal_emit (matcher, matcher_signals[VIEW_CLOSED],0, view);
+  g_signal_emit (matcher, matcher_signals[VIEW_CLOSED], 0, view);
   
   g_object_unref (view);
 }

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-09-22 15:15:28 +0000
+++ src/Makefile.in	2011-12-15 22:03:33 +0000
@@ -129,6 +129,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -209,6 +210,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2011-09-08 20:09:28 +0000
+++ src/bamf-application.c	2011-12-15 22:03:33 +0000
@@ -145,7 +145,9 @@
       gicon = g_app_info_get_icon (G_APP_INFO (desktop));
 
       name = g_strdup (g_app_info_get_display_name (G_APP_INFO (desktop)));
-      icon = g_icon_to_string (gicon);
+
+      if (gicon)
+        icon = g_icon_to_string (gicon);
 
       if (g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, STUB_KEY, NULL)) {
         /* This will error to return false, which is okay as it seems
@@ -227,7 +229,12 @@
     }
 
   if (icon)
-    self->priv->icon = icon;
+    {
+      if (self->priv->icon)
+        g_free (self->priv->icon);
+
+      self->priv->icon = icon;
+    }
 
   if (name)
     bamf_view_set_name (BAMF_VIEW (self), name);
@@ -611,6 +618,12 @@
       priv->app_type = NULL;
     }
 
+  if (priv->icon)
+    {
+      g_free (priv->icon);
+      priv->icon = NULL;
+    }
+
   if (priv->wmclass)
     {
       g_free (priv->wmclass);

=== modified file 'src/bamf-legacy-screen.c'
--- src/bamf-legacy-screen.c	2011-08-04 14:56:07 +0000
+++ src/bamf-legacy-screen.c	2011-12-15 22:03:33 +0000
@@ -160,6 +160,7 @@
 handle_window_opened (WnckScreen *screen, WnckWindow *window, BamfLegacyScreen *legacy)
 {
   BamfLegacyWindow *legacy_window;
+  g_return_if_fail (WNCK_IS_WINDOW (window));
 
   legacy_window = bamf_legacy_window_new (window);
 
@@ -171,6 +172,36 @@
   g_signal_emit (legacy, legacy_screen_signals[WINDOW_OPENED], 0, legacy_window);
 }
 
+/* This function allows to push into the screen a window by its xid.
+ * If the window is already known, it's just ignored, otherwise it gets added
+ * to the windows list. The BamfLegacyScreen should automatically update its
+ * windows list when they are added/removed from the screen, but if a child
+ * BamfLegacyWindow is closed, then it could be possible to re-add it.        */
+void
+bamf_legacy_screen_inject_window (BamfLegacyScreen *self, guint xid)
+{
+  g_return_if_fail (BAMF_IS_LEGACY_SCREEN (self));
+  BamfLegacyWindow *window;
+  GList *l;
+
+  for (l = self->priv->windows; l; l = l->next)
+    {
+      window = l->data;
+
+      if (bamf_legacy_window_get_xid (window) == xid)
+        {
+          return;
+        }
+    }
+
+  WnckWindow *legacy_window = wnck_window_get(xid);
+
+  if (WNCK_IS_WINDOW (legacy_window))
+    {
+      handle_window_opened(NULL, legacy_window, self);
+    }
+}
+
 void
 bamf_legacy_screen_set_state_file (BamfLegacyScreen *self,
                                    const char *file)

=== modified file 'src/bamf-legacy-screen.h'
--- src/bamf-legacy-screen.h	2010-05-25 10:32:24 +0000
+++ src/bamf-legacy-screen.h	2011-12-15 22:03:33 +0000
@@ -67,4 +67,6 @@
 
 BamfLegacyScreen * bamf_legacy_screen_get_default        (void);
 
+void               bamf_legacy_screen_inject_window      (BamfLegacyScreen *screen, guint xid);
+
 #endif

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2011-09-26 13:51:22 +0000
+++ src/bamf-legacy-window.c	2011-12-15 22:03:33 +0000
@@ -215,6 +215,9 @@
   
   window = self->priv->legacy_window;
   
+  if (!window)
+    return NULL;
+  
   if (wnck_window_get_icon_is_fallback (window))
     return NULL;
   
@@ -325,13 +328,41 @@
 {
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW (self));
   g_return_if_fail (WNCK_IS_WINDOW (window));
-  
+
+  if (self->priv->legacy_window == window)
+    {
+      self->priv->is_closed = TRUE;
+      g_signal_emit (self, legacy_window_signals[CLOSED], 0);
+    }
+}
+
+static void
+handle_destroy_notify (gpointer *data, BamfLegacyWindow *self_was_here)
+{
+  BamfLegacyScreen *screen = bamf_legacy_screen_get_default ();
+  bamf_legacy_screen_inject_window (screen, GPOINTER_TO_UINT (data));
+}
+
+/* This utility function allows to set a BamfLegacyWindow as closed, notifying
+ * all its owners, and to reopen it once the current window has been destroyed.
+ * This allows to remap particular windows to different applications.         */
+void
+bamf_legacy_window_reopen (BamfLegacyWindow *self)
+{
+  g_return_if_fail (BAMF_IS_LEGACY_WINDOW (self));
+  g_return_if_fail (WNCK_IS_WINDOW (self->priv->legacy_window));
+
+  guint xid = bamf_legacy_window_get_xid (self);
+
+  /* Adding a weak ref to this object, causes to get notified after the object
+   * destruction, so once this BamfLegacyWindow has been closed and drestroyed
+   * the handle_destroy_notify() function will be called, and that will
+   * provide to iniject another window like this one to the BamfLegacyScreen  */
+  g_object_weak_ref (G_OBJECT (self), (GWeakNotify) handle_destroy_notify,
+                                                    GUINT_TO_POINTER (xid));
+
   self->priv->is_closed = TRUE;
-
-  if (window == self->priv->legacy_window)
-    {
-      g_signal_emit (self, legacy_window_signals[CLOSED], 0);
-    }
+  g_signal_emit (self, legacy_window_signals[CLOSED], 0);
 }
 
 static void
@@ -378,7 +409,7 @@
   screen = wnck_screen_get_default ();
 
   priv->closed_id = g_signal_connect (G_OBJECT (screen), "window-closed",
-    		                       (GCallback) handle_window_closed, self);
+                                      (GCallback) handle_window_closed, self);
 }
 
 static void

=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2011-09-26 13:51:22 +0000
+++ src/bamf-legacy-window.h	2011-12-15 22:03:33 +0000
@@ -112,6 +112,8 @@
 
 BamfLegacyWindow * bamf_legacy_window_get_transient     (BamfLegacyWindow *self);
 
+void               bamf_legacy_window_reopen            (BamfLegacyWindow *self);
+
 BamfLegacyWindow * bamf_legacy_window_new               (WnckWindow *legacy_window);
 
 #endif

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2011-09-26 13:51:22 +0000
+++ src/bamf-matcher.c	2011-12-15 22:03:33 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
@@ -65,7 +66,6 @@
   GHashTable      * desktop_id_table;
   GHashTable      * desktop_file_table;
   GHashTable      * desktop_class_table;
-  GHashTable      * exec_list;
   GHashTable      * registered_pids;
   GList           * views;
   GList           * monitors;
@@ -135,12 +135,12 @@
     }
 }
 
-static void bamf_matcher_unregister_view (BamfMatcher *self, BamfView *view);
+static void bamf_matcher_unregister_view (BamfMatcher *self, BamfView *view, gboolean unref);
 
 static void
 on_view_closed (BamfView *view, BamfMatcher *self)
 {
-  bamf_matcher_unregister_view (self, view);
+  bamf_matcher_unregister_view (self, view, TRUE);
 }
 
 static void
@@ -168,7 +168,7 @@
 }
 
 static void
-bamf_matcher_unregister_view (BamfMatcher *self, BamfView *view)
+bamf_matcher_unregister_view (BamfMatcher *self, BamfView *view, gboolean unref)
 {
   const char * path;
   char * type;
@@ -181,8 +181,11 @@
   g_signal_handlers_disconnect_by_func (G_OBJECT (view), on_view_closed, self);
   g_signal_handlers_disconnect_by_func (G_OBJECT (view), on_view_active_changed, self);
 
-  self->priv->views = g_list_remove (self->priv->views, view);
-  g_object_unref (view);
+  if (unref)
+    {
+      self->priv->views = g_list_remove (self->priv->views, view);
+      g_object_unref (view);
+    }
 
   g_free (type);
 }
@@ -191,7 +194,7 @@
 get_open_office_window_hint (BamfMatcher * self, BamfLegacyWindow * window)
 {
   const gchar *name;
-  char *exec;
+  char *exec = NULL;
   GHashTable *desktopFileTable;
   GList *list;
 
@@ -199,18 +202,44 @@
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
 
   name = bamf_legacy_window_get_name (window);
+  const gchar *class = bamf_legacy_window_get_class_name (window);
+  BamfWindowType type = bamf_legacy_window_get_window_type (window);
 
-  if (name == NULL)
+  if (name == NULL && class == NULL)
     return NULL;
 
-  if (g_str_has_suffix (name, "OpenOffice.org Writer"))
+  if (g_str_has_suffix (name, "LibreOffice Writer"))
+    {
+      exec = "libreoffice -writer %U";
+    }
+  else if (g_str_has_suffix (name, "LibreOffice Calc"))
+    {
+      exec = "libreoffice -calc %U";
+    }
+  else if (g_str_has_suffix (name, "LibreOffice Impress"))
+    {
+      exec = "libreoffice -impress %U";
+    }
+  else if (g_str_has_suffix (name, "LibreOffice Math"))
+    {
+      exec = "libreoffice -math %U";
+    }
+  else if (g_str_has_suffix (name, "LibreOffice Draw"))
+    {
+      exec = "libreoffice -draw %U";
+    }
+  else if (g_strcmp0 (class, "libreoffice-startcenter") == 0)
+    {
+      exec = "libreoffice %U";
+    }
+  else if (g_strcmp0 (name, "LibreOffice") == 0 && type == BAMF_WINDOW_NORMAL)
+    {
+      exec = "libreoffice %U";
+    }
+  else if (g_str_has_suffix (name, "OpenOffice.org Writer"))
     {
       exec = "ooffice -writer %F";
     }
-  else if (g_str_has_suffix (name, "OpenOffice.org Math"))
-    {
-      exec = "ooffice -math %F";
-    }
   else if (g_str_has_suffix (name, "OpenOffice.org Calc"))
     {
       exec = "ooffice -calc %F";
@@ -219,41 +248,63 @@
     {
       exec = "ooffice -impress %F";
     }
+  else if (g_str_has_suffix (name, "OpenOffice.org Math"))
+    {
+      exec = "ooffice -math %F";
+    }
   else if (g_str_has_suffix (name, "OpenOffice.org Draw"))
     {
       exec = "ooffice -draw %F";
     }
-  else if (g_str_has_suffix (name, "LibreOffice Writer"))
-    {
-      exec = "libreoffice -writer %U";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Math"))
-    {
-      exec = "libreoffice -math %U";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Calc"))
-    {
-      exec = "libreoffice -calc %U";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Impress"))
-    {
-      exec = "libreoffice -impress %U";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Draw"))
-    {
-      exec = "libreoffice -draw %U";
+  else if (g_strcmp0 (name, "OpenOffice.org") == 0 && type == BAMF_WINDOW_NORMAL)
+    {
+      exec = "ooffice %F";
     }
   else
     {
-      return NULL;
+      if (type != BAMF_WINDOW_NORMAL || bamf_legacy_window_get_transient (window))
+      {
+        /* Child windows can generally easily be recognized by their class */
+        if (g_strcmp0 (class, "libreoffice-writer") == 0)
+          {
+            exec = "libreoffice -writer %U";
+          }
+        else if (g_strcmp0 (class, "libreoffice-calc") == 0)
+          {
+            exec = "libreoffice -calc %U";
+          }
+        else if (g_strcmp0 (class, "libreoffice-impress") == 0)
+          {
+            exec = "libreoffice -impress %U";
+          }
+        else if (g_strcmp0 (class, "libreoffice-math") == 0)
+          {
+            exec = "libreoffice -math %U";
+          }
+        else if (g_strcmp0 (class, "libreoffice-draw") == 0)
+          {
+            exec = "libreoffice -draw %U";
+          }
+      }
+
+      if (!exec)
+        {
+          /* By default fallback to the main launcher */
+          if (g_str_has_prefix (class, "OpenOffice"))
+            {
+              exec = "ooffice %F";
+            }
+          else
+            {
+              exec = "libreoffice %U";
+            }
+        }
     }
 
   desktopFileTable = self->priv->desktop_file_table;
   list = g_hash_table_lookup (desktopFileTable, exec);
 
-  g_return_val_if_fail (list, NULL);
-
-  return (char *) list->data;
+  return (list ? (char *) list->data : NULL);
 }
 
 /* Attempts to return the binary name for a particular execution string */
@@ -266,7 +317,7 @@
   gboolean regexFail;
   GRegex *regex;
 
-  g_return_val_if_fail (execString && strlen (execString) > 0, g_strdup (execString));
+  g_return_val_if_fail ((execString && execString[0] != '\0'), g_strdup (execString));
 
   exec = g_utf8_casefold (execString, -1);
   parts = g_strsplit (exec, " ", 0);
@@ -328,7 +379,7 @@
 {
   GArray *arr = g_array_new (FALSE, TRUE, sizeof (char *));
 
-  char *str = "^gsku$";
+  char *str = "^gksu(do)?$";
   g_array_append_val (arr, str);
 
   str = "^sudo$";
@@ -542,22 +593,22 @@
                             GHashTable *desktop_id_table,
                             GHashTable *desktop_class_table)
 {
-  GAppInfo *desktop_file;
+  GDesktopAppInfo *desktop_file;
   char *exec;
   char *path;
   GString *desktop_id; /* is ok... really */
 
   g_return_if_fail (BAMF_IS_MATCHER (self));
 
-  desktop_file = G_APP_INFO (g_desktop_app_info_new_from_filename (file));
+  desktop_file = g_desktop_app_info_new_from_filename (file);
 
   if (!G_IS_APP_INFO (desktop_file))
     return;
-    
-  if (g_app_info_should_show (desktop_file) == FALSE)
+
+  if (!g_desktop_app_info_get_show_in (desktop_file, g_getenv ("XDG_CURRENT_DESKTOP")))
     return;
 
-  exec = g_strdup (g_app_info_get_commandline (desktop_file));
+  exec = g_strdup (g_app_info_get_commandline (G_APP_INFO (desktop_file)));
   
   if (!exec)
     return;
@@ -582,7 +633,7 @@
   g_free (path);
 
   desktop_id = g_string_truncate (desktop_id, desktop_id->len - 8); /* remove last 8 characters for .desktop */
-  
+
   insert_data_into_tables (self, file, exec, desktop_id->str, desktop_file_table, desktop_id_table);
   insert_desktop_file_class_into_table (self, file, desktop_class_table);
 
@@ -617,7 +668,6 @@
   info = g_file_enumerator_next_file (enumerator, NULL, NULL);
   for (; info; info = g_file_enumerator_next_file (enumerator, NULL, NULL))
     {
-
       name = g_file_info_get_name (info);
       path = g_build_filename (directory, name, NULL);
 
@@ -937,7 +987,10 @@
   if (!g_str_has_suffix (path, ".desktop") &&
       filetype != G_FILE_TYPE_DIRECTORY &&
       type != G_FILE_MONITOR_EVENT_DELETED)
-    goto out;
+    {
+      g_free(path);
+      return;
+    }
 
   if (type == G_FILE_MONITOR_EVENT_DELETED ||
       type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
@@ -994,7 +1047,7 @@
                                        self->priv->desktop_id_table,
                                        self->priv->desktop_class_table);
       
-              g_list_free_full (dirs, (GDestroyNotify) g_free);
+              g_list_free_full (dirs, g_free);
             }
         }
       else if (filetype != G_FILE_TYPE_UNKNOWN)
@@ -1003,7 +1056,6 @@
         }
     }
 
-out:
   g_free (path);
 }
 
@@ -1097,15 +1149,18 @@
   fill_desktop_file_table (self, directories, *desktop_file_table,
                            *desktop_id_table, *desktop_class_table);
   
-  g_list_free_full (directories, (GDestroyNotify) g_free);
+  g_list_free_full (directories, g_free);
 }
 
 static gboolean
 is_open_office_window (BamfMatcher * self, BamfLegacyWindow * window)
 {
-  return g_str_has_prefix (bamf_legacy_window_get_class_name (window), "OpenOffice") ||
-         g_str_has_prefix (bamf_legacy_window_get_class_name (window), "LibreOffice") ||
-         g_str_has_prefix (bamf_legacy_window_get_class_name (window), "libreoffice");
+  const char *class_name = bamf_legacy_window_get_class_name (window);
+
+  return (g_str_has_prefix (class_name, "LibreOffice") ||
+          g_str_has_prefix (class_name, "libreoffice") ||
+          g_str_has_prefix (class_name, "OpenOffice") ||
+          g_str_has_prefix (class_name, "openoffice"));
 }
 
 static char *
@@ -1297,7 +1352,7 @@
       
       if (trimmed)
         {
-          if (strlen (trimmed) > 0)
+          if (trimmed[0] != '\0')
             {
               table_list = g_hash_table_lookup (priv->desktop_file_table, trimmed);
               
@@ -1370,7 +1425,7 @@
   hint = get_window_hint (self, window, _NET_WM_DESKTOP_FILE);
   const char *window_class = bamf_legacy_window_get_class_name (window);
 
-  if (hint && strlen (hint) > 0 && !is_web_app_window(self, window))
+  if (hint && hint[0] != '\0' && !is_web_app_window(self, window))
     {
       desktop_files = g_list_prepend (desktop_files, hint);
       /* whew, hard work, didn't even have to make a copy! */
@@ -1568,13 +1623,7 @@
       g_object_unref (best);
     }
 
-  for (l = possible_apps; l; l = l->next)
-    {
-      char *str = l->data;
-      g_free (str);
-    }
-
-  g_list_free (possible_apps);
+  g_list_free_full (possible_apps, g_free);
 
   bamf_view_add_child (BAMF_VIEW (best), BAMF_VIEW (bamf_window));
 }
@@ -1589,7 +1638,7 @@
   GHashTable *registered_pids;
   char *window_hint = NULL;
   gint i, pid;
-  gint *key;
+  gpointer key;
 
   g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW (window));
@@ -1603,9 +1652,7 @@
 
       if (pid > 0)
         {
-          key = g_new (gint, 1);
-          *key = pid;
-
+          gpointer key = GINT_TO_POINTER (pid);
           const char* result = g_hash_table_lookup (registered_pids, key);
           if (result && g_str_has_prefix (result, "/home/"))
             {
@@ -1617,48 +1664,45 @@
     }
 
   window_hint = get_window_hint (self, window, _NET_WM_DESKTOP_FILE);
-  if (window_hint && strlen (window_hint) > 0)
+  if (window_hint)
     {
-      /* already set, make sure we know about this
-       * fact for future windows of this applications */
-      pid = bamf_legacy_window_get_pid (window);
-
-      if (pid > 0)
+      if (window_hint[0] != '\0')
         {
-          key = g_new (gint, 1);
-          *key = pid;
+          /* already set, make sure we know about this
+           * fact for future windows of this applications */
+          pid = bamf_legacy_window_get_pid (window);
 
-          if (!g_hash_table_lookup (registered_pids, key))
+          if (pid > 0)
             {
-              g_hash_table_insert (registered_pids, key, g_strdup (window_hint));
+              key = GINT_TO_POINTER (pid);
+
+              if (!g_hash_table_lookup (registered_pids, key))
+                {
+                  g_hash_table_insert (registered_pids, key, g_strdup (window_hint));
+                }
             }
+
+          g_free (window_hint);
+          return;
         }
 
       g_free (window_hint);
-      return;
-    }
-
-  if (is_open_office_window (self, window))
-    {
-      window_hint = get_open_office_window_hint (self, window);
-    }
-  else
-    {
-      pids = pid_parent_tree (self, bamf_legacy_window_get_pid (window));
-
-      for (i = 0; i < pids->len; i++)
-        {
-          pid = g_array_index (pids, gint, i);
-
-          key = g_new (gint, 1);
-          *key = pid;
-
-          window_hint = g_hash_table_lookup (registered_pids, key);
-          if (window_hint != NULL && strlen (window_hint) > 0)
-            break;
-        }
-      g_array_free (pids, TRUE);
-    }
+      window_hint = NULL;
+    }
+
+  pids = pid_parent_tree (self, bamf_legacy_window_get_pid (window));
+
+  for (i = 0; i < pids->len; i++)
+    {
+      pid = g_array_index (pids, gint, i);
+      key = GINT_TO_POINTER (pid);
+
+      window_hint = g_hash_table_lookup (registered_pids, key);
+      if (window_hint != NULL && window_hint[0] != '\0')
+        break;
+    }
+
+  g_array_free (pids, TRUE);
 
   if (window_hint)
     set_window_hint (self, window, _NET_WM_DESKTOP_FILE, window_hint);
@@ -1689,24 +1733,31 @@
   bamf_matcher_setup_window_state (self, bamfwindow);
 }
 
-static gboolean
-open_office_window_setup_timer (OpenOfficeTimeoutArgs *args)
+static void
+on_open_office_window_name_changed (BamfLegacyWindow *window, BamfMatcher* self)
 {
-  if (bamf_legacy_window_is_closed (args->window))
-  {
-    g_object_unref (args->window);
-    return FALSE;
-  }
-
-  args->count++;
-  if (args->count > 20 || get_open_office_window_hint (args->matcher, args->window))  
+  g_return_if_fail (BAMF_IS_MATCHER (self));
+  g_return_if_fail (BAMF_IS_LEGACY_WINDOW (window));
+
+  char *old_hint;
+  const char *new_hint;
+
+  old_hint = get_window_hint (self, window, _NET_WM_DESKTOP_FILE);
+  new_hint = get_open_office_window_hint (self, window);
+
+  if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
     {
-      g_object_unref (args->window);
-      handle_raw_window (args->matcher, args->window);
-      return FALSE;
+      bamf_legacy_window_reopen (window);
     }
-  
-  return TRUE;
+
+  g_free (old_hint);
+}
+
+static void
+on_open_office_window_closed (BamfLegacyWindow *window, BamfMatcher* self)
+{
+  g_signal_handlers_disconnect_by_func (window, on_open_office_window_name_changed, self);
+  g_object_unref (window);
 }
 
 static void
@@ -1723,24 +1774,35 @@
       bamf_matcher_register_view (self, BAMF_VIEW (bamfwindow));
       g_object_unref (bamfwindow);
       
-      return;    
+      return;
     }
 
-  if (is_open_office_window (self, window) && get_open_office_window_hint (self, window) == NULL)
+  if (is_open_office_window (self, window))
     {
-      OpenOfficeTimeoutArgs* args = (OpenOfficeTimeoutArgs*) g_malloc0 (sizeof (OpenOfficeTimeoutArgs));
-      args->matcher = self;
-      args->window = window;
-      
+      BamfWindowType win_type = bamf_legacy_window_get_window_type (window);
+
+      if (win_type == BAMF_WINDOW_SPLASHSCREEN || win_type == BAMF_WINDOW_TOOLBAR)
+        {
+          return;
+        }
+
+      char *old_hint = get_window_hint (self, window, _NET_WM_DESKTOP_FILE);
+      const char *new_hint = get_open_office_window_hint (self, window);
+
+      if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)
+        {
+          set_window_hint (self, window, _NET_WM_DESKTOP_FILE, new_hint);
+        }
+
       g_object_ref (window);
-      /* we have an open office window who is not ready to match yet */
-      g_timeout_add (100, (GSourceFunc) open_office_window_setup_timer, args);
-    }
-  else
-    {
-      /* we have a window who is ready to be matched */
-      handle_raw_window (self, window); 
-    }
+      g_signal_connect (window, "name-changed", (GCallback) on_open_office_window_name_changed, self);
+      g_signal_connect (window, "closed", (GCallback) on_open_office_window_closed, self);
+
+      g_free (old_hint);
+    }
+
+  /* we have a window who is ready to be matched */
+  handle_raw_window (self, window);
 }
 
 static void
@@ -1805,14 +1867,7 @@
         }
     }
 
- for (l = possible_apps; l; l = l->next)
-  {
-    char *str = l->data;
-    g_free (str);
-  }
-
-
-  g_list_free (possible_apps);
+  g_list_free_full (possible_apps, g_free);
 
   if (best)
     bamf_view_add_child (BAMF_VIEW (best), BAMF_VIEW (indicator));
@@ -1846,20 +1901,16 @@
                                             const char * desktopFile,
                                             gint pid)
 {
-  gint *key;
+  gpointer key;
   BamfLegacyScreen *screen;
   GList *glist_item;
   GList *windows;
-  char *dup;
 
   g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (desktopFile);
 
-  key = g_new (gint, 1);
-  *key = pid;
-
-  dup = g_strdup (desktopFile);
-  g_hash_table_insert (self->priv->registered_pids, key, dup);
+  key = GINT_TO_POINTER (pid);
+  g_hash_table_insert (self->priv->registered_pids, key, g_strdup (desktopFile));
 
   /* fixme, this is a bit heavy */
 
@@ -2216,8 +2267,8 @@
 
   priv->known_pids = g_array_new (FALSE, TRUE, sizeof (gint));
   priv->bad_prefixes = g_array_new (FALSE, TRUE, sizeof (GRegex *));
-  priv->registered_pids =
-    g_hash_table_new ((GHashFunc) g_int_hash, (GEqualFunc) g_int_equal);
+  priv->registered_pids = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+                                                 NULL, g_free);
 
   prefixstrings = prefix_strings (self);
   for (i = 0; i < prefixstrings->len; i++)
@@ -2251,13 +2302,61 @@
 }
 
 static void
+bamf_matcher_finalize (GObject *object)
+{
+  BamfMatcher *self = (BamfMatcher *) object;
+  BamfMatcherPrivate *priv = self->priv;
+  GList *l;
+  int i;
+
+  for (i = 0; i < priv->bad_prefixes->len; i++)
+    {
+      GRegex *regex = g_array_index (priv->bad_prefixes, GRegex *, i);
+      g_regex_unref (regex);
+    }
+
+  g_array_free (priv->bad_prefixes, TRUE);
+  g_array_free (priv->known_pids, TRUE);
+  g_hash_table_destroy (priv->desktop_id_table);
+  g_hash_table_destroy (priv->desktop_file_table);
+  g_hash_table_destroy (priv->desktop_class_table);
+  g_hash_table_destroy (priv->registered_pids);
+
+  for (l = priv->views; l; l = l->next)
+    {
+      bamf_matcher_unregister_view (self, (BamfView*)l->data, FALSE);
+    }
+  g_list_free_full (priv->views, g_object_unref);
+  priv->views = NULL;
+
+  for (l = priv->monitors; l; l = l->next)
+    {
+      g_signal_handlers_disconnect_by_func (G_OBJECT (l->data), 
+                                            (GCallback) on_monitor_changed, self);
+    }
+  g_list_free_full (priv->monitors, g_object_unref);
+  priv->monitors = NULL;
+
+  g_list_free_full (priv->favorites, g_free);
+  priv->favorites = NULL;
+
+  priv->active_app = NULL;
+  priv->active_win = NULL;
+
+  G_OBJECT_CLASS (bamf_matcher_parent_class)->finalize (object);
+}
+
+static void
 bamf_matcher_class_init (BamfMatcherClass * klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   g_type_class_add_private (klass, sizeof (BamfMatcherPrivate));
 
   dbus_g_object_type_install_info (BAMF_TYPE_MATCHER,
                                    &dbus_glib_bamf_matcher_object_info);
 
+  object_class->finalize = bamf_matcher_finalize;
+
   matcher_signals [VIEW_OPENED] =
     g_signal_new ("view-opened",
                   G_OBJECT_CLASS_TYPE (klass),
@@ -2293,7 +2392,7 @@
                   bamf_marshal_VOID__STRING_STRING,
                   G_TYPE_NONE, 2,
                   G_TYPE_STRING, G_TYPE_STRING);
-                  
+ 
   matcher_signals [FAVORITES_CHANGED] =
     g_signal_new ("favorites-changed",
                   G_OBJECT_CLASS_TYPE (klass),

=== modified file 'src/bamf-view.c'
--- src/bamf-view.c	2011-08-04 14:56:07 +0000
+++ src/bamf-view.c	2011-12-15 22:03:33 +0000
@@ -462,8 +462,6 @@
       path = g_strdup_printf ("%s/%s", BAMF_DBUS_PATH, stable_name);
       g_free (stable_name);
 
-      g_print ("Export Path: %s\n", path);
-
       BAMF_VIEW_GET_CLASS (view)->names = g_list_prepend (BAMF_VIEW_GET_CLASS (view)->names, path);
 
       view->priv->path = path;
@@ -472,8 +470,14 @@
 
       g_return_val_if_fail (bus, NULL);
 
+      GObject *old_object = dbus_g_connection_lookup_g_object (bus, path);
+      if (G_IS_OBJECT (old_object))
+      {
+        g_critical ("BAMF has already registered an object on path \"%s`, this should never happen!", path);
+        dbus_g_connection_unregister_g_object (bus, old_object);
+      }
+
       dbus_g_connection_register_g_object (bus, path, G_OBJECT (view));
-
       g_signal_emit (view, view_signals[EXPORTED], 0);
     }
 

=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am	2010-11-18 18:28:10 +0000
+++ tests/bamfdaemon/Makefile.am	2011-12-15 22:03:33 +0000
@@ -77,8 +77,13 @@
 		-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
 		$(NULL)
 
-#run make test as part of make check
+# Run tests as part of make check
+if ENABLE_HEADLESS_TESTS
+check-local: test-headless
+else
 check-local: test
+endif
+
 test:
 	@gtester -k -o=test-bamf-results.xml ./test-bamf
 
@@ -98,3 +103,28 @@
 
 clean-generic:
 	rm -f test-bamf-results.xml test-bamf-results.html
+
+# START HEADLESS TESTS
+if ENABLE_HEADLESS_TESTS
+DISPLAY = :27
+LOG_PATH = headless-logs
+test-headless:
+	set -e; \
+	export DISPLAY=$(DISPLAY); \
+	rm -rf $(LOG_PATH); \
+	mkdir $(LOG_PATH); \
+	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
+	sleep 1; \
+	\
+	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+	source $(LOG_PATH)/sessionbus.sh; \
+	sleep 1; \
+	\
+	make test; \
+	sleep 1; \
+	\
+	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
+	pkill Xvfb;
+	
+endif
+# END HEADLESS TESTS

=== modified file 'tests/bamfdaemon/Makefile.in'
--- tests/bamfdaemon/Makefile.in	2011-09-22 15:15:28 +0000
+++ tests/bamfdaemon/Makefile.in	2011-12-15 22:03:33 +0000
@@ -112,6 +112,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -192,6 +193,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
@@ -326,6 +328,10 @@
 		-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
 		$(NULL)
 
+
+# START HEADLESS TESTS
+@ENABLE_HEADLESS_TESTS_TRUE@DISPLAY = :27
+@ENABLE_HEADLESS_TESTS_TRUE@LOG_PATH = headless-logs
 all: all-am
 
 .SUFFIXES:
@@ -875,8 +881,10 @@
 	tags uninstall uninstall-am
 
 
-#run make test as part of make check
-check-local: test
+# Run tests as part of make check
+@ENABLE_HEADLESS_TESTS_TRUE@check-local: test-headless
+@ENABLE_HEADLESS_TESTS_FALSE@check-local: test
+
 test:
 	@gtester -k -o=test-bamf-results.xml ./test-bamf
 
@@ -896,6 +904,25 @@
 
 clean-generic:
 	rm -f test-bamf-results.xml test-bamf-results.html
+@ENABLE_HEADLESS_TESTS_TRUE@test-headless:
+@ENABLE_HEADLESS_TESTS_TRUE@	set -e; \
+@ENABLE_HEADLESS_TESTS_TRUE@	export DISPLAY=$(DISPLAY); \
+@ENABLE_HEADLESS_TESTS_TRUE@	rm -rf $(LOG_PATH); \
+@ENABLE_HEADLESS_TESTS_TRUE@	mkdir $(LOG_PATH); \
+@ENABLE_HEADLESS_TESTS_TRUE@	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
+@ENABLE_HEADLESS_TESTS_TRUE@	sleep 1; \
+@ENABLE_HEADLESS_TESTS_TRUE@	\
+@ENABLE_HEADLESS_TESTS_TRUE@	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+@ENABLE_HEADLESS_TESTS_TRUE@	source $(LOG_PATH)/sessionbus.sh; \
+@ENABLE_HEADLESS_TESTS_TRUE@	sleep 1; \
+@ENABLE_HEADLESS_TESTS_TRUE@	\
+@ENABLE_HEADLESS_TESTS_TRUE@	make test; \
+@ENABLE_HEADLESS_TESTS_TRUE@	sleep 1; \
+@ENABLE_HEADLESS_TESTS_TRUE@	\
+@ENABLE_HEADLESS_TESTS_TRUE@	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
+@ENABLE_HEADLESS_TESTS_TRUE@	pkill Xvfb;
+
+# END HEADLESS TESTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'tests/bamfdaemon/test-application.c'
--- tests/bamfdaemon/test-application.c	2010-05-25 10:32:24 +0000
+++ tests/bamfdaemon/test-application.c	2011-12-15 22:03:33 +0000
@@ -401,24 +401,12 @@
   bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (window));
   
   g_assert (signal_seen);
-  g_assert (g_strcmp0 (signal_window, path) == 0);
+  g_assert_cmpstr (signal_window, ==, path);
   
   signal_seen = FALSE;
   
   g_object_unref (window);
   g_object_unref (test);
-   
-  test = bamf_legacy_window_test_new (20, "Window X", "class", "exec");
-  window = bamf_window_new (BAMF_LEGACY_WINDOW (test));
-  
-  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (window));
-  
-  g_assert (!signal_seen);
-  
-  path = bamf_view_export_on_bus (BAMF_VIEW (window));
-  
-  g_assert (signal_seen);
-  g_assert (g_strcmp0 (signal_window, path) == 0);
 }
 
 static void

=== modified file 'tests/functional/Makefile.in'
--- tests/functional/Makefile.in	2011-09-22 15:15:28 +0000
+++ tests/functional/Makefile.in	2011-12-15 22:03:33 +0000
@@ -115,6 +115,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -195,6 +196,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@

=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am	2011-06-17 12:19:14 +0000
+++ tests/libbamf/Makefile.am	2011-12-15 22:03:33 +0000
@@ -33,8 +33,13 @@
   $(GTK_LIBS) \
   $(DBUS_LIBS)
 
-#run make test as part of make check
+# Run tests as part of make check
+if ENABLE_HEADLESS_TESTS
+check-local: test-headless
+else
 check-local: test
+endif
+
 test:
 	@gtester -k -o=test-libbamf-results.xml ./test-libbamf
 
@@ -54,3 +59,28 @@
 
 clean-generic:
 	rm -f test-libbamf-results.xml test-libbamf-results.html
+
+# START HEADLESS TESTS
+if ENABLE_HEADLESS_TESTS
+DISPLAY = :27
+LOG_PATH = headless-logs
+test-headless:
+	set -e; \
+	export DISPLAY=$(DISPLAY); \
+	rm -rf $(LOG_PATH); \
+	mkdir $(LOG_PATH); \
+	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
+	sleep 1; \
+	\
+	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+	source $(LOG_PATH)/sessionbus.sh; \
+	sleep 1; \
+	\
+	make test; \
+	sleep 1; \
+	\
+	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
+	pkill Xvfb;
+	
+endif
+# END HEADLESS TESTS

=== modified file 'tests/libbamf/Makefile.in'
--- tests/libbamf/Makefile.in	2011-09-22 15:15:28 +0000
+++ tests/libbamf/Makefile.in	2011-12-15 22:03:33 +0000
@@ -96,6 +96,7 @@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_BIN = @DBUS_GLIB_BIN@
+DBUS_LAUNCH = @DBUS_LAUNCH@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -176,6 +177,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WNCK_CFLAGS = @WNCK_CFLAGS@
 WNCK_LIBS = @WNCK_LIBS@
+XVFB = @XVFB@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
@@ -262,6 +264,10 @@
   $(GTK_LIBS) \
   $(DBUS_LIBS)
 
+
+# START HEADLESS TESTS
+@ENABLE_HEADLESS_TESTS_TRUE@DISPLAY = :27
+@ENABLE_HEADLESS_TESTS_TRUE@LOG_PATH = headless-logs
 all: all-am
 
 .SUFFIXES:
@@ -571,8 +577,10 @@
 	tags uninstall uninstall-am
 
 
-#run make test as part of make check
-check-local: test
+# Run tests as part of make check
+@ENABLE_HEADLESS_TESTS_TRUE@check-local: test-headless
+@ENABLE_HEADLESS_TESTS_FALSE@check-local: test
+
 test:
 	@gtester -k -o=test-libbamf-results.xml ./test-libbamf
 
@@ -592,6 +600,25 @@
 
 clean-generic:
 	rm -f test-libbamf-results.xml test-libbamf-results.html
+@ENABLE_HEADLESS_TESTS_TRUE@test-headless:
+@ENABLE_HEADLESS_TESTS_TRUE@	set -e; \
+@ENABLE_HEADLESS_TESTS_TRUE@	export DISPLAY=$(DISPLAY); \
+@ENABLE_HEADLESS_TESTS_TRUE@	rm -rf $(LOG_PATH); \
+@ENABLE_HEADLESS_TESTS_TRUE@	mkdir $(LOG_PATH); \
+@ENABLE_HEADLESS_TESTS_TRUE@	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
+@ENABLE_HEADLESS_TESTS_TRUE@	sleep 1; \
+@ENABLE_HEADLESS_TESTS_TRUE@	\
+@ENABLE_HEADLESS_TESTS_TRUE@	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+@ENABLE_HEADLESS_TESTS_TRUE@	source $(LOG_PATH)/sessionbus.sh; \
+@ENABLE_HEADLESS_TESTS_TRUE@	sleep 1; \
+@ENABLE_HEADLESS_TESTS_TRUE@	\
+@ENABLE_HEADLESS_TESTS_TRUE@	make test; \
+@ENABLE_HEADLESS_TESTS_TRUE@	sleep 1; \
+@ENABLE_HEADLESS_TESTS_TRUE@	\
+@ENABLE_HEADLESS_TESTS_TRUE@	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
+@ENABLE_HEADLESS_TESTS_TRUE@	pkill Xvfb;
+
+# END HEADLESS TESTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.