Call set_errcall() earlier, so it can catch errors in env->open.

2007-05-21  Ross Burton  <ross@openedhand.com>

	* backends/file/e-book-backend-file.c:
	Call set_errcall() earlier, so it can catch errors in env->open.

svn path=/trunk/; revision=7769

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index bb0cab4..68fe587 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,6 +1,11 @@
 2007-05-21  Ross Burton  <ross@openedhand.com>
 
        * backends/file/e-book-backend-file.c:
+       Call set_errcall() earlier, so it can catch errors in env->open.
+
+2007-05-21  Ross Burton  <ross@openedhand.com>
+
+       * backends/file/e-book-backend-file.c:
        Move a g_free to the correct place, to avoid calling g_free (NULL).
 
 2007-05-20  Ross Burton  <ross@openedhand.com>

diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index abd33d4..d4d3520 100644 (file)
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -1100,6 +1100,8 @@ e_book_backend_file_load_source (EBookBackend           *backend,
                        return db_error_to_status (db_error);
                }
 
+               env->set_errcall (env, file_errcall);
+
                /* Set the allocation routines to the non-aborting GLib functions */
                env->set_alloc (env, (void *(*)(size_t))g_try_malloc, 
                                (void *(*)(void *, size_t))g_try_realloc,
@@ -1115,8 +1117,6 @@ e_book_backend_file_load_source (EBookBackend           *backend,
                        return db_error_to_status (db_error);
                }
 
-               env->set_errcall (env, file_errcall);
-
                global_env.env = env;
                global_env.ref_count = 1;
        }