[Telepathy-commits] [telepathy-gabble/master] GabbleMediaChannel: remove pointless guard against multiple initialization - class_init() only runs once
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Aug 19 10:53:04 PDT 2008
20080606102254-53eee-ed136088bd743ad1d725a45ab9f726050d78a0e4.gz
---
src/gabble-media-channel.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/gabble-media-channel.c b/src/gabble-media-channel.c
index 5d34990..08a43ce 100644
--- a/src/gabble-media-channel.c
+++ b/src/gabble-media-channel.c
@@ -484,7 +484,6 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
{
GObjectClass *object_class = G_OBJECT_CLASS (gabble_media_channel_class);
GParamSpec *param_spec;
- static gboolean initialized = FALSE;
g_type_class_add_private (gabble_media_channel_class,
sizeof (GabbleMediaChannelPrivate));
@@ -581,16 +580,11 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
tp_dbus_properties_mixin_class_init (object_class,
G_STRUCT_OFFSET (GabbleMediaChannelClass, dbus_props_class));
- if (!initialized)
- {
- initialized = TRUE;
-
- tp_group_mixin_class_init (object_class,
- G_STRUCT_OFFSET (GabbleMediaChannelClass, group_class),
- _gabble_media_channel_add_member,
- gabble_media_channel_remove_member);
- tp_group_mixin_init_dbus_properties (object_class);
- }
+ tp_group_mixin_class_init (object_class,
+ G_STRUCT_OFFSET (GabbleMediaChannelClass, group_class),
+ _gabble_media_channel_add_member,
+ gabble_media_channel_remove_member);
+ tp_group_mixin_init_dbus_properties (object_class);
}
void
--
1.5.6.3
More information about the Telepathy-commits
mailing list