aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--widgets/e-text/e-text-model.c5
-rw-r--r--widgets/text/e-text-model.c5
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d2f506f6c..766db20420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-09 Christopher James Lahey <clahey@helixcode.com>
+
+ * widgets/e-text/e-text-model.c (e_text_model_real_get_text):
+ Return "" instead of NULL.
+
2000-07-07 Christopher James Lahey <clahey@helixcode.com>
* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.
diff --git a/widgets/e-text/e-text-model.c b/widgets/e-text/e-text-model.c
index d571e87791..6ca650867c 100644
--- a/widgets/e-text/e-text-model.c
+++ b/widgets/e-text/e-text-model.c
@@ -131,7 +131,10 @@ e_text_model_destroy (GtkObject *object)
static gchar *
e_text_model_real_get_text(ETextModel *model)
{
- return model->text;
+ if (model->text)
+ return model->text;
+ else
+ return "";
}
static void
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index d571e87791..6ca650867c 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -131,7 +131,10 @@ e_text_model_destroy (GtkObject *object)
static gchar *
e_text_model_real_get_text(ETextModel *model)
{
- return model->text;
+ if (model->text)
+ return model->text;
+ else
+ return "";
}
static void