# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1245688798 0
# Node ID 3cd831d4915fb8ab406a933f92346c51a0a8034d
# Parent  454d46e9cbb70dd1241f94cd6432dbc60e4309e1# Parent  14baa6cb1c2b683f6228c9b7205198063c68187e
merge of 'bfb17183fbbf44cc19720d4d11594a7fdaad25de'
     and 'f525448585711b2790cb6158b85897a15b546241'

diff -r 454d46e9cbb7 -r 3cd831d4915f ChangeLog
--- a/ChangeLog	Mon Jun 22 08:15:58 2009 +0000
+++ b/ChangeLog	Mon Jun 22 16:39:58 2009 +0000
@@ -98,7 +98,7 @@
 	  (Dmitry Petroff)
 	* Draw the user's buddy icon at the bottom of the Buddy List with rounded
 	  corners for visual consistency with the actual icons in the Buddy List.
-	  (kostaa)
+	  (Kosta Arvanitis)
 
 	Finch:
 	* The hardware cursor is updated correctly. This will be useful
diff -r 454d46e9cbb7 -r 3cd831d4915f pidgin/plugins/disco/Makefile.mingw
--- a/pidgin/plugins/disco/Makefile.mingw	Mon Jun 22 08:15:58 2009 +0000
+++ b/pidgin/plugins/disco/Makefile.mingw	Mon Jun 22 16:39:58 2009 +0000
@@ -46,6 +46,8 @@
 			-lglib-2.0 \
 			-lgdk-win32-2.0 \
 			-lgobject-2.0 \
+			-lpango-1.0 \
+			-lgdk_pixbuf-2.0 \
 			-lintl \
 			-lpurple \
 			-lpidgin