empathy r2487 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Feb 16 21:25:14 2009
New Revision: 2487
URL: http://svn.gnome.org/viewvc/empathy?rev=2487&view=rev

Log:
empathy-dispatcher: deal properly with NULL channel_wrapper

From: Guillaume Desmottes <gdesmott gnome org>

Modified:
   trunk/libempathy/empathy-dispatcher.c

Modified: trunk/libempathy/empathy-dispatcher.c
==============================================================================
--- trunk/libempathy/empathy-dispatcher.c	(original)
+++ trunk/libempathy/empathy-dispatcher.c	Mon Feb 16 21:25:14 2009
@@ -121,7 +121,8 @@
 {
   DispatchData *d = g_slice_new0 (DispatchData);
   d->channel = g_object_ref (channel);
-  d->channel_wrapper = g_object_ref (channel_wrapper);
+  if (channel_wrapper != NULL)
+    d->channel_wrapper = g_object_ref (channel_wrapper);
 
   return d;
 }
@@ -130,7 +131,8 @@
 free_dispatch_data (DispatchData *data)
 {
   g_object_unref (data->channel);
-  g_object_unref (data->channel_wrapper);
+  if (data->channel_wrapper != NULL)
+    g_object_unref (data->channel_wrapper);
 
   g_slice_free (DispatchData, data);
 }