From 5569968699ce8163d51110eeefee8e8ebfe31b46 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Fri, 28 Feb 2003 21:08:45 +0000 Subject: Add calendar/importers/Makefile to output. 2003-02-28 Hans Petter Jansson * configure.in: Add calendar/importers/Makefile to output. * calendar/Makefile.am (SUBDIRS): Add importers/. * calendar/importers/Makefile.am (server_in_files) (server_DATA): Insert $(libexecdir). * calendar/importers/icalendar-importer.c (connect_to_shell): oaf_activate_from_id() -> bonobo_activation_activate_from_id(). (load_vcalendar_file): U_() -> _(). svn path=/trunk/; revision=20109 --- calendar/importers/icalendar-importer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 6899679bc0..b8168ff39e 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -92,7 +93,7 @@ connect_to_shell (ICalImporter *ici) GNOME_Evolution_Shell corba_shell; CORBA_exception_init (&ev); - corba_shell = oaf_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); + corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); if (BONOBO_EX (&ev)) { CORBA_exception_free (&ev); return; @@ -481,7 +482,7 @@ load_vcalendar_file (const char *filename) defaults.alarm_audio_url = "file://" EVOLUTION_SOUNDDIR "/default_alarm.wav"; defaults.alarm_audio_fmttype = "audio/x-wav"; - defaults.alarm_description = (char*) U_("Reminder!!"); + defaults.alarm_description = (char*) _("Reminder!!"); contents = read_file (filename); -- cgit v1.2.3