gobjectification: 32f1df15: Fixed a few abstracts and blist_new bug

[aluink at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 32f1df15e5100856048894f960bc5df4e71e3c46
Ancestor: cd5571c4fe8193525f4460ec321fc7a0d5f1e1f2
Author: aluink at soc.pidgin.im
Date: 2009-06-25T04:01:30
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/32f1df15e5100856048894f960bc5df4e71e3c46

Modified files:
        libpurple/blist.c libpurple/buddy.c libpurple/chat.c
        libpurple/contact.c libpurple/group.c

ChangeLog: 

Fixed a few abstracts and blist_new bug

-------------- next part --------------
============================================================
--- libpurple/blist.c	ebb38e6846cc3e5864db04a7c2e3760080fb506a
+++ libpurple/blist.c	3ed468d3720696344d5595d653fb2618c853a501
@@ -218,7 +218,7 @@ purple_blist_schedule_save()
 void
 purple_blist_schedule_save()
 {
-	if (purplebuddylist->save_timer == 0)
+	if (purplebuddylist && purplebuddylist->save_timer == 0)
 		purplebuddylist->save_timer = purple_timeout_add_seconds(5, save_cb, NULL);
 }
 
@@ -317,6 +317,11 @@ PurpleBuddyList *purple_blist_new()
 
 	ui_ops = purple_blist_get_ui_ops();
 
+  #warning: This has to be set here or we can't add the buddies cache
+  if(purplebuddylist) /* In case we're creating a replacement list */
+    purple_blist_destroy();
+  purple_set_blist(gbl);
+
 	gbl->buddies = g_hash_table_new_full((GHashFunc)_purple_blist_hbuddy_hash,
 					 (GEqualFunc)_purple_blist_hbuddy_equal,
 					 (GDestroyNotify)_purple_blist_hbuddy_free_key, NULL);
@@ -1264,8 +1269,8 @@ purple_blist_get_gtype(void)
 		};
 
 		type = g_type_register_static(PURPLE_TYPE_OBJECT,
-									  "PurpleBlist",
-									  &info, G_TYPE_FLAG_ABSTRACT);
+									  "PurpleBuddyList",
+									  &info, 0);
 	}
 
 	return type;
============================================================
--- libpurple/buddy.c	7b71d55d5d07c1d35828bb5a14b0147d2bf382e8
+++ libpurple/buddy.c	dd51d3f0b19622d335e7c252a185eda9d61d9723
@@ -601,7 +601,7 @@ purple_buddy_get_gtype(void)
 
 		type = g_type_register_static(PURPLE_BLIST_NODE_TYPE,
 									  "PurpleBuddy",
-									  &info, G_TYPE_FLAG_ABSTRACT);
+									  &info, 0);
 	}
 
 	return type;
============================================================
--- libpurple/chat.c	b27838a4ed9642c46e056a7db2c7355b5e980346
+++ libpurple/chat.c	114e664a4636a78c1487dc388864b86d13021c62
@@ -341,7 +341,7 @@ purple_chat_get_gtype(void)
 
     type = g_type_register_static(PURPLE_BLIST_NODE_TYPE,
                     "PurpleChat",
-                    &info, G_TYPE_FLAG_ABSTRACT);
+                    &info, 0);
   }
 
   return type;
============================================================
--- libpurple/contact.c	65169629e90a79cf47a08c1ac30984844813e361
+++ libpurple/contact.c	f8391ddd1af9fad839852fe12fd8e621e54b53de
@@ -311,7 +311,7 @@ purple_contact_get_gtype(void)
 
 		type = g_type_register_static(PURPLE_BLIST_NODE_TYPE,
 									  "PurpleContact",
-									  &info, G_TYPE_FLAG_ABSTRACT);
+									  &info, 0);
 	}
 
 	return type;
============================================================
--- libpurple/group.c	3d40773e4ab3ec7ada31399601afee4986adb0a9
+++ libpurple/group.c	7ea460951fe9f707ac512e7b31d766e9bce795b4
@@ -348,7 +348,7 @@ purple_group_get_gtype(void)
 
 		type = g_type_register_static(PURPLE_BLIST_NODE_TYPE,
 									  "PurpleGroup",
-									  &info, G_TYPE_FLAG_ABSTRACT);
+									  &info, 0);
 	}
 
 	return type;