aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-03-19 06:10:38 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-03-19 06:10:38 +0800
commite977f1be9e5b5a5dae943c3cf44ea8810c5e8ec3 (patch)
tree4c3ae058392b8e808a82b5daafc984edd062565f
parent680504834f2f47b14acf01277804051ebec9a1f5 (diff)
downloadgsoc2013-evolution-e977f1be9e5b5a5dae943c3cf44ea8810c5e8ec3.tar
gsoc2013-evolution-e977f1be9e5b5a5dae943c3cf44ea8810c5e8ec3.tar.gz
gsoc2013-evolution-e977f1be9e5b5a5dae943c3cf44ea8810c5e8ec3.tar.bz2
gsoc2013-evolution-e977f1be9e5b5a5dae943c3cf44ea8810c5e8ec3.tar.lz
gsoc2013-evolution-e977f1be9e5b5a5dae943c3cf44ea8810c5e8ec3.tar.xz
gsoc2013-evolution-e977f1be9e5b5a5dae943c3cf44ea8810c5e8ec3.tar.zst
gsoc2013-evolution-e977f1be9e5b5a5dae943c3cf44ea8810c5e8ec3.zip
e_msg_composer_get_subject() now returns a const char *, so update
2003-03-18 Jeffrey Stedfast <fejj@ximian.com> * mail-callbacks.c (composer_get_message): e_msg_composer_get_subject() now returns a const char *, so update appropriately. svn path=/trunk/; revision=20349
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-callbacks.c7
2 files changed, 8 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index de3ad4a369..d2471db503 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-18 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-callbacks.c (composer_get_message):
+ e_msg_composer_get_subject() now returns a const char *, so update
+ appropriately.
+
2003-03-18 Larry Ewing <lewing@ximian.com>
* mail-callbacks.c (do_mail_print): fix leak, cleanup variable
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 560ea7650c..f4b2ecca12 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -410,9 +410,9 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_
CamelInternetAddress *cia;
int hidden = 0, shown = 0;
int num = 0, num_bcc = 0;
+ const char *subject;
GConfClient *gconf;
EAccount *account;
- char *subject;
int i;
gconf = gconf_client_get_default ();
@@ -505,12 +505,9 @@ composer_get_message (EMsgComposer *composer, gboolean post, gboolean save_html_
/* Check for no subject */
subject = e_msg_composer_get_subject (composer);
if (subject == NULL || subject[0] == '\0') {
- if (!ask_confirm_for_empty_subject (composer)) {
- g_free (subject);
+ if (!ask_confirm_for_empty_subject (composer))
goto finished;
- }
}
- g_free (subject);
/* actually get the message now, this will sign/encrypt etc */
message = e_msg_composer_get_message (composer, save_html_object_data);