1 files changed, 22 insertions, 24 deletions

diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
index c1d58a88bf..b7bc394e55 100644
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ b/addressbook/backend/ebook/load-pine-addressbook.c
@@ -3,22 +3,17 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-init.h>
+#include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.h>
 
 #include "e-book.h"
 
 static CORBA_Environment ev;
 
 static void
-init_bonobo (int argc, char **argv)
+init_bonobo (int *argc, char **argv)
 {
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
+	if (bonobo_init (argc, argv) == FALSE)
 		g_error (_("Could not initialize Bonobo"));
 }
 
@@ -29,7 +24,7 @@ add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
 	char *vcard = e_card_get_vcard_assume_utf8(card);
 	g_print ("Saved card: %s\n", vcard);
 	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
+	g_object_unref(card);
 }
 
 static void
@@ -44,14 +39,14 @@ parse_line (EBook *book, char *line)
 	strings = g_strsplit(line, "\t", 3);
 	if (strings[0] && strings[1] && strings[2]) {
 		name = e_card_name_from_string(strings[1]);
-		gtk_object_set(GTK_OBJECT(card),
-			       "nickname", strings[0],
-			       "full_name", strings[1],
-			       "name", name,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card),
-			       "email", &list,
-			       NULL);
+		g_object_set(card,
+			     "nickname", strings[0],
+			     "full_name", strings[1],
+			     "name", name,
+			     NULL);
+		g_object_get(card,
+			     "email", &list,
+			     NULL);
 		e_list_append(list, strings[2]);
 		e_book_add_card(book, card, add_card_cb, card);
 	}
@@ -99,8 +94,8 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
 	}
 }
 
-static guint
-ebook_create (void)
+static gboolean
+ebook_create (gpointer data)
 {
 	EBook *book;
 	gchar *path, *uri;
@@ -115,8 +110,10 @@ ebook_create (void)
 	}
 	
 
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
+	path = g_build_filename (g_get_home_dir (),
+				 "evolution/local/Contacts/addressbook.db",
+				 NULL);
+
 	uri = g_strdup_printf ("file://%s", path);
 	g_free (path);
 
@@ -161,10 +158,11 @@ main (int argc, char **argv)
 	CORBA_exception_init (&ev);
 
 	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
 
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
+	bonobo_activation_init (argc, argv);
+	init_bonobo (&argc, argv);
+
+	g_idle_add (ebook_create, NULL);
 	
 	bonobo_main ();