diff options
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); } } |