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 --- ChangeLog | 4 ++ calendar/ChangeLog | 11 +++++ calendar/Makefile.am | 2 +- .../GNOME_Evolution_Calendar_Importer.server.in | 51 ---------------------- .../GNOME_Evolution_Calendar_Importer.server.in.in | 51 ++++++++++++++++++++++ calendar/importers/Makefile.am | 6 ++- calendar/importers/icalendar-importer.c | 5 ++- configure.in | 1 + 8 files changed, 75 insertions(+), 56 deletions(-) delete mode 100644 calendar/importers/GNOME_Evolution_Calendar_Importer.server.in create mode 100644 calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in diff --git a/ChangeLog b/ChangeLog index d1d53ae852..c5d90f11ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-02-28 Hans Petter Jansson + + * configure.in: Add calendar/importers/Makefile to output. + 2003-02-27 Chris Toshok * tools/.cvsignore: ignore some stuff, yo. diff --git a/calendar/ChangeLog b/calendar/ChangeLog index c31495dd9f..c06491e3b3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2003-02-28 Hans Petter Jansson + + * Makefile.am (SUBDIRS): Add importers/. + + * importers/Makefile.am (server_in_files) + (server_DATA): Insert $(libexecdir). + + * importers/icalendar-importer.c (connect_to_shell): + oaf_activate_from_id() -> bonobo_activation_activate_from_id(). + (load_vcalendar_file): U_() -> _(). + 2003-02-28 Dan Winship * gui/Makefile.am (libevolution_calendar_la_LIBADD): Remove diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 0e4c8d28eb..8ee73dc1e5 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -4,6 +4,6 @@ else CONDUIT_DIR = endif -SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR) +SUBDIRS = importers idl cal-util pcs cal-client gui $(CONDUIT_DIR) EXTRA_DIST = zones.h diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in deleted file mode 100644 index 710567dbc0..0000000000 --- a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in new file mode 100644 index 0000000000..c60468f5e8 --- /dev/null +++ b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index 08006c21a3..887e1b97cc 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -31,9 +31,11 @@ evolution_calendar_importer_LDADD = \ $(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \ $(EVOLUTION_CALENDAR_LIBS) -server_in_files = GNOME_Evolution_Calendar_Importer.server.in +server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in -server_DATA = $(server_in_files:.server.in=.server) +server_DATA = $(server_in_files:.server.in.in=.server) +%.server.in: %.server.in.in + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ EXTRA_DIST = $(server_in_files) $(server_DATA) 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); diff --git a/configure.in b/configure.in index f1c3cd9cf1..edc1f2d2a8 100644 --- a/configure.in +++ b/configure.in @@ -1365,6 +1365,7 @@ widgets/misc/Makefile wombat/Makefile libwombat/Makefile calendar/Makefile +calendar/importers/Makefile calendar/idl/Makefile calendar/cal-util/Makefile calendar/cal-client/Makefile -- cgit v1.2.3