1 files changed, 7 insertions, 162 deletions

diff --git a/shell/e-shell-config.c b/shell/e-shell-config.c
index 73103cd98d..77f4804594 100644
--- a/shell/e-shell-config.c
+++ b/shell/e-shell-config.c
@@ -23,171 +23,19 @@
 #endif
 
 #include "e-shell-config.h"
+
+#include "e-shell-config-default-folders.h"
+#include "e-shell-config-offline.h"
 #include "evolution-config-control.h"
 #include "evolution-folder-selector-button.h"
 
 #include <bonobo/bonobo-generic-factory.h>
-#include <glade/glade-xml.h>
-#include <gtk/gtktogglebutton.h>
 
+
 #define E_SHELL_CONFIG_FACTORY_OAFIID "OAFIID:GNOME_Evolution_Shell_Config_Factory"
 
-
 #define E_SHELL_CONFIG_DEFAULT_FOLDERS_OAFIID "OAFIID:GNOME_Evolution_Shell_Config_DefaultFolders_Control"
 
-typedef struct {
-	GladeXML *glade;
-	EvolutionConfigControl *config_control;
-
-	char *mail_uri, *mail_path;
-	char *contacts_uri, *contacts_path;
-	char *calendar_uri, *calendar_path;
-	char *tasks_uri, *tasks_path;
-
-	Bonobo_ConfigDatabase db;
-	EvolutionShellClient *shell_client;
-} EvolutionDefaultFolderConfig;
-
-static void
-folder_selected (EvolutionFolderSelectorButton *button,
-		 GNOME_Evolution_Folder *folder,
-		 EvolutionDefaultFolderConfig *dfc)
-{
-	char **uri_ptr, **path_ptr;
-
-	uri_ptr = gtk_object_get_data (GTK_OBJECT (button), "uri_ptr");
-	path_ptr = gtk_object_get_data (GTK_OBJECT (button), "path_ptr");
-
-	g_free (*uri_ptr);
-	g_free (*path_ptr);
-	*uri_ptr = g_strdup (folder->physicalUri);
-	*path_ptr = g_strdup (folder->evolutionUri);
-
-	evolution_config_control_changed (dfc->config_control);
-}
-
-GtkWidget *e_shell_config_default_folder_selector_button_new (char *widget_name, char *string1, char *string2, int int1, int int2);
-
-GtkWidget *
-e_shell_config_default_folder_selector_button_new (char *widget_name,
-						   char *string1,
-						   char *string2,
-						   int int1, int int2)
-{
-	return (GtkWidget *)gtk_type_new (EVOLUTION_TYPE_FOLDER_SELECTOR_BUTTON);
-}
-
-static void
-config_control_apply_cb (EvolutionConfigControl *control,
-			 EvolutionDefaultFolderConfig *dfc)
-{
-	bonobo_config_set_string (dfc->db, "/DefaultFolders/mail_path", dfc->mail_path, NULL);
-	bonobo_config_set_string (dfc->db, "/DefaultFolders/mail_uri", dfc->mail_uri, NULL);
-	bonobo_config_set_string (dfc->db, "/DefaultFolders/contacts_path", dfc->contacts_path, NULL);
-	bonobo_config_set_string (dfc->db, "/DefaultFolders/contacts_uri", dfc->contacts_uri, NULL);
-	bonobo_config_set_string (dfc->db, "/DefaultFolders/calendar_path", dfc->calendar_path, NULL);
-	bonobo_config_set_string (dfc->db, "/DefaultFolders/calendar_uri", dfc->calendar_uri, NULL);
-	bonobo_config_set_string (dfc->db, "/DefaultFolders/tasks_path", dfc->tasks_path, NULL);
-	bonobo_config_set_string (dfc->db, "/DefaultFolders/tasks_uri", dfc->tasks_uri, NULL);
-}
-
-static void
-config_control_destroy_cb (EvolutionConfigControl *config_control,
-			   EvolutionDefaultFolderConfig *dfc)
-{
-	g_free (dfc->mail_uri);
-	g_free (dfc->mail_path);
-	g_free (dfc->contacts_uri);
-	g_free (dfc->contacts_path);
-	g_free (dfc->calendar_uri);
-	g_free (dfc->calendar_path);
-	g_free (dfc->tasks_uri);
-	g_free (dfc->tasks_path);
-
-	gtk_object_unref (GTK_OBJECT (dfc->glade));
-	bonobo_object_unref (BONOBO_OBJECT (dfc->shell_client));
-	g_free (dfc);
-}
-
-static const char *mail_types[] = { "mail", NULL };
-static const char *contacts_types[] = { "contacts", "ldap-contacts", NULL };
-static const char *calendar_types[] = { "calendar", NULL };
-static const char *tasks_types[] = { "tasks", NULL };
-
-static void
-setup_folder_selector (EvolutionDefaultFolderConfig *dfc,
-		       const char *widget_name,
-		       char **path_ptr, char *path_dbpath,
-		       char **uri_ptr, char *uri_dbpath,
-		       const char **types)
-{
-	GtkWidget *button;
-
-	*path_ptr = bonobo_config_get_string (dfc->db, path_dbpath, NULL);
-	*uri_ptr = bonobo_config_get_string (dfc->db, uri_dbpath, NULL);
-
-	button = glade_xml_get_widget (dfc->glade, widget_name);
-	evolution_folder_selector_button_construct (
-		EVOLUTION_FOLDER_SELECTOR_BUTTON (button),
-		dfc->shell_client, _("Select Default Folder"),
-		*uri_ptr, types);
-	gtk_object_set_data (GTK_OBJECT (button), "uri_ptr", uri_ptr);
-	gtk_object_set_data (GTK_OBJECT (button), "path_ptr", path_ptr);
-	gtk_signal_connect (GTK_OBJECT (button), "selected",
-			    GTK_SIGNAL_FUNC (folder_selected),
-			    dfc);
-}
-
-static BonoboObject *
-default_folders_config_control_new (EShell *shell)
-{
-	GNOME_Evolution_Shell shell_dup;
-	CORBA_Environment ev;
-	EvolutionDefaultFolderConfig *dfc;
-	GtkWidget *widget;
-
-	dfc = g_new0 (EvolutionDefaultFolderConfig, 1);
-	dfc->db = e_shell_get_config_db (shell);
-
-	CORBA_exception_init (&ev);
-	shell_dup = CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (shell)), &ev);
-	CORBA_exception_free (&ev);
-	dfc->shell_client = evolution_shell_client_new (shell_dup);
-
-	dfc->glade = glade_xml_new (EVOLUTION_GLADEDIR "/e-shell-config-default-folders.glade", NULL);
-
-	setup_folder_selector (dfc, "default_mail_button",
-			       &dfc->mail_path, "/DefaultFolders/mail_path",
-			       &dfc->mail_uri, "/DefaultFolders/mail_uri",
-			       mail_types);
-	setup_folder_selector (dfc, "default_contacts_button",
-			       &dfc->contacts_path, "/DefaultFolders/contacts_path",
-			       &dfc->contacts_uri, "/DefaultFolders/contacts_uri",
-			       contacts_types);
-	setup_folder_selector (dfc, "default_calendar_button",
-			       &dfc->calendar_path, "/DefaultFolders/calendar_path",
-			       &dfc->calendar_uri, "/DefaultFolders/calendar_uri",
-			       calendar_types);
-	setup_folder_selector (dfc, "default_tasks_button",
-			       &dfc->tasks_path, "/DefaultFolders/tasks_path",
-			       &dfc->tasks_uri, "/DefaultFolders/tasks_uri",
-			       tasks_types);
-
-	widget = glade_xml_get_widget (dfc->glade, "default_folders_vbox");
-	gtk_widget_ref (widget);
-	gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
-	gtk_widget_show (widget);
-	dfc->config_control = evolution_config_control_new (widget);
-	gtk_widget_unref (widget);
-
-	gtk_signal_connect (GTK_OBJECT (dfc->config_control), "apply",
-			    GTK_SIGNAL_FUNC (config_control_apply_cb), dfc);
-	gtk_signal_connect (GTK_OBJECT (dfc->config_control), "destroy",
-			    GTK_SIGNAL_FUNC (config_control_destroy_cb), dfc);
-
-	return BONOBO_OBJECT (dfc->config_control);
-}
-
 
 static BonoboObject *
 config_control_factory_cb (BonoboGenericFactory *factory,
@@ -195,11 +43,9 @@ config_control_factory_cb (BonoboGenericFactory *factory,
 			   gpointer shell)
 {
 	if (!strcmp (component_id, E_SHELL_CONFIG_DEFAULT_FOLDERS_OAFIID))
-		return default_folders_config_control_new (shell);
-	else {
-		g_assert_not_reached ();
-		return NULL;
-	}
+		return e_shell_config_default_folders_create_control (shell);
+	else
+		return e_shell_config_offline_create_control (shell);
 }
 
 gboolean
@@ -220,4 +66,3 @@ e_shell_config_factory_register (EShell *shell)
 	}
 	return TRUE;
 }
-