aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-08-16 02:42:21 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-09-14 20:08:50 +0800
commitb3b0cf89b137018c50b42d4162c7a3dab195d626 (patch)
tree6545275265b70d3161ae5af2859dd55916702d6d
parent48ff38256c978f179276a3fc0b86ebb059eaf915 (diff)
downloadgsoc2013-evolution-b3b0cf89b137018c50b42d4162c7a3dab195d626.tar.gz
gsoc2013-evolution-b3b0cf89b137018c50b42d4162c7a3dab195d626.tar.zst
gsoc2013-evolution-b3b0cf89b137018c50b42d4162c7a3dab195d626.zip
Bug #655254 - Cropped Junk settings text
-rw-r--r--mail/mail-config.ui3
-rw-r--r--modules/mail/em-mailer-prefs.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 2f50f30cf2..49eda714c5 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 62d9377bc1..6d7322803b 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);