callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Append /addressbook.db to the end of the default URI if it starts with

Browse Source 
* backend/ebook/e-book-util.c (e_book_load_default_book): Append
	/addressbook.db to the end of the default URI if it starts with
	file:

	* backend/ebook/e-book.c (e_book_load_uri_step): Fix this to not
	loop forever if you have more than one backend.

svn path=/trunk/; revision=16519
This commit is contained in:
Dan Winship
2002-04-18 20:50:28 +00:00
parent 6ac6466501
commit 0c7e55e75c
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/ChangeLog
View File

@ -1,3 +1,12 @@
2002-04-18 Dan Winship <danw@ximian.com>
* backend/ebook/e-book-util.c (e_book_load_default_book): Append
/addressbook.db to the end of the default URI if it starts with
file:
* backend/ebook/e-book.c (e_book_load_uri_step): Fix this to not
loop forever if you have more than one backend.
2002-04-17 Christopher James Lahey <clahey@ximian.com> 2002-04-17 Christopher James Lahey <clahey@ximian.com>
* gui/component/select-names/e-select-names.c * gui/component/select-names/e-select-names.c

11
addressbook/backend/ebook/e-book-util.c
View File

@ -242,7 +242,7 @@ e_book_default_book_open (EBook *book, EBookStatus status, gpointer closure)
gboolean gboolean
e_book_load_default_book (EBook *book, EBookCallback open_response, gpointer closure) e_book_load_default_book (EBook *book, EBookCallback open_response, gpointer closure)
{ {
char *val; char *val, *uri;
gboolean rv; gboolean rv;
CORBA_Environment ev; CORBA_Environment ev;
Bonobo_ConfigDatabase config_db; Bonobo_ConfigDatabase config_db;
@ -260,8 +260,15 @@ e_book_load_default_book (EBook *book, EBookCallback open_response, gpointer clo
DefaultBookClosure *default_book_closure = g_new (DefaultBookClosure, 1); DefaultBookClosure *default_book_closure = g_new (DefaultBookClosure, 1);
default_book_closure->closure = closure; default_book_closure->closure = closure;
default_book_closure->open_response = open_response; default_book_closure->open_response = open_response;
rv = e_book_load_uri (book, val,
/* Sigh. FIXME. */
if (!strncmp (val, "file:", 5))
uri = g_strconcat (val, "/addressbook.db", NULL);
else
uri = g_strdup (val);
rv = e_book_load_uri (book, uri,
e_book_default_book_open, default_book_closure); e_book_default_book_open, default_book_closure);
g_free (uri);
g_free (val); g_free (val);
} }
else { else {

2
addressbook/backend/ebook/e-book.c
View File

@ -547,7 +547,7 @@ e_book_load_uri_step (EBook *book, EBookStatus status, EBookLoadURIData *data)
{ {
/* iterate to the next possible CardFactory, or fail /* iterate to the next possible CardFactory, or fail
if it's the last one */ if it's the last one */
book->priv->iter = book->priv->book_factories->next; book->priv->iter = book->priv->iter->next;
if (book->priv->iter) { if (book->priv->iter) {
GNOME_Evolution_Addressbook_BookFactory factory = book->priv->iter->data; GNOME_Evolution_Addressbook_BookFactory factory = book->priv->iter->data;
e_book_load_uri_from_factory (book, factory, data); e_book_load_uri_from_factory (book, factory, data);