im.pidgin.pidgin: c8b1856cef843f416d9ecf13198f232fe7ba741b

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: c8b1856cef843f416d9ecf13198f232fe7ba741b
Ancestor: eeae2261ffb1dccbc44c10b02a7e95db57406bd9
Author: resiak at soc.pidgin.im
Date: 2007-11-14T12:26:52
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

Remove account error dialogs from the scrollbook's notebook, not from the
scrollbook.  (I think the scrollbook's GtkContainer implementation is faulty.)
Stops a bug where network_error mini-dialogs proliferate whenever you
auto-reconnect, which datallah noticed.

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	22dd3953c0b4087dbe33466e0a1bf9b4f88772e3
+++ pidgin/gtkblist.c	4cfa7748e1b21324624d62dcbf99415711268fe2
@@ -110,13 +110,13 @@ typedef struct
 
 typedef struct
 {
-	/** PidginScrollBook used to hold error minidialogs.  Gets packed
-	 * inside PidginBuddyList.error_buttons
+	/** Used to hold error minidialogs.  Gets packed
+	 *  inside PidginBuddyList.error_buttons
 	 */
-	GtkWidget *error_scrollbook;
+	PidginScrollBook *error_scrollbook;
 
 	/** Pointer to the mini-dialog about having signed on elsewhere, if one
-	 * is showing; @c NULL otherwise.
+	 *  is showing; @c NULL otherwise.
 	 */
 	PidginMiniDialog *signed_on_elsewhere;
 } PidginBuddyListPrivate;
@@ -4538,8 +4538,8 @@ remove_generic_error_dialog(PurpleAccoun
 remove_generic_error_dialog(PurpleAccount *account)
 {
 	PidginBuddyListPrivate *priv = PIDGIN_BUDDY_LIST_GET_PRIVATE(gtkblist);
-	remove_child_widget_by_account(GTK_CONTAINER(priv->error_scrollbook),
-		account);
+	remove_child_widget_by_account(
+		GTK_CONTAINER(priv->error_scrollbook->notebook), account);
 }
 
 
@@ -5230,9 +5230,9 @@ static void pidgin_blist_show(PurpleBudd
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->error_buttons, FALSE, FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(gtkblist->error_buttons), 0);
 
-	priv->error_scrollbook = pidgin_scroll_book_new();
+	priv->error_scrollbook = PIDGIN_SCROLL_BOOK(pidgin_scroll_book_new());
 	gtk_box_pack_start(GTK_BOX(gtkblist->error_buttons),
-		priv->error_scrollbook, FALSE, FALSE, 0);
+		GTK_WIDGET(priv->error_scrollbook), FALSE, FALSE, 0);
 
 
 	/* Add the statusbox */