Mercurial > pidgin
changeset 22475:53ffaf968813
merge of '409dce18b3381a807c9f3a692d19bc38e55ecf2b'
and '90b8f3a86dc4e3a40bee83272b9def28ae2b2602'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Thu, 13 Mar 2008 18:06:57 +0000 |
| parents | 8445ea581a6e (diff) 8aa07f5d1524 (current diff) |
| children | 77b6ff5bdb07 5a85bded9ae8 |
| files | ChangeLog |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);