diff options
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 19 | ||||
| -rw-r--r-- | widgets/misc/e-signature-editor.c | 48 | ||||
| -rw-r--r-- | widgets/misc/e-signature-editor.h | 5 | ||||
| -rw-r--r-- | widgets/misc/e-signature-manager.c | 2 |
4 files changed, 8 insertions, 66 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 2633b72e4e..43a4cf5789 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -40,7 +40,6 @@ #include <composer/e-msg-composer.h> #include <widgets/misc/e-preferences-window.h> -#include <widgets/misc/e-signature-editor.h> #include <widgets/misc/e-web-view.h> #include <libemail-engine/e-mail-folder-utils.h> @@ -364,6 +363,7 @@ mail_shell_backend_window_added_cb (GtkApplication *application, /* This applies to both the composer and signature editor. */ if (GTKHTML_IS_EDITOR (window)) { + EShellSettings *shell_settings; GList *spell_languages; gboolean active = TRUE; @@ -372,19 +372,14 @@ mail_shell_backend_window_added_cb (GtkApplication *application, GTKHTML_EDITOR (window), spell_languages); g_list_free (spell_languages); - if (!E_IS_SIGNATURE_EDITOR (window) || - !e_signature_editor_get_editing_old (E_SIGNATURE_EDITOR (window))) { - EShellSettings *shell_settings; + shell_settings = e_shell_get_shell_settings (shell); - shell_settings = e_shell_get_shell_settings (shell); + /* Express mode does not honor this setting. */ + if (!e_shell_get_express_mode (shell)) + active = e_shell_settings_get_boolean ( + shell_settings, "composer-format-html"); - /* Express mode does not honor this setting. */ - if (!e_shell_get_express_mode (shell)) - active = e_shell_settings_get_boolean ( - shell_settings, "composer-format-html"); - - gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); - } + gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); } if (E_IS_MSG_COMPOSER (window)) { diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c index ce181138ec..0ddfb8d513 100644 --- a/widgets/misc/e-signature-editor.c +++ b/widgets/misc/e-signature-editor.c @@ -40,8 +40,7 @@ enum { PROP_0, PROP_FOCUS_TRACKER, - PROP_SIGNATURE, - PROP_EDITING_OLD + PROP_SIGNATURE }; struct _ESignatureEditorPrivate { @@ -50,7 +49,6 @@ struct _ESignatureEditorPrivate { ESignature *signature; GtkWidget *entry; gchar *original_name; - gboolean editing_old; }; static const gchar *ui = @@ -256,12 +254,6 @@ signature_editor_set_property (GObject *object, E_SIGNATURE_EDITOR (object), g_value_get_object (value)); return; - - case PROP_EDITING_OLD: - e_signature_editor_set_editing_old ( - E_SIGNATURE_EDITOR (object), - g_value_get_boolean (value)); - return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -285,12 +277,6 @@ signature_editor_get_property (GObject *object, value, e_signature_editor_get_signature ( E_SIGNATURE_EDITOR (object))); return; - - case PROP_EDITING_OLD: - g_value_set_boolean ( - value, e_signature_editor_get_editing_old ( - E_SIGNATURE_EDITOR (object))); - return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -403,16 +389,6 @@ e_signature_editor_class_init (ESignatureEditorClass *class) NULL, E_TYPE_SIGNATURE, G_PARAM_READWRITE)); - - g_object_class_install_property ( - object_class, - PROP_EDITING_OLD, - g_param_spec_boolean ( - "editing-old", - NULL, - NULL, - FALSE, - G_PARAM_READWRITE)); } static void @@ -609,25 +585,3 @@ exit: g_object_notify (G_OBJECT (editor), "signature"); } - -void -e_signature_editor_set_editing_old (ESignatureEditor *editor, - gboolean editing_old) -{ - g_return_if_fail (E_IS_SIGNATURE_EDITOR (editor)); - - if (editor->priv->editing_old == editing_old) - return; - - editor->priv->editing_old = editing_old; - - g_object_notify (G_OBJECT (editor), "editing-old"); -} - -gboolean -e_signature_editor_get_editing_old (ESignatureEditor *editor) -{ - g_return_val_if_fail (E_IS_SIGNATURE_EDITOR (editor), FALSE); - - return editor->priv->editing_old; -} diff --git a/widgets/misc/e-signature-editor.h b/widgets/misc/e-signature-editor.h index f848e89fbf..0d07cb840e 100644 --- a/widgets/misc/e-signature-editor.h +++ b/widgets/misc/e-signature-editor.h @@ -67,11 +67,6 @@ EFocusTracker * e_signature_editor_get_focus_tracker ESignature * e_signature_editor_get_signature (ESignatureEditor *editor); void e_signature_editor_set_signature (ESignatureEditor *editor, ESignature *signature); -void e_signature_editor_set_editing_old - (ESignatureEditor *editor, - gboolean editing_old); -gboolean e_signature_editor_get_editing_old - (ESignatureEditor *editor); G_END_DECLS diff --git a/widgets/misc/e-signature-manager.c b/widgets/misc/e-signature-manager.c index 888a9df3c4..eb68dd251d 100644 --- a/widgets/misc/e-signature-manager.c +++ b/widgets/misc/e-signature-manager.c @@ -378,8 +378,6 @@ signature_manager_edit_signature (ESignatureManager *manager) editor = e_signature_editor_new (); e_signature_editor_set_signature ( E_SIGNATURE_EDITOR (editor), signature); - e_signature_editor_set_editing_old ( - E_SIGNATURE_EDITOR (editor), TRUE); signature_manager_emit_editor_created (manager, editor); goto exit; |