aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/backend')
-rw-r--r--addressbook/backend/ebook/e-book-view-listener.c22
-rw-r--r--addressbook/backend/ebook/e-destination.c2
-rw-r--r--addressbook/backend/ebook/e-destination.h2
3 files changed, 16 insertions, 10 deletions
diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
index f1fd4d4519..d0323a9874 100644
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ b/addressbook/backend/ebook/e-book-view-listener.c
@@ -58,19 +58,21 @@ e_book_view_listener_check_queue (EBookViewListener *listener)
else
thrash = 0;
- if (thrash > 20) {
- g_error ("e_book_view_listener_check_queue thrashing!");
- thrash = 0;
- listener->priv->idle_id = 0;
- return FALSE;
- }
+ if (thrash > 20 || listener->priv->response_queue == NULL) {
- if (listener->priv->response_queue == NULL) {
+ if (thrash > 20) {
+ g_error ("e_book_view_listener_check_queue thrashing!");
+ thrash = 0;
+ }
+
listener->priv->idle_id = 0;
+
+ /* Only release our listener reference when the idle is finished. */
bonobo_object_unref (BONOBO_OBJECT (listener));
+
return FALSE;
}
- bonobo_object_unref (BONOBO_OBJECT (listener));
+
return TRUE;
}
@@ -84,6 +86,10 @@ e_book_view_listener_queue_response (EBookViewListener *listener,
response);
if (listener->priv->idle_id == 0) {
+
+ /* Hold a reference to the listener while the idle is active. */
+ gtk_object_ref (GTK_OBJECT (listener));
+
listener->priv->idle_id = g_idle_add (
(GSourceFunc) e_book_view_listener_check_queue, listener);
}
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
index 42377aaa33..f470769a2e 100644
--- a/addressbook/backend/ebook/e-destination.c
+++ b/addressbook/backend/ebook/e-destination.c
@@ -119,7 +119,7 @@ e_destination_new (void)
}
EDestination *
-e_destination_copy (EDestination *dest)
+e_destination_copy (const EDestination *dest)
{
EDestination *new_dest;
GList *iter;
diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h
index c4d742afbe..c53f255436 100644
--- a/addressbook/backend/ebook/e-destination.h
+++ b/addressbook/backend/ebook/e-destination.h
@@ -60,7 +60,7 @@ GtkType e_destination_get_type (void);
EDestination *e_destination_new (void);
-EDestination *e_destination_copy (EDestination *);
+EDestination *e_destination_copy (const EDestination *);
void e_destination_clear (EDestination *);
gboolean e_destination_is_empty (EDestination *);