Sync with yet-another-mail-config branch.

2002-03-26  Jeffrey Stedfast  <fejj@ximian.com>

	Sync with yet-another-mail-config branch.

	* mail-composer-prefs.c: Updated to get the right widgets and
	whatnot. Also updated to tell the evolution-config-control that
	stuff has changed.

	* mail-preferences.c: Updated to get the right widgets and
	whatnot. Also updated to tell the evolution-config-control that
	stuff has changed.

	* mail-accounts.etspec: New file needed by mail-accounts.c

svn path=/trunk/; revision=16257

1 files changed, 127 insertions, 0 deletions

diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c
new file mode 100644
index 0000000000..17b75ed2e6
--- /dev/null
+++ b/mail/mail-config-factory.c
@@ -0,0 +1,127 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "mail-accounts.h"
+#include "mail-preferences.h"
+#include "mail-composer-prefs.h"
+
+#include "mail-config-factory.h"
+
+#include <bonobo/bonobo-generic-factory.h>
+
+#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ConfigControlFactory"
+
+static BonoboGenericFactory *factory = NULL;
+
+
+typedef void (*ApplyFunc) (GtkWidget *prefs);
+
+struct _config_data {
+	GtkWidget *prefs;
+	ApplyFunc apply;
+};
+
+static void
+config_control_destroy_callback (EvolutionConfigControl *config_control, void *user_data)
+{
+	struct _config_data *data = user_data;
+	
+	gtk_widget_unref (data->prefs);
+	g_free (data);
+}
+
+static void
+config_control_apply_callback (EvolutionConfigControl *config_control, void *user_data)
+{
+	struct _config_data *data = user_data;
+	
+	data->apply (data->prefs);
+}
+
+
+static BonoboObject *
+config_control_factory_cb (BonoboGenericFactory *factory, const char *component_id, void *user_data)
+{
+	GNOME_Evolution_Shell shell = (GNOME_Evolution_Shell) user_data;
+	EvolutionConfigControl *control;
+	struct _config_data *data;
+	GtkWidget *prefs = NULL;
+	
+	data = g_new (struct _config_data, 1);
+	
+	if (!strcmp (component_id, MAIL_ACCOUNTS_CONTROL_ID)) {
+		prefs = mail_accounts_tab_new (shell);
+		data->apply = (ApplyFunc) mail_accounts_tab_apply;
+	} else if (!strcmp (component_id, MAIL_PREFERENCES_CONTROL_ID)) {
+		prefs = mail_preferences_new ();
+		data->apply = (ApplyFunc) mail_preferences_apply;
+	} else if (!strcmp (component_id, MAIL_COMPOSER_PREFS_CONTROL_ID)) {
+		prefs = mail_composer_prefs_new ();
+		data->apply = (ApplyFunc) mail_composer_prefs_apply;
+	} else {
+		g_assert_not_reached ();
+	}
+	
+	data->prefs = prefs;
+	gtk_widget_show_all (prefs);
+	
+	control = evolution_config_control_new (prefs);
+	
+	if (!strcmp (component_id, MAIL_ACCOUNTS_CONTROL_ID)) {
+		/* nothing to do here... */
+	} else if (!strcmp (component_id, MAIL_PREFERENCES_CONTROL_ID)) {
+		MAIL_PREFERENCES (prefs)->control = control;
+	} else if (!strcmp (component_id, MAIL_COMPOSER_PREFS_CONTROL_ID)) {
+		MAIL_COMPOSER_PREFS (prefs)->control = control;
+	} else {
+		g_assert_not_reached ();
+	}
+	
+	gtk_signal_connect (GTK_OBJECT (control), "apply",
+			    GTK_SIGNAL_FUNC (config_control_apply_callback), data);
+	gtk_signal_connect (GTK_OBJECT (control), "destroy",
+			    GTK_SIGNAL_FUNC (config_control_destroy_callback), data);
+	
+	return BONOBO_OBJECT (control);
+}
+
+gboolean
+mail_config_register_factory (GNOME_Evolution_Shell shell)
+{
+	g_return_val_if_fail (shell != CORBA_OBJECT_NIL, FALSE);
+	
+	factory = bonobo_generic_factory_new_multi (CONFIG_CONTROL_FACTORY_ID,
+						    config_control_factory_cb,
+						    shell);
+	
+	if (factory != NULL) {
+		return TRUE;
+	} else {
+		g_warning ("Cannot register factory %s", CONFIG_CONTROL_FACTORY_ID);
+		return FALSE;
+	}
+}