ignore the new .server file.

2002-11-05  Chris Toshok  <toshok@ximian.com>

	* gui/component/.cvsignore: ignore the new .server file.

	* gui/component/Makefile.am: typical port stuff.  switch the .oaf
	to .server, and leave out a lot of libs so we can actually get
	things linking.

	* gui/component/GNOME_Evolution_Addressbook.server.in: rename
	.oaf.in here.

	* gui/component/addressbook-component.c: Port to GObject/gnome2.

	* gui/component/addressbook-config.c: Port to GObject/gnome2.

	* gui/component/addressbook-factory.c: Port to GObject/gnome2.

	* gui/component/addressbook-storage.c: Port to GObject/gnome2.

	* gui/component/addressbook.[ch]: Port to GObject/gnome2.

	* gui/component/e-address-popup.[ch]: Port to GObject/gnome2.

	* gui/component/e-address-widget.[ch]: Port to GObject/gnome2.

	* gui/component/e-cardlist-model.h: Port to GObject/gnome2.

svn path=/trunk/; revision=18591

1 files changed, 9 insertions, 14 deletions

diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index ad7fa563a4..77b386ce77 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -97,7 +97,7 @@ create_view (EvolutionShellComponent *shell_component,
 		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
 
 	control = addressbook_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
+	bonobo_control_set_property (control, NULL, "folder_uri", physical_uri);
 
 	*control_return = control;
 
@@ -524,7 +524,7 @@ add_creatable_item (EvolutionShellComponent *shell_component,
 		icon = NULL;
 	} else {
 		icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);
-		icon = gdk_pixbuf_new_from_file (icon_path);
+		icon = gdk_pixbuf_new_from_file (icon_path, NULL);
 	}
 
 	evolution_shell_component_add_user_creatable_item (shell_component,
@@ -587,15 +587,12 @@ ensure_completion_uris_exist()
 {
 	/* Initialize the completion uris if they aren't set yet.  The
 	   default set is just the local Contacts folder. */
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
+	EConfigListener *db;
 	char *val;
 
-	CORBA_exception_init (&ev);
-	
-	db = addressbook_config_database (&ev);
+	db = e_book_get_config_database ();
 		
-	val = bonobo_config_get_string (db, "/Addressbook/Completion/uris", &ev);
+	val = e_config_listener_get_string (db, "/Addressbook/Completion/uris");
 
 	if (!val) {
 		EFolderListItem f[2];
@@ -616,12 +613,10 @@ ensure_completion_uris_exist()
 
 		g_free (dirname);
 		g_free (uri);
-		bonobo_config_set_string (db, "/Addressbook/Completion/uris", val, &ev);
+		e_config_listener_set_string (db, "/Addressbook/Completion/uris", val);
 
 		g_free (val);
 	}
-
-	CORBA_exception_free (&ev);
 }
 
 
@@ -636,9 +631,9 @@ addressbook_component_factory_init (void)
 
 	/* FIXME: Handle errors better?  */
 
-	result = oaf_active_server_register (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID,
-					     bonobo_object_corba_objref (object));
-	if (result == OAF_REG_ERROR)
+	result = bonobo_activation_active_server_register (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID,
+							   bonobo_object_corba_objref (object));
+	if (result == Bonobo_ACTIVATION_REG_ERROR)
 		g_error ("Cannot register -- %s", GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID);
 
 	/* XXX this could probably go someplace else, but I'll leave