aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/evolution-folder-selector-button.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 01ad81b2f0..d4d0605fc9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-03 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution-folder-selector-button.c (impl_finalize): Protect
+ against priv->possible_types being NULL.
+
2003-02-27 Rodney Dawes <dobey@ximian.com>
* Makefile.am (evolution_SOURCES): Add e-config-upgrade.h
diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c
index 730f1cbaba..70d221d6f0 100644
--- a/shell/evolution-folder-selector-button.c
+++ b/shell/evolution-folder-selector-button.c
@@ -224,9 +224,12 @@ impl_finalize (GObject *object)
priv = folder_selector_button->priv;
g_free (priv->title);
- for (i = 0; priv->possible_types[i]; i++)
- g_free (priv->possible_types[i]);
- g_free (priv->possible_types);
+
+ if (priv->possible_types != NULL) {
+ for (i = 0; priv->possible_types[i]; i++)
+ g_free (priv->possible_types[i]);
+ g_free (priv->possible_types);
+ }
if (priv->selected_folder)
CORBA_free (priv->selected_folder);