[Telepathy-commits] [telepathy-gabble/master] GabbleRosterChannel: 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
20080606102331-53eee-02262e45e03c4cf5cf80115aba0061cba415a186.gz
---
src/gabble-roster-channel.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/gabble-roster-channel.c b/src/gabble-roster-channel.c
index 36e2da0..3bc9df7 100644
--- a/src/gabble-roster-channel.c
+++ b/src/gabble-roster-channel.c
@@ -260,7 +260,6 @@ gabble_roster_channel_class_init (GabbleRosterChannelClass *gabble_roster_channe
{
GObjectClass *object_class = G_OBJECT_CLASS (gabble_roster_channel_class);
GParamSpec *param_spec;
- static gboolean initialized = FALSE;
g_type_class_add_private (gabble_roster_channel_class,
sizeof (GabbleRosterChannelPrivate));
@@ -294,16 +293,11 @@ gabble_roster_channel_class_init (GabbleRosterChannelClass *gabble_roster_channe
tp_dbus_properties_mixin_class_init (object_class,
G_STRUCT_OFFSET (GabbleRosterChannelClass, properties_class));
- if (!initialized)
- {
- initialized = TRUE;
-
- tp_group_mixin_class_init (object_class,
- G_STRUCT_OFFSET (GabbleRosterChannelClass, group_class),
- _gabble_roster_channel_add_member_cb,
- _gabble_roster_channel_remove_member_cb);
- tp_group_mixin_init_dbus_properties (object_class);
- }
+ tp_group_mixin_class_init (object_class,
+ G_STRUCT_OFFSET (GabbleRosterChannelClass, group_class),
+ _gabble_roster_channel_add_member_cb,
+ _gabble_roster_channel_remove_member_cb);
+ tp_group_mixin_init_dbus_properties (object_class);
}
void
--
1.5.6.3
More information about the Telepathy-commits
mailing list