diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-07-16 16:13:51 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-07-16 16:13:51 +0800 |
| commit | e7c7bd9cac4ca46d5ee9b03722a0ae1989797b59 (patch) | |
| tree | a8e3d655e5e4a992318c1c0badef74475600f922 | |
| parent | 6b532af3e9071e69423c1455658ff7b81b432ecb (diff) | |
| download | gsoc2013-evolution-e7c7bd9cac4ca46d5ee9b03722a0ae1989797b59.tar.gz gsoc2013-evolution-e7c7bd9cac4ca46d5ee9b03722a0ae1989797b59.tar.zst gsoc2013-evolution-e7c7bd9cac4ca46d5ee9b03722a0ae1989797b59.zip | |
[ fixes #60873, and possibly other crashes ]
2004-07-14 Chris Toshok <toshok@ximian.com>
[ fixes #60873, and possibly other crashes ]
* gui/widgets/e-addressbook-model.c (get_view): don't call
free_data before potentially making an async call. Or rather,
don't call free_data without ensure we'll be emitting
MODEL_CHANGED shortly after.
svn path=/trunk/; revision=26661
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-model.c | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c96f99dff3..458a73b95f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,14 @@ 2004-07-14 Chris Toshok <toshok@ximian.com> + [ fixes #60873, and possibly other crashes ] + + * gui/widgets/e-addressbook-model.c (get_view): don't call + free_data before potentially making an async call. Or rather, + don't call free_data without ensure we'll be emitting + MODEL_CHANGED shortly after. + +2004-07-14 Chris Toshok <toshok@ximian.com> + * gui/contact-list-editor/.cvsignore: ignore Evolution-Addressbook-SelectNames.h. diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 244c37cb0c..e6f4ecb868 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -501,7 +501,6 @@ get_view (EABModel *model) limit = atoi (limit_str); remove_book_view(model); - free_data (model); if (model->first_get_view) { model->first_get_view = FALSE; @@ -509,6 +508,8 @@ get_view (EABModel *model) if (e_book_check_static_capability (model->book, "do-initial-query")) { success = e_book_async_get_book_view (model->book, model->query, NULL, limit, book_view_loaded, model); } else { + free_data (model); + g_signal_emit (model, eab_model_signals [MODEL_CHANGED], 0); g_signal_emit (model, |