diff options
Diffstat (limited to 'addressbook/backend/ebook/load-gnomecard-addressbook.c')
-rw-r--r-- | addressbook/backend/ebook/load-gnomecard-addressbook.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c index 6f592a4664..0e26c2d101 100644 --- a/addressbook/backend/ebook/load-gnomecard-addressbook.c +++ b/addressbook/backend/ebook/load-gnomecard-addressbook.c @@ -2,22 +2,18 @@ #include <config.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")); } @@ -28,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 @@ -43,8 +39,8 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure) g_list_free(list); } -static guint -ebook_create (void) +static gboolean +ebook_create (gpointer data) { EBook *book; gchar *path, *uri; @@ -59,8 +55,9 @@ 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); @@ -80,10 +77,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 (); |