aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer-hdrs.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 8b9e337e66..4dee7c0e54 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,5 +1,12 @@
2003-01-09 Chris Toshok <toshok@ximian.com>
+ * e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_to): don't pass
+ NULL to bonobo_widget_set_property.
+ (e_msg_composer_hdrs_set_cc): same.
+ (e_msg_composer_hdrs_set_bcc): same.
+
+2003-01-09 Chris Toshok <toshok@ximian.com>
+
* e-msg-composer-hdrs.c (e_msg_composer_hdrs_new): need to
ref/sink "new" so that the g_object_unref doesn't spew a warning.
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 172718157b..ddb392e11d 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -947,7 +947,7 @@ e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
str = e_destination_exportv (to_destv);
- bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->to.entry), "destinations", TC_CORBA_string, str, NULL);
+ bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->to.entry), "destinations", TC_CORBA_string, str ? str : "", NULL);
g_free (str);
}
@@ -960,7 +960,7 @@ e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
str = e_destination_exportv (cc_destv);
- bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->cc.entry), "destinations", TC_CORBA_string, str, NULL);
+ bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->cc.entry), "destinations", TC_CORBA_string, str ? str :"", NULL);
if (str && *str)
set_pair_visibility (hdrs, &hdrs->priv->cc, TRUE);
g_free (str);
@@ -975,7 +975,7 @@ e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
str = e_destination_exportv (bcc_destv);
- bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->bcc.entry), "destinations", TC_CORBA_string, str, NULL);
+ bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->bcc.entry), "destinations", TC_CORBA_string, str ? str : "", NULL);
if (str && *str)
set_pair_visibility (hdrs, &hdrs->priv->bcc, TRUE);
g_free (str);