From bc9f58d42aab81a76e020a21c4760ca098df0aa8 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sun, 9 Jul 2000 07:17:15 +0000 Subject: Return "" instead of NULL. 2000-07-09 Christopher James Lahey * widgets/e-text/e-text-model.c (e_text_model_real_get_text): Return "" instead of NULL. svn path=/trunk/; revision=4003 --- ChangeLog | 5 +++++ widgets/e-text/e-text-model.c | 5 ++++- widgets/text/e-text-model.c | 5 ++++- 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 + + * widgets/e-text/e-text-model.c (e_text_model_real_get_text): + Return "" instead of NULL. + 2000-07-07 Christopher James Lahey * 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 -- cgit v1.2.3