debug-window: prevent using the store when disposing

Using g_signal_connect_object() isn't enought as it prevents from calling the
callback when the windows has been destroyed but not while disposing it.

https://bugzilla.gnome.org/show_bug.cgi?id=692793

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index b56fe3c026b5503cd94de71f9ed70eb671fbc9a1..b4392c331dd741b1a74340e6f85d2ee11c69b1b8 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -323,11 +323,16 @@ proxy_invalidated_cb (TpProxy *proxy,
     gpointer user_data)
 {
   EmpathyDebugWindow *self = (EmpathyDebugWindow *) user_data;
     gpointer user_data)
 {
   EmpathyDebugWindow *self = (EmpathyDebugWindow *) user_data;

-  GtkTreeModel *service_store = GTK_TREE_MODEL (self->priv->service_store);
+  GtkTreeModel *service_store;

   TpProxy *stored_proxy;
   GtkTreeIter iter;
   gboolean valid_iter;
 
   TpProxy *stored_proxy;
   GtkTreeIter iter;
   gboolean valid_iter;
 

+  if (self->priv->service_store == NULL)
+    return;
+
+  service_store = GTK_TREE_MODEL (self->priv->service_store);
+

   /* Proxy has been invalidated so we find and set it to NULL
    * in service store */
   gtk_tree_model_get_iter_first (service_store, &iter);
   /* Proxy has been invalidated so we find and set it to NULL
    * in service store */
   gtk_tree_model_get_iter_first (service_store, &iter);