/pidgin/main: 115560993ff5: Make the plugin preferences frame sc...

Daniel Atallah datallah at pidgin.im
Sat Nov 1 01:32:59 EDT 2014


Changeset: 115560993ff51e0339514b7c0d22ed0d2f4f127d
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2014-11-01 01:32 -0400
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/115560993ff5

Description:

Make the plugin preferences frame scrollable

 * this prevents the dialog from getting out of had when plugins do weird things

diffstat:

 pidgin/gtkplugin.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (25 lines):

diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
--- a/pidgin/gtkplugin.c
+++ b/pidgin/gtkplugin.c
@@ -527,7 +527,9 @@ static void plugin_dialog_response_cb(Gt
 		g_hash_table_insert(plugin_pref_dialogs, plug, dialog);
 
 		g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(pref_dialog_response_cb), plug);
-		gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), box);
+		gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),
+				pidgin_make_scrollable(box, GTK_POLICY_AUTOMATIC,
+						GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, 400, 400));
 		gtk_window_set_role(GTK_WINDOW(dialog), "plugin_config");
 		gtk_window_set_title(GTK_WINDOW(dialog), _(purple_plugin_get_name(plug)));
 		gtk_widget_show_all(dialog);
@@ -772,8 +774,8 @@ void pidgin_plugin_dialog_show()
 	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), 
-		pidgin_make_scrollable(event_view, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, -1), 
+	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(plugin_dialog)->vbox),
+		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);
 	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(event_view),



More information about the Commits mailing list