[evolution] Bug #655254 - Cropped Junk settings text

[Milan Crha <mcrha src gnome org>]

commit 4296c1b0c5c1a011ad3751280eeead92a045c635
Author: Milan Crha <mcrha redhat com>
Date:   Mon Aug 15 20:42:21 2011 +0200

    Bug #655254 - Cropped Junk settings text

 mail/mail-config.ui            |    3 +--
 modules/mail/em-mailer-prefs.c |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 2f50f30..49eda71 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -2868,7 +2868,6 @@ for display purposes only. </property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">12</property>
-            <property name="resize_mode">immediate</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkVBox" id="junk-general-section">
@@ -2900,7 +2899,7 @@ for display purposes only. </property>
                       <object class="GtkTable" id="junk-general-table">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_rows">8</property>
+                        <property name="n_rows">7</property>
                         <property name="row_spacing">3</property>
                         <child>
                           <object class="GtkCheckButton" id="chkCheckIncomingMail">
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 62d9377..6d73228 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -1054,12 +1054,11 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		G_BINDING_SYNC_CREATE);
 
 	widget = e_builder_get_widget (prefs->builder, "junk_empty_combobox");
+	emmp_empty_junk_init (prefs, GTK_COMBO_BOX (widget));
 	g_object_bind_property (
 		shell_settings, "mail-empty-junk-on-exit",
 		widget, "sensitive",
-		G_BINDING_BIDIRECTIONAL |
 		G_BINDING_SYNC_CREATE);
-	emmp_empty_junk_init (prefs, GTK_COMBO_BOX (widget));
 
 	widget = e_builder_get_widget (prefs->builder, "junk-module-options");
 	e_mail_junk_options_set_session (E_MAIL_JUNK_OPTIONS (widget), session);