diff options
author | Chris Toshok <toshok@ximian.com> | 2002-11-09 11:11:33 +0800 |
---|---|---|
committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-09 11:11:33 +0800 |
commit | 0b1546202c75992262a3da84bcf8adf2c216022a (patch) | |
tree | 5ced1ebdf4adcf466a2f9b66f92097a240407b37 /addressbook/gui/component/select-names/e-select-names-text-model.c | |
parent | 2fb9565ed501cc57da1ca42ff540fd123c00ba48 (diff) | |
download | gsoc2013-evolution-0b1546202c75992262a3da84bcf8adf2c216022a.tar gsoc2013-evolution-0b1546202c75992262a3da84bcf8adf2c216022a.tar.gz gsoc2013-evolution-0b1546202c75992262a3da84bcf8adf2c216022a.tar.bz2 gsoc2013-evolution-0b1546202c75992262a3da84bcf8adf2c216022a.tar.lz gsoc2013-evolution-0b1546202c75992262a3da84bcf8adf2c216022a.tar.xz gsoc2013-evolution-0b1546202c75992262a3da84bcf8adf2c216022a.tar.zst gsoc2013-evolution-0b1546202c75992262a3da84bcf8adf2c216022a.zip |
parent class is GObjectClass.
2002-11-08 Chris Toshok <toshok@ximian.com>
* gui/component/select-names/e-select-names-model.h: parent class
is GObjectClass.
* gui/component/select-names/e-simple-card-bonobo.c
(impl_dispose): guard against multiple invocations, and chain
dispose.
* gui/component/select-names/e-select-names.c
(e_select_names_dispose): guard against multiple invocations.
* gui/component/select-names/e-select-names-text-model.c
(e_select_names_text_model_dispose): guard against multiple
invocations.
(e_select_names_text_model_set_source): fix casts.
* gui/component/select-names/e-select-names-table-model.c
(e_select_names_table_model_add_source): remove the GTK_OBJECT
cast, fixes a warning.
(clear_info): guard against multiple invocations from ::dispose.
* gui/component/select-names/e-select-names-manager.c
(e_select_names_manager_dispose): same.
* gui/component/select-names/e-select-names-completion.c
(e_select_names_completion_dispose): same.
* gui/component/select-names/e-select-names-bonobo.c
(impl_dispose): guard against multiple invocations.
svn path=/trunk/; revision=18681
Diffstat (limited to 'addressbook/gui/component/select-names/e-select-names-text-model.c')
-rw-r--r-- | addressbook/gui/component/select-names/e-select-names-text-model.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c index 2463e4c1f2..48a1601770 100644 --- a/addressbook/gui/component/select-names/e-select-names-text-model.c +++ b/addressbook/gui/component/select-names/e-select-names-text-model.c @@ -163,8 +163,14 @@ e_select_names_text_model_dispose (GObject *object) model = E_SELECT_NAMES_TEXT_MODEL (object); - g_free (model->text); - g_free (model->sep); + if (model->text) { + g_free (model->text); + model->text = NULL; + } + if (model->sep) { + g_free (model->sep); + model->sep = NULL; + } e_select_names_text_model_set_source (model, NULL); @@ -264,13 +270,13 @@ e_select_names_text_model_set_source (ESelectNamesTextModel *model, if (model->source) { g_object_ref (model->source); - model->source_changed_id = g_signal_connect (GTK_OBJECT(model->source), + model->source_changed_id = g_signal_connect (model->source, "changed", - GTK_SIGNAL_FUNC (changed_cb), + G_CALLBACK (changed_cb), model); - model->source_resize_id = g_signal_connect (GTK_OBJECT(model->source), + model->source_resize_id = g_signal_connect (model->source, "resized", - GTK_SIGNAL_FUNC (resize_cb), + G_CALLBACK (resize_cb), model); } } |