changeset 32351:03efb97b552b

Convert to using purple_blist_node_ accessor functions.
author andrew.victor@mxit.com
date Tue, 01 Nov 2011 17:28:17 +0000
parents cd46874707b1
children c94e2bfae121 ab736b16bb26 930820b18a8d
files pidgin/gtkblist.c pidgin/gtkconv.c
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Mon Oct 31 21:27:32 2011 +0000
+++ b/pidgin/gtkblist.c	Tue Nov 01 17:28:17 2011 +0000
@@ -6812,7 +6812,7 @@
 	if (purple_blist_node_get_ui_data(node) == NULL)
 		pidgin_blist_new_node(node);
 
-	switch(node->type) {
+	switch (purple_blist_node_get_type(node)) {
 		case PURPLE_BLIST_GROUP_NODE:
 			pidgin_blist_update_group(list, node);
 			break;
--- a/pidgin/gtkconv.c	Mon Oct 31 21:27:32 2011 +0000
+++ b/pidgin/gtkconv.c	Tue Nov 01 17:28:17 2011 +0000
@@ -5656,7 +5656,6 @@
 	GtkWidget *pane = NULL;
 	GtkWidget *tab_cont;
 	PurpleBlistNode *convnode;
-	PurpleValue *value;
 
 	if (conv_type == PURPLE_CONV_TYPE_IM && (gtkconv = pidgin_conv_find_gtkconv(conv))) {
 		purple_conversation_set_ui_data(conv, gtkconv);
@@ -5741,11 +5740,9 @@
 	if (convnode == NULL || !purple_blist_node_get_bool(convnode, "gtk-mute-sound"))
 		gtkconv->make_sound = TRUE;
 
-	if (convnode != NULL &&
-	    (value = g_hash_table_lookup(convnode->settings, "enable-logging")) &&
-	    purple_value_get_type(value) == PURPLE_TYPE_BOOLEAN)
-	{
-		purple_conversation_set_logging(conv, purple_value_get_boolean(value));
+	if (convnode != NULL) {
+		gboolean logging = purple_blist_node_get_bool(convnode, "enable-logging");
+		purple_conversation_set_logging(conv, logging);
 	}
 
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar"))