# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1205431617 0
# Node ID 53ffaf968813f8907d46eb585060b60390bc1eaa
# Parent  8445ea581a6e5fa424b4fd3c496ad704b5ad28ea# Parent  8aa07f5d1524864862c53bb6fc1698367b09b385
merge of '409dce18b3381a807c9f3a692d19bc38e55ecf2b'
     and '90b8f3a86dc4e3a40bee83272b9def28ae2b2602'

diff -r 8aa07f5d1524 -r 53ffaf968813 ChangeLog
--- a/ChangeLog	Thu Mar 13 01:44:01 2008 +0000
+++ b/ChangeLog	Thu Mar 13 18:06:57 2008 +0000
@@ -29,6 +29,8 @@
 	* Fix compiling with Glib older than 2.6
 	* Ensure existing conversations selected from the 'Send IM' dialog are
 	  given focus
+	* Move the tooltip on the left of the buddylist if there's not enough room
+	  on the right to show it.
 
 version 2.4.0 (02/29/2008):
 	http://developer.pidgin.im/query?status=closed&milestone=2.4.0
diff -r 8aa07f5d1524 -r 53ffaf968813 finch/gntblist.c
--- a/finch/gntblist.c	Thu Mar 13 01:44:01 2008 +0000
+++ b/finch/gntblist.c	Thu Mar 13 18:06:57 2008 +0000
@@ -1742,6 +1742,8 @@
 	gnt_text_view_set_flag(GNT_TEXT_VIEW(tv), GNT_TEXT_VIEW_NO_SCROLL);
 	gnt_box_add_widget(GNT_BOX(box), tv);
 
+	if (x + w >= getmaxx(stdscr))
+		x -= w + width + 2;
 	gnt_widget_set_position(box, x, y);
 	GNT_WIDGET_UNSET_FLAGS(box, GNT_WIDGET_CAN_TAKE_FOCUS);
 	GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_TRANSIENT);