[evolution] Bug #661885 - Disable horizontal scrolling in filter rule editor

[Milan Crha <mcrha src gnome org>]

commit e53a866afa08085048db5940a3b3175ed52c4f93
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jan 2 18:52:07 2012 +0100

    Bug #661885 - Disable horizontal scrolling in filter rule editor

 filter/e-filter-rule.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index f40f3b3..09172f8 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -644,6 +644,15 @@ filter_rule_copy (EFilterRule *dest,
 	}
 }
 
+static void
+ensure_scrolled_width_cb (GtkAdjustment *adj,
+			  GParamSpec *param_spec,
+			  GtkScrolledWindow *scrolled_window)
+{
+	gtk_scrolled_window_set_min_content_width (scrolled_window,
+		gtk_adjustment_get_upper (adj));
+}
+
 static GtkWidget *
 filter_rule_get_widget (EFilterRule *rule,
                         ERuleContext *context)
@@ -816,9 +825,11 @@ filter_rule_get_widget (EFilterRule *rule,
 	vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0));
 	scrolledwindow = gtk_scrolled_window_new (hadj, vadj);
 
+	g_signal_connect (hadj, "notify::upper", G_CALLBACK (ensure_scrolled_width_cb), scrolledwindow);
+
 	gtk_scrolled_window_set_policy (
 		GTK_SCROLLED_WINDOW (scrolledwindow),
-		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+		GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
 	gtk_scrolled_window_add_with_viewport (
 		GTK_SCROLLED_WINDOW (scrolledwindow), parts);