diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-11-12 11:28:38 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-12 11:28:38 +0800 |
| commit | b5d027f4285267d769975ab7fc4ec95959375b26 (patch) | |
| tree | eb16b66cb8ec40789eccb04541b4260d40b4412f | |
| parent | f9ea4ba866e44ba394cbd7364555ebb0e3916a8a (diff) | |
| download | gsoc2013-evolution-b5d027f4285267d769975ab7fc4ec95959375b26.tar gsoc2013-evolution-b5d027f4285267d769975ab7fc4ec95959375b26.tar.gz gsoc2013-evolution-b5d027f4285267d769975ab7fc4ec95959375b26.tar.bz2 gsoc2013-evolution-b5d027f4285267d769975ab7fc4ec95959375b26.tar.lz gsoc2013-evolution-b5d027f4285267d769975ab7fc4ec95959375b26.tar.xz gsoc2013-evolution-b5d027f4285267d769975ab7fc4ec95959375b26.tar.zst gsoc2013-evolution-b5d027f4285267d769975ab7fc4ec95959375b26.zip | |
only clear choices if cv->choices != NULL. (e_completion_view_disconnect):
2002-11-11 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-completion-view.c (e_completion_view_destroy): only
clear choices if cv->choices != NULL.
(e_completion_view_disconnect): zero out cancel_signal_id.
svn path=/trunk/; revision=18718
| -rw-r--r-- | widgets/text/e-completion-view.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c index 42b2a53876..d09176c98a 100644 --- a/widgets/text/e-completion-view.c +++ b/widgets/text/e-completion-view.c @@ -296,11 +296,13 @@ e_completion_view_destroy (GtkObject *object) ECompletionView *cv = E_COMPLETION_VIEW (object); e_completion_view_disconnect (cv); - e_completion_view_clear_choices (cv); - if (cv->choices) + if (cv->choices) { + e_completion_view_clear_choices (cv); + g_ptr_array_free (cv->choices, TRUE); - cv->choices = NULL; + cv->choices = NULL; + } if (cv->key_widget) { gtk_signal_disconnect (GTK_OBJECT (cv->key_widget), cv->key_signal_id); @@ -340,6 +342,7 @@ e_completion_view_disconnect (ECompletionView *cv) cv->begin_signal_id = 0; cv->comp_signal_id = 0; cv->restart_signal_id = 0; + cv->cancel_signal_id = 0; cv->end_signal_id = 0; cv->clear_signal_id = 0; cv->lost_signal_id = 0; |