diff options
| author | Johnny Jacob <jjohnny@src.gnome.org> | 2008-02-25 12:05:19 +0800 |
|---|---|---|
| committer | Johnny Jacob <jjohnny@src.gnome.org> | 2008-02-25 12:05:19 +0800 |
| commit | 6eb14fb4f58ebcf5cf38f6d68842c0a1e167a187 (patch) | |
| tree | be9091202b5312869dfd74e0b0a44f995ce2b918 | |
| parent | 7872974d30866671fa29ea02143a894b3821463c (diff) | |
| download | gsoc2013-evolution-6eb14fb4f58ebcf5cf38f6d68842c0a1e167a187.tar.gz gsoc2013-evolution-6eb14fb4f58ebcf5cf38f6d68842c0a1e167a187.tar.zst gsoc2013-evolution-6eb14fb4f58ebcf5cf38f6d68842c0a1e167a187.zip | |
Reverting commit for #371011
svn path=/trunk/; revision=35083
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 925e0244f1..f630340f75 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2008-02-25 Johny Jacob <jjohnny@novell.com> + + * e-msg-composer.c (e_msg_composer_show_sig_file): Reverting + commit for #371011. + 2008-02-20 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #515744 diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index ae82e9b262..5d1dbe23ab 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -5419,14 +5419,16 @@ e_msg_composer_show_sig_file (EMsgComposer *composer) 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); - GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "cursor-backward", &ev); - GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "insert-paragraph", &ev); - - /* printf ("insert %s\n", html); */ + 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); |