aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorPeter Williams <peterw@ximian.com>2002-07-17 04:05:02 +0800
committerPeter Williams <peterw@src.gnome.org>2002-07-17 04:05:02 +0800
commitbc20187dc0782187ccedec5edd9c744ce652a803 (patch)
tree359099d7e88c1fa77568cfa181fdb9eb858ddd5d /composer
parent9f421a0b1cbed4440e623adf47ecf8a5c7aeaf0c (diff)
downloadgsoc2013-evolution-bc20187dc0782187ccedec5edd9c744ce652a803.tar
gsoc2013-evolution-bc20187dc0782187ccedec5edd9c744ce652a803.tar.gz
gsoc2013-evolution-bc20187dc0782187ccedec5edd9c744ce652a803.tar.bz2
gsoc2013-evolution-bc20187dc0782187ccedec5edd9c744ce652a803.tar.lz
gsoc2013-evolution-bc20187dc0782187ccedec5edd9c744ce652a803.tar.xz
gsoc2013-evolution-bc20187dc0782187ccedec5edd9c744ce652a803.tar.zst
gsoc2013-evolution-bc20187dc0782187ccedec5edd9c744ce652a803.zip
Instead of doing this with a weakref, do it by connecting to the destroy
2002-07-16 Peter Williams <peterw@ximian.com> * e-msg-composer.c (create_composer): Instead of doing this with a weakref, do it by connecting to the destroy signal. The weakref was not getting notified in certain conditions that I could never really pin down, and this caused problems at exit. * e-msg-composer-hdrs.c (create_headers): Reorder to create reply_to before from, because create_from_optionmenu causes from_changed to be called, which expects reply_to.entry to exist. svn path=/trunk/; revision=17480
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog11
-rw-r--r--composer/e-msg-composer-hdrs.c16
-rw-r--r--composer/e-msg-composer.c6
3 files changed, 24 insertions, 9 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 28e5b175a0..a19f850fbc 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-16 Peter Williams <peterw@ximian.com>
+
+ * e-msg-composer.c (create_composer): Instead of doing this with a
+ weakref, do it by connecting to the destroy signal. The weakref was
+ not getting notified in certain conditions that I could never really
+ pin down, and this caused problems at exit.
+
+ * e-msg-composer-hdrs.c (create_headers): Reorder to create reply_to
+ before from, because create_from_optionmenu causes from_changed to
+ be called, which expects reply_to.entry to exist.
+
2002-07-15 Radek Doulik <rodo@ximian.com>
* e-msg-composer.c (build_message): added save_html_object_data
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index a39fd806c6..d98b452cff 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -365,13 +365,11 @@ create_headers (EMsgComposerHdrs *hdrs)
EMsgComposerHdrsPrivate *priv = hdrs->priv;
/*
- * From:
- */
- priv->from.label = gtk_label_new (_("From:"));
- priv->from.entry = create_from_optionmenu (hdrs);
-
- /*
* Reply-To:
+ *
+ * Create this before we call create_from_optionmenu,
+ * because that causes from_changed to be called, which
+ * expects the reply_to fields to be initialized.
*/
priv->reply_to.label = gtk_label_new (_("Reply-To:"));
priv->reply_to.entry = e_entry_new ();
@@ -382,6 +380,12 @@ create_headers (EMsgComposerHdrs *hdrs)
NULL);
/*
+ * From:
+ */
+ priv->from.label = gtk_label_new (_("From:"));
+ priv->from.entry = create_from_optionmenu (hdrs);
+
+ /*
* Subject:
*/
priv->subject.label = gtk_label_new (_("Subject:"));
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 769d8afbbd..f0ec802c7e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2695,9 +2695,9 @@ create_composer (void)
all_composers = g_slist_prepend (all_composers, composer);
- gtk_object_weakref (GTK_OBJECT (composer),
- msg_composer_destroy_notify,
- composer);
+ gtk_signal_connect (GTK_OBJECT (composer), "destroy",
+ GTK_SIGNAL_FUNC (msg_composer_destroy_notify),
+ NULL);
gtk_window_set_default_size (GTK_WINDOW (composer),
DEFAULT_WIDTH, DEFAULT_HEIGHT);