829392f14f
- Use stricter build settings. - Make .desktop symlinks absolute (RH bug #209322). - Add patch for RH bug #202751 (printing of indic languages). - Add patch for Gnome.org bug #357970 (deprecated GLib / GDK symbols). - Add patch for Gnome.org bug #359236 (search state crash). - Add patch for Gnome.org bug #360240 ("unused variable" warnings). - Add patch for Gnome.org bug #360619 ("incompatible pointer type" warnings). - Add patch for Gnome.org bug #360946 (improved "about" dialog). - Add patch for Gnome.org bug #362638 (deprecate EThread). - Update patch for RH bug #211058 (partially fixed upstream). - Remove patch for RH bug #201307 (fixed upstream). - Remove patch for RH bug #205576 (fixed upstream). - Remove patch for Gnome.org bug #351332 (fixed upstream). - Remove patch for Gnome.org bug #352450 (fixed upstream). - Remove patch for Gnome.org bug #353472 (fixed upstream). - Remove patch for Gnome.org bug #356811 (fixed upstream).
83 lines
3.1 KiB
Diff
83 lines
3.1 KiB
Diff
--- evolution-2.8.1/plugins/print-message/print-message.c.fix-indic-printing 2005-08-23 23:14:10.000000000 -0400
|
|
+++ evolution-2.8.1/plugins/print-message/print-message.c 2006-10-10 10:35:17.000000000 -0400
|
|
@@ -83,7 +83,8 @@
|
|
data->config = e_print_load_config ();
|
|
data->preview = 0;
|
|
|
|
- data->msg = e_msg_composer_get_message (composer, 1);
|
|
+ data->msg = e_msg_composer_get_message_print (composer, TRUE);
|
|
+
|
|
dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config);
|
|
gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
|
|
e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer);
|
|
@@ -104,7 +105,7 @@
|
|
data->config = e_print_load_config ();
|
|
data->preview = 0;
|
|
|
|
- data->msg = e_msg_composer_get_message (composer, 1);
|
|
+ data->msg = e_msg_composer_get_message_print (composer, TRUE);
|
|
|
|
print_response(NULL, GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, data);
|
|
}
|
|
--- evolution-2.8.1/composer/e-msg-composer.h.fix-indic-printing 2005-12-07 03:29:51.000000000 -0500
|
|
+++ evolution-2.8.1/composer/e-msg-composer.h 2006-10-10 10:35:17.000000000 -0400
|
|
@@ -94,6 +94,8 @@
|
|
const char *filename);
|
|
void e_msg_composer_add_inline_image_from_mime_part (EMsgComposer *composer,
|
|
CamelMimePart *part);
|
|
+CamelMimeMessage *e_msg_composer_get_message_print (EMsgComposer *composer,
|
|
+ gboolean save_html_object_data);
|
|
CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer,
|
|
gboolean save_html_object_data);
|
|
CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer);
|
|
--- evolution-2.8.1/composer/e-msg-composer.c.fix-indic-printing 2006-10-10 10:34:38.000000000 -0400
|
|
+++ evolution-2.8.1/composer/e-msg-composer.c 2006-10-10 10:35:17.000000000 -0400
|
|
@@ -5162,6 +5162,38 @@
|
|
}
|
|
}
|
|
|
|
+/* Stub for helping in printing of mails */
|
|
+CamelMimeMessage *
|
|
+e_msg_composer_get_message_print (EMsgComposer *composer, gboolean save_html_object_data)
|
|
+{
|
|
+ CamelMimeMessage *msg;
|
|
+ gboolean old_flags[4];
|
|
+ gboolean old_send_html;
|
|
+ EMsgComposerPrivate *p = composer->priv;
|
|
+
|
|
+ /* create printable mail as HTML */
|
|
+ old_send_html = p->send_html;
|
|
+ p->send_html = TRUE;
|
|
+ old_flags[0] = p->pgp_sign;
|
|
+ p->pgp_sign = FALSE;
|
|
+ old_flags[1] = p->pgp_encrypt;
|
|
+ p->pgp_encrypt = FALSE;
|
|
+ old_flags[2] = p->smime_sign;
|
|
+ p->smime_sign = FALSE;
|
|
+ old_flags[3] = p->smime_encrypt;
|
|
+ p->smime_encrypt = FALSE;
|
|
+
|
|
+ msg = build_message (composer, save_html_object_data);
|
|
+
|
|
+ /* Revert back message's original settings */
|
|
+ p->send_html = old_send_html;
|
|
+ p->pgp_sign = old_flags[0];
|
|
+ p->pgp_encrypt = old_flags[1];
|
|
+ p->smime_sign = old_flags[2];
|
|
+ p->smime_encrypt = old_flags[3];
|
|
+
|
|
+ return msg;
|
|
+}
|
|
|
|
/**
|
|
* e_msg_composer_get_message:
|
|
@@ -5183,7 +5215,7 @@
|
|
}
|
|
}
|
|
|
|
- return build_message (composer, save_html_object_data);
|
|
+ return e_msg_composer_get_message_print (composer, save_html_object_data);
|
|
}
|
|
|
|
CamelMimeMessage *
|