diff options
Diffstat (limited to 'addressbook/backend/ebook/evolution-vcard-importer.c')
| -rw-r--r-- | addressbook/backend/ebook/evolution-vcard-importer.c | 105 |
1 files changed, 79 insertions, 26 deletions
diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c index b5baebf2d1..f07192d72c 100644 --- a/addressbook/backend/ebook/evolution-vcard-importer.c +++ b/addressbook/backend/ebook/evolution-vcard-importer.c @@ -1,14 +1,13 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ #include <config.h> #include <stdio.h> -#include <string.h> +#include <liboaf/liboaf.h> #include <bonobo/bonobo-context.h> #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-main.h> #include <e-book.h> -#include <e-book-util.h> #include <importer/evolution-importer.h> #include <importer/GNOME_Evolution_Importer.h> @@ -16,10 +15,12 @@ #include <e-util/e-path.h> #define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory" -#define COMPONENT_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_Importer" + +static BonoboGenericFactory *factory = NULL; typedef struct { char *filename; + char *folderpath; GList *cardlist; GList *iterator; EBook *book; @@ -30,7 +31,7 @@ static void add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure) { ECard *card = E_CARD(closure); - g_object_unref(card); + gtk_object_unref(GTK_OBJECT(card)); } static void @@ -43,18 +44,39 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure) } static void -ebook_open (VCardImporter *gci, const char *uri) +ebook_create (VCardImporter *gci) { + gchar *path, *uri; + gchar *epath; + gci->book = e_book_new (); if (!gci->book) { printf ("%s: %s(): Couldn't create EBook, bailing.\n", __FILE__, - G_GNUC_FUNCTION); + __FUNCTION__); return; } - e_book_load_address_book_by_uri (gci->book, uri, book_open_cb, gci); +#if 0 + path = g_concat_dir_and_file (g_get_home_dir (), "evolution/local"); + uri = g_strdup_printf ("file://%s", path); + g_free (path); + + epath = e_path_to_physical (uri, gci->folderpath); + g_free (uri); + uri = g_strdup_printf ("%s/addressbook.db", epath); + g_free (epath); + + if (! e_book_load_uri (gci->book, uri, book_open_cb, gci)) { + printf ("error calling load_uri!\n"); + } + g_free(uri); +#endif + + if (! e_book_load_default_book (gci->book, book_open_cb, gci)) { + g_warning ("Error calling load_default_book"); + } } /* EvolutionImporter methods */ @@ -128,7 +150,7 @@ check_file_is_vcard (const char *filename) return FALSE; } - if (g_ascii_strncasecmp (line, "BEGIN:VCARD", 11) == 0) { + if (g_strncasecmp (line, "BEGIN:VCARD", 11) == 0) { result = TRUE; } else { result = FALSE; @@ -151,7 +173,7 @@ support_format_fn (EvolutionImporter *importer, return check_file_is_vcard (filename); } for (i = 0; supported_extensions[i] != NULL; i++) { - if (g_ascii_strcasecmp (supported_extensions[i], ext) == 0) + if (g_strcasecmp (supported_extensions[i], ext) == 0) return check_file_is_vcard (filename); } @@ -159,16 +181,16 @@ support_format_fn (EvolutionImporter *importer, } static void -importer_destroy_cb (gpointer data, - GObject *where_object_was) +importer_destroy_cb (GtkObject *object, + VCardImporter *gci) { - bonobo_main_quit (); + gtk_main_quit (); } static gboolean load_file_fn (EvolutionImporter *importer, const char *filename, - const char *uri, + const char *folderpath, void *closure) { VCardImporter *gci; @@ -179,35 +201,66 @@ load_file_fn (EvolutionImporter *importer, gci = (VCardImporter *) closure; gci->filename = g_strdup (filename); + gci->folderpath = g_strdup (folderpath); gci->cardlist = NULL; gci->iterator = NULL; gci->ready = FALSE; - ebook_open (gci, uri); + ebook_create (gci); return TRUE; } static BonoboObject * factory_fn (BonoboGenericFactory *_factory, - const char *component_id, void *closure) { EvolutionImporter *importer; VCardImporter *gci; - if (!strcmp (component_id, COMPONENT_IID)) { - gci = g_new (VCardImporter, 1); - importer = evolution_importer_new (support_format_fn, load_file_fn, - process_item_fn, NULL, gci); + gci = g_new (VCardImporter, 1); + importer = evolution_importer_new (support_format_fn, load_file_fn, + process_item_fn, NULL, gci); + + gtk_signal_connect (GTK_OBJECT (importer), "destroy", + GTK_SIGNAL_FUNC (importer_destroy_cb), gci); - g_object_weak_ref (G_OBJECT (importer), - importer_destroy_cb, gci); - return BONOBO_OBJECT (importer); + return BONOBO_OBJECT (importer); +} + +static void +importer_init (void) +{ + if (factory != NULL) + return; + + factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, + factory_fn, NULL); + + if (factory == NULL) { + g_error ("Unable to create factory"); } - else { - g_warning (COMPONENT_FACTORY_IID ": Don't know what to do with %s", component_id); - return NULL; + + bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory)); +} + +int +main (int argc, + char **argv) +{ + CORBA_ORB orb; + + gnome_init_with_popt_table ("Evolution-VCard-Importer", + PACKAGE, argc, argv, oaf_popt_options, 0, + NULL); + orb = oaf_init (argc, argv); + if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) { + g_error ("Could not initialize Bonobo."); } + + importer_init (); + bonobo_main (); + + return 0; } -BONOBO_ACTIVATION_FACTORY (COMPONENT_FACTORY_IID, "Evolution VCard Importer Factory", VERSION, factory_fn, NULL); + |