callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cancel any pending queries.

Browse Source 
2001-10-26  Jon Trowbridge  <trow@ximian.com>

	* gui/component/e-address-popup.c (e_address_popup_destroy):
	Cancel any pending queries.

svn path=/trunk/; revision=14194
This commit is contained in:
Jon Trowbridge
2001-10-27 01:59:49 +00:00
committed by Jon Trowbridge
parent 128d15489f
commit 3eca5f6e1c
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addressbook/ChangeLog
View File

@ -1,5 +1,8 @@
2001-10-26 Jon Trowbridge <trow@ximian.com>
* gui/component/e-address-popup.c (e_address_popup_destroy):
Cancel any pending queries.
* gui/contact-editor/e-contact-editor.c (close_dialog): Don't
assert, but check if ce->app != NULL, since this function can
(apparently) get called multiple times.

12
addressbook/gui/component/e-address-popup.c
View File

@ -687,6 +687,12 @@ e_address_popup_destroy (GtkObject *obj)
if (pop->scheduled_refresh)
gtk_idle_remove (pop->scheduled_refresh);
if (pop->query_tag)
e_book_simple_query_cancel (pop->book, pop->query_tag);
if (pop->book)
gtk_object_unref (GTK_OBJECT (pop->book));
g_free (pop->name);
g_free (pop->email);
@ -1095,6 +1101,12 @@ start_query (EBook *book, gpointer closure)
if (pop->query_tag)
e_book_simple_query_cancel (book, pop->query_tag);
if (pop->book != book) {
gtk_object_ref (GTK_OBJECT (book));
gtk_object_unref (GTK_OBJECT (pop->book));
pop->book = book;
}
pop->query_tag = e_book_name_and_email_query (book, pop->name, pop->email, query_cb, pop);
}