pidgin: 941f205e: Convert to using purple_blist_node_ acce...

andrew.victor at mxit.com andrew.victor at mxit.com
Tue Nov 1 14:01:01 EDT 2011


----------------------------------------------------------------------
Revision: 941f205e71bee6f0fe79442af21238c088eecbac
Parent:   675014ff452a4b5f25e0fba99b2eca51f4f28775
Author:   andrew.victor at mxit.com
Date:     11/01/11 13:28:17
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/941f205e71bee6f0fe79442af21238c088eecbac

Changelog: 

Convert to using purple_blist_node_ accessor functions.


Changes against parent 675014ff452a4b5f25e0fba99b2eca51f4f28775

  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	b48d94dade156c67d5c5488405b63ca2ca5b055f
+++ pidgin/gtkconv.c	585efbb1db92d9d406d26969657b64635b72c3c6
@@ -5656,7 +5656,6 @@ private_gtkconv_new(PurpleConversation *
 	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 @@ private_gtkconv_new(PurpleConversation *
 	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"))
============================================================
--- pidgin/gtkblist.c	00331b0b2289d449ccc20582e5cc4f681bf78aa4
+++ pidgin/gtkblist.c	915cf2b871dc9542f31877d93f8efaa17b3af0df
@@ -6812,7 +6812,7 @@ static void pidgin_blist_update(PurpleBu
 	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;


More information about the Commits mailing list