aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-msg-composer.c
diff options
context:
space:
mode:
authorSankar P <psankar@novell.com>2007-08-23 18:09:53 +0800
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2007-08-23 18:09:53 +0800
commit559de8bd1b13b8b062ba1df9fc6b2f9290f82c6d (patch)
tree935e31e4426217b555fbcfebf310b27905f3916a /composer/e-msg-composer.c
parentc08bea18589e973da6c4f8e8d3ff3c840001e8b7 (diff)
downloadgsoc2013-evolution-559de8bd1b13b8b062ba1df9fc6b2f9290f82c6d.tar.gz
gsoc2013-evolution-559de8bd1b13b8b062ba1df9fc6b2f9290f82c6d.tar.zst
gsoc2013-evolution-559de8bd1b13b8b062ba1df9fc6b2f9290f82c6d.zip
Committed on behalf of Raghavendran <raghavguru7@gmail.com>
2007-08-23 Sankar P <psankar@novell.com> * Committed on behalf of Raghavendran <raghavguru7@gmail.com> ** Fix for bug #328405 * e-msg-composer.c: (e_msg_composer_show_sig_file): A signature will be attached when redirecting an email. Fixes that issue. svn path=/trunk/; revision=34071
Diffstat (limited to 'composer/e-msg-composer.c')
-rw-r--r--composer/e-msg-composer.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 62db0ef7e7..a1770cdd69 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -5454,35 +5454,35 @@ e_msg_composer_show_sig_file (EMsgComposer *composer)
/* printf ("e_msg_composer_show_sig_file\n"); */
/* printf ("set sig '%s' '%s'\n", sig_file, p->sig_file); */
+ if (!p->redirect) {
+ p->in_signature_insert = TRUE;
+ CORBA_exception_init (&ev);
+ GNOME_GtkHTML_Editor_Engine_freeze (p->eeditor_engine, &ev);
+ GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-position-save", &ev);
+ GNOME_GtkHTML_Editor_Engine_undoBegin (p->eeditor_engine, "Set signature", "Reset signature", &ev);
- p->in_signature_insert = TRUE;
- CORBA_exception_init (&ev);
- GNOME_GtkHTML_Editor_Engine_freeze (p->eeditor_engine, &ev);
- GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-position-save", &ev);
- GNOME_GtkHTML_Editor_Engine_undoBegin (p->eeditor_engine, "Set signature", "Reset signature", &ev);
-
- delete_old_signature (composer);
- html = get_signature_html (composer);
- if (html) {
- GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "insert-paragraph", &ev);
- if (!GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-backward", &ev))
+ delete_old_signature (composer);
+ html = get_signature_html (composer);
+ if (html) {
GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "insert-paragraph", &ev);
- else
- GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-forward", &ev);
+ if (!GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-backward", &ev))
+ GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "insert-paragraph", &ev);
+ else
+ GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-forward", &ev);
/* printf ("insert %s\n", html); */
- GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "orig", "0", &ev);
- GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "indent-zero", &ev);
- GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "style-normal", &ev);
- GNOME_GtkHTML_Editor_Engine_insertHTML (p->eeditor_engine, html, &ev);
- g_free (html);
- }
+ GNOME_GtkHTML_Editor_Engine_setParagraphData (p->eeditor_engine, "orig", "0", &ev);
+ GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "indent-zero", &ev);
+ GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "style-normal", &ev);
+ GNOME_GtkHTML_Editor_Engine_insertHTML (p->eeditor_engine, html, &ev);
+ g_free (html);
+ }
- GNOME_GtkHTML_Editor_Engine_undoEnd (p->eeditor_engine, &ev);
- GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-position-restore", &ev);
- GNOME_GtkHTML_Editor_Engine_thaw (p->eeditor_engine, &ev);
- CORBA_exception_free (&ev);
- p->in_signature_insert = FALSE;
-
+ GNOME_GtkHTML_Editor_Engine_undoEnd (p->eeditor_engine, &ev);
+ GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-position-restore", &ev);
+ GNOME_GtkHTML_Editor_Engine_thaw (p->eeditor_engine, &ev);
+ CORBA_exception_free (&ev);
+ p->in_signature_insert = FALSE;
+ }
/* printf ("e_msg_composer_show_sig_file end\n"); */
}