[evolution/wip/webkit-composer: 149/372] Convert EEditorWidget::Mode property to boolean
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 149/372] Convert EEditorWidget::Mode property to boolean
- Date: Thu, 6 Feb 2014 11:36:02 +0000 (UTC)
commit f5b870122510475bc9a213f7e5c54fa6bb29622a
Author: Dan Vrátil <dvratil redhat com>
Date: Sun Nov 4 18:22:27 2012 +0100
Convert EEditorWidget::Mode property to boolean
composer/e-composer-actions.c | 2 +-
composer/e-composer-private.c | 8 +-
composer/e-msg-composer.c | 368 +++++++++++++++++++++++------------
e-util/e-editor-actions.c | 20 +-
e-util/e-editor-widget.c | 64 +++---
e-util/e-editor-widget.h | 12 +-
e-util/e-mail-signature-editor.c | 7 +-
e-util/e-mail-signature-manager.c | 6 +-
e-util/test-editor.c | 6 +-
mail/em-composer-utils.c | 4 +-
modules/mail/e-mail-shell-backend.c | 6 +-
11 files changed, 297 insertions(+), 206 deletions(-)
---
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index db4e75a..ac429dd 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -509,7 +509,7 @@ e_composer_actions_init (EMsgComposer *composer)
ACTION (SAVE_DRAFT), "short-label", _("Save Draft"), NULL);
g_object_bind_property (
- editor_widget, "mode",
+ editor_widget, "html-mode",
ACTION (PICTURE_GALLERY), "sensitive",
G_BINDING_SYNC_CREATE);
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 94d4e93..702ecca 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -66,16 +66,16 @@ composer_update_gallery_visibility (EMsgComposer *composer)
EEditorWidget *editor_widget;
GtkToggleAction *toggle_action;
gboolean gallery_active;
- EEditorWidgetMode mode;
+ gboolean is_html;
editor = e_editor_window_get_editor (E_EDITOR_WINDOW (composer));
editor_widget = e_editor_get_editor_widget (editor);
- mode = e_editor_widget_get_mode (editor_widget);
+ is_html = e_editor_widget_get_html_mode (editor_widget);
toggle_action = GTK_TOGGLE_ACTION (ACTION (PICTURE_GALLERY));
gallery_active = gtk_toggle_action_get_active (toggle_action);
- if ((mode == E_EDITOR_WIDGET_MODE_HTML) && gallery_active) {
+ if (is_html && gallery_active) {
gtk_widget_show (composer->priv->gallery_scrolled_window);
gtk_widget_show (composer->priv->gallery_icon_view);
} else {
@@ -556,7 +556,7 @@ e_composer_paste_image (EMsgComposer *composer,
* In text mode, add the image to the attachment store. */
editor = e_editor_window_get_editor (E_EDITOR_WINDOW (composer));
editor_widget = e_editor_get_editor_widget (editor);
- if (e_editor_widget_get_mode (editor_widget) == E_EDITOR_WIDGET_MODE_HTML) {
+ if (e_editor_widget_get_html_mode (editor_widget)) {
EEditorSelection *selection;
selection = e_editor_widget_get_selection (editor_widget);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6f50c2e..8d166eb 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -250,9 +250,9 @@ emcu_part_to_html (EMsgComposer *composer,
g_object_unref (mem);
text = (gchar *) buf->data;
- if (len)
+ if (len) {
*len = buf->len - 1;
-
+ }
g_byte_array_free (buf, FALSE);
return text;
@@ -264,12 +264,15 @@ emcu_remove_xevolution_headers (CamelMimeMessage *message)
{
struct _camel_header_raw *scan, *list = NULL;
- for (scan = ((CamelMimePart *) message)->headers; scan; scan = scan->next)
- if (!strncmp (scan->name, "X-Evolution", 11))
+ for (scan = ((CamelMimePart *) message)->headers; scan; scan = scan->next) {
+ if (!strncmp (scan->name, "X-Evolution", 11)) {
camel_header_raw_append (&list, scan->name, scan->value, scan->offset);
+ }
+ }
- for (scan = list; scan; scan = scan->next)
+ for (scan = list; scan; scan = scan->next) {
camel_medium_remove_header ((CamelMedium *) message, scan->name);
+ }
return list;
}
@@ -281,11 +284,13 @@ destination_list_to_vector_sized (GList *list,
EDestination **destv;
gint i = 0;
- if (n == -1)
+ if (n == -1) {
n = g_list_length (list);
+ }
- if (n == 0)
+ if (n == 0) {
return NULL;
+ }
destv = g_new (EDestination *, n + 1);
while (list != NULL && i < n) {
@@ -314,18 +319,22 @@ text_requires_quoted_printable (const gchar *text,
const gchar *p;
gsize pos;
- if (!text)
+ if (!text) {
return FALSE;
+ }
- if (len == -1)
+ if (len == -1) {
len = strlen (text);
+ }
- if (len >= 5 && strncmp (text, "From ", 5) == 0)
+ if (len >= 5 && strncmp (text, "From ", 5) == 0) {
return TRUE;
+ }
for (p = text, pos = 0; pos + 6 <= len; pos++, p++) {
- if (*p == '\n' && strncmp (p + 1, "From ", 5) == 0)
+ if (*p == '\n' && strncmp (p + 1, "From ", 5) == 0) {
return TRUE;
+ }
}
return FALSE;
@@ -340,12 +349,14 @@ best_encoding (GByteArray *buf,
gint status, count = 0;
iconv_t cd;
- if (!charset)
+ if (!charset) {
return -1;
+ }
cd = camel_iconv_open (charset, "utf-8");
- if (cd == (iconv_t) -1)
+ if (cd == (iconv_t) -1) {
return -1;
+ }
in = (gchar *) buf->data;
inlen = buf->len;
@@ -354,23 +365,26 @@ best_encoding (GByteArray *buf,
outlen = sizeof (outbuf);
status = camel_iconv (cd, (const gchar **) &in, &inlen, &out, &outlen);
for (ch = out - 1; ch >= outbuf; ch--) {
- if ((guchar) *ch > 127)
+ if ((guchar) *ch > 127) {
count++;
+ }
}
} while (status == (gsize) -1 && errno == E2BIG);
camel_iconv_close (cd);
- if (status == (gsize) -1 || status > 0)
+ if (status == (gsize) -1 || status > 0) {
return -1;
+ }
if ((count == 0) && (buf->len < LINE_LEN) &&
!text_requires_quoted_printable (
- (const gchar *) buf->data, buf->len))
+ (const gchar *) buf->data, buf->len)) {
return CAMEL_TRANSFER_ENCODING_7BIT;
- else if (count <= buf->len * 0.17)
+ } else if (count <= buf->len * 0.17) {
return CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE;
- else
+ } else {
return CAMEL_TRANSFER_ENCODING_BASE64;
+ }
}
static gchar *
@@ -482,8 +496,9 @@ set_recipients_from_destv (CamelMimeMessage *msg,
seen_hidden_list = TRUE;
}
- if (camel_address_decode (CAMEL_ADDRESS (target), text_addr) <= 0)
+ if (camel_address_decode (CAMEL_ADDRESS (target), text_addr) <= 0) {
camel_internet_address_add (target, "", text_addr);
+ }
}
}
@@ -497,23 +512,26 @@ set_recipients_from_destv (CamelMimeMessage *msg,
seen_hidden_list = TRUE;
}
- if (camel_address_decode (CAMEL_ADDRESS (target), text_addr) <= 0)
+ if (camel_address_decode (CAMEL_ADDRESS (target), text_addr) <= 0) {
camel_internet_address_add (target, "", text_addr);
+ }
}
}
for (i = 0; bcc_destv != NULL && bcc_destv[i] != NULL; ++i) {
text_addr = e_destination_get_address (bcc_destv[i]);
if (text_addr && *text_addr) {
- if (camel_address_decode (CAMEL_ADDRESS (bcc_addr), text_addr) <= 0)
+ if (camel_address_decode (CAMEL_ADDRESS (bcc_addr), text_addr) <= 0) {
camel_internet_address_add (bcc_addr, "", text_addr);
+ }
}
}
- if (redirect)
+ if (redirect) {
header = CAMEL_RECIPIENT_TYPE_RESENT_TO;
- else
+ } else {
header = CAMEL_RECIPIENT_TYPE_TO;
+ }
if (camel_address_length (CAMEL_ADDRESS (to_addr)) > 0) {
camel_mime_message_set_recipients (msg, header, to_addr);
@@ -622,8 +640,9 @@ build_message_headers (EMsgComposer *composer,
addr = camel_internet_address_new ();
- if (camel_address_unformat (CAMEL_ADDRESS (addr), reply_to) > 0)
+ if (camel_address_unformat (CAMEL_ADDRESS (addr), reply_to) > 0) {
camel_mime_message_set_reply_to (message, addr);
+ }
g_object_unref (addr);
}
@@ -730,8 +749,9 @@ composer_build_message_pgp (AsyncContext *context,
gboolean encrypt_to_self;
/* Return silently if we're not signing or encrypting with PGP. */
- if (!context->pgp_sign && !context->pgp_encrypt)
+ if (!context->pgp_sign && !context->pgp_encrypt) {
return TRUE;
+ }
extension_name = E_SOURCE_EXTENSION_OPENPGP;
extension = e_source_get_extension (context->source, extension_name);
@@ -747,16 +767,18 @@ composer_build_message_pgp (AsyncContext *context,
CAMEL_MEDIUM (mime_part),
context->top_level_part);
- if (context->top_level_part == context->text_plain_part)
+ if (context->top_level_part == context->text_plain_part) {
camel_mime_part_set_encoding (
mime_part, context->plain_encoding);
+ }
g_object_unref (context->top_level_part);
context->top_level_part = NULL;
- if (pgp_key_id == NULL || *pgp_key_id == '\0')
+ if (pgp_key_id == NULL || *pgp_key_id == '\0') {
camel_internet_address_get (
context->from, 0, NULL, &pgp_key_id);
+ }
if (context->pgp_sign) {
CamelMimePart *npart;
@@ -793,10 +815,11 @@ composer_build_message_pgp (AsyncContext *context,
/* Check to see if we should encrypt to self.
* NB: Gets removed immediately after use. */
- if (encrypt_to_self && pgp_key_id != NULL)
+ if (encrypt_to_self && pgp_key_id != NULL) {
g_ptr_array_add (
context->recipients,
g_strdup (pgp_key_id));
+ }
cipher = camel_gpg_context_new (context->session);
camel_gpg_context_set_always_trust (
@@ -808,10 +831,11 @@ composer_build_message_pgp (AsyncContext *context,
g_object_unref (cipher);
- if (encrypt_to_self && pgp_key_id != NULL)
+ if (encrypt_to_self && pgp_key_id != NULL) {
g_ptr_array_set_size (
context->recipients,
context->recipients->len - 1);
+ }
g_object_unref (mime_part);
@@ -849,8 +873,9 @@ composer_build_message_smime (AsyncContext *context,
gboolean have_encryption_certificate;
/* Return silently if we're not signing or encrypting with S/MIME. */
- if (!context->smime_sign && !context->smime_encrypt)
+ if (!context->smime_sign && !context->smime_encrypt) {
return TRUE;
+ }
extension_name = E_SOURCE_EXTENSION_SMIME;
extension = e_source_get_extension (context->source, extension_name);
@@ -899,9 +924,10 @@ composer_build_message_smime (AsyncContext *context,
CAMEL_MEDIUM (mime_part),
context->top_level_part);
- if (context->top_level_part == context->text_plain_part)
+ if (context->top_level_part == context->text_plain_part) {
camel_mime_part_set_encoding (
mime_part, context->plain_encoding);
+ }
g_object_unref (context->top_level_part);
context->top_level_part = NULL;
@@ -950,10 +976,11 @@ composer_build_message_smime (AsyncContext *context,
/* Check to see if we should encrypt to self.
* NB: Gets removed immediately after use. */
- if (encrypt_to_self)
+ if (encrypt_to_self) {
g_ptr_array_add (
context->recipients, g_strdup (
encryption_certificate));
+ }
cipher = camel_smime_context_new (context->session);
camel_smime_context_set_encrypt_key (
@@ -971,10 +998,11 @@ composer_build_message_smime (AsyncContext *context,
if (!success)
return FALSE;
- if (encrypt_to_self)
+ if (encrypt_to_self) {
g_ptr_array_set_size (
context->recipients,
context->recipients->len - 1);
+ }
}
/* we replaced the message directly, we don't want to do reparenting foo */
@@ -1050,22 +1078,27 @@ composer_add_evolution_format_header (CamelMedium *medium,
string = g_string_sized_new (128);
- if (flags & COMPOSER_FLAG_HTML_CONTENT)
+ if (flags & COMPOSER_FLAG_HTML_CONTENT) {
g_string_append (string, "text/html");
- else
+ } else {
g_string_append (string, "text/plain");
+ }
- if (flags & COMPOSER_FLAG_PGP_SIGN)
+ if (flags & COMPOSER_FLAG_PGP_SIGN) {
g_string_append (string, ", pgp-sign");
+ }
- if (flags & COMPOSER_FLAG_PGP_ENCRYPT)
+ if (flags & COMPOSER_FLAG_PGP_ENCRYPT) {
g_string_append (string, ", pgp-encrypt");
+ }
- if (flags & COMPOSER_FLAG_SMIME_SIGN)
+ if (flags & COMPOSER_FLAG_SMIME_SIGN) {
g_string_append (string, ", smime-sign");
+ }
- if (flags & COMPOSER_FLAG_SMIME_ENCRYPT)
+ if (flags & COMPOSER_FLAG_SMIME_ENCRYPT) {
g_string_append (string, ", smime-encrypt");
+ }
camel_medium_add_header (
medium, "X-Evolution-Format", string->str);
@@ -1120,6 +1153,7 @@ composer_build_message (EMsgComposer *composer,
context->session = e_msg_composer_ref_session (composer);
context->from = e_msg_composer_get_from (composer);
+<<<<<<< HEAD
if ((flags & COMPOSER_FLAG_DRAFT) == 0) {
if ((flags & COMPOSER_FLAG_PGP_SIGN) != 0)
context->pgp_sign = TRUE;
@@ -1132,6 +1166,22 @@ composer_build_message (EMsgComposer *composer,
if ((flags & COMPOSER_FLAG_SMIME_ENCRYPT) != 0)
context->smime_encrypt = TRUE;
+=======
+ if (flags & COMPOSER_FLAG_PGP_SIGN) {
+ context->pgp_sign = TRUE;
+ }
+
+ if (flags & COMPOSER_FLAG_PGP_ENCRYPT) {
+ context->pgp_encrypt = TRUE;
+ }
+
+ if (flags & COMPOSER_FLAG_SMIME_SIGN) {
+ context->smime_sign = TRUE;
+ }
+
+ if (flags & COMPOSER_FLAG_SMIME_ENCRYPT) {
+ context->smime_encrypt = TRUE;
+>>>>>>> Convert EEditorWidget::Mode property to boolean
}
context->need_thread =
@@ -1180,19 +1230,22 @@ composer_build_message (EMsgComposer *composer,
const gchar *mdn_address;
mdn_address = e_source_mail_identity_get_reply_to (mi);
- if (mdn_address == NULL)
+ if (mdn_address == NULL) {
mdn_address = e_source_mail_identity_get_address (mi);
- if (mdn_address != NULL)
+ }
+ if (mdn_address != NULL) {
camel_medium_add_header (
CAMEL_MEDIUM (context->message),
"Disposition-Notification-To", mdn_address);
+ }
}
/* X-Priority */
- if (flags & COMPOSER_FLAG_PRIORITIZE_MESSAGE)
+ if (flags & COMPOSER_FLAG_PRIORITIZE_MESSAGE) {
camel_medium_add_header (
CAMEL_MEDIUM (context->message),
"X-Priority", "1");
+ }
/* Organization */
if (organization != NULL && *organization != '\0') {
@@ -1260,12 +1313,14 @@ composer_build_message (EMsgComposer *composer,
g_object_unref (mem_stream);
/* Convert the stream to the appropriate charset. */
- if (iconv_charset && g_ascii_strcasecmp (iconv_charset, "UTF-8") != 0)
+ if (iconv_charset && g_ascii_strcasecmp (iconv_charset, "UTF-8") != 0) {
composer_add_charset_filter (stream, iconv_charset);
+ }
/* Encode the stream to quoted-printable if necessary. */
- if (context->plain_encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE)
+ if (context->plain_encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE) {
composer_add_quoted_printable_filter (stream);
+ }
/* Construct the content object. This does not block since
* we're constructing the data wrapper from a memory stream. */
@@ -1277,8 +1332,9 @@ composer_build_message (EMsgComposer *composer,
context->text_plain_part = g_object_ref (context->top_level_part);
/* Avoid re-encoding the data when adding it to a MIME part. */
- if (context->plain_encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE)
+ if (context->plain_encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE) {
context->top_level_part->encoding = context->plain_encoding;
+ }
camel_data_wrapper_set_mime_type_field (
context->top_level_part, type);
@@ -1323,8 +1379,9 @@ composer_build_message (EMsgComposer *composer,
stream = camel_stream_filter_new (mem_stream);
g_object_unref (mem_stream);
- if (pre_encode)
+ if (pre_encode) {
composer_add_quoted_printable_filter (stream);
+ }
/* Construct the content object. This does not block since
* we're constructing the data wrapper from a memory stream. */
@@ -1337,9 +1394,10 @@ composer_build_message (EMsgComposer *composer,
html, "text/html; charset=utf-8");
/* Avoid re-encoding the data when adding it to a MIME part. */
- if (pre_encode)
+ if (pre_encode) {
html->encoding =
CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE;
+ }
/* Build the multipart/alternative */
body = camel_multipart_new ();
@@ -1410,9 +1468,10 @@ composer_build_message (EMsgComposer *composer,
camel_medium_set_content (
CAMEL_MEDIUM (part),
context->top_level_part);
- if (context->top_level_part == context->text_plain_part)
+ if (context->top_level_part == context->text_plain_part) {
camel_mime_part_set_encoding (
part, context->plain_encoding);
+ }
camel_multipart_add_part (multipart, part);
g_object_unref (part);
@@ -1424,13 +1483,14 @@ composer_build_message (EMsgComposer *composer,
}
/* Run any blocking operations in a separate thread. */
- if (context->need_thread)
+ if (context->need_thread) {
g_simple_async_result_run_in_thread (
simple, (GSimpleAsyncThreadFunc)
composer_build_message_thread,
io_priority, cancellable);
- else
+ } else {
g_simple_async_result_complete (simple);
+ }
g_object_unref (simple);
}
@@ -1450,20 +1510,23 @@ composer_build_message_finish (EMsgComposer *composer,
simple = G_SIMPLE_ASYNC_RESULT (result);
context = g_simple_async_result_get_op_res_gpointer (simple);
- if (g_simple_async_result_propagate_error (simple, error))
+ if (g_simple_async_result_propagate_error (simple, error)) {
return NULL;
+ }
/* Finalize some details before returning. */
- if (!context->skip_content)
+ if (!context->skip_content) {
camel_medium_set_content (
CAMEL_MEDIUM (context->message),
context->top_level_part);
+ }
- if (context->top_level_part == context->text_plain_part)
+ if (context->top_level_part == context->text_plain_part) {
camel_mime_part_set_encoding (
CAMEL_MIME_PART (context->message),
context->plain_encoding);
+ }
return g_object_ref (context->message);
}
@@ -1483,8 +1546,9 @@ use_top_signature (EMsgComposer *composer)
* signature placement is either there already, or pt it at the
* bottom regardless of a preferences (which is for reply anyway,
* not for Edit as new) */
- if (priv->is_from_message)
+ if (priv->is_from_message) {
return FALSE;
+ }
/* FIXME This should be an EMsgComposer property. */
settings = g_settings_new ("org.gnome.evolution.mail");
@@ -1544,8 +1608,9 @@ set_editor_text (EMsgComposer *composer,
editor_widget = e_editor_get_editor_widget (editor);
e_editor_widget_set_text_html (editor_widget, body);
- if (set_signature)
+ if (set_signature) {
e_composer_update_signature (composer);
+ }
g_free (body);
}
@@ -1574,8 +1639,9 @@ msg_composer_subject_changed_cb (EMsgComposer *composer)
table = e_msg_composer_get_header_table (composer);
subject = e_composer_header_table_get_subject (table);
- if (subject == NULL || *subject == '\0')
+ if (subject == NULL || *subject == '\0') {
subject = _("Compose Message");
+ }
gtk_window_set_title (GTK_WINDOW (composer), subject);
}
@@ -1602,8 +1668,9 @@ msg_composer_mail_identity_changed_cb (EMsgComposer *composer)
uid = e_composer_header_table_get_identity_uid (table);
/* Silently return if no identity is selected. */
- if (uid == NULL)
+ if (uid == NULL) {
return;
+ }
source = e_composer_header_table_ref_source (table, uid);
g_return_if_fail (source != NULL);
@@ -1659,11 +1726,9 @@ msg_composer_paste_clipboard_targets_cb (GtkClipboard *clipboard,
{
EEditor *editor;
EEditorWidget *editor_widget;
- EEditorWidgetMode mode;
editor = e_editor_window_get_editor (E_EDITOR_WINDOW (composer));
editor_widget = e_editor_get_editor_widget (editor);
- mode = e_editor_widget_get_mode (editor_widget);
/* Order is important here to ensure common use cases are
* handled correctly. See GNOME bug #603715 for details. */
@@ -1674,7 +1739,7 @@ msg_composer_paste_clipboard_targets_cb (GtkClipboard *clipboard,
}
/* Only paste HTML content in HTML mode. */
- if (mode == E_EDITOR_WIDGET_MODE_HTML) {
+ if (e_editor_widget_get_html_mode (editor_widget)) {
if (e_targets_include_html (targets, n_targets)) {
e_composer_paste_html (composer, clipboard);
return;
@@ -1771,25 +1836,25 @@ msg_composer_drag_data_received_cb (GtkWidget *widget,
EAttachmentView *view;
EEditor *editor;
EEditorWidget *editor_widget;
- EEditorWidgetMode mode;
editor = e_editor_window_get_editor (E_EDITOR_WINDOW (composer));
editor_widget = e_editor_get_editor_widget (editor);
- mode = e_editor_widget_get_mode (editor_widget);
/* HTML mode has a few special cases for drops... */
- if (mode == E_EDITOR_WIDGET_MODE_HTML) {
+ if (e_editor_widget_get_html_mode (editor_widget)) {
/* If we're receiving an image, we want the image to be
* inserted in the message body. Let GtkHtml handle it. */
- if (gtk_selection_data_targets_include_image (selection, TRUE))
+ if (gtk_selection_data_targets_include_image (selection, TRUE)) {
return;
+ }
/* If we're receiving URIs and -all- the URIs point to
* image files, we want the image(s) to be inserted in
* the message body. Let GtkHtml handle it. */
- if (e_composer_selection_is_image_uris (composer, selection))
+ if (e_composer_selection_is_image_uris (composer, selection)) {
return;
+ }
}
view = e_msg_composer_get_attachment_view (composer);
@@ -1828,8 +1893,9 @@ msg_composer_delete_event_cb (EMsgComposer *composer)
/* If the "async" action group is insensitive, it means an
* asynchronous operation is in progress. Block the event. */
- if (!gtk_action_group_get_sensitive (composer->priv->async_actions))
+ if (!gtk_action_group_get_sensitive (composer->priv->async_actions)) {
return TRUE;
+ }
application = GTK_APPLICATION (shell);
windows = gtk_application_get_windows (application);
@@ -1956,8 +2022,9 @@ msg_composer_gallery_drag_data_get (GtkIconView *icon_view,
GdkAtom target;
gchar *str_data;
- if (!gtk_icon_view_get_cursor (icon_view, &path, &cell))
+ if (!gtk_icon_view_get_cursor (icon_view, &path, &cell)) {
return;
+ }
target = gtk_selection_data_get_target (selection_data);
@@ -2312,24 +2379,27 @@ msg_composer_image_uri (EMsgComposer *composer,
hash_table = composer->priv->inline_images_by_url;
part = g_hash_table_lookup (hash_table, uri);
- if (part == NULL && g_str_has_prefix (uri, "file:"))
+ if (part == NULL && g_str_has_prefix (uri, "file:")) {
part = e_msg_composer_add_inline_image_from_file (
composer, uri + 5);
+ }
if (part == NULL && g_str_has_prefix (uri, "cid:")) {
hash_table = composer->priv->inline_images;
part = g_hash_table_lookup (hash_table, uri);
}
- if (part == NULL)
+ if (part == NULL) {
return NULL;
+ }
composer->priv->current_images =
g_list_prepend (composer->priv->current_images, part);
cid = camel_mime_part_get_content_id (part);
- if (cid == NULL)
+ if (cid == NULL) {
return NULL;
+ }
return g_strconcat ("cid:", cid, NULL);
}
@@ -2536,8 +2606,9 @@ e_msg_composer_flush_pending_body (EMsgComposer *composer)
body = g_object_get_data (G_OBJECT (composer), "body:text");
- if (body != NULL)
+ if (body != NULL) {
set_editor_text (composer, body, FALSE);
+ }
g_object_set_data (G_OBJECT (composer), "body:text", NULL);
}
@@ -2552,8 +2623,9 @@ add_attachments_handle_mime_part (EMsgComposer *composer,
CamelContentType *content_type;
CamelDataWrapper *wrapper;
- if (!mime_part)
+ if (!mime_part) {
return;
+ }
content_type = camel_mime_part_get_content_type (mime_part);
wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
@@ -2631,8 +2703,9 @@ e_msg_composer_add_message_attachments (EMsgComposer *composer,
CamelDataWrapper *wrapper;
wrapper = camel_medium_get_content (CAMEL_MEDIUM (message));
- if (!CAMEL_IS_MULTIPART (wrapper))
+ if (!CAMEL_IS_MULTIPART (wrapper)) {
return;
+ }
add_attachments_from_multipart (
composer, (CamelMultipart *) wrapper, just_inlines, 0);
@@ -2655,21 +2728,24 @@ handle_multipart_signed (EMsgComposer *composer,
content_type = camel_data_wrapper_get_mime_type_field (content);
protocol = camel_content_type_param (content_type, "protocol");
- if (protocol == NULL)
+ if (protocol == NULL) {
action = NULL;
- else if (g_ascii_strcasecmp (protocol, "application/pgp-signature") == 0)
+ } else if (g_ascii_strcasecmp (protocol, "application/pgp-signature") == 0) {
action = GTK_TOGGLE_ACTION (ACTION (PGP_SIGN));
- else if (g_ascii_strcasecmp (protocol, "application/x-pkcs7-signature") == 0)
+ } else if (g_ascii_strcasecmp (protocol, "application/x-pkcs7-signature") == 0) {
action = GTK_TOGGLE_ACTION (ACTION (SMIME_SIGN));
+ }
- if (action)
+ if (action) {
gtk_toggle_action_set_active (action, TRUE);
+ }
mime_part = camel_multipart_get_part (
multipart, CAMEL_MULTIPART_SIGNED_CONTENT);
- if (mime_part == NULL)
+ if (mime_part == NULL) {
return;
+ }
content_type = camel_mime_part_get_content_type (mime_part);
content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
@@ -2739,15 +2815,17 @@ handle_multipart_encrypted (EMsgComposer *composer,
content_type = camel_mime_part_get_content_type (multipart);
protocol = camel_content_type_param (content_type, "protocol");
- if (protocol && g_ascii_strcasecmp (protocol, "application/pgp-encrypted") == 0)
+ if (protocol && g_ascii_strcasecmp (protocol, "application/pgp-encrypted") == 0) {
action = GTK_TOGGLE_ACTION (ACTION (PGP_ENCRYPT));
- else if (content_type && (
+ } else if (content_type && (
camel_content_type_is (content_type, "application", "x-pkcs7-mime")
- || camel_content_type_is (content_type, "application", "pkcs7-mime")))
+ || camel_content_type_is (content_type, "application", "pkcs7-mime"))) {
action = GTK_TOGGLE_ACTION (ACTION (SMIME_ENCRYPT));
+ }
- if (action)
+ if (action) {
gtk_toggle_action_set_active (action, TRUE);
+ }
session = e_msg_composer_ref_session (composer);
cipher = camel_gpg_context_new (session);
@@ -2757,8 +2835,9 @@ handle_multipart_encrypted (EMsgComposer *composer,
g_object_unref (cipher);
g_object_unref (session);
- if (valid == NULL)
+ if (valid == NULL) {
return;
+ }
camel_cipher_validity_free (valid);
@@ -2834,8 +2913,9 @@ handle_multipart_alternative (EMsgComposer *composer,
mime_part = camel_multipart_get_part (multipart, i);
- if (!mime_part)
+ if (!mime_part) {
continue;
+ }
content_type = camel_mime_part_get_content_type (mime_part);
content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
@@ -2916,8 +2996,9 @@ handle_multipart (EMsgComposer *composer,
mime_part = camel_multipart_get_part (multipart, i);
- if (!mime_part)
+ if (!mime_part) {
continue;
+ }
content_type = camel_mime_part_get_content_type (mime_part);
content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
@@ -3220,12 +3301,17 @@ e_msg_composer_new_with_message (EShell *shell,
}
}
+<<<<<<< HEAD
Bccv = destination_list_to_vector (Bcc);
g_hash_table_destroy (auto_bcc);
g_list_free (Bcc);
if (source != NULL)
+=======
+ if (source != NULL) {
+>>>>>>> Convert EEditorWidget::Mode property to boolean
g_object_unref (source);
+ }
subject = camel_mime_message_get_subject (message);
@@ -3253,11 +3339,11 @@ e_msg_composer_new_with_message (EShell *shell,
flags = g_strsplit (format, ", ", 0);
for (i = 0; flags[i]; i++) {
if (g_ascii_strcasecmp (flags[i], "text/html") == 0) {
- e_editor_widget_set_mode (
- editor_widget, E_EDITOR_WIDGET_MODE_HTML);
+ e_editor_widget_set_html_mode (
+ editor_widget, TRUE);
} else if (g_ascii_strcasecmp (flags[i], "text/plain") == 0) {
- e_editor_widget_set_mode (
- editor_widget, E_EDITOR_WIDGET_MODE_PLAIN_TEXT);
+ e_editor_widget_set_html_mode (
+ editor_widget, FALSE);
} else if (g_ascii_strcasecmp (flags[i], "pgp-sign") == 0) {
action = GTK_TOGGLE_ACTION (ACTION (PGP_SIGN));
gtk_toggle_action_set_active (action, TRUE);
@@ -3641,10 +3727,9 @@ msg_composer_save_to_drafts_cb (EMsgComposer *composer,
g_object_unref (message);
- if (e_msg_composer_is_exiting (composer))
- g_object_weak_ref (
- G_OBJECT (context->activity),
- (GWeakNotify) gtk_widget_destroy, composer);
+ if (e_msg_composer_is_exiting (composer)) {
+ g_object_weak_ref (G_OBJECT (context->activity), (GWeakNotify) gtk_widget_destroy, composer);
+ }
async_context_free (context);
}
@@ -3752,8 +3837,9 @@ e_msg_composer_save_to_outbox (EMsgComposer *composer)
/* This gives the user a chance to abort the save. */
g_signal_emit (composer, signals[PRESEND], 0, &proceed_with_save);
- if (!proceed_with_save)
+ if (!proceed_with_save) {
return;
+ }
context = g_slice_new0 (AsyncContext);
context->activity = e_composer_activity_new (composer);
@@ -3886,8 +3972,9 @@ list_contains_addr (const GList *list,
g_return_val_if_fail (dest != NULL, FALSE);
while (list != NULL) {
- if (e_destination_equal (dest, list->data))
+ if (e_destination_equal (dest, list->data)) {
return TRUE;
+ }
list = list->next;
}
@@ -3952,8 +4039,9 @@ file_is_blacklisted (const gchar *argument)
filename = g_file_get_path (file);
g_object_unref (file);
- if (filename == NULL)
+ if (filename == NULL) {
return FALSE;
+ }
parts = g_strsplit (filename, G_DIR_SEPARATOR_S, -1);
n_parts = g_strv_length (parts);
@@ -3971,25 +4059,30 @@ file_is_blacklisted (const gchar *argument)
gchar *base_dir;
/* Don't blacklist files in trusted base directories. */
- if (g_str_has_prefix (filename, g_get_user_data_dir ()))
+ if (g_str_has_prefix (filename, g_get_user_data_dir ())) {
blacklisted = FALSE;
- if (g_str_has_prefix (filename, g_get_user_cache_dir ()))
+ }
+ if (g_str_has_prefix (filename, g_get_user_cache_dir ())) {
blacklisted = FALSE;
- if (g_str_has_prefix (filename, g_get_user_config_dir ()))
+ }
+ if (g_str_has_prefix (filename, g_get_user_config_dir ())) {
blacklisted = FALSE;
+ }
/* Apparently KDE still uses ~/.kde heavily, and some
* distributions use ~/.kde4 to distinguish KDE4 data
* from KDE3 data. Trust these directories as well. */
base_dir = g_build_filename (g_get_home_dir (), ".kde", NULL);
- if (g_str_has_prefix (filename, base_dir))
+ if (g_str_has_prefix (filename, base_dir)) {
blacklisted = FALSE;
+ }
g_free (base_dir);
base_dir = g_build_filename (g_get_home_dir (), ".kde4", NULL);
- if (g_str_has_prefix (filename, base_dir))
+ if (g_str_has_prefix (filename, base_dir)) {
blacklisted = FALSE;
+ }
g_free (base_dir);
}
@@ -4098,10 +4191,11 @@ handle_mailto (EMsgComposer *composer,
E_ALERT_SINK (composer),
"mail:blacklisted-file",
content, NULL);
- if (g_ascii_strncasecmp (content, "file:", 5) == 0)
+ if (g_ascii_strncasecmp (content, "file:", 5) == 0) {
attachment = e_attachment_new_for_uri (content);
- else
+ } else {
attachment = e_attachment_new_for_path (content);
+ }
e_attachment_store_add_attachment (store, attachment);
e_attachment_load_async (
attachment, (GAsyncReadyCallback)
@@ -4122,8 +4216,9 @@ handle_mailto (EMsgComposer *composer,
p += clen;
if (*p == '&') {
p++;
- if (!g_ascii_strncasecmp (p, "amp;", 4))
+ if (!g_ascii_strncasecmp (p, "amp;", 4)) {
p += 4;
+ }
}
}
}
@@ -4241,7 +4336,7 @@ e_msg_composer_set_body (EMsgComposer *composer,
set_editor_text (composer, buff, FALSE);
g_free (buff);
- e_editor_widget_set_mode (editor_widget, E_EDITOR_WIDGET_MODE_PLAIN_TEXT);
+ e_editor_widget_set_html_mode (editor_widget, FALSE);
webkit_web_view_set_editable (WEBKIT_WEB_VIEW (editor_widget), FALSE);
g_free (priv->mime_body);
@@ -4483,13 +4578,15 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
dec_file_name = g_strdup (filename);
camel_url_decode (dec_file_name);
- if (!g_file_test (dec_file_name, G_FILE_TEST_IS_REGULAR))
+ if (!g_file_test (dec_file_name, G_FILE_TEST_IS_REGULAR)) {
return NULL;
+ }
stream = camel_stream_fs_new_with_name (
dec_file_name, O_RDONLY, 0, NULL);
- if (!stream)
+ if (!stream) {
return NULL;
+ }
wrapper = camel_data_wrapper_new ();
camel_data_wrapper_construct_from_stream_sync (
@@ -4497,8 +4594,9 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
g_object_unref (CAMEL_OBJECT (stream));
mime_type = e_util_guess_mime_type (dec_file_name, TRUE);
- if (mime_type == NULL)
+ if (mime_type == NULL) {
mime_type = g_strdup ("application/octet-stream");
+ }
camel_data_wrapper_set_mime_type (wrapper, mime_type);
g_free (mime_type);
@@ -4552,10 +4650,11 @@ e_msg_composer_add_inline_image_from_mime_part (EMsgComposer *composer,
g_object_ref (part);
location = camel_mime_part_get_content_location (part);
- if (location != NULL)
+ if (location != NULL) {
g_hash_table_insert (
p->inline_images_by_url,
g_strdup (location), part);
+ }
}
static void
@@ -4568,9 +4667,10 @@ composer_get_message_ready (EMsgComposer *composer,
message = composer_build_message_finish (composer, result, &error);
- if (message != NULL)
+ if (message != NULL) {
g_simple_async_result_set_op_res_gpointer (
simple, message, (GDestroyNotify) g_object_unref);
+ }
if (error != NULL) {
g_warn_if_fail (message == NULL);
@@ -4614,33 +4714,40 @@ e_msg_composer_get_message (EMsgComposer *composer,
g_simple_async_result_set_check_cancellable (simple, cancellable);
- if (e_editor_widget_get_mode (editor_widget) == E_EDITOR_WIDGET_MODE_HTML)
+ if (e_editor_widget_get_html_mode (editor_widget)) {
flags |= COMPOSER_FLAG_HTML_CONTENT;
+ }
action = ACTION (PRIORITIZE_MESSAGE);
- if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
flags |= COMPOSER_FLAG_PRIORITIZE_MESSAGE;
+ }
action = ACTION (REQUEST_READ_RECEIPT);
- if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
flags |= COMPOSER_FLAG_REQUEST_READ_RECEIPT;
+ }
action = ACTION (PGP_SIGN);
- if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
flags |= COMPOSER_FLAG_PGP_SIGN;
+ }
action = ACTION (PGP_ENCRYPT);
- if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
flags |= COMPOSER_FLAG_PGP_ENCRYPT;
+ }
#ifdef HAVE_NSS
action = ACTION (SMIME_SIGN);
- if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
flags |= COMPOSER_FLAG_SMIME_SIGN;
+ }
action = ACTION (SMIME_ENCRYPT);
- if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
flags |= COMPOSER_FLAG_SMIME_ENCRYPT;
+ }
#endif
composer_build_message (
@@ -4665,8 +4772,9 @@ e_msg_composer_get_message_finish (EMsgComposer *composer,
simple = G_SIMPLE_ASYNC_RESULT (result);
message = g_simple_async_result_get_op_res_gpointer (simple);
- if (g_simple_async_result_propagate_error (simple, error))
+ if (g_simple_async_result_propagate_error (simple, error)) {
return NULL;
+ }
g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
@@ -4716,8 +4824,9 @@ e_msg_composer_get_message_print_finish (EMsgComposer *composer,
simple = G_SIMPLE_ASYNC_RESULT (result);
message = g_simple_async_result_get_op_res_gpointer (simple);
- if (g_simple_async_result_propagate_error (simple, error))
+ if (g_simple_async_result_propagate_error (simple, error)) {
return NULL;
+ }
g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
@@ -4747,8 +4856,9 @@ e_msg_composer_get_message_draft (EMsgComposer *composer,
editor = e_editor_window_get_editor (E_EDITOR_WINDOW (composer));
editor_widget = e_editor_get_editor_widget (editor);
- if (e_editor_widget_get_mode (editor_widget) == E_EDITOR_WIDGET_MODE_HTML)
+ if (e_editor_widget_get_html_mode (editor_widget)) {
flags |= COMPOSER_FLAG_HTML_CONTENT;
+ }
action = ACTION (PRIORITIZE_MESSAGE);
if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
@@ -4798,8 +4908,9 @@ e_msg_composer_get_message_draft_finish (EMsgComposer *composer,
simple = G_SIMPLE_ASYNC_RESULT (result);
message = g_simple_async_result_get_op_res_gpointer (simple);
- if (g_simple_async_result_propagate_error (simple, error))
+ if (g_simple_async_result_propagate_error (simple, error)) {
return NULL;
+ }
g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
@@ -4857,8 +4968,9 @@ e_msg_composer_get_reply_to (EMsgComposer *composer)
table = e_msg_composer_get_header_table (composer);
reply_to = e_composer_header_table_get_reply_to (table);
- if (reply_to == NULL || *reply_to == '\0')
+ if (reply_to == NULL || *reply_to == '\0') {
return NULL;
+ }
address = camel_internet_address_new ();
if (camel_address_unformat (CAMEL_ADDRESS (address), reply_to) == -1) {
@@ -4936,11 +5048,13 @@ e_msg_composer_can_close (EMsgComposer *composer,
/* this means that there is an async operation running,
* in which case the composer cannot be closed */
- if (!gtk_action_group_get_sensitive (composer->priv->async_actions))
+ if (!gtk_action_group_get_sensitive (composer->priv->async_actions)) {
return FALSE;
+ }
- if (!e_editor_widget_get_changed (editor_widget))
+ if (!e_editor_widget_get_changed (editor_widget)) {
return TRUE;
+ }
window = gtk_widget_get_window (widget);
gdk_window_raise (window);
@@ -4948,8 +5062,9 @@ e_msg_composer_can_close (EMsgComposer *composer,
table = e_msg_composer_get_header_table (composer);
subject = e_composer_header_table_get_subject (table);
- if (subject == NULL || *subject == '\0')
+ if (subject == NULL || *subject == '\0') {
subject = _("Untitled Message");
+ }
response = e_alert_run_dialog_for_args (
GTK_WINDOW (composer),
@@ -5039,9 +5154,10 @@ e_load_spell_languages (ESpellChecker *spell_checker)
ESpellDictionary *dict;
dict = e_spell_checker_lookup_dictionary (spell_checker, language_code);
- if (dict != NULL)
+ if (dict != NULL) {
spell_dicts = g_list_prepend (
spell_dicts, (gpointer) dict);
+ }
}
g_strfreev (strv);
diff --git a/e-util/e-editor-actions.c b/e-util/e-editor-actions.c
index 87ef70c..f9bf9db 100644
--- a/e-util/e-editor-actions.c
+++ b/e-util/e-editor-actions.c
@@ -634,14 +634,12 @@ mode_changed (struct _ModeChanged *data)
GtkActionGroup *action_group;
EEditor *editor = data->editor;
EEditorWidget *widget;
- EEditorWidgetMode mode;
gboolean is_html;
widget = e_editor_get_editor_widget (editor);
- mode = gtk_radio_action_get_current_value (data->action);
- is_html = (mode == E_EDITOR_WIDGET_MODE_HTML);
+ is_html = gtk_radio_action_get_current_value (data->action);
- if (mode == e_editor_widget_get_mode (widget)) {
+ if (is_html == e_editor_widget_get_html_mode (widget)) {
goto exit;
}
@@ -668,7 +666,7 @@ mode_changed (struct _ModeChanged *data)
NULL);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_CANCEL) {
gtk_radio_action_set_current_value (
- data->action, E_EDITOR_WIDGET_MODE_HTML);
+ data->action, TRUE);
gtk_widget_destroy (dialog);
goto exit;
}
@@ -699,8 +697,8 @@ mode_changed (struct _ModeChanged *data)
gtk_action_set_sensitive (ACTION (STYLE_H6), is_html);
gtk_action_set_sensitive (ACTION (STYLE_ADDRESS), is_html);
- e_editor_widget_set_mode (
- e_editor_get_editor_widget (editor), mode);
+ e_editor_widget_set_html_mode (
+ e_editor_get_editor_widget (editor), is_html);
exit:
g_clear_object (&data->editor);
@@ -1142,14 +1140,14 @@ static GtkRadioActionEntry core_mode_entries[] = {
N_("_HTML"),
NULL,
N_("HTML editing mode"),
- E_EDITOR_WIDGET_MODE_HTML },
+ TRUE }, /* e_editor_widget_set_html_mode */
{ "mode-plain",
NULL,
N_("Plain _Text"),
NULL,
N_("Plain text editing mode"),
- E_EDITOR_WIDGET_MODE_PLAIN_TEXT }
+ FALSE } /* e_editor_widget_set_html_mode */
};
static GtkRadioActionEntry core_style_entries[] = {
@@ -1828,7 +1826,7 @@ editor_actions_init (EEditor *editor)
gtk_action_group_add_radio_actions (
action_group, core_mode_entries,
G_N_ELEMENTS (core_mode_entries),
- E_EDITOR_WIDGET_MODE_HTML,
+ TRUE,
G_CALLBACK (action_mode_cb), editor);
gtk_action_group_add_radio_actions (
action_group, core_style_entries,
@@ -1838,7 +1836,7 @@ editor_actions_init (EEditor *editor)
gtk_ui_manager_insert_action_group (manager, action_group, 0);
/* Synchronize wiget mode with the button */
- e_editor_widget_set_mode (editor_widget, E_EDITOR_WIDGET_MODE_HTML);
+ e_editor_widget_set_html_mode (editor_widget, TRUE);
/* Face Action */
action = e_emoticon_action_new (
diff --git a/e-util/e-editor-widget.c b/e-util/e-editor-widget.c
index 2e1c82c..e781c72 100644
--- a/e-util/e-editor-widget.c
+++ b/e-util/e-editor-widget.c
@@ -40,11 +40,10 @@ struct _EEditorWidgetPrivate {
gint can_redo : 1;
gint can_undo : 1;
gint reload_in_progress : 1;
+ gint html_mode : 1;
EEditorSelection *selection;
- EEditorWidgetMode mode;
-
/* FIXME WEBKIT Is this in widget's competence? */
GList *spelling_langs;
@@ -62,7 +61,7 @@ G_DEFINE_TYPE (
enum {
PROP_0,
PROP_CHANGED,
- PROP_MODE,
+ PROP_HTML_MODE,
PROP_INLINE_SPELLING,
PROP_MAGIC_LINKS,
PROP_MAGIC_SMILEYS,
@@ -462,7 +461,7 @@ editor_widget_key_release_event (GtkWidget *gtk_widget,
range = editor_widget_get_dom_range (widget);
if (widget->priv->magic_smileys &&
- widget->priv->mode == E_EDITOR_WIDGET_MODE_HTML) {
+ widget->priv->html_mode) {
editor_widget_check_magic_smileys (widget, range);
}
@@ -569,9 +568,9 @@ e_editor_widget_get_property (GObject *object,
{
switch (property_id) {
- case PROP_MODE:
- g_value_set_int (
- value, e_editor_widget_get_mode (
+ case PROP_HTML_MODE:
+ g_value_set_boolean (
+ value, e_editor_widget_get_html_mode (
E_EDITOR_WIDGET (object)));
return;
@@ -635,10 +634,10 @@ e_editor_widget_set_property (GObject *object,
{
switch (property_id) {
- case PROP_MODE:
- e_editor_widget_set_mode (
+ case PROP_HTML_MODE:
+ e_editor_widget_set_html_mode (
E_EDITOR_WIDGET (object),
- g_value_get_int (value));
+ g_value_get_boolean (value));
return;
case PROP_INLINE_SPELLING:
@@ -702,14 +701,12 @@ e_editor_widget_class_init (EEditorWidgetClass *klass)
g_object_class_install_property (
object_class,
- PROP_MODE,
- g_param_spec_int (
- "mode",
- "Mode",
+ PROP_HTML_MODE,
+ g_param_spec_boolean (
+ "html-mode",
+ "HTML Mode",
"Edit HTML or plain text",
- E_EDITOR_WIDGET_MODE_PLAIN_TEXT,
- E_EDITOR_WIDGET_MODE_HTML,
- E_EDITOR_WIDGET_MODE_PLAIN_TEXT,
+ FALSE,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
@@ -944,33 +941,27 @@ e_editor_widget_set_changed (EEditorWidget *widget,
g_object_notify (G_OBJECT (widget), "changed");
}
-EEditorWidgetMode
-e_editor_widget_get_mode (EEditorWidget *widget)
+gboolean
+e_editor_widget_get_html_mode (EEditorWidget *widget)
{
g_return_val_if_fail (E_IS_EDITOR_WIDGET (widget), FALSE);
- return widget->priv->mode;
+ return widget->priv->html_mode;
}
void
-e_editor_widget_set_mode (EEditorWidget *widget,
- EEditorWidgetMode mode)
+e_editor_widget_set_html_mode (EEditorWidget *widget,
+ gboolean html_mode)
{
g_return_if_fail (E_IS_EDITOR_WIDGET (widget));
- if (widget->priv->mode == mode)
+ if ((widget->priv->html_mode ? 1 : 0) == (html_mode ? 1 : 0)) {
return;
+ }
- widget->priv->mode = mode;
-
- if (widget->priv->mode == E_EDITOR_WIDGET_MODE_PLAIN_TEXT) {
- gchar *plain;
+ widget->priv->html_mode = html_mode;
- plain = e_editor_widget_get_text_plain (widget);
- e_editor_widget_set_text_plain (widget, plain);
-
- g_free (plain);
- } else {
+ if (widget->priv->html_mode) {
gchar *plain_text, *html;
plain_text = e_editor_widget_get_text_plain (widget);
@@ -990,9 +981,16 @@ e_editor_widget_set_mode (EEditorWidget *widget,
g_free (plain_text);
g_free (html);
+ } else {
+ gchar *plain;
+
+ plain = e_editor_widget_get_text_plain (widget);
+ e_editor_widget_set_text_plain (widget, plain);
+
+ g_free (plain);
}
- g_object_notify (G_OBJECT (widget), "mode");
+ g_object_notify (G_OBJECT (widget), "html-mode");
}
gboolean
diff --git a/e-util/e-editor-widget.h b/e-util/e-editor-widget.h
index 59a5b9e..23d5149 100644
--- a/e-util/e-editor-widget.h
+++ b/e-util/e-editor-widget.h
@@ -50,11 +50,6 @@
G_BEGIN_DECLS
typedef enum {
- E_EDITOR_WIDGET_MODE_PLAIN_TEXT,
- E_EDITOR_WIDGET_MODE_HTML,
-} EEditorWidgetMode;
-
-typedef enum {
E_EDITOR_WIDGET_REPLACE_ANSWER_REPLACE,
E_EDITOR_WIDGET_REPLACE_ANSWER_REPLACE_ALL,
E_EDITOR_WIDGET_REPLACE_ANSWER_CANCEL,
@@ -92,10 +87,9 @@ gboolean e_editor_widget_get_changed (EEditorWidget *widget);
void e_editor_widget_set_changed (EEditorWidget *widget,
gboolean changed);
-EEditorWidgetMode
- e_editor_widget_get_mode (EEditorWidget *widget);
-void e_editor_widget_set_mode (EEditorWidget *widget,
- EEditorWidgetMode mode);
+gboolean e_editor_widget_get_html_mode (EEditorWidget *widget);
+void e_editor_widget_set_html_mode (EEditorWidget *widget,
+ gboolean html_mode);
gboolean e_editor_widget_get_inline_spelling
(EEditorWidget *widget);
diff --git a/e-util/e-mail-signature-editor.c b/e-util/e-mail-signature-editor.c
index 105a64b..8598973 100644
--- a/e-util/e-mail-signature-editor.c
+++ b/e-util/e-mail-signature-editor.c
@@ -155,8 +155,7 @@ mail_signature_editor_loaded_cb (GObject *object,
editor = e_editor_window_get_editor (E_EDITOR_WINDOW (object));
editor_widget = e_editor_get_editor_widget (editor);
- e_editor_widget_set_mode (editor_widget,
- (is_html) ? E_EDITOR_WIDGET_MODE_HTML : E_EDITOR_WIDGET_MODE_PLAIN_TEXT);
+ e_editor_widget_set_html_mode (editor_widget, is_html);
editor_selection = e_editor_widget_get_selection (editor_widget);
if (is_html) {
@@ -826,7 +825,6 @@ e_mail_signature_editor_commit (EMailSignatureEditor *window,
gchar *contents;
EEditor *editor;
EEditorWidget *editor_widget;
- EEditorWidgetMode mode;
g_return_if_fail (E_IS_MAIL_SIGNATURE_EDITOR (window));
@@ -834,9 +832,8 @@ e_mail_signature_editor_commit (EMailSignatureEditor *window,
source = e_mail_signature_editor_get_source (window);
editor = e_editor_window_get_editor (E_EDITOR_WINDOW (window));
editor_widget = e_editor_get_editor_widget (editor);
- mode = e_editor_widget_get_mode (editor_widget);
- if (mode == E_EDITOR_WIDGET_MODE_HTML) {
+ if (e_editor_widget_get_html_mode (editor_widget)) {
mime_type = "text/html";
contents = e_editor_widget_get_text_html (editor_widget);
} else {
diff --git a/e-util/e-mail-signature-manager.c b/e-util/e-mail-signature-manager.c
index 8f83f87..741972d 100644
--- a/e-util/e-mail-signature-manager.c
+++ b/e-util/e-mail-signature-manager.c
@@ -409,11 +409,7 @@ mail_signature_manager_add_signature (EMailSignatureManager *manager)
editor = e_mail_signature_editor_new (registry, NULL);
editor_widget = e_mail_signature_editor_get_editor_widget (
E_MAIL_SIGNATURE_EDITOR (editor));
- e_editor_widget_set_mode (
- editor_widget,
- manager->priv->prefer_html ?
- E_EDITOR_WIDGET_MODE_HTML :
- E_EDITOR_WIDGET_MODE_PLAIN_TEXT);
+ e_editor_widget_set_html_mode (editor_widget, manager->priv->prefer_html);
mail_signature_manager_emit_editor_created (manager, editor);
gtk_widget_grab_focus (manager->priv->tree_view);
diff --git a/e-util/test-editor.c b/e-util/test-editor.c
index ed5cd17..dc92037 100644
--- a/e-util/test-editor.c
+++ b/e-util/test-editor.c
@@ -227,8 +227,7 @@ action_save_cb (GtkAction *action,
return;
filename = e_editor_get_filename (editor);
- as_html = (e_editor_widget_get_mode (
- e_editor_get_editor_widget (editor)) == E_EDITOR_WIDGET_MODE_HTML);
+ as_html = (e_editor_widget_get_html_mode (e_editor_get_editor_widget (editor)));
e_editor_save (editor, filename, as_html, &error);
handle_error (&error);
@@ -246,8 +245,7 @@ action_save_as_cb (GtkAction *action,
return;
filename = e_editor_get_filename (editor);
- as_html = (e_editor_widget_get_mode (
- e_editor_get_editor_widget (editor)) == E_EDITOR_WIDGET_MODE_HTML);
+ as_html = (e_editor_widget_get_html_mode (e_editor_get_editor_widget (editor)));
e_editor_save (editor, filename, as_html, &error);
handle_error (&error);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 0dfb835..7f74995 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -448,7 +448,6 @@ composer_presend_check_unwanted_html (EMsgComposer *composer,
EComposerHeaderTable *table;
GSettings *settings;
gboolean check_passed = TRUE;
- EEditorWidgetMode html_mode;
gboolean send_html;
gboolean confirm_html;
gint ii;
@@ -459,7 +458,6 @@ composer_presend_check_unwanted_html (EMsgComposer *composer,
recipients = e_composer_header_table_get_destinations (table);
editor = e_editor_window_get_editor (E_EDITOR_WINDOW (composer));
editor_widget = e_editor_get_editor_widget (editor);
- html_mode = e_editor_widget_get_mode (editor_widget);
send_html = g_settings_get_boolean (settings, "composer-send-html");
confirm_html = g_settings_get_boolean (settings, "prompt-on-unwanted-html");
@@ -467,7 +465,7 @@ composer_presend_check_unwanted_html (EMsgComposer *composer,
/* Only show this warning if our default is to send html. If it
* isn't, we've manually switched into html mode in the composer
* and (presumably) had a good reason for doing this. */
- if (html_mode == E_EDITOR_WIDGET_MODE_HTML && send_html &&
+ if (e_editor_widget_get_html_mode (editor_widget) && send_html &&
confirm_html && recipients != NULL) {
gboolean html_problem = FALSE;
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 18a9a5c..1181b94 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -471,11 +471,7 @@ mail_shell_backend_window_added_cb (GtkApplication *application,
g_object_unref (settings);
- e_editor_widget_set_mode (
- editor_widget,
- active ?
- E_EDITOR_WIDGET_MODE_HTML :
- E_EDITOR_WIDGET_MODE_PLAIN_TEXT);
+ e_editor_widget_set_html_mode (editor_widget, active);
}
if (E_IS_MSG_COMPOSER (window)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
