pidgin/plugins/gevolution/gevo-util.c

changeset 27706
ae1893256821
parent 26092
f52065eb12f1
child 28391
bde9215d656e
equal deleted inserted replaced
27705:06cdb9c6366f 27706:ae1893256821
141 gboolean result = FALSE; 141 gboolean result = FALSE;
142 142
143 g_return_val_if_fail(book != NULL, FALSE); 143 g_return_val_if_fail(book != NULL, FALSE);
144 144
145 if (uri == NULL) 145 if (uri == NULL)
146 *book = e_book_new_system_addressbook(NULL); 146 *book = e_book_new_system_addressbook(error);
147 else 147 else
148 *book = e_book_new_from_uri(uri, error); 148 *book = e_book_new_from_uri(uri, error);
149 149
150 result = e_book_open(*book, FALSE, NULL); 150 if (*book == NULL)
151 return FALSE;
152
153 *error = NULL;
154
155 result = e_book_open(*book, FALSE, error);
151 156
152 if (!result && *book != NULL) 157 if (!result && *book != NULL)
153 { 158 {
154 g_object_unref(*book); 159 g_object_unref(*book);
155 *book = NULL; 160 *book = NULL;

mercurial