From 2bc072651cc5650a4a799746ba187cee8e4b6903 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@ximian.com>
Date: Thu, 7 Nov 2002 21:50:17 +0000
Subject: removed non-existant headers.

2002-11-07  Rodrigo Moya <rodrigo@ximian.com>

	* importers/icalendar-importer.c: removed non-existant headers.

	* importers/Makefile.am: changes for BonoboActivation.

	* gui/GNOME_Evolution_Calendar.server.in: install to $libdir, not
	$datadir.

svn path=/trunk/; revision=18640
---
 calendar/ChangeLog                                 |  9 ++++
 calendar/gui/Makefile.am                           |  2 +-
 calendar/importers/.cvsignore                      |  2 +-
 .../GNOME_Evolution_Calendar_Importer.oaf.in       | 51 ----------------------
 .../GNOME_Evolution_Calendar_Importer.server.in    | 51 ++++++++++++++++++++++
 calendar/importers/Makefile.am                     | 10 ++---
 calendar/importers/icalendar-importer.c            |  2 -
 7 files changed, 67 insertions(+), 60 deletions(-)
 delete mode 100644 calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in
 create mode 100644 calendar/importers/GNOME_Evolution_Calendar_Importer.server.in

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ba9603182f..8c17eb7da8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
+
+	* importers/icalendar-importer.c: removed non-existant headers.
+
+	* importers/Makefile.am: changes for BonoboActivation.
+
+	* gui/GNOME_Evolution_Calendar.server.in: install to $libdir, not
+	$datadir.
+
 2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
 
 	* cal-client/query-listener.[ch]: converted to BonoboObject.
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 1ae5c01c2e..37fd67eb18 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -181,7 +181,7 @@ evolution_calendar_LDADD =								\
 
 evolution_calendar_LDFLAGS = -export-dynamic
 
-serversdir = $(datadir)/bonobo/servers
+serversdir = $(libdir)/bonobo/servers
 servers_in_files = \
 	GNOME_Evolution_Calendar.server.in
 
diff --git a/calendar/importers/.cvsignore b/calendar/importers/.cvsignore
index dfa0930c53..0da04d0400 100644
--- a/calendar/importers/.cvsignore
+++ b/calendar/importers/.cvsignore
@@ -3,4 +3,4 @@
 Makefile
 Makefile.in
 evolution-calendar-importer
-GNOME_Evolution_Calendar_Importer.oaf
+GNOME_Evolution_Calendar_Importer.server
diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in
deleted file mode 100644
index 710567dbc0..0000000000
--- a/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.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 b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in
new file mode 100644
index 0000000000..710567dbc0
--- /dev/null
+++ b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in
@@ -0,0 +1,51 @@
+<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/Makefile.am b/calendar/importers/Makefile.am
index 6266ae9f5e..7e385ff477 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -33,11 +33,11 @@ evolution_calendar_importer_LDADD =				\
 	$(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \
 	$(EVOLUTION_CALENDAR_LIBS)
 
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Calendar_Importer.oaf.in
+serversdir = $(libdir)/bonobo/servers
+server_in_files = GNOME_Evolution_Calendar_Importer.server.in
 
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+servers_DATA = $(server_in_files:.server.in=.server)
 
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
+EXTRA_DIST = $(server_in_files) $(servers_DATA)
 
-@XML_I18N_MERGE_OAF_RULE@
+@INTLTOOL_SERVER_RULE@
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index f887637e53..0300201ca4 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -26,11 +26,9 @@
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
-#include <gal/util/e-unicode-i18n.h>
 #include <cal-client.h>
 #include <importer/evolution-importer.h>
 #include <importer/evolution-intelligent-importer.h>
-- 
cgit v1.2.3