summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-07-02 15:24:22 +0100
committerWill Thompson <will.thompson@collabora.co.uk>2012-07-02 15:24:22 +0100
commitde9b0d133c83c6340b1797040a236367dadcf2dd (patch)
tree11e5b252dd55669cd62abd3c7703a6bc4e27b213 /src
parent4f470ee12f43f0eed298cb9fd703cd990f3fbf75 (diff)
downloadtelepathy-salut-de9b0d133c83c6340b1797040a236367dadcf2dd.tar.gz
Don't crash when closing a roomlist channel.
TpBaseChannel requires that the 'close' vfunc be implemented, even if the implementation is literally tp_base_channel_destroyed() because there is no clean-up to do. As a result, Empathy pre-emptively requesting a roomlist channel when you open the Join Room… dialog would crash Salut when you close that dialog.
Diffstat (limited to 'src')
-rw-r--r--src/roomlist-channel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index 566db977..2faa0f9f 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -135,6 +135,7 @@ salut_roomlist_channel_class_init (
base_class->target_handle_type = TP_HANDLE_TYPE_NONE;
base_class->fill_immutable_properties =
salut_roomlist_channel_fill_immutable_properties;
+ base_class->close = tp_base_channel_destroyed;
param_spec = g_param_spec_string ("conference-server",
"Name of conference server to use",