From 1d9a3023e59067ea10eea867cbcb831ea265beb3 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 27 Jan 2003 18:54:56 +0000 Subject: #include bonobo-activation instead of oaf. (main): Initialize using * tools/evolution-addressbook-export.c: #include bonobo-activation instead of oaf. (main): Initialize using gnome_program_init(). (save_cards): Use g_main_loop_quit() instead of gtk_exit(). * tools/evolution-addressbook-import.c: Update include list for GNOME 2. (main): Initialize using gnome_program_init(). (unref_executable): Use g_main_loop_quit() instead of gtk_exit(). (add_cb): Likewise. * tools/evolution-addressbook-abuse.c: Update include list for GNOME 2. (main): Initialize using gnome_program_init(). (use_addressbook): Use g_object_unref() instead of gtk_object_unref(). (main): Use g_timeout_add() instead of gtk_timeout_add(). (add_cb): Use g_main_loop_quit() instead of gtk_exit(). * configure.in (AC_SUBST): Add tools/Makefile. * Makefile.am (SUBDIRS): Add tools/ back into the list. * tools/Makefile.am: Install everything in $(datadir)/evolution-$(BASE_VERSION)/tools. (INCLUDES): Add the defines that gnome_program_init() likes and also add the _DISABLE_DEPRECATED stuff. svn path=/trunk/; revision=19656 --- tools/evolution-addressbook-export.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'tools/evolution-addressbook-export.c') diff --git a/tools/evolution-addressbook-export.c b/tools/evolution-addressbook-export.c index e21053b300..585728f853 100644 --- a/tools/evolution-addressbook-export.c +++ b/tools/evolution-addressbook-export.c @@ -2,7 +2,7 @@ #include -#include +#include #include #include #include @@ -26,7 +26,7 @@ save_cards (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpoi result = e_write_file_mkstemp (tmpname, vcard); printf (tmpname); sync(); - gtk_exit (result); + g_main_loop_quit (NULL); } static void @@ -44,7 +44,6 @@ main (int argc, char *argv[]) struct poptOption options[] = { { "output-file", '\0', POPT_ARG_STRING, &filename, 0, N_("Output File"), NULL }, - { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL }, POPT_AUTOHELP { NULL, '\0', 0, NULL, 0, NULL, NULL } }; @@ -52,12 +51,11 @@ main (int argc, char *argv[]) bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); textdomain (PACKAGE); - gnome_init_with_popt_table ("evolution-addressbook-clean", "0.0", - argc, argv, options, 0, NULL); - oaf_init (argc, argv); - - if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) - g_error (_("Could not initialize Bonobo")); + gnome_program_init ("evolution-addressbook-export", VERSION, + LIBGNOMEUI_MODULE, argc, argv, + GNOME_PROGRAM_STANDARD_PROPERTIES, + GNOME_PARAM_POPT_TABLE, options, + NULL); e_book_use_default_book (use_addressbook, filename); -- cgit v1.2.3