[empathy/gnome-2-30] disconnect empathy_call_window_bus_message() in dispose (#616301)



commit ab0e8f605cc781f8eda275babc47c1e3cc98545a
Author: David Laban <david laban collabora co uk>
Date:   Tue Apr 20 15:51:30 2010 +0100

    disconnect empathy_call_window_bus_message() in dispose (#616301)
    
    Otherwise, we will crash because priv->handler is not there.

 src/empathy-call-window.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 0d6cf1c..6ae3a4d 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1334,6 +1334,12 @@ empathy_call_window_dispose (GObject *object)
     g_object_unref (priv->handler);
   priv->handler = NULL;
 
+  if (priv->bus_message_source_id != 0)
+    {
+      g_source_remove (priv->bus_message_source_id);
+      priv->bus_message_source_id = 0;
+    }
+
   if (priv->pipeline != NULL)
     g_object_unref (priv->pipeline);
   priv->pipeline = NULL;
@@ -1392,12 +1398,6 @@ empathy_call_window_finalize (GObject *object)
       priv->video_output_motion_handler_id = 0;
     }
 
-  if (priv->bus_message_source_id != 0)
-    {
-      g_source_remove (priv->bus_message_source_id);
-      priv->bus_message_source_id = 0;
-    }
-
   /* free any data held directly by the object here */
   g_mutex_free (priv->lock);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]