~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick

« back to all changes in this revision

Viewing changes to debian/patches/60_google_backend_lookup.patch

  • Committer: Bazaar Package Importer
  • Author(s): Baptiste Mille-Mathias
  • Date: 2010-09-04 11:26:17 UTC
  • Revision ID: james.westby@ubuntu.com-20100904112617-7t1f3pvxli2vejgi
Tags: 2.30.3-1ubuntu2
* debian/patches/60_google_backend_lookup.patch:
  - Fix crash when lookup address in google backend (LP: #602225)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Reference counting error in Google backend
 
2
# Fix from Matthew Barnes <mbarnes@redhat.com> ported to 2.30 by Baptiste Mille-Mathias 
 
3
# http://git.gnome.org/browse/evolution-data-server/commit/?id=2440b4744a2f12abfd1bd616a5e72a9faf879b96
 
4
# LP #602225
 
5
--- evolution-data-server-2.22.1.orig/addressbook/backends/google/e-book-backend-google.c       2010-09-04 11:54:10.447797001 +0200
 
6
+++ evolution-data-server-2.22.1/addressbook/backends/google/e-book-backend-google.c         2010-09-04 11:55:04.167797001 +0200
 
7
@@ -328,12 +328,15 @@ e_book_backend_google_stop_book_view (EB
 
8
                                      EDataBookView *bookview)
 
9
 {
 
10
     EBookBackendGooglePrivate *priv;
 
11
+    GList *link;
 
12
 
 
13
     __debug__ (G_STRFUNC);
 
14
     priv = GET_PRIVATE (backend);
 
15
 
 
16
-    priv->bookviews = g_list_remove (priv->bookviews, bookview);
 
17
-    e_data_book_view_unref (bookview);
 
18
+    if ((link = g_list_find (priv->bookviews, bookview)) != NULL) {
 
19
+        priv->bookviews = g_list_remove (priv->bookviews, bookview);
 
20
+        e_data_book_view_unref (bookview);
 
21
+    };
 
22
 
 
23
     if (NULL == priv->bookviews) {
 
24
        google_book_set_live_mode (priv->book, FALSE);