From 5569968699ce8163d51110eeefee8e8ebfe31b46 Mon Sep 17 00:00:00 2001
From: Hans Petter Jansson <hpj@ximian.com>
Date: Fri, 28 Feb 2003 21:08:45 +0000
Subject: Add calendar/importers/Makefile to output.

2003-02-28  Hans Petter Jansson  <hpj@ximian.com>

	* 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
---
 .../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 ++-
 4 files changed, 58 insertions(+), 55 deletions(-)
 delete mode 100644 calendar/importers/GNOME_Evolution_Calendar_Importer.server.in
 create mode 100644 calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in

(limited to 'calendar/importers')

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 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"
-	    type="exe"
-	    location="evolution-calendar-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to import iCalendar files into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="evolution:menu-name" type="string"
-                       value="iCalendar files (.ics)"/>
-        <oaf_attribute name="description" type="string"
-                       _value="Imports iCalendar files into Evolution"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="evolution:menu-name" type="string"
-                       value="vCalendar files (.vcf)"/>
-        <oaf_attribute name="description" type="string"
-                       _value="Imports vCalendar files into Evolution"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-</oaf_info>
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 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"
+	    type="exe"
+	    location="@LIBEXECDIR@/evolution-calendar-importer">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="description" type="string"
+                       _value="Factory to import iCalendar files into Evolution"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"
+	    type="factory"
+	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="evolution:menu-name" type="string"
+                       value="iCalendar files (.ics)"/>
+        <oaf_attribute name="description" type="string"
+                       _value="Imports iCalendar files into Evolution"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer"
+	    type="factory"
+	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="evolution:menu-name" type="string"
+                       value="vCalendar files (.vcf)"/>
+        <oaf_attribute name="description" type="string"
+                       _value="Imports vCalendar files into Evolution"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer"
+	    type="factory"
+	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
+	</oaf_attribute>
+
+</oaf_server>
+</oaf_info>
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);
 
-- 
cgit v1.2.3