projects
/
empathy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
57421f4
)
empathy-dispatcher: deal properly with NULL channel_wrapper
author
Guillaume Desmottes
<gdesmott@gnome.org>
Mon, 16 Feb 2009 21:25:14 +0000
(21:25 +0000)
committer
Xavier Claessens
<xclaesse@src.gnome.org>
Mon, 16 Feb 2009 21:25:14 +0000
(21:25 +0000)
From: Guillaume Desmottes <gdesmott@gnome.org>
svn path=/trunk/; revision=2487
libempathy/empathy-dispatcher.c
patch
|
blob
|
history
diff --git
a/libempathy/empathy-dispatcher.c
b/libempathy/empathy-dispatcher.c
index 06dafa43cf31db4215af8053b5cf24bdbb7f1699..ab00503c813d804f4f7962ba9abccc050ab65773 100644
(file)
--- a/
libempathy/empathy-dispatcher.c
+++ b/
libempathy/empathy-dispatcher.c
@@
-121,7
+121,8
@@
new_dispatch_data (TpChannel *channel,
{
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
@@
static void
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);
}