diff options
| -rw-r--r-- | mail/mail-config.ui | 204 | ||||
| -rw-r--r-- | modules/mail/em-mailer-prefs.c | 92 |
2 files changed, 0 insertions, 296 deletions
diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 4718aa601e..ad460db217 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -3047,173 +3047,6 @@ For example: "Work" or "Personal"</property> <property name="visible">True</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hboxReadTimeout"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="chkMarkTimeout"> - <property name="label" translatable="yes">_Mark messages as read after</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinMarkTimeout"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - <property name="climb_rate">1</property> - <property name="digits">1</property> - <property name="numeric">True</property> - <property name="update_policy">if-valid</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblSeconds"> - <property name="visible">True</property> - <property name="label" translatable="yes">seconds</property> - <property name="justify">center</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hboxMailSizeLimit"> - <property name="visible">True</property> - <property name="spacing">4</property> - <child> - <object class="GtkCheckButton" id="mlimit_checkbutton"> - <property name="label" translatable="yes">Do not display messages when text si_ze exceeds</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="mlimit_spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment2</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label585"> - <property name="visible">True</property> - <property name="label" translatable="yes">KB</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hboxShrinkAddresses"> - <property name="visible">True</property> - <child> - <object class="GtkCheckButton" id="address_checkbox"> - <property name="label" translatable="yes" comments="Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number">_Shrink To / Cc / Bcc headers to </property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="address_spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment3</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">2</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label584"> - <property name="visible">True</property> - <property name="label" translatable="yes" comments="Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number">addresses</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">2</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="magic_spacebar_checkbox"> - <property name="label" translatable="yes">Enable Magic S_pacebar</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> <object class="GtkHBox" id="hboxHighlightColor"> <property name="visible">True</property> <property name="spacing">6</property> @@ -3289,43 +3122,6 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hboxEnableSearchFolders"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="chkEnableSearchFolders"> - <property name="label" translatable="yes">Enable Sea_rch Folders</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblEnableSFRestart"> - <property name="visible">True</property> - <property name="label" translatable="yes">(Note: Requires restart of the application)</property> - <property name="justify">center</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">6</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="view-check"> <property name="label" translatable="yes">Apply the same _view settings to all folders</property> <property name="visible">True</property> diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index ecc794ebf6..944c007007 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -131,34 +131,6 @@ em_mailer_prefs_init (EMMailerPrefs *preferences) preferences->gconf = mail_config_get_gconf_client (); } -static gboolean -mark_seen_timeout_transform (const GValue *src_value, - GValue *dst_value, - gpointer user_data) -{ - gdouble v_double; - - /* Shell Settings (gint) -> Spin Button (double) */ - v_double = (gdouble) g_value_get_int (src_value); - g_value_set_double (dst_value, v_double / 1000.0); - - return TRUE; -} - -static gboolean -mark_seen_timeout_reverse_transform (const GValue *src_value, - GValue *dst_value, - gpointer user_data) -{ - gdouble v_double; - - /* Spin Button (double) -> Shell Settings (gint) */ - v_double = g_value_get_double (src_value); - g_value_set_int (dst_value, v_double * 1000); - - return TRUE; -} - enum { JH_LIST_COLUMN_NAME, JH_LIST_COLUMN_VALUE @@ -847,56 +819,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, /* General tab */ /* Message Display */ - widget = e_builder_get_widget (prefs->builder, "chkMarkTimeout"); - e_mutual_binding_new ( - shell_settings, "mail-mark-seen", - widget, "active"); - - /* The "mark seen" timeout requires special transform functions - * because we display the timeout value to the user in seconds - * but store the settings value in milliseconds. */ - widget = e_builder_get_widget (prefs->builder, "spinMarkTimeout"); - prefs->timeout = GTK_SPIN_BUTTON (widget); - e_mutual_binding_new ( - shell_settings, "mail-mark-seen", - widget, "sensitive"); - e_mutual_binding_new_full ( - shell_settings, "mail-mark-seen-timeout", - widget, "value", - mark_seen_timeout_transform, - mark_seen_timeout_reverse_transform, - NULL, NULL); - - widget = e_builder_get_widget (prefs->builder, "mlimit_checkbutton"); - e_mutual_binding_new ( - shell_settings, "mail-force-message-limit", - widget, "active"); - - widget = e_builder_get_widget (prefs->builder, "mlimit_spin"); - e_mutual_binding_new ( - shell_settings, "mail-force-message-limit", - widget, "sensitive"); - e_mutual_binding_new ( - shell_settings, "mail-message-text-part-limit", - widget, "value"); - - widget = e_builder_get_widget (prefs->builder, "address_checkbox"); - e_mutual_binding_new ( - shell_settings, "mail-address-compress", - widget, "active"); - - widget = e_builder_get_widget (prefs->builder, "address_spin"); - e_mutual_binding_new ( - shell_settings, "mail-address-compress", - widget, "sensitive"); - e_mutual_binding_new ( - shell_settings, "mail-address-count", - widget, "value"); - - widget = e_builder_get_widget (prefs->builder, "magic_spacebar_checkbox"); - e_mutual_binding_new ( - shell_settings, "mail-magic-spacebar", - widget, "active"); widget = e_builder_get_widget (prefs->builder, "view-check"); e_mutual_binding_new ( @@ -927,11 +849,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, e_binding_transform_color_to_string, NULL, NULL); - widget = e_builder_get_widget (prefs->builder, "chkEnableSearchFolders"); - e_mutual_binding_new ( - shell_settings, "mail-enable-search-folders", - widget, "active"); - /* Deleting Mail */ widget = e_builder_get_widget (prefs->builder, "chkEmptyTrashOnExit"); e_mutual_binding_new ( @@ -1196,15 +1113,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, g_signal_connect (G_OBJECT (prefs->junk_header_add), "clicked", G_CALLBACK (jh_add_cb), prefs); g_signal_connect (G_OBJECT (prefs->junk_header_remove), "clicked", G_CALLBACK (jh_remove_cb), prefs); - /* Sanitize the dialog for Express mode */ - e_shell_hide_widgets_for_express_mode (shell, prefs->builder, - "hboxReadTimeout", - "hboxMailSizeLimit", - "hboxShrinkAddresses", - "magic_spacebar_checkbox", - "hboxEnableSearchFolders", - NULL); - /* get our toplevel widget */ target = em_config_target_new_prefs (ec, prefs->gconf); e_config_set_target ((EConfig *)ec, (EConfigTarget *)target); |