# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1182024996 0
# Node ID 97b735ca9d7a97ed5426c68aa6e82f665d1f9dcf
# Parent  f52def9dc7c9419481b7a9d990096e225d787afb# Parent  d40fd7106ebf40d004b5608ee93de03886220895
merge of '55af2e26c71950d7f8fc3a7b6a9b2249abb5ae0f'
     and 'ab66c9deff83832be4f49fffce0742d853b6c8b1'

diff -r f52def9dc7c9 -r 97b735ca9d7a ChangeLog.API
diff -r f52def9dc7c9 -r 97b735ca9d7a libpurple/blist.c
diff -r f52def9dc7c9 -r 97b735ca9d7a libpurple/conversation.c
diff -r f52def9dc7c9 -r 97b735ca9d7a pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Sat Jun 16 17:57:07 2007 +0000
+++ b/pidgin/gtkaccount.c	Sat Jun 16 20:16:36 2007 +0000
@@ -2686,3 +2686,4 @@
 	purple_signals_unregister_by_instance(pidgin_account_get_handle());
 }
 
+
diff -r f52def9dc7c9 -r 97b735ca9d7a pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sat Jun 16 17:57:07 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Jun 16 20:16:36 2007 +0000
@@ -4234,7 +4234,7 @@
 				{"application/x-im-contact", 0, DRAG_BUDDY},
 				{"text/x-vcard", 0, DRAG_VCARD }};
 	if (gtkblist && gtkblist->window) {
-		purple_blist_set_visible(TRUE);
+		purple_blist_set_visible(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible"));
 		return;
 	}
 
@@ -5030,6 +5030,7 @@
 	PurpleContact *contact;
 	PurpleBuddy *buddy;
 	struct _pidgin_blist_node *gtknode;
+
 	if (editing_blist)
 		return;
 
@@ -5128,6 +5129,7 @@
 	PurpleChat *chat;
 
 	g_return_if_fail(PURPLE_BLIST_NODE_IS_CHAT(node));
+
 	if (editing_blist)
 		return;
 
@@ -6736,3 +6738,4 @@
 	if (activeitem)
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(activeitem), TRUE);
 }
+
diff -r f52def9dc7c9 -r 97b735ca9d7a pidgin/gtkconv.c
diff -r f52def9dc7c9 -r 97b735ca9d7a pidgin/gtkdialogs.c
diff -r f52def9dc7c9 -r 97b735ca9d7a pidgin/gtkimhtml.c
diff -r f52def9dc7c9 -r 97b735ca9d7a pidgin/gtkimhtmltoolbar.c
diff -r f52def9dc7c9 -r 97b735ca9d7a pidgin/gtkpounce.c
diff -r f52def9dc7c9 -r 97b735ca9d7a pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Sat Jun 16 17:57:07 2007 +0000
+++ b/pidgin/gtkutils.c	Sat Jun 16 20:16:36 2007 +0000
@@ -3090,3 +3090,4 @@
 	return path;
 }
 #endif
+