diff options
| -rw-r--r-- | composer/e-msg-composer.c | 12 | ||||
| -rw-r--r-- | e-util/e-util.c | 30 | ||||
| -rw-r--r-- | mail/em-format-html.h | 5 |
3 files changed, 2 insertions, 45 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index c1379d21aa..d1a6abb222 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1109,13 +1109,12 @@ get_signature_html (EMsgComposer *composer) "<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature_name\" value=\"uid:%s\">-->" "<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD><BR>" "%s%s%s%s" - "%s</TD></TR></TABLE>", + "</TD></TR></TABLE>", encoded_uid ? encoded_uid : "", format_html ? "" : "<PRE>\n", format_html || (!strncmp ("-- \n", text, 4) || strstr (text, "\n-- \n")) ? "" : "-- \n", text, - format_html ? "" : "</PRE>\n", - is_top_signature () ? "<BR>" : ""); + format_html ? "" : "</PRE>\n"); g_free (text); g_free (encoded_uid); text = html; @@ -3862,7 +3861,6 @@ e_msg_composer_show_sig_file (EMsgComposer *composer) GtkhtmlEditor *editor; GtkHTML *html; gchar *html_text; - gboolean top_signature; g_return_if_fail (E_IS_MSG_COMPOSER (composer)); @@ -3889,8 +3887,6 @@ e_msg_composer_show_sig_file (EMsgComposer *composer) } gtkhtml_editor_run_command (editor, "unblock-selection"); - top_signature = is_top_signature (); - html_text = get_signature_html (composer); if (html_text) { gtkhtml_editor_run_command (editor, "insert-paragraph"); @@ -3904,10 +3900,6 @@ e_msg_composer_show_sig_file (EMsgComposer *composer) gtkhtml_editor_run_command (editor, "style-normal"); gtkhtml_editor_insert_html (editor, html_text); g_free (html_text); - } else if (top_signature) { - /* insert paragraph after the signature ClueFlow things */ - gtkhtml_editor_run_command (editor, "cursor-forward"); - gtkhtml_editor_run_command (editor, "insert-paragraph"); } gtkhtml_editor_undo_end (editor); diff --git a/e-util/e-util.c b/e-util/e-util.c index 04be119657..071f5e58b8 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1531,33 +1531,3 @@ e_camel_object_get_type (void) return type; } - -static gpointer -e_camel_object_copy (gpointer camel_object) -{ - if (CAMEL_IS_OBJECT (camel_object)) - camel_object_ref (camel_object); - - return camel_object; -} - -static void -e_camel_object_free (gpointer camel_object) -{ - if (CAMEL_IS_OBJECT (camel_object)) - camel_object_unref (camel_object); -} - -GType -e_camel_object_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - type = g_boxed_type_register_static ( - "ECamelObject", - (GBoxedCopyFunc) e_camel_object_copy, - (GBoxedFreeFunc) e_camel_object_free); - - return type; -} diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 23e0057f89..d35556316a 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -209,11 +209,6 @@ struct _EMFormatHTML { EMFormat parent; EMFormatHTMLPrivate *priv; -<<<<<<< HEAD:mail/em-format-html.h -======= - EMFormatHTMLPrivate *priv; - ->>>>>>> master:mail/em-format-html.h GtkHTML *html; EDList pending_object_list; |