aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-09-17 14:20:18 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-09-17 14:20:18 +0800
commit34e866099254d32a7707db4c2c881525fe64fafa (patch)
tree855fc9427397c72dd60708ac0f7f8842fa7ffd21
parent44b5778c8de76ddc40f7282d97089ae3cb8aef70 (diff)
downloadgsoc2013-evolution-34e866099254d32a7707db4c2c881525fe64fafa.tar.gz
gsoc2013-evolution-34e866099254d32a7707db4c2c881525fe64fafa.tar.zst
gsoc2013-evolution-34e866099254d32a7707db4c2c881525fe64fafa.zip
2007-09-17 mcrha Fix for bug #472865
svn path=/trunk/; revision=34277
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-composer-utils.c8
2 files changed, 13 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index af05f004c4..c4017a12f7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-17 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #472865
+
+ * em-composer-utils.c: (ask_confirm_for_unwanted_html_mail):
+ Show dialog only when there is any recipient, not always.
+
2007-09-12 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #476040
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 0d4c056450..c9519d9fdb 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -147,8 +147,12 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip
}
}
- res = em_utils_prompt_user((GtkWindow *)composer,"/apps/evolution/mail/prompts/unwanted_html",
- "mail:ask-send-html", str->str, NULL);
+ if (str->len)
+ res = em_utils_prompt_user((GtkWindow *)composer,"/apps/evolution/mail/prompts/unwanted_html",
+ "mail:ask-send-html", str->str, NULL);
+ else
+ res = TRUE;
+
g_string_free(str, TRUE);
return res;