[evolution-mapi/gnome-3-10] Book/Cal backends - do not call g_propagate_error() when there is no error



commit aeca0c5a2052accb1a649a5ef6ebc4ed7675888c
Author: Milan Crha <mcrha redhat com>
Date:   Wed Oct 16 13:13:05 2013 +0200

    Book/Cal backends - do not call g_propagate_error() when there is no error
    
    It only printed a runtime warning on a console

 src/addressbook/e-book-backend-mapi.c |    3 ++-
 src/calendar/e-cal-backend-mapi.c     |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index 84ff517..9725aea 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -534,7 +534,8 @@ ebbm_open (EBookBackendMAPI *ebma,
 
        e_book_backend_mapi_ensure_connected (ebma, cancellable, &error);
 
-       g_propagate_error (perror, error);
+       if (error)
+               g_propagate_error (perror, error);
 }
 
 static ESourceAuthenticationResult
diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
index 70a4d20..c097b90 100644
--- a/src/calendar/e-cal-backend-mapi.c
+++ b/src/calendar/e-cal-backend-mapi.c
@@ -1421,7 +1421,8 @@ ecbm_open (ECalBackend *backend,
 
        e_cal_backend_mapi_ensure_connected (cbmapi, cancellable, &error);
 
-       g_propagate_error (perror, error);
+       if (error)
+               g_propagate_error (perror, error);
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]