diff options
| author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
| commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
| tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/text/e-text-model.c | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.bz2 gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.lz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.xz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip | |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/text/e-text-model.c')
| -rw-r--r-- | widgets/text/e-text-model.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index da8644570b..d761f8e193 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -27,11 +27,12 @@ #include <ctype.h> #include <string.h> #include <gtk/gtksignal.h> +#include <gal/util/e-util.h> #include "e-text-model-repos.h" #include "e-text-model.h" #include "gal/util/e-util.h" -#define CLASS(obj) (E_TEXT_MODEL_CLASS (GTK_OBJECT (obj)->klass)) +#define CLASS(obj) (E_TEXT_MODEL_CLASS (GTK_OBJECT_GET_CLASS (obj))) #define MAX_LENGTH (2047) @@ -121,7 +122,7 @@ e_text_model_class_init (ETextModelClass *klass) GTK_RUN_LAST, E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextModelClass, reposition), - gtk_marshal_NONE__POINTER_POINTER, + e_marshal_NONE__POINTER_POINTER, GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER); @@ -186,10 +187,12 @@ e_text_model_destroy (GtkObject *object) model = E_TEXT_MODEL (object); - g_free (model->priv->text); + if (model->priv) { + g_free (model->priv->text); - g_free (model->priv); - model->priv = NULL; + g_free (model->priv); + model->priv = NULL; + } if (GTK_OBJECT_CLASS (parent_class)->destroy) GTK_OBJECT_CLASS (parent_class)->destroy (object); |