Call `e_summary_preferences_register_config_control_factory()'.

* e-summary-factory.c (e_summary_factory_new_control): Call
`e_summary_preferences_register_config_control_factory()'.

* e-summary-preferences.c: Remove member `box' from struct
PropertyData.  Added member `config_control'.
(e_summary_configure): Removed.
(property_box_destroy_cb): Removed.
(property_box_clicked_cb): Removed.
(property_box_apply_cb): New.
(config_control_destroy_cb): New.
(factory_fn): New, factory function for the
EvolutionConfigControl.
(e_summary_preferences_register_config_control_factory): New.
(mail_show_full_path_toggled_cb): Invoke ::changed on
pd->config_control.
(add_dialog_clicked_cb): Likewise.
(rdf_refresh_value_changed_cb): Likewise.
(rdf_limit_value_changed_cb): Likewise.
(mail_etable_item_changed_cb): Likewise.
(rdf_etable_item_changed_cb): Likewise.
(weather_etable_item_changed_cb): Likewise.
(weather_refresh_value_changed_cb): Likewise.
(weather_metric_toggled_cb): Likewise.
(weather_imperial_toggled_cb): Likewise.
(calendar_one_toggled_cb): Likewise.
(calendar_five_toggled_cb): Likewise.
(calendar_week_toggled_cb): Likewise.
(calendar_month_toggled_cb): Likewise.
(calendar_all_toggled_cb): Likewise.
(calendar_today_toggled_cb): Likewise.
(config_control_destroy_cb): Don't set ->prefs_window to NULL.

* my-evolution.glade: Renamed "notebook2" to "notebook".  Also
change its parent into a GtkWindow as libglade seems to have some
kind of problem with the GnomePropertyBox [glade_xml_get_widget()
for "notebook" always returned NULL].

* e-summary.h: Remove member `prefs_window' from `ESummary'.

svn path=/trunk/; revision=16162

1 files changed, 45 insertions, 11 deletions

diff --git a/my-evolution/GNOME_Evolution_Summary.oaf.in b/my-evolution/GNOME_Evolution_Summary.oaf.in
index 4c4e42e2b8..d360e0e10b 100644
--- a/my-evolution/GNOME_Evolution_Summary.oaf.in
+++ b/my-evolution/GNOME_Evolution_Summary.oaf.in
@@ -1,18 +1,52 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
-	type="exe"
-	location="evolution-executive-summary">
+  <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
+	      type="exe"
+	      location="evolution-executive-summary">
 
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
+    <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 the executive summary."/>
+    <oaf_attribute name="description" type="string"
+		   _value="Evolution component for the executive summary."/>
 
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
+    <oaf_attribute name="evolution:shell-component-icon" type="string"
+		   value="evolution-today.png"/>
+  </oaf_server>
+
+  <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ConfigControlFactory"
+	      type="exe"
+	      location="evolution-executive-summary">
+
+    <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 Evolution Summary's configuration control."/>
+  </oaf_server>
+
+  <oaf_server iid="OAFIID:GNOME_Evolution_Summary_ConfigControl"
+	      type="factory"
+	      location="OAFIID:GNOME_Evolution_Summary_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="Summary Preferences"/>
+
+    <oaf_attribute name="evolution:config_item:description" type="string"
+		   _value="This page can be used to control the appearance of the Evolution Summary"/>
+
+    <oaf_attribute name="evolution:config_item:icon_name" type="string"
+		   value="evolution-today.png"/>
+
+    <oaf_attribute name="description" type="string"
+		   _value="Configuration control for the Evolution Summary."/>
+
+  </oaf_server>
 
 </oaf_info>