changeset 32659:50f4d84e0660

Fix some changes for the scrollable stuff.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 14 Mar 2011 06:41:44 +0000
parents ea07a6230b57
children 1c1317a2d471
files pidgin/gtkplugin.c pidgin/gtkutils.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkplugin.c	Mon Mar 14 06:09:47 2011 +0000
+++ b/pidgin/gtkplugin.c	Mon Mar 14 06:41:44 2011 +0000
@@ -776,7 +776,7 @@
 	gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col);
 	gtk_tree_view_column_set_sort_column_id(col, 1);
 	g_object_unref(G_OBJECT(ls));
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(plugin_dialog)->vbox), 
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(plugin_dialog))), 
 		pidgin_make_scrollable(event_view, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, -1), 
 		TRUE, TRUE, 0);
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(event_view), 1);
--- a/pidgin/gtkutils.c	Mon Mar 14 06:09:47 2011 +0000
+++ b/pidgin/gtkutils.c	Mon Mar 14 06:41:44 2011 +0000
@@ -3433,7 +3433,7 @@
 		if (width != -1 || height != -1)
 			gtk_widget_set_size_request(sw, width, height);
 		if (child) {
-			if (GTK_WIDGET_GET_CLASS(child)->set_scroll_adjustments_signal)
+			if (GTK_IS_SCROLLABLE(child))
 				gtk_container_add(GTK_CONTAINER(sw), child);
 			else
 				gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), child);