gobjectification: bd8bd0f0: Pidgin and Finch compile.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: bd8bd0f012c308ad56b73d7040280fc53e6d1bb9
Parent:   34d42527d618c9d019e6bb22745fd8ec90b4df20
Author:   qulogic at pidgin.im
Date:     07/07/10 21:50:12
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/bd8bd0f012c308ad56b73d7040280fc53e6d1bb9

Changelog: 

Pidgin and Finch compile.

Changes against parent 34d42527d618c9d019e6bb22745fd8ec90b4df20

  patched  finch/gntblist.c
  patched  libpurple/buddy.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	a73da40f4ddc73740796320ae5d73e9692869d36
+++ pidgin/gtkconv.c	6f5a6f4d041bff0f9e263f64cb66e34564186559
@@ -3236,7 +3236,7 @@ populate_menu_with_options(GtkWidget *me
 			}
 
 			if ((buddy == NULL) && (gtkconv->imhtml != NULL)) {
-				buddy = purple_buddy_new(conv->account, conv->name, NULL);
+				buddy = purple_buddy_new(conv->account, conv->name, NULL, NULL);
 				purple_blist_node_set_flags((PurpleBlistNode *)buddy,
 						PURPLE_BLIST_NODE_FLAG_NO_SAVE);
 				g_object_set_data_full(G_OBJECT(gtkconv->imhtml), "transient_buddy",
============================================================
--- pidgin/gtkblist.c	651bb030f6ad366e791714de3ca17c711877347e
+++ pidgin/gtkblist.c	14d7753af1d846aac4a49020b695bd84bb2656eb
@@ -7051,8 +7051,7 @@ add_buddy_cb(GtkWidget *w, int resp, Pid
 
 		if (b == NULL)
 		{
-			b = purple_buddy_new(account, who, whoalias);
-			purple_blist_add_buddy(b, NULL, g, NULL);
+			b = purple_buddy_new(account, who, whoalias, PURPLE_BLIST_NODE(g));
 		}
 
 		purple_account_add_buddy(account, b);
============================================================
--- finch/gntblist.c	3ccddb8402b78387eaf65d27ef86b652295d7c88
+++ finch/gntblist.c	6af902ddc88feef07cd6544c0b17724034cfbfef
@@ -648,8 +648,7 @@ add_buddy_cb(void *data, PurpleRequestFi
 
 	if ((buddy = purple_find_buddy_in_group(account, username, grp)) == NULL)
 	{
-		buddy = purple_buddy_new(account, username, alias);
-		purple_blist_add_buddy(buddy, NULL, grp, NULL);
+		buddy = purple_buddy_new(account, username, alias, PURPLE_BLIST_NODE(grp));
 	}
 
 	purple_account_add_buddy(account, buddy);
============================================================
--- libpurple/buddy.c	88c47b1edbc341a158edb8a887f646bc71962c74
+++ libpurple/buddy.c	a2687cfb589ee62de3eba89213213f9e9e915306
@@ -529,7 +529,8 @@ PurpleBuddy *purple_buddy_new(PurpleAcco
 			PROP_ALIAS_S, alias,
 			NULL);
 
-	purple_blist_node_add_child(parent, PURPLE_BLIST_NODE(buddy));
+	if (parent)
+		purple_blist_node_add_child(parent, PURPLE_BLIST_NODE(buddy));
 	g_signal_emit_by_name(G_OBJECT(buddy), "new");
 
 	return buddy;