aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2003-03-05 06:03:22 +0800
committerJP Rosevear <jpr@src.gnome.org>2003-03-05 06:03:22 +0800
commitfbf56b4c56143ef9487e5e454d906e83fe2ef4a2 (patch)
treed42244537553e5f1c039e8c2e52b701e25ab849d /calendar
parentaf8947c7c413379f6eca5fe81b930a5e0014bc8c (diff)
downloadgsoc2013-evolution-fbf56b4c56143ef9487e5e454d906e83fe2ef4a2.tar
gsoc2013-evolution-fbf56b4c56143ef9487e5e454d906e83fe2ef4a2.tar.gz
gsoc2013-evolution-fbf56b4c56143ef9487e5e454d906e83fe2ef4a2.tar.bz2
gsoc2013-evolution-fbf56b4c56143ef9487e5e454d906e83fe2ef4a2.tar.lz
gsoc2013-evolution-fbf56b4c56143ef9487e5e454d906e83fe2ef4a2.tar.xz
gsoc2013-evolution-fbf56b4c56143ef9487e5e454d906e83fe2ef4a2.tar.zst
gsoc2013-evolution-fbf56b4c56143ef9487e5e454d906e83fe2ef4a2.zip
Fixes #37806, #37697
2003-03-04 JP Rosevear <jpr@ximian.com> Fixes #37806, #37697 * gui/e-itip-control.c (e_itip_control_set_data): if the text is null or the empty string, just clear the widget (init): set the html widget to initially be blank svn path=/trunk/; revision=20155
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-itip-control.c10
2 files changed, 14 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fc3b43ab14..b49c08bbd8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
2003-03-04 JP Rosevear <jpr@ximian.com>
+ Fixes #37806, #37697
+
+ * gui/e-itip-control.c (e_itip_control_set_data): if the text is
+ null or the empty string, just clear the widget
+ (init): set the html widget to initially be blank
+
+2003-03-04 JP Rosevear <jpr@ximian.com>
+
* pcs/cal.c (impl_Cal_get_ldap_attribute): implement
* pcs/cal-backend.h: add virtual method
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index e5f3b83c67..f2c0c93d8f 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -309,6 +309,7 @@ init (EItipControl *itip)
priv->html = gtk_html_new ();
gtk_html_set_default_content_type (GTK_HTML (priv->html),
"text/html; charset=utf-8");
+ gtk_html_load_from_string (GTK_HTML (priv->html), " ", 1);
gtk_widget_show (priv->html);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -1548,10 +1549,11 @@ e_itip_control_set_data (EItipControl *itip, const gchar *text)
clean_up (itip);
- priv->comp = NULL;
- priv->total = 0;
- priv->current = 0;
-
+ if (text == NULL || *text == '\0') {
+ gtk_html_load_from_string (GTK_HTML (priv->html), " ", 1);
+ return;
+ }
+
priv->vcalendar = g_strdup (text);
priv->top_level = cal_util_new_top_level ();