pidgin: e4546fa8: Stop trying to get "gtk-autojoin" as a s...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: e4546fa88606ad39b1926afe342cdda4b92a2451
Parent:   41b0140041e7b5f52558997cf4225340e2f07971
Author:   markdoliner at pidgin.im
Date:     02/21/11 22:19:18
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e4546fa88606ad39b1926afe342cdda4b92a2451

Changelog: 

Stop trying to get "gtk-autojoin" as a string from chat rooms in the buddy
list.  This field is a boolean, and has been since at least 2004.  It looks
like it was a boolean even before then, too...
For some reason Nathan added this in revision
d7d95551eb1d08f00bf41b6c742180ffd18bb525 with the comment:
"another one of those horrible hacks that I plan to remove in 6 months or so"

This causes this warning to be logged when right clicking on any chat room
where you have previously had auto-join checked, but it is now unchecked:
"(09:26:22) g_log: purple_blist_node_get_string: assertion purple_value_get_type(value) == PURPLE_TYPE_STRING' failed"

Changes against parent 41b0140041e7b5f52558997cf4225340e2f07971

  patched  pidgin/gtkblist.c

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	6af89ce91a9b8d525df534bc6742642bb64fd1a4
+++ pidgin/gtkblist.c	547cd57d4576a8a4eae99d1014463420c59dfa9c
@@ -1740,8 +1740,7 @@ create_chat_menu(PurpleBlistNode *node, 
 	gboolean autojoin, persistent;
 
 	menu = gtk_menu_new();
-	autojoin = (purple_blist_node_get_bool(node, "gtk-autojoin") ||
-			(purple_blist_node_get_string(node, "gtk-autojoin") != NULL));
+	autojoin = purple_blist_node_get_bool(node, "gtk-autojoin");
 	persistent = purple_blist_node_get_bool(node, "gtk-persistent");
 
 	pidgin_new_item_from_stock(menu, _("_Join"), PIDGIN_STOCK_CHAT,
@@ -7423,9 +7422,7 @@ static gboolean autojoin_cb(PurpleConnec
 			if(chat->account != account)
 				continue;
 
-			if(purple_blist_node_get_bool((PurpleBlistNode*)chat, "gtk-autojoin") ||
-					(purple_blist_node_get_string((PurpleBlistNode*)chat,
-					 "gtk-autojoin") != NULL))
+			if (purple_blist_node_get_bool((PurpleBlistNode*)chat, "gtk-autojoin"))
 				serv_join_chat(gc, chat->components);
 		}
 	}