From 922de49f1d4cdb6fe0044fd19d11f8ed5391a4fb Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@ximian.com>
Date: Mon, 12 Jan 2004 16:51:55 +0000
Subject: fix up the controls factory location.

2004-01-12  Larry Ewing  <lewing@ximian.com>

	* GNOME_Evolution_Mail.server.in.in: fix up the controls factory
	location.

	* mail-component.c (mail_control_new): add new interface for
	getting a mail control with a folder_uri property bag.
	(get_prop): pbag get method.
	(set_prop): pbag set method.

svn path=/trunk/; revision=24171
---
 mail/GNOME_Evolution_Mail.server.in.in | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'mail/GNOME_Evolution_Mail.server.in.in')

diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index 36e48bce0d..d482615e30 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -15,20 +15,6 @@
 		   _value="Evolution Mail"/>
   </oaf_server>
 
-  <!-- (control) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control:@VERSION@"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory:@VERSION@">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:BonoboControl/evolution-mail:@VERSION@"/>
-      <item value="IDL:GNOME/Control:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="name" type="string"
-		   _value="Evolution Mail folder viewer"/>
-  </oaf_server>
-
   <!-- Component Interface -->
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Component:@VERSION@"
@@ -90,8 +76,22 @@
 		   _value="Evolution Mail composer"/>
   </oaf_server>
 
-  <!-- Startup Wizard -->
+  <!-- (control) -->
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control:@VERSION@"
+	      type="factory"
+              location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+	<item value="IDL:BonoboControl/evolution-mail-control:@VERSION@"/>
+	<item value="IDL:GNOME/Control:1.0"/>
+    </oaf_attribute>
 
+    <oaf_attribute name="name" type="string"
+	    	   _value="Evolution Mail folder viewer"/>
+
+  </oaf_server>
+
+  <!-- Startup Wizard -->
   <!-- (wizard) -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard:@VERSION@"
 	      type="factory"
-- 
cgit