diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-05-07 10:22:08 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-05-07 10:22:08 +0800 |
| commit | fe27ab117972b1d98792ee0c78abce0a3c4a0acb (patch) | |
| tree | e62ce3cab9a074917276ffb2ab3ee91e56deb11d /shell/e-shell.c | |
| parent | 3219faad0c583cf44add809ded9183ccc9c4f302 (diff) | |
| download | gsoc2013-evolution-fe27ab117972b1d98792ee0c78abce0a3c4a0acb.tar gsoc2013-evolution-fe27ab117972b1d98792ee0c78abce0a3c4a0acb.tar.gz gsoc2013-evolution-fe27ab117972b1d98792ee0c78abce0a3c4a0acb.tar.bz2 gsoc2013-evolution-fe27ab117972b1d98792ee0c78abce0a3c4a0acb.tar.lz gsoc2013-evolution-fe27ab117972b1d98792ee0c78abce0a3c4a0acb.tar.xz gsoc2013-evolution-fe27ab117972b1d98792ee0c78abce0a3c4a0acb.tar.zst gsoc2013-evolution-fe27ab117972b1d98792ee0c78abce0a3c4a0acb.zip | |
Portability fix (use `readdir()', not `readdir_r()'). Also, be safer
about NULL objects when destroying the shell or the shortcuts.
svn path=/trunk/; revision=2850
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 6c225cdf49..dbde28f890 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -91,9 +91,14 @@ destroy (GtkObject *object) shell = E_SHELL (object); priv = shell->priv; - gtk_object_unref (GTK_OBJECT (priv->storage_set)); - gtk_object_unref (GTK_OBJECT (priv->shortcuts)); - gtk_object_unref (GTK_OBJECT (priv->folder_type_repository)); + if (priv->storage_set != NULL) + gtk_object_unref (GTK_OBJECT (priv->storage_set)); + + if (priv->shortcuts != NULL) + gtk_object_unref (GTK_OBJECT (priv->shortcuts)); + + if (priv->folder_type_repository != NULL) + gtk_object_unref (GTK_OBJECT (priv->folder_type_repository)); g_free (priv); |