From 3a39176f2f757a4e089d4ce17e64d6da78a7af31 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@ximian.com>
Date: Thu, 7 Nov 2002 00:09:52 +0000
Subject: renmaed .oaf.in files.

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

	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
	* gui/GNOME_Evolution_Calendar.server.in: renmaed .oaf.in files.

	* gui/alarm-notify/Makefile.am:
	* gui/Makefile.am: fixed rules for .server files.

svn path=/trunk/; revision=18619
---
 calendar/ChangeLog                                 |   8 +
 calendar/gui/GNOME_Evolution_Calendar.oaf.in       | 179 ---------------------
 calendar/gui/GNOME_Evolution_Calendar.server.in    | 179 +++++++++++++++++++++
 calendar/gui/Makefile.am                           |  12 +-
 .../GNOME_Evolution_Calendar_AlarmNotify.oaf.in    |  24 ---
 .../GNOME_Evolution_Calendar_AlarmNotify.server.in |  24 +++
 calendar/gui/alarm-notify/Makefile.am              |  14 +-
 7 files changed, 224 insertions(+), 216 deletions(-)
 delete mode 100644 calendar/gui/GNOME_Evolution_Calendar.oaf.in
 create mode 100644 calendar/gui/GNOME_Evolution_Calendar.server.in
 delete mode 100644 calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
 create mode 100644 calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d178328584..2bd29bc8a3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
+
+	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
+	* gui/GNOME_Evolution_Calendar.server.in: renmaed .oaf.in files.
+
+	* gui/alarm-notify/Makefile.am:
+	* gui/Makefile.am: fixed rules for .server files.
+
 2002-11-06  Rodrigo Moya <rodrigo@ximian.com>
 
 	* gui/dialogs/comp-editor-util.[ch]
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
deleted file mode 100644
index 68fd2a07d0..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ /dev/null
@@ -1,179 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell_component_icon" type="string"
-		       value="evolution-calendar.png"/>
-	<oaf_attribute name="evolution:shell_component_launch_order" type="number"
-		       value="3"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_ControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Evolution Tasks control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Tasks_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/tasks-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="A Bonobo control which displays a task list."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory"
-            type="exe"
-            location="evolution-calendar">
-
-	<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 create a component editor factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory to centralize calendar component editor dialogs"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:config_item:title" type="string"
-		       _value="Calendar and Tasks"/>
-
-	<oaf_attribute name="evolution:config_item:description" type="string"
-		       _value="Configure your timezone, Calendar and Task List here "/>
-
-	<oaf_attribute name="evolution:config_item:icon_name" type="string"
-		       value="evolution-calendar.png"/>
-
-	<oaf_attribute name="evolution:config_item:type" type="stringv">
-		<item value="calendar"/>
-		<item value="tasks"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/>
-    
-	<oaf_attribute name="description" type="string"
-		       _value="Configuration control for the Evolution Calendar."/>
-
-</oaf_server>
-
-</oaf_info>
-
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in b/calendar/gui/GNOME_Evolution_Calendar.server.in
new file mode 100644
index 0000000000..68fd2a07d0
--- /dev/null
+++ b/calendar/gui/GNOME_Evolution_Calendar.server.in
@@ -0,0 +1,179 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"
+            type="exe"
+            location="evolution-calendar">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="Factory for the calendar iTip view control"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Bonobo/Control:1.0"/>
+	        <item value="IDL:Bonobo/PersistStream:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/calendar"/>
+		<item value="text/x-calendar"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution calendar iTip/iMip viewer"/>
+	<oaf_attribute name="description" type="string"
+                       _value="Factory for the calendar iTip view control"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"
+            type="exe"
+            location="evolution-calendar">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+	               _value="Evolution component for handling the calendar."/>
+
+	<oaf_attribute name="evolution:shell_component_icon" type="string"
+		       value="evolution-calendar.png"/>
+	<oaf_attribute name="evolution:shell_component_launch_order" type="number"
+		       value="3"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory"
+            type="exe"
+            location="evolution-calendar">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="Factory for the sample Calendar control"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_ControlFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:BonoboControl/calendar-control:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/calendar"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+	               _value="A sample Bonobo control which displays an calendar."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_ControlFactory"
+            type="exe"
+            location="evolution-calendar">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="Factory for the Evolution Tasks control"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Tasks_ControlFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:BonoboControl/tasks-control:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+		<item value="text/calendar"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+	               _value="A Bonobo control which displays a task list."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory"
+            type="exe"
+            location="evolution-calendar">
+
+	<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 create a component editor factory"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="Factory to centralize calendar component editor dialogs"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"
+            type="exe"
+            location="evolution-calendar">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
+	    type="factory"
+	    location="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="evolution:config_item:title" type="string"
+		       _value="Calendar and Tasks"/>
+
+	<oaf_attribute name="evolution:config_item:description" type="string"
+		       _value="Configure your timezone, Calendar and Task List here "/>
+
+	<oaf_attribute name="evolution:config_item:icon_name" type="string"
+		       value="evolution-calendar.png"/>
+
+	<oaf_attribute name="evolution:config_item:type" type="stringv">
+		<item value="calendar"/>
+		<item value="tasks"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/>
+    
+	<oaf_attribute name="description" type="string"
+		       _value="Configuration control for the Evolution Calendar."/>
+
+</oaf_server>
+
+</oaf_info>
+
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 6e6f640b81..1ae5c01c2e 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -181,18 +181,18 @@ evolution_calendar_LDADD =								\
 
 evolution_calendar_LDFLAGS = -export-dynamic
 
-oafdir = $(datadir)/oaf
-oaf_in_files = \
-	GNOME_Evolution_Calendar.oaf.in
+serversdir = $(datadir)/bonobo/servers
+servers_in_files = \
+	GNOME_Evolution_Calendar.server.in
 
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+servers_DATA = $(servers_in_files:.server.in=.server)
 
-@INTLTOOL_OAF_RULE@
+@INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST =	 			\
 	$(glade_DATA)			\
 	$(etspec_DATA)			\
-	$(oaf_in_files)
+	$(servers_in_files)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
deleted file mode 100644
index 86f5c71493..0000000000
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"
-            type="exe"
-            location="evolution-alarm-notify">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the alarm notification service"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory">
-
-	<oaf_attribute name="description" type="string"
-                       _value="Alarm notification service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in
new file mode 100644
index 0000000000..86f5c71493
--- /dev/null
+++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in
@@ -0,0 +1,24 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"
+            type="exe"
+            location="evolution-alarm-notify">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       _value="Factory for the alarm notification service"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify"
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory">
+
+	<oaf_attribute name="description" type="string"
+                       _value="Alarm notification service"/>
+</oaf_server>
+
+</oaf_info>
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index ca28d1c10b..4a4dc86d25 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -66,17 +66,17 @@ evolution_alarm_notify_LDADD =						\
 
 evolution_alarm_notify_LDFLAGS = -export-dynamic
 
-oafdir = $(datadir)/oaf
-oaf_in_files = \
-	GNOME_Evolution_Calendar_AlarmNotify.oaf.in
+serversdir = $(libdir)/bonobo/servers
+servers_in_files = \
+	GNOME_Evolution_Calendar_AlarmNotify.server.in
 
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+servers_DATA = $(servers_in_files:.server.in=.server)
 
-@INTLTOOL_OAF_RULE@
+@INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST =		\
-	$(oaf_DATA)	\
-	$(oaf_in_files)	\
+	$(servers_DATA)	\
+	$(servers_in_files)	\
 	$(glade_DATA)
 
 BUILT_SOURCES = $(CORBA_GENERATED)
-- 
cgit v1.2.3