# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1183417150 0
# Node ID 579ba98668823eac30e7fe8011497bf7ae16f962
# Parent  93c5c785a811fbc7701d5a92662b09cc73707dd4# Parent  ec20ef0c2509c13ebcb9b829f93843a8a79edfdf
merge of '2c61c0960a48cb258fd0a3c93727265ec78e7809'
     and 'efa0e31922a07bb598a6fc8951462e1fa96a886e'

diff -r 93c5c785a811 -r 579ba9866882 ChangeLog
--- a/ChangeLog	Mon Jul 02 22:58:36 2007 +0000
+++ b/ChangeLog	Mon Jul 02 22:59:10 2007 +0000
@@ -18,6 +18,10 @@
 	  directory.  The net effect of this is that trying to start Pidgin a
 	  second time will raise the buddy list.  (Gabriel Schulhof)
 	* Undo capability in the conversation window
+	* The formatting toolbar has been reorganized to be more concise.
+	* A new status area has been added to the top of conversations to
+	  provide additional detail about the buddy, including buddy icon,
+	  protocol and status message.
 
 	Finch:
 	* There's support for workspaces now (details in the manpage)
diff -r 93c5c785a811 -r 579ba9866882 pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Mon Jul 02 22:58:36 2007 +0000
+++ b/pidgin/gtkdocklet.c	Mon Jul 02 22:59:10 2007 +0000
@@ -636,7 +636,7 @@
 
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet");
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/blink", FALSE);
-	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/docklet/show", "always");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/docklet/show", "pending");
 	purple_prefs_connect_callback(docklet_handle, PIDGIN_PREFS_ROOT "/docklet/show",
 				    docklet_show_pref_changed_cb, NULL);