pidgin: 99739b01: Remove backwards-compatibility vbox.

qulogic at pidgin.im qulogic at pidgin.im
Sun May 27 00:35:07 EDT 2012


----------------------------------------------------------------------
Revision: 99739b011f36e9d78efbf63334b90d59bd14a111
Parent:   4be4f8f4223a546687a2bde65fc9163f7c0f9dea
Author:   qulogic at pidgin.im
Date:     05/26/12 23:55:52
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/99739b011f36e9d78efbf63334b90d59bd14a111

Changelog: 

Remove backwards-compatibility vbox.

Changes against parent 4be4f8f4223a546687a2bde65fc9163f7c0f9dea

  patched  pidgin/gtkblist.c
  patched  pidgin/gtkblist.h

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	1e3b973df803e12045403ba32bf82376a5bb18a1
+++ pidgin/gtkblist.c	6f0d5519573aa7d51900571794c1a5ed44512239
@@ -6059,19 +6059,10 @@ static void pidgin_blist_show(PurpleBudd
 	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);
============================================================
--- pidgin/gtkblist.h	488786b7b67c9a5a1c73af89940d65c9d842fc0a
+++ pidgin/gtkblist.h	e707ea970f489d09f6d9f076b1cb1d3b4eb0d180
@@ -116,7 +116,6 @@ struct _PidginBuddyList {
 	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 */
 


More information about the Commits mailing list