diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2008-08-18 17:33:37 +0100 |
---|---|---|
committer | Will Thompson <will.thompson@collabora.co.uk> | 2008-08-18 17:33:37 +0100 |
commit | 43caffe6689574528b5c30416f5c47c94bbebb68 (patch) | |
tree | add88eb4f31af29086a4c86efcfe8344a7d225d9 | |
parent | 4a35f5405ac14eee81db51eb511933dac0ab4c2f (diff) |
Reorder haze_contact_list_channel_class_init()
-rw-r--r-- | src/contact-list-channel.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/contact-list-channel.c b/src/contact-list-channel.c index 741a382..a81681d 100644 --- a/src/contact-list-channel.c +++ b/src/contact-list-channel.c @@ -675,20 +675,8 @@ haze_contact_list_channel_class_init (HazeContactListChannelClass *klass) GParamSpec *param_spec; static gboolean properties_mixin_initialized = FALSE; - tp_group_mixin_class_init (object_class, - G_STRUCT_OFFSET (HazeContactListChannelClass, group_class), - _haze_contact_list_channel_add_member_cb, - _haze_contact_list_channel_remove_member_cb); - - if (!properties_mixin_initialized) - { - properties_mixin_initialized = TRUE; - klass->properties_class.interfaces = NULL; - tp_dbus_properties_mixin_class_init (object_class, - G_STRUCT_OFFSET (HazeContactListChannelClass, properties_class)); - - tp_group_mixin_init_dbus_properties (object_class); - } + g_type_class_add_private (object_class, + sizeof(HazeContactListChannelPrivate)); object_class->constructor = haze_contact_list_channel_constructor; @@ -698,6 +686,7 @@ haze_contact_list_channel_class_init (HazeContactListChannelClass *klass) object_class->get_property = haze_contact_list_channel_get_property; object_class->set_property = haze_contact_list_channel_set_property; + param_spec = g_param_spec_object ("connection", "HazeConnection object", "Haze connection object that owns this " "contact list channel object.", @@ -716,8 +705,21 @@ haze_contact_list_channel_class_init (HazeContactListChannelClass *klass) "handle-type"); g_object_class_override_property (object_class, PROP_HANDLE, "handle"); - g_type_class_add_private (object_class, - sizeof(HazeContactListChannelPrivate)); + + tp_group_mixin_class_init (object_class, + G_STRUCT_OFFSET (HazeContactListChannelClass, group_class), + _haze_contact_list_channel_add_member_cb, + _haze_contact_list_channel_remove_member_cb); + + if (!properties_mixin_initialized) + { + properties_mixin_initialized = TRUE; + klass->properties_class.interfaces = NULL; + tp_dbus_properties_mixin_class_init (object_class, + G_STRUCT_OFFSET (HazeContactListChannelClass, properties_class)); + + tp_group_mixin_init_dbus_properties (object_class); + } } static void |