clean up propmanager initialization code.

2002-04-29  Larry Ewing  <lewing@ximian.com>

	* mail-composer-prefs.c (mail_composer_prefs_construct): clean up
	propmanager initialization code.

	* mail-preferences.c (mail_preferences_construct): small clean
	ups to propmanager code.

svn path=/trunk/; revision=16628

3 files changed, 26 insertions, 32 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6407eee8c0..a32417969b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,11 @@
 2002-04-29  Larry Ewing  <lewing@ximian.com>
 
+	* mail-composer-prefs.c (mail_composer_prefs_construct): clean up
+	propmanager initialization code.
+
+	* mail-preferences.c (mail_preferences_construct): small clean
+	ups to propmanager code.
+
 	* mail-config-factory.c (config_control_factory_cb): handle
 	requests for the font manager control.
 
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index 44bd0a08c8..723ce5f651 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -110,13 +110,11 @@ mail_composer_prefs_destroy (GtkObject *obj)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (obj);
 }
 
-#if 0
 static void
 colorpicker_set_color (GnomeColorPicker *color, guint32 rgb)
 {
 	gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff);
 }
-#endif 
 
 static guint32
 colorpicker_get_color (GnomeColorPicker *color)
@@ -517,6 +515,9 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	GtkWidget *toplevel, *widget, *menu;
 	GladeXML *gui;
 	int style;
+	char *names[][2] = {{"live_spell_check", "chkEnableSpellChecking"},
+			    {"gtk_html_prop_keymap_option", "omenuShortcutsType"},
+			    {NULL, NULL}};
 	
 	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "composer_tab");
 	prefs->gui = gui;
@@ -554,20 +555,13 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	option_menu_connect (prefs->charset, prefs);
 	
 	/* Spell Checking */
-	/* FIXME: do stuff with these */
-	{
-		char *names[][2] = {{"live_spell_check", "chkEnableSpellChecking"},
-				    {"gtk_html_prop_keymap_option", "omenuShortcutsType"},
-				    {NULL, NULL}};
-		
-		prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (NULL));
-		gtk_object_ref (GTK_OBJECT (prefs->pman));
-		gtk_object_sink (GTK_OBJECT (prefs->pman));
+	prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (NULL));
+	gtk_signal_connect (GTK_OBJECT (prefs->pman), "changed", toggle_button_toggled, prefs);
+	gtk_object_ref (GTK_OBJECT (prefs->pman));
+
+	gtk_html_propmanager_set_names (prefs->pman, names);
+	gtk_html_propmanager_set_gui (prefs->pman, gui, NULL);
 
-		gtk_html_propmanager_set_names (prefs->pman, names);
-		gtk_html_propmanager_set_gui (prefs->pman, gui, NULL);
-		gtk_signal_connect (GTK_OBJECT (prefs->pman), "changed", toggle_button_toggled, prefs);
-	}
 	/*
 	prefs->colour = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerSpellCheckColor"));
 	prefs->language = GTK_COMBO (glade_xml_get_widget (gui, "cmboSpellCheckLanguage"));
diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c
index 90e7d331bb..ba8f0fe495 100644
--- a/mail/mail-preferences.c
+++ b/mail/mail-preferences.c
@@ -195,7 +195,11 @@ mail_preferences_construct (MailPreferences *prefs)
 	const char *text;
 	GladeXML *gui;
 	int i;
-	
+	char *names[][2] = {{"anim_check", "chkShowAnimatedImages"},
+			    {"magic_check", "chkAutoDetectLinks"},
+			    {"gtk_html_prop_keymap_option", "omenuShortcutsType"},
+			    {NULL, NULL}};
+		
 	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "preferences_tab");
 	prefs->gui = gui;
 	
@@ -289,22 +293,12 @@ mail_preferences_construct (MailPreferences *prefs)
 	gtk_signal_connect (GTK_OBJECT (prefs->images_always), "toggled",
 			    toggle_button_toggled, prefs);
 	
-	/* Some GtkHTML settings */
-	{
-		char *names[][2] = {{"anim_check", "chkShowAnimatedImages"},
-				    {"magic_check", "chkAutoDetectLinks"},
-				    {"gtk_html_prop_keymap_option", "omenuShortcutsType"},
-				    {NULL, NULL}};
-
-		prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (prefs->gconf));
-		gtk_object_ref (GTK_OBJECT (prefs->pman));
-		gtk_object_sink (GTK_OBJECT (prefs->pman));
-
-		gtk_html_propmanager_set_names (prefs->pman, names);
-		gtk_html_propmanager_set_gui (prefs->pman, gui, NULL);
-		gtk_signal_connect (GTK_OBJECT (prefs->pman), "changed", toggle_button_toggled, prefs);
-
-	}		
+	prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (prefs->gconf));
+	gtk_signal_connect (GTK_OBJECT (prefs->pman), "changed", toggle_button_toggled, prefs);
+	gtk_object_ref (GTK_OBJECT (prefs->pman));
+	
+	gtk_html_propmanager_set_names (prefs->pman, names);
+	gtk_html_propmanager_set_gui (prefs->pman, gui, NULL);
 
 	prefs->prompt_unwanted_html = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptWantHTML"));
 	gtk_toggle_button_set_active (prefs->prompt_unwanted_html, mail_config_get_confirm_unwanted_html ());