Mercurial > pidgin.yaz
changeset 21630:1c34b63076df
merge of '2cbd8db1d77e345ea55b3b765ca79726273ca727'
and '4f88abe06fd8a1d074983f3cf8aeb93d06d57f5f'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 23 Nov 2007 19:42:47 +0000 |
| parents | 512785bd7fcb (diff) b2aa68cdc8b9 (current diff) |
| children | f472035d6c77 a9cb48039d3b |
| files | |
| diffstat | 3 files changed, 23 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/libgnt/gntwm.c Fri Nov 23 19:41:44 2007 +0000 +++ b/finch/libgnt/gntwm.c Fri Nov 23 19:42:47 2007 +0000 @@ -81,6 +81,7 @@ static int widestringwidth(wchar_t *wide); #endif +static void ensure_normal_mode(GntWM *wm); static gboolean write_already(gpointer data); static int write_timeout; static time_t last_active_time; @@ -392,6 +393,10 @@ if (!wm->cws->ordered || !wm->cws->ordered->next) return; + if (wm->mode != GNT_KP_MODE_NORMAL) { + ensure_normal_mode(wm); + } + w = wm->cws->ordered->data; pos = g_list_index(wm->cws->list, w); pos += direction; @@ -503,6 +508,7 @@ if (wm->cws->ordered) { gnt_widget_destroy(wm->cws->ordered->data); + ensure_normal_mode(wm); } return TRUE; @@ -522,6 +528,7 @@ setup__list(GntWM *wm) { GntWidget *tree, *win; + ensure_normal_mode(wm); win = wm->_list.window = gnt_box_new(FALSE, FALSE); gnt_box_set_toplevel(GNT_BOX(win), TRUE); gnt_box_set_pad(GNT_BOX(win), 0); @@ -972,6 +979,16 @@ update_screen(wm); } +static void +ensure_normal_mode(GntWM *wm) +{ + if (wm->mode != GNT_KP_MODE_NORMAL) { + if (wm->cws->ordered) + window_reverse(wm->cws->ordered->data, FALSE, wm); + wm->mode = GNT_KP_MODE_NORMAL; + } +} + static gboolean start_move(GntBindable *bindable, GList *null) { @@ -1453,6 +1470,7 @@ if (wm->_list.window) { gnt_widget_destroy(wm->_list.window); } + ensure_normal_mode(wm); gnt_ws_hide(wm->cws, wm->nodes); wm->cws = s; gnt_ws_show(wm->cws, wm->nodes);
--- a/pidgin/gtkblist.c Fri Nov 23 19:41:44 2007 +0000 +++ b/pidgin/gtkblist.c Fri Nov 23 19:42:47 2007 +0000 @@ -4445,7 +4445,7 @@ GtkWidget *ret = NULL; /* XXX: Workaround for the currently incomplete implementation of PidginScrollBook */ if (PIDGIN_IS_SCROLL_BOOK(container)) - container = PIDGIN_SCROLL_BOOK(container)->notebook; + container = GTK_CONTAINER(PIDGIN_SCROLL_BOOK(container)->notebook); children = gtk_container_get_children(container); l = g_list_find_custom(children, account, (GCompareFunc) find_account_widget); if (l)
--- a/po/de.po Fri Nov 23 19:41:44 2007 +0000 +++ b/po/de.po Fri Nov 23 19:42:47 2007 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-17 16:16+0100\n" +"POT-Creation-Date: 2007-11-22 21:19+0100\n" "PO-Revision-Date: 2007-11-17 16:14+0100\n" "Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n" "Language-Team: Deutsch <de@li.org>\n" @@ -4301,6 +4301,9 @@ msgid "Connect server" msgstr "Verbindungsserver" +msgid "File transfer proxies" +msgstr "Proxys für Dateiübertragungen" + #, c-format msgid "%s has left the conversation." msgstr "%s hat das Gespräch verlassen."