diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in (renamed from calendar/importers/GNOME_Evolution_Calendar_Importer.server.in) | 2 | ||||
| -rw-r--r-- | calendar/importers/Makefile.am | 6 | ||||
| -rw-r--r-- | calendar/importers/icalendar-importer.c | 5 | ||||
| -rw-r--r-- | configure.in | 1 |
7 files changed, 25 insertions, 6 deletions
@@ -1,3 +1,7 @@ +2003-02-28 Hans Petter Jansson <hpj@ximian.com> + + * configure.in: Add calendar/importers/Makefile to output. + 2003-02-27 Chris Toshok <toshok@ximian.com> * 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 <hpj@ximian.com> + + * 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 <danw@ximian.com> * 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.in index 710567dbc0..c60468f5e8 100644 --- a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in +++ b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in @@ -2,7 +2,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory" type="exe" - location="evolution-calendar-importer"> + location="@LIBEXECDIR@/evolution-calendar-importer"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> 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 <gtk/gtkhbox.h> #include <gtk/gtkmain.h> #include <libgnome/gnome-util.h> +#include <libgnome/gnome-i18n.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-exception.h> #include <cal-client.h> @@ -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 |