# HG changeset patch # User Elliott Sales de Andrade # Date 1338090952 0 # Node ID c0837c5cc7e5243715f7fb3cfda3cc3efcd3f21e # Parent fa666e7f747eedb6ecf0331896b5a6dbc4ea7a5f Remove backwards-compatibility vbox. diff -r fa666e7f747e -r c0837c5cc7e5 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Fri May 25 19:41:04 2012 +0000 +++ b/pidgin/gtkblist.c Sun May 27 03:55:52 2012 +0000 @@ -6059,19 +6059,10 @@ gtkblist->scrollbook = pidgin_scroll_book_new(); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->scrollbook, FALSE, FALSE, 0); - /* Create an vbox which holds the scrollbook which is actually used to - * display connection errors. The vbox needs to still exist for - * backwards compatibility. - */ - gtkblist->error_buttons = gtk_vbox_new(FALSE, 0); - 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(pidgin_scroll_book_new()); - gtk_box_pack_start(GTK_BOX(gtkblist->error_buttons), + gtk_box_pack_start(GTK_BOX(gtkblist->vbox), GTK_WIDGET(priv->error_scrollbook), FALSE, FALSE, 0); - /* Add the statusbox */ gtkblist->statusbox = pidgin_status_box_new(); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0); diff -r fa666e7f747e -r c0837c5cc7e5 pidgin/gtkblist.h --- a/pidgin/gtkblist.h Fri May 25 19:41:04 2012 +0000 +++ b/pidgin/gtkblist.h Sun May 27 03:55:52 2012 +0000 @@ -116,7 +116,6 @@ GDestroyNotify headline_destroy; /**< Callback to use for destroying the headline-data */ gboolean changing_style; /**< True when changing GTK+ theme style */ - GtkWidget *error_buttons; /**< Box containing the connection error buttons */ GtkWidget *statusbox; /**< The status selector dropdown */ GdkPixbuf *empty_avatar; /**< A 32x32 transparent pixbuf */