diff options
Diffstat (limited to 'addressbook/backend/ebook/evolution-ldif-importer.c')
| -rw-r--r-- | addressbook/backend/ebook/evolution-ldif-importer.c | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/addressbook/backend/ebook/evolution-ldif-importer.c b/addressbook/backend/ebook/evolution-ldif-importer.c index d792a74172..8ec5b631ab 100644 --- a/addressbook/backend/ebook/evolution-ldif-importer.c +++ b/addressbook/backend/ebook/evolution-ldif-importer.c @@ -13,9 +13,6 @@ */ #include <config.h> -#include <bonobo.h> -#include <gnome.h> -#include <liboaf/liboaf.h> #include <stdio.h> #include <ctype.h> @@ -269,9 +266,9 @@ parseLine( ECardSimple *simple, ECardDeliveryAddress *address, char **buf ) } else if (!g_strcasecmp (ptr, "member")) { EList *email; - gtk_object_get (GTK_OBJECT (simple->card), - "email", &email, - NULL); + g_object_get (simple->card, + "email", &email, + NULL); e_list_append (email, ldif_value->str); } } @@ -326,7 +323,7 @@ getNextLDIFEntry( FILE *f ) while (buf) { if (!parseLine (simple, address, &buf)) { /* parsing error */ - gtk_object_unref (GTK_OBJECT (simple)); + g_object_unref (simple); e_card_delivery_address_unref (address); return NULL; } @@ -374,17 +371,17 @@ resolve_list_card (LDIFImporter *gci, ECard *card) if (!e_card_evolution_list (card)) return; - gtk_object_get (GTK_OBJECT (card), - "email", &email, - "full_name", &full_name, - NULL); + g_object_get (card, + "email", &email, + "full_name", &full_name, + NULL); /* set file_as to full_name so we don't later try and figure out a first/last name for the list. */ if (full_name) - gtk_object_set (GTK_OBJECT (card), - "file_as", full_name, - NULL); + g_object_set (card, + "file_as", full_name, + NULL); email_iter = e_list_get_iterator (email); while (e_iterator_is_valid (email_iter)) { @@ -397,7 +394,7 @@ resolve_list_card (LDIFImporter *gci, ECard *card) gchar *dest_xml; e_destination_set_card (dest, dn_card, 0); /* Hard-wired for default e-mail, since netscape only exports 1 email address */ dest_xml = e_destination_export (dest); - gtk_object_unref (GTK_OBJECT (dest)); + g_object_unref (dest); if (dest_xml) { e_iterator_set (email_iter, dest_xml); g_free (dest_xml); @@ -549,10 +546,10 @@ support_format_fn (EvolutionImporter *importer, } static void -importer_destroy_cb (GtkObject *object, +importer_destroy_cb (GObject *object, LDIFImporter *gci) { - gtk_main_quit (); + g_main_quit (); } static gboolean @@ -584,8 +581,8 @@ factory_fn (BonoboGenericFactory *_factory, 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_signal_connect (importer, "destroy", + G_CALLBACK (importer_destroy_cb), gci); return BONOBO_OBJECT (importer); } @@ -615,8 +612,8 @@ main (int argc, gnome_init_with_popt_table ("Evolution-LDIF-Importer", "0.0", argc, argv, oaf_popt_options, 0, NULL); - orb = oaf_init (argc, argv); - if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) { + orb = bonobo_activation_init (argc, argv); + if (bonobo_init_full (&argc, argv, orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) { g_error ("Could not initialize Bonobo."); } |