cb07aeca2e
- Require gtkhtml3 >= 3.13.6. - Add files for new imap-features plugin. - Add flag to disable deprecated Pango symbols. - Remove patch for GNOME bug #357216 (fixed upstream). - Remove patch for GNOME bug #359979 (fixed upstream).
84 lines
3.4 KiB
Diff
84 lines
3.4 KiB
Diff
--- evolution-2.9.91/plugins/print-message/print-message.c.fix-indic-printing 2007-02-12 01:58:01.000000000 -0500
|
|
+++ evolution-2.9.91/plugins/print-message/print-message.c 2007-02-12 13:30:17.000000000 -0500
|
|
@@ -83,7 +83,7 @@
|
|
data->config = e_print_load_settings ();
|
|
data->preview = 0;
|
|
|
|
- data->msg = e_msg_composer_get_message (composer, 1);
|
|
+ data->msg = e_msg_composer_get_message_print (composer, 1);
|
|
dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), 0, data->config);
|
|
gtk_dialog_set_default_response(dialog, GTK_RESPONSE_OK);
|
|
e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer);
|
|
@@ -102,7 +102,7 @@
|
|
data->config = e_print_load_settings ();
|
|
data->preview = 0;
|
|
|
|
- data->msg = e_msg_composer_get_message (composer, 1);
|
|
+ data->msg = e_msg_composer_get_message_print (composer, 1);
|
|
|
|
print_response(NULL, GTK_RESPONSE_APPLY, data);
|
|
}
|
|
--- evolution-2.9.91/composer/e-msg-composer.h.fix-indic-printing 2007-01-22 10:23:06.000000000 -0500
|
|
+++ evolution-2.9.91/composer/e-msg-composer.h 2007-02-12 13:29:24.000000000 -0500
|
|
@@ -101,6 +101,8 @@
|
|
CamelMimePart *part);
|
|
CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer,
|
|
gboolean save_html_object_data);
|
|
+CamelMimeMessage *e_msg_composer_get_message_print (EMsgComposer *composer,
|
|
+ gboolean save_html_object_data);
|
|
CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer);
|
|
void e_msg_composer_show_sig_file (EMsgComposer *composer);
|
|
gboolean e_msg_composer_get_send_html (EMsgComposer *composer);
|
|
--- evolution-2.9.91/composer/e-msg-composer.c.fix-indic-printing 2007-02-12 13:29:24.000000000 -0500
|
|
+++ evolution-2.9.91/composer/e-msg-composer.c 2007-02-12 13:29:24.000000000 -0500
|
|
@@ -5267,6 +5267,49 @@
|
|
}
|
|
|
|
CamelMimeMessage *
|
|
+e_msg_composer_get_message_print (EMsgComposer *composer, gboolean save_html_object_data)
|
|
+{
|
|
+ EMsgComposer *temp_composer;
|
|
+ CamelMimeMessage *msg;
|
|
+ GString *flags;
|
|
+
|
|
+ msg = build_message (composer, save_html_object_data);
|
|
+ temp_composer = e_msg_composer_new_with_message (msg);
|
|
+ camel_object_unref (msg);
|
|
+
|
|
+ /* build flags string */
|
|
+ flags = g_string_sized_new (128);
|
|
+ if (temp_composer->priv->send_html)
|
|
+ g_string_append (flags, "text/html");
|
|
+ else
|
|
+ g_string_append (flags, "text/plain");
|
|
+ if (temp_composer->priv->pgp_sign)
|
|
+ g_string_append (flags, ", pgp-sign");
|
|
+ if (temp_composer->priv->pgp_encrypt)
|
|
+ g_string_append (flags, ", pgp-encrypt");
|
|
+ if (temp_composer->priv->smime_sign)
|
|
+ g_string_append (flags, ", smime-sign");
|
|
+ if (temp_composer->priv->smime_encrypt)
|
|
+ g_string_append (flags, ", smime-encrypt");
|
|
+
|
|
+ /* override composer flags */
|
|
+ temp_composer->priv->send_html = TRUE;
|
|
+ temp_composer->priv->pgp_sign = FALSE;
|
|
+ temp_composer->priv->pgp_encrypt = FALSE;
|
|
+ temp_composer->priv->smime_sign = FALSE;
|
|
+ temp_composer->priv->smime_encrypt = FALSE;
|
|
+
|
|
+ msg = build_message (temp_composer, save_html_object_data);
|
|
+ camel_medium_set_header (CAMEL_MEDIUM (msg),
|
|
+ "X-Evolution-Format", flags->str);
|
|
+
|
|
+ e_msg_composer_delete (temp_composer);
|
|
+ g_string_free (flags, TRUE);
|
|
+
|
|
+ return msg;
|
|
+}
|
|
+
|
|
+CamelMimeMessage *
|
|
e_msg_composer_get_message_draft (EMsgComposer *composer)
|
|
{
|
|
CamelMimeMessage *msg;
|