Mercurial > pidgin.yaz
changeset 31705:43f75716a233
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"
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 22 Feb 2011 03:19:18 +0000 |
| parents | 65999cb4fc40 |
| children | 4ef9165ebe45 |
| files | pidgin/gtkblist.c |
| diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Mon Feb 21 22:57:30 2011 +0000 +++ b/pidgin/gtkblist.c Tue Feb 22 03:19:18 2011 +0000 @@ -1740,8 +1740,7 @@ 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 @@ 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); } }