# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1195790783 0
# Node ID 512785bd7fcb0182d5fcba44d0b651150547b9ca
# Parent  6f6f8af235ebb058f4de280f73ec96fdcce2968d# Parent  63e54b7c73faef9fa5562474753e8e083feca2d7
merge of '2a30e00005809366a1e544824043c204cd66c1a1'
     and 'd8f84687e4066b00b1340586932f7d23d430579c'

diff -r 6f6f8af235eb -r 512785bd7fcb pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Fri Nov 23 04:04:33 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Nov 23 04:06:23 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)
diff -r 6f6f8af235eb -r 512785bd7fcb po/de.po
--- a/po/de.po	Fri Nov 23 04:04:33 2007 +0000
+++ b/po/de.po	Fri Nov 23 04:06:23 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."