diff options
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-book-factory.c | 8 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-book-factory.h | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 1d3e27859b..87fa6f0fd5 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2001-01-17 Federico Mena Quintero <federico@ximian.com> + + * backend/pas/pas-book-factory.c (pas_book_factory_activate): Made + it return a gboolean; it was completely ignoring the return value + from register_factory(). + 2001-01-17 Larry Ewing <lewing@helixcode.com> * backend/ebook/.cvsignore: add evolution-gnomecard-importer. diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c index 6584bc8589..e1470c1fad 100644 --- a/addressbook/backend/pas/pas-book-factory.c +++ b/addressbook/backend/pas/pas-book-factory.c @@ -447,13 +447,13 @@ register_factory (CORBA_Object obj) /** * pas_book_factory_activate: */ -void +gboolean pas_book_factory_activate (PASBookFactory *factory) { - g_return_if_fail (factory != NULL); - g_return_if_fail (PAS_IS_BOOK_FACTORY (factory)); + g_return_val_if_fail (factory != NULL, FALSE); + g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), FALSE); - register_factory (bonobo_object_corba_objref (BONOBO_OBJECT (factory))); + return register_factory (bonobo_object_corba_objref (BONOBO_OBJECT (factory))); } static void diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h index 7e4690adf1..7f8754ce2f 100644 --- a/addressbook/backend/pas/pas-book-factory.h +++ b/addressbook/backend/pas/pas-book-factory.h @@ -35,7 +35,7 @@ void pas_book_factory_register_backend (PASBookFactory int pas_book_factory_get_n_backends (PASBookFactory *factory); -void pas_book_factory_activate (PASBookFactory *factory); +gboolean pas_book_factory_activate (PASBookFactory *factory); GtkType pas_book_factory_get_type (void); |