Added druidpagestart1 to the pages list. (construct): Change the limits on

2003-01-09  Not Zed  <NotZed@Ximian.com>

        * mail-config-druid.c: Added druidpagestart1 to the pages list.
        (construct): Change the limits on the page initialisation, and
        widget_show_all on the page rather than the content.

        * GNOME_Evolution_Mail.server.in.in: Make Mail a shlib component.

        * folder-info.c (evolution_folder_info_factory_init): Removed.
        (evolution_folder_info_factory_fn): renamed to evolution_folder_info_new().

        *  mail-config-druid.c  (evolution_mail_config_wizard_factory_fn):
        Renamed to evolution_mail_config_wizard_new().
        (evolution_mail_config_wizard_init): Removed.

        * mail-config-factory.c (mail_config_register_factory): Remove.
        (config_control_factory_cb): make this public.

        * Makefile.am: setup evolution-mail as a shared library.

        * component-factory.c (make_factory): implement the bonobo-plugin
        factory for shlib operation.  Also, preliminary work to setup mailer-specific
        (factory): Implement the factory which starts various components.

        * mail-config.c (xml_get_prop): g_free->xmlFree
        (account_to_xml): copy xml memory to glib memory when adding the 0
        on the end of the string.
        (accounts_save): Use slightly different logic with appending to
        the tail of the list, we can't use the &node trick with gslists.
        (accounts_changed): Same here.

svn path=/trunk/; revision=19362

1 files changed, 25 insertions, 111 deletions

diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index 929d988c00..853e59c011 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -2,38 +2,38 @@
 
   <!-- Folder display control -->
 
-  <!-- (control) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
+  <!-- (factory) -->
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
+	      type="shlib"
+	      location="@COMPONENTDIR@/libevolution-mail.so">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:BonoboControl/evolution-mail:1.0"/>
-      <item value="IDL:GNOME/Control:1.0"/>
+      <item value="IDL:GNOME/ObjectFactory:1.0"/>
     </oaf_attribute>
 
     <oaf_attribute name="description" type="string"
-		   _value="Evolution mail folder display component."/>
+		   _value="Factory for the controls exported by the Evolution Mailer"/>
   </oaf_server>
 
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-mail">
+  <!-- (control) -->
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
+	      type="factory"
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/ObjectFactory:1.0"/>
+      <item value="IDL:BonoboControl/evolution-mail:1.0"/>
+      <item value="IDL:GNOME/Control:1.0"/>
     </oaf_attribute>
 
     <oaf_attribute name="description" type="string"
-		   _value="Evolution mail folder factory component."/>
+		   _value="Evolution mail folder display component."/>
   </oaf_server>
 
   <!-- Shell Component -->
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-mail">
+	      type="factory"
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
@@ -50,21 +50,9 @@
 
   <!-- Summary component, for showing info in the summary -->
 
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:Bonobo/Unknown:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Factory for the Mail Summary component."/>
-  </oaf_server>
-
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
@@ -76,23 +64,10 @@
 
   <!-- Message composer -->
 
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerFactory"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Factory for the Evolution composer."/>
-  </oaf_server>
-
   <!-- (composer) -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ComposerFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution:Composer:1.0"/>
@@ -103,19 +78,10 @@
 		   _value="Evolution mail composer."/>
   </oaf_server>
 
-  <!-- Config Wizard interface -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig_Factory"
-              type="exe"
-              location="@LIBEXECDIR@/evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
+  <!-- MailConfig interface -->
   <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig"
               type="factory"
-              location="OAFIID:GNOME_Evolution_MailConfig_Factory">
+              location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/MailConfig:1.0"/>
@@ -125,47 +91,11 @@
                    _value="Mail configuration interface"/>
   </oaf_server>
 
-  <!-- MailConfig interface -->
-
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig_Factory"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <!-- (interface) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_MailConfig_Factory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/MailConfig:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Mail configuration interface"/>
-  </oaf_server>
-
   <!-- FolderInfo interface -->
 
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_FolderInfo_Factory"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <!-- (interface) -->
   <oaf_server iid="OAFIID:GNOME_Evolution_FolderInfo"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_FolderInfo_Factory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/FolderInfo:1.0"/>
@@ -174,35 +104,19 @@
 
   <!-- Startup Wizard -->
 
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard_Factory"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-mail">
-  </oaf_server>
-
   <!-- (wizard) -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_Wizard_Factory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
   </oaf_server>
 
 
   <!-- Configuration pages -->
 
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory"
-	      type="exe"
-	      location="@LIBEXECDIR@/evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
   <!-- Account Editor -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Accounts_ConfigControl"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
@@ -231,7 +145,7 @@
   <!-- Mail Preferences -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Preferences_ConfigControl"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
@@ -256,7 +170,7 @@
   <!-- Font Preferences -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_FontPrefs_ConfigControl"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
@@ -281,7 +195,7 @@
   <!-- Composer Preferences -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>