aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/backend/ebook/e-book.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 895f0cb0d2..f1528492e6 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-03 Chris Toshok <toshok@ximian.com>
+
+ * backend/ebook/e-book.c (activate_factories_for_uri): finally
+ remove the #if 0's and use the oaf query stuff to get backends
+ that handle specific protocols.
+
2002-05-03 Christopher James Lahey <clahey@ximian.com>
* gui/component/addressbook-config.c
@@ -55,6 +61,7 @@
menu item if there are no email addresses in the listed contacts.
Fixes bug #1298.
+>>>>>>> 1.1041
2002-04-30 Christopher James Lahey <clahey@ximian.com>
* backend/ebook/e-card.c (e_card_list_send): Changed this to set a
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index 61930fc4d6..28308a7016 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -626,9 +626,7 @@ activate_factories_for_uri (EBook *book, const char *uri)
protocol = g_strndup (uri, colon-uri);
query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/BookFactory:1.0')"
-#if 0
" AND addressbook:supported_protocols.has ('%s')", protocol
-#endif
);
CORBA_exception_init (&ev);