--- a/pidgin/gtkblist.c Wed May 30 22:05:28 2012 +0000
+++ b/pidgin/gtkblist.c Sat Jun 02 02:39:29 2012 +0000
@@ -5958,8 +5958,6 @@
NULL);
gtk_widget_set_name(gtkblist->headline_hbox, "gtk-tooltips");
- gtkblist->headline_close = gtk_widget_render_icon(ebox, GTK_STOCK_CLOSE,
- gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC), NULL);
gtkblist->hand_cursor = gdk_cursor_new (GDK_HAND2);
gtkblist->arrow_cursor = gdk_cursor_new (GDK_LEFT_PTR);
@@ -6066,19 +6064,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);
@@ -6963,9 +6952,6 @@
purple_signals_disconnect_by_handle(gtkblist);
- if (gtkblist->headline_close)
- g_object_unref(G_OBJECT(gtkblist->headline_close));
-
gtk_widget_destroy(gtkblist->window);
pidgin_blist_tooltip_destroy();
