1 files changed, 21 insertions, 20 deletions

diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 6034a7ea74..106e1c8e97 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -35,7 +35,8 @@
 
 #include <bonobo/bonobo-widget.h>
 #include <bonobo/bonobo-exception.h>
-#include <liboaf/liboaf.h>
+
+#include <bonobo-activation/bonobo-activation.h>
 
 #include <string.h>
 
@@ -59,7 +60,7 @@ set_dialog_size (EShellSettingsDialog *dialog)
 	GdkFont *font;
 	int width, height;
 
-	font = GTK_WIDGET (dialog)->style->font;
+	font = gtk_style_get_font (GTK_WIDGET (dialog)->style);
 	width = gdk_string_width (font, "M") * 72;
 	height = (font->ascent + font->descent) * 35;
 
@@ -73,7 +74,7 @@ struct _Page {
 	char *title;
 	char *description;
 	GdkPixbuf *icon;
-	OAF_Property *type;
+	Bonobo_ActivationProperty *type;
 	int priority;
 	EConfigPage *page_widget;
 };
@@ -83,7 +84,7 @@ static Page *
 page_new (const char *title,
 	  const char *description,
 	  GdkPixbuf *icon,
-	  OAF_Property *type,
+	  Bonobo_ActivationProperty *type,
 	  int priority,
 	  EConfigPage *page_widget)
 {
@@ -141,7 +142,7 @@ static void
 load_pages (EShellSettingsDialog *dialog)
 {
 	EShellSettingsDialogPrivate *priv;
-	OAF_ServerInfoList *control_list;
+	Bonobo_ServerInfoList *control_list;
 	CORBA_Environment ev;
 	GSList *language_list;
 	GList *page_list;
@@ -152,9 +153,9 @@ load_pages (EShellSettingsDialog *dialog)
 	
 	CORBA_exception_init (&ev);
 
-	control_list = oaf_query ("defined(evolution:config_item:title)", NULL, &ev);
+	control_list = bonobo_activation_query ("defined(evolution:config_item:title)", NULL, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION || control_list == NULL) {
-		g_warning ("Cannot load configuration pages -- %s", ev._repo_id);
+		g_warning ("Cannot load configuration pages -- %s", BONOBO_EX_REPOID (&ev));
 		CORBA_exception_free (&ev);
 		return;
 	}
@@ -164,45 +165,45 @@ load_pages (EShellSettingsDialog *dialog)
 	page_list = NULL;
 	for (i = 0; i < control_list->_length; i ++) {
 		CORBA_Object corba_object;
-		OAF_ServerInfo *info;
+		Bonobo_ServerInfo *info;
 		const char *title;
 		const char *description;
 		const char *icon_path;
 		const char *priority_string;
-		OAF_Property *type;
+		Bonobo_ActivationProperty *type;
 		int priority;
 		GdkPixbuf *icon;
 
 		info = & control_list->_buffer[i];
 
-		title       	= oaf_server_info_prop_lookup (info, "evolution:config_item:title", language_list);
-		description 	= oaf_server_info_prop_lookup (info, "evolution:config_item:description", language_list);
-		icon_path   	= oaf_server_info_prop_lookup (info, "evolution:config_item:icon_name", NULL);
-		type            = oaf_server_info_prop_find (info, "evolution:config_item:type");
-		priority_string = oaf_server_info_prop_lookup (info, "evolution:config_item:priority", NULL);
+		title       	= bonobo_server_info_prop_lookup (info, "evolution:config_item:title", language_list);
+		description 	= bonobo_server_info_prop_lookup (info, "evolution:config_item:description", language_list);
+		icon_path   	= bonobo_server_info_prop_lookup (info, "evolution:config_item:icon_name", NULL);
+		type            = bonobo_server_info_prop_find   (info, "evolution:config_item:type");
+		priority_string = bonobo_server_info_prop_lookup (info, "evolution:config_item:priority", NULL);
 
 		if (icon_path == NULL) {
 			icon = NULL;
 		} else {
 			if (g_path_is_absolute (icon_path)) {
-				icon = gdk_pixbuf_new_from_file (icon_path);
+				icon = gdk_pixbuf_new_from_file (icon_path, NULL);
 			} else {
 				char *real_icon_path;
 
 				real_icon_path = g_concat_dir_and_file (EVOLUTION_IMAGES, icon_path);
-				icon = gdk_pixbuf_new_from_file (real_icon_path);
+				icon = gdk_pixbuf_new_from_file (real_icon_path, NULL);
 				g_free (real_icon_path);
 			}
 		}
 
-		if (type != NULL && type->v._d != OAF_P_STRINGV)
+		if (type != NULL && type->v._d != Bonobo_ACTIVATION_P_STRINGV)
 			type = NULL;
 		if (priority_string == NULL)
 			priority = 0xffff;
 		else
 			priority = atoi (priority_string);
 
-		corba_object = oaf_activate_from_id ((char *) info->iid, 0, NULL, &ev);
+		corba_object = bonobo_activation_activate_from_id ((char *) info->iid, 0, NULL, &ev);
 
 		if (! BONOBO_EX (&ev)) {
 			Page *page;
@@ -212,7 +213,7 @@ load_pages (EShellSettingsDialog *dialog)
 
 			page_list = g_list_prepend (page_list, page);
 		} else {
-			g_warning ("Cannot activate %s -- %s", info->iid, BONOBO_EX_ID (&ev));
+			g_warning ("Cannot activate %s -- %s", info->iid, BONOBO_EX_REPOID (&ev));
 		}
 
 		if (icon != NULL)
@@ -232,7 +233,7 @@ load_pages (EShellSettingsDialog *dialog)
 						page->page_widget);
 
 		if (page->type != NULL) {
-			GNOME_stringlist list = page->type->v._u.value_stringv;
+			Bonobo_StringList list = page->type->v._u.value_stringv;
 			
 			for (j = 0; j < list._length; j++) {
 				if (g_hash_table_lookup (priv->types, list._buffer[j]) == NULL)