# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1185088173 0
# Node ID ac9f19a3105170d0e46940fee6b62ec21c2b0ae8
# Parent  5733c0691c254cb62fa7de63a76cb8e35592a5be# Parent  321658bf0e03cd2100e206de17a0c0b4c3addf7f
merge of 'ee06baadf86c44d4707c364c06c874bd9b27ad07'
     and 'ff1016b75717a37c96fb6e4d7e388259022043de'

diff -r 321658bf0e03 -r ac9f19a31051 libpurple/dbus-useful.c
diff -r 321658bf0e03 -r ac9f19a31051 libpurple/debug.c
diff -r 321658bf0e03 -r ac9f19a31051 libpurple/plugins/perl/common/Connection.xs
diff -r 321658bf0e03 -r ac9f19a31051 libpurple/protocols/gg/lib/http.c
diff -r 321658bf0e03 -r ac9f19a31051 libpurple/protocols/gg/lib/pubdir50.c
diff -r 321658bf0e03 -r ac9f19a31051 libpurple/protocols/jabber/jutil.c
diff -r 321658bf0e03 -r ac9f19a31051 libpurple/protocols/yahoo/yahoochat.h
diff -r 321658bf0e03 -r ac9f19a31051 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sun Jul 22 06:53:13 2007 +0000
+++ b/pidgin/gtkconv.c	Sun Jul 22 07:09:33 2007 +0000
@@ -4804,6 +4804,11 @@
 	else
 		gtk_widget_hide(gtkconv->toolbar);
 
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
+		gtk_widget_show(gtkconv->infopane_hbox);
+	else
+		gtk_widget_hide(gtkconv->infopane_hbox);
+
 	gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),
 		purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps"));
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->imhtml),
@@ -6783,9 +6788,14 @@
 
 	for (l = purple_get_conversations(); l != NULL; l = l->next) {
 		PurpleConversation *conv = l->data;
-
-		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
+		if (GPOINTER_TO_INT(value)) 
+			gtk_widget_show(PIDGIN_CONVERSATION(conv)->infopane_hbox);
+		else
+			gtk_widget_hide(PIDGIN_CONVERSATION(conv)->infopane_hbox);
+
+		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 			pidgin_conv_update_buddy_icon(conv);
+		}
 	}
 }
 
diff -r 321658bf0e03 -r ac9f19a31051 pidgin/gtkdocklet.c
diff -r 321658bf0e03 -r ac9f19a31051 pidgin/gtklog.c
diff -r 321658bf0e03 -r ac9f19a31051 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Sun Jul 22 06:53:13 2007 +0000
+++ b/pidgin/gtkprefs.c	Sun Jul 22 07:09:33 2007 +0000
@@ -994,7 +994,7 @@
 	pidgin_prefs_checkbox(_("Show _formatting on incoming messages"),
 				PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox);
 
-	iconpref1 = pidgin_prefs_checkbox(_("Show buddy _icons"),
+	iconpref1 = pidgin_prefs_checkbox(_("Show Buddy _Details"),
 			PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox);
 	iconpref2 = pidgin_prefs_checkbox(_("Enable buddy ic_on animation"),
 			PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons", vbox);
diff -r 321658bf0e03 -r ac9f19a31051 pidgin/plugins/gestures/gestures.c
diff -r 321658bf0e03 -r ac9f19a31051 pidgin/plugins/notify.c
diff -r 321658bf0e03 -r ac9f19a31051 pidgin/plugins/timestamp.c