Merge lp:~3v1n0/bamf/fix-window-removed-crash into lp:bamf/0.4

[Marco Trevisan (Treviño)]

libbamf, BamfApplication: add a sanity check to prevent crash on signals

Applying this fix lp:~3v1n0/unity/quick-app-reopen-icon-fix can happen that, even if we disconnect from the "WindowRemoved" dbus signal in BamfApplication's dispose, bamf_application_on_window_removed gets called anyway, so that it causes a crash since the pointed application is not valid anymore.

Adding a sanity check fixes this crash.

[Gord Allott (gordallott)]

review: Approve

=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2012-04-26 17:11:45 +0000
+++ lib/libbamf/bamf-application.c	2012-05-17 05:09:20 +0000
@@ -249,6 +249,8 @@
   BamfView *view;
   BamfFactory *factory;
 
+  g_return_if_fail (BAMF_IS_APPLICATION (self));
+
   factory = bamf_factory_get_default ();
   view = bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
 
@@ -271,6 +273,8 @@
   BamfView *view;
   BamfFactory *factory;
 
+  g_return_if_fail (BAMF_IS_APPLICATION (self));
+
   factory = bamf_factory_get_default ();
   view = bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
 
@@ -312,6 +316,12 @@
       priv->desktop_file = NULL;
     }
 
+  if (priv->cached_xids)
+    {
+      g_list_free (priv->cached_xids);
+      priv->cached_xids = NULL;
+    }
+
   if (priv->proxy)
     {
       dbus_g_proxy_disconnect_signal (priv->proxy,
@@ -328,12 +338,6 @@
       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);
 }