Mercurial > pidgin3 / file diff

--- a/libpurple/buddylist.c	Tue Oct 01 04:43:26 2013 +0530
+++ b/libpurple/buddylist.c	Tue Oct 01 17:29:45 2013 +0530
@@ -2048,21 +2048,14 @@
 					 (GDestroyNotify)_purple_blist_hbuddy_free_key, NULL);
 }
 
-/* GObject dispose function */
-static void
-purple_buddy_list_dispose(GObject *object)
-{
-	PURPLE_DBUS_UNREGISTER_POINTER(object);
-
-	G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
 /* GObject finalize function */
 static void
 purple_buddy_list_finalize(GObject *object)
 {
 	g_hash_table_destroy(PURPLE_BUDDY_LIST_GET_PRIVATE(object)->buddies);
 
+	PURPLE_DBUS_UNREGISTER_POINTER(object);
+
 	G_OBJECT_CLASS(parent_class)->finalize(object);
 }
 
@@ -2073,7 +2066,6 @@
 
 	parent_class = g_type_class_peek_parent(klass);
 
-	obj_class->dispose = purple_buddy_list_dispose;
 	obj_class->finalize = purple_buddy_list_finalize;
 
 	g_type_class_add_private(klass, sizeof(PurpleBuddyListPrivate));