aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-09-29 07:26:59 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-09-29 07:26:59 +0800
commitddbb5d882b691588573c60c5c41aa4cd33a25b76 (patch)
tree4fd54ba47f8f910b429f0e76090e504242d8f560
parentc540870b0c5653363a06cf17fab33b7ffff49e78 (diff)
downloadgsoc2013-evolution-ddbb5d882b691588573c60c5c41aa4cd33a25b76.tar
gsoc2013-evolution-ddbb5d882b691588573c60c5c41aa4cd33a25b76.tar.gz
gsoc2013-evolution-ddbb5d882b691588573c60c5c41aa4cd33a25b76.tar.bz2
gsoc2013-evolution-ddbb5d882b691588573c60c5c41aa4cd33a25b76.tar.lz
gsoc2013-evolution-ddbb5d882b691588573c60c5c41aa4cd33a25b76.tar.xz
gsoc2013-evolution-ddbb5d882b691588573c60c5c41aa4cd33a25b76.tar.zst
gsoc2013-evolution-ddbb5d882b691588573c60c5c41aa4cd33a25b76.zip
Fix a stupid crash in ::destroy that was my fault.
svn path=/trunk/; revision=5624
-rw-r--r--widgets/shortcut-bar/ChangeLog5
-rw-r--r--widgets/shortcut-bar/e-shortcut-bar.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/widgets/shortcut-bar/ChangeLog b/widgets/shortcut-bar/ChangeLog
index 2b45fba9f8..58b315d2a8 100644
--- a/widgets/shortcut-bar/ChangeLog
+++ b/widgets/shortcut-bar/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-28 Ettore Perazzoli <ettore@helixcode.com>
+
+ * e-shortcut-bar.c (e_shortcut_bar_destroy): Disconnect the model
+ before freeing the group array.
+
2000-09-26 Ettore Perazzoli <ettore@helixcode.com>
* e-shortcut-bar.c (e_shortcut_bar_on_drag_data_delete): Emit the
diff --git a/widgets/shortcut-bar/e-shortcut-bar.c b/widgets/shortcut-bar/e-shortcut-bar.c
index 846e9e727f..2c15d499d2 100644
--- a/widgets/shortcut-bar/e-shortcut-bar.c
+++ b/widgets/shortcut-bar/e-shortcut-bar.c
@@ -244,10 +244,10 @@ e_shortcut_bar_destroy (GtkObject *object)
shortcut_bar = E_SHORTCUT_BAR (object);
- g_array_free (shortcut_bar->groups, TRUE);
-
e_shortcut_bar_disconnect_model (shortcut_bar);
+ g_array_free (shortcut_bar->groups, TRUE);
+
g_free (shortcut_bar->dragged_url);
g_free (shortcut_bar->dragged_name);