aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/importers/evolution-calendar-importer.h4
-rw-r--r--calendar/importers/main.c12
3 files changed, 15 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 18a1ed8c27..2778c099bc 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-08 Rodrigo Moya <rodrigo@ximian.com>
+
+ * importers/evolution-calendar-importer.h: use GLib macros.
+
+ * importers/main.c (init_importer): use bonobo_generic_factory_new,
+ not bonobo_generic_factory_new_multi.
+ (main): don't use libgnome functions.
+
2002-11-07 Rodrigo Moya <rodrigo@ximian.com>
* cal-client/client-test.c: don't use GTK, we don't need it.
diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h
index b4c59da340..0691ee2cab 100644
--- a/calendar/importers/evolution-calendar-importer.h
+++ b/calendar/importers/evolution-calendar-importer.h
@@ -25,13 +25,13 @@
#include <bonobo/bonobo-object.h>
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
BonoboObject *ical_importer_new (void);
BonoboObject *vcal_importer_new (void);
BonoboObject *gnome_calendar_importer_new (void);
-END_GNOME_DECLS
+G_END_DECLS
#endif
diff --git a/calendar/importers/main.c b/calendar/importers/main.c
index d5f0de1b50..e3ac17fa2a 100644
--- a/calendar/importers/main.c
+++ b/calendar/importers/main.c
@@ -57,8 +57,8 @@ init_importer (void)
{
BonoboGenericFactory *factory;
- factory = bonobo_generic_factory_new_multi (IMPORTER_FACTORY_ID,
- importer_factory_fn, NULL);
+ factory = bonobo_generic_factory_new (IMPORTER_FACTORY_ID,
+ importer_factory_fn, NULL);
if (factory == NULL) {
g_error ("Unable to create factory");
exit (0);
@@ -75,11 +75,9 @@ main (int argc, char *argv[])
bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);
textdomain(PACKAGE);
- gnome_init_with_popt_table ("evolution-calendar-importer",
- VERSION, argc, argv, oaf_popt_options, 0,
- NULL);
- orb = oaf_init (argc, argv);
- if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
+ g_type_init ();
+ bonobo_activation_init (argc, argv);
+ if (bonobo_init (&argc, argv) == FALSE) {
g_error ("Could not initialize Bonobo.");
exit (0);
}