aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog10
-rw-r--r--composer/e-msg-composer-hdrs.c6
-rw-r--r--composer/e-msg-composer.c7
3 files changed, 14 insertions, 9 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 459eeadcf4..68bb062759 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-21 Not Zed <NotZed@Ximian.com>
+
+ * e-msg-composer.c (subject_changed_cb): Duh! dont free subject &
+ simplify logic a little.
+
+2002-11-20 Not Zed <NotZed@Ximian.com>
+
+ * e-msg-composer-hdrs.c (entry_changed): duh, emit the signal
+ using an initialised value(!).
+
2002-11-19 Radek Doulik <rodo@ximian.com>
* e-msg-composer.c (e_msg_composer_get_sig_file_content): use
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 6dc091f913..6dce1ad737 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -369,11 +369,11 @@ header_new_recipient (EMsgComposerHdrs *hdrs, const char *name, const char *tip)
static void
entry_changed (GtkWidget *entry, EMsgComposerHdrs *hdrs)
{
- char *subject, *tmp;
+ char *subject;
- tmp = e_msg_composer_hdrs_get_subject (hdrs);
+ subject = e_msg_composer_hdrs_get_subject (hdrs);
g_signal_emit(hdrs, signals[SUBJECT_CHANGED], 0, subject);
- g_free (tmp);
+ g_free (subject);
g_signal_emit(hdrs, signals[HDRS_CHANGED], 0);
}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 3df26f5449..87835892c7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2153,12 +2153,7 @@ subject_changed_cb (EMsgComposerHdrs *hdrs,
composer = E_MSG_COMPOSER (data);
- if (strlen (subject))
- gtk_window_set_title (GTK_WINDOW (composer), subject);
- else
- gtk_window_set_title (GTK_WINDOW (composer),
- _("Compose a message"));
- g_free (subject);
+ gtk_window_set_title (GTK_WINDOW (composer), subject[0]?subject:_("Compose a message"));
}
static void