[Telepathy-commits] [telepathy-gabble/master] GabbleMucChannel: avoid initializing static data twice if we're subclassed

[Simon McVittie]

20080526180128-53eee-8afe65986ee88743e914e4fb4e0d38ba5dc330c7.gz
---
 src/gabble-muc-channel.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/gabble-muc-channel.c b/src/gabble-muc-channel.c
index 713e710..d92241a 100644
--- a/src/gabble-muc-channel.c
+++ b/src/gabble-muc-channel.c
@@ -934,7 +934,11 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class)
       G_STRUCT_OFFSET (GabbleMucChannelClass, text_class));
 
   gabble_muc_channel_class->dbus_props_class.interfaces = interfaces;
-  tp_group_mixin_init_dbus_properties (&(interfaces[0]));
+
+  /* only executed once */
+  if (interfaces[0].name == NULL)
+    tp_group_mixin_init_dbus_properties (&(interfaces[0]));
+
   tp_dbus_properties_mixin_class_init (object_class,
       G_STRUCT_OFFSET (GabbleMucChannelClass, dbus_props_class));
 }
-- 
1.5.6.3