[Telepathy-commits] [telepathy-gabble/master] GabbleMucChannel: remove pointless guard against multiple initialization - class_init can only run once anyway

[Simon McVittie]

20080606085428-53eee-e082aa41c394246cfc57af7d678ed712638990f2.gz
---
 src/gabble-muc-channel.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/gabble-muc-channel.c b/src/gabble-muc-channel.c
index f7b7c5f..f57375b 100644
--- a/src/gabble-muc-channel.c
+++ b/src/gabble-muc-channel.c
@@ -825,7 +825,6 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (gabble_muc_channel_class);
   GParamSpec *param_spec;
-  static gboolean initialized = FALSE;
 
   g_type_class_add_private (gabble_muc_channel_class,
       sizeof (GabbleMucChannelPrivate));
@@ -927,15 +926,11 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class)
   tp_dbus_properties_mixin_class_init (object_class,
       G_STRUCT_OFFSET (GabbleMucChannelClass, dbus_props_class));
 
-  if (!initialized)
-    {
-      initialized = TRUE;
-      tp_group_mixin_class_init (object_class,
-          G_STRUCT_OFFSET (GabbleMucChannelClass, group_class),
-          gabble_muc_channel_add_member,
-          gabble_muc_channel_remove_member);
-      tp_group_mixin_init_dbus_properties (object_class);
-    }
+  tp_group_mixin_class_init (object_class,
+      G_STRUCT_OFFSET (GabbleMucChannelClass, group_class),
+      gabble_muc_channel_add_member,
+      gabble_muc_channel_remove_member);
+  tp_group_mixin_init_dbus_properties (object_class);
 }
 
 static void clear_join_timer (GabbleMucChannel *chan);
-- 
1.5.6.3