these just handle creating the ~/evolution dir and so are no longer needed

2003-12-30  JP Rosevear <jpr@ximian.com>

	* e-setup.[hc]: these just handle creating the ~/evolution dir and
	so are no longer needed

	* main.c (main): don't setup the old ~/evolution dir

	* Makefile.am: don't build dead files

	* e-shell.c (e_shell_go_online): get the id from the component
	info

svn path=/trunk/; revision=24024

6 files changed, 14 insertions, 372 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 73991d0eee..05c28b39e2 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2003-12-30  JP Rosevear <jpr@ximian.com>
+
+	* e-setup.[hc]: these just handle creating the ~/evolution dir and
+	so are no longer needed
+
+	* main.c (main): don't setup the old ~/evolution dir
+	
+	* Makefile.am: don't build dead files
+
+	* e-shell.c (e_shell_go_online): get the id from the component
+	info
+
 2003-12-22  Ross Burton  <ross@burtonini.com>
 
 	* e-shell.c: mark the settings dialog as transient for the main window.
diff --git a/shell/Makefile.am b/shell/Makefile.am
index c81ba64c1f..eb2244edcf 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -139,8 +139,6 @@ evolution_SOURCES =				\
 	e-corba-config-page.h			\
 	e-history.c				\
 	e-history.h				\
-	e-setup.c				\
-	e-setup.h				\
 	e-shell-about-box.c			\
 	e-shell-about-box.h			\
 	e-shell-constants.h			\
diff --git a/shell/e-setup.c b/shell/e-setup.c
deleted file mode 100644
index 200528e6b7..0000000000
--- a/shell/e-setup.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-setup.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-/* This needs to be a lot better.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-setup.h"
-
-#include "e-shell-constants.h"
-
-#include "e-util/e-dialog-utils.h"
-#include "e-util/e-path.h"
-
-#include <gconf/gconf-client.h>
-
-#include <gtk/gtklabel.h>
-
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#define DEFAULT_USER_PATH  EVOLUTION_DATADIR "/evolution/" BASE_VERSION "/default_user"
-
-
-static GList *
-check_dir_recur (const char *evolution_directory,
-		 const char *current_directory)
-{
-	DIR *def;
-	GList *newfiles = NULL;
-	struct dirent *current;
-
-	def = opendir (current_directory);
-	if (def == NULL)
-		return NULL;
-
-	current = readdir (def);
-	while (current != NULL) {
-		struct stat buf;
-		char *fullname, *fulldefaultname;
-
-		if (current->d_name[0] == '.' &&
-		    (current->d_name[1] == '\0' ||
-		     (current->d_name[1] == '.' && current->d_name[2] == '\0'))) {
-			current = readdir (def);
-			continue;
-		}
-
-		/* Hack to not copy the old Executive-Summary dir */
-		if (strcmp (current->d_name, "Executive-Summary") == 0) {
-			current = readdir (def);
-			continue;
-		}
-
-		fullname = g_build_filename (evolution_directory, current->d_name, NULL);
-		fulldefaultname = g_build_filename (current_directory, current->d_name, NULL);
-
-		if (stat (fullname, &buf) == -1) {
-			char *name;
-
-			name = g_strdup (fulldefaultname);
-			newfiles = g_list_append (newfiles, name);
-		} else {
-			if (S_ISDIR (buf.st_mode)) {
-				newfiles = g_list_concat (newfiles,
-							  check_dir_recur (fullname,
-									   fulldefaultname));
-			}
-		}
-
-		g_free (fulldefaultname);
-		g_free (fullname);
-		current = readdir (def);
-	}
-
-	closedir (def);
-	return newfiles;
-}
-
-static gboolean
-check_evolution_directory (const char *evolution_directory)
-{
-	gboolean retval;
-	GList *newfiles, *l;
-
-	newfiles = g_list_concat (NULL, check_dir_recur (evolution_directory, DEFAULT_USER_PATH));
-
-	if (newfiles == NULL) {
-		retval = TRUE;
-		goto out;
-	}
-
-	retval = TRUE;
-	for (l = newfiles; l; l = l->next) {
-		char *command;
-		char *shortpath;
-
-		shortpath = l->data + strlen (DEFAULT_USER_PATH);
-		command = g_strconcat ("cp -r ",
-				       l->data, " ",
-				       evolution_directory, "/",
-				       shortpath,
-				       NULL);
-
-		if (system (command) != 0) {
-			retval = FALSE;
-		} else {
-			retval = (retval && TRUE);
-		}
-
-		g_free (command);
-	}
-
-	if (retval == FALSE)
-		e_notice (NULL, GTK_MESSAGE_ERROR,
-			  _("Could not update files correctly"));
-
- out:
-
-	for (l = newfiles; l; l = l->next)
-		g_free (l->data);
-
-	g_list_free (newfiles);
-
-	return retval;
-}
-
-
-static gboolean
-copy_default_stuff (const char *evolution_directory)
-{
-	gboolean retval;
-	char *command;
-
-	if (mkdir (evolution_directory, 0700)) {
-		e_notice (NULL, GTK_MESSAGE_ERROR,
-			  _("Cannot create the directory\n%s\nError: %s"),
-			  evolution_directory,
-			  g_strerror (errno));
-		return FALSE;
-	}
-
-	command = g_strconcat ("cp -r " DEFAULT_USER_PATH "/* ", evolution_directory, NULL);
-
-	if (system (command) != 0) {
-		/* FIXME: Give more help.  */
-		e_notice (NULL, GTK_MESSAGE_ERROR,
-			  _("An error occurred in copying files into\n`%s'."), evolution_directory);
-		retval = FALSE;
-	} else {
-		retval = TRUE;
-	}
-
-	g_free (command);
-
-	return retval;
-}
-
-static void
-e_shell_rm_dir (const char *path)
-{
-	DIR *base;
-	struct stat statbuf;
-	struct dirent *contents;
-
-	stat (path, &statbuf);
-	if (!S_ISDIR (statbuf.st_mode)) {
-		/* Not a directory */
-		g_message ("Removing: %s", path);
-		unlink (path);
-		return;
-	} else {
-		g_message ("Opening: %s", path);
-		base = opendir (path);
-
-		if (base == NULL)
-			return;
-
-		contents = readdir (base);
-		while (contents != NULL) {
-			char *fullpath;
-
-			if (strcmp (contents->d_name, ".") == 0|| 
-			    strcmp (contents->d_name, "..") ==0) {
-				contents = readdir (base);
-				continue;
-			}
-
-			fullpath = g_build_filename (path, contents->d_name, NULL);
-			e_shell_rm_dir (fullpath);
-			g_free (fullpath);
-
-			contents = readdir (base);
-		}
-
-		closedir (base);
-		rmdir (path);
-	}
-}
-
-
-gboolean
-e_setup (const char *evolution_directory)
-{
-	struct stat statinfo;
-	char *file;
-
-	if (stat (evolution_directory, &statinfo) != 0) {
-		return copy_default_stuff (evolution_directory);
-	}
-
-	if (! S_ISDIR (statinfo.st_mode)) {
-		e_notice (NULL, GTK_MESSAGE_ERROR,
-			  _("The file `%s' is not a directory.\n"
-			    "Please move it in order to allow installation\n"
-			    "of the Evolution user files."));
-		return FALSE;
-	}
-
-	file = g_strdup_printf ("%s/searches.xml", evolution_directory);
-	if (stat (file, &statinfo) != 0) {
-		e_notice (NULL, GTK_MESSAGE_ERROR,
-			  _("The directory `%s' exists but is not the\n"
-			    "Evolution directory.  Please move it in order\n"
-			    "to allow installation of the Evolution user "
-			    "files."), evolution_directory);
-		g_free (file);
-		return FALSE;
-	}
-	g_free (file);
-
-	/* User has evolution directory...
-	   Check if it is up to date. */
-	return check_evolution_directory (evolution_directory);
-}
-
-
-static void
-set_default_folder_physical_uri_from_path (GConfClient *client,
-					   const char *evolution_directory,
-					   const char *path_key_name)
-{
-	char *gconf_path;
-	char *path_value;
-
-	gconf_path = g_strconcat ("/apps/evolution/shell/default_folders/", path_key_name, NULL);
-	path_value = gconf_client_get_string (client, gconf_path, NULL);
-	g_free (gconf_path);
-
-	if (path_value != NULL
-	    && strncmp (path_value, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0
-	    && strncmp (path_value + E_SHELL_URI_PREFIX_LEN, "/local/", 7) == 0) {
-		char *key_prefix;
-		char *local_physical_uri;
-		char *file_uri_prefix;
-
-		key_prefix = g_strndup (path_key_name, strchr (path_key_name, '_') - path_key_name);
-		gconf_path = g_strconcat ("/apps/evolution/shell/default_folders/", key_prefix, "_uri", NULL);
-		file_uri_prefix = g_strconcat ("file://", evolution_directory, "/local", NULL);
-		local_physical_uri = e_path_to_physical (file_uri_prefix, path_value + E_SHELL_URI_PREFIX_LEN + 6);
-
-		gconf_client_set_string (client, gconf_path, local_physical_uri, NULL);
-
-		g_free (gconf_path);
-		g_free (key_prefix);
-		g_free (local_physical_uri);
-		g_free (file_uri_prefix);
-	}
-}
-
-void
-e_setup_check_config (const char *evolution_directory)
-{
-	GConfClient *client;
-	char *tmp;
-	gboolean present = FALSE;
-
-	client = gconf_client_get_default ();
-
-	tmp = gconf_client_get_string (client, "/apps/evolution/shell/default_folders/mail_uri", NULL);
-	if (tmp != NULL) {
-		if (*tmp != 0)
-			present = TRUE;
-		g_free (tmp);
-	}
-
-	if (present) {
-		g_object_unref (client);
-		return;
-	}
-
-	/* The following ugliness is to initially set up the physical URIs
-	   based on the default path values (which come from GConf).  Of
-	   course, this way of configuring the default folders is a bit of a
-	   mess and needs to be cleaned up...  */
-
-	set_default_folder_physical_uri_from_path (client, evolution_directory, "mail_path");
-	set_default_folder_physical_uri_from_path (client, evolution_directory, "contacts_path");
-	set_default_folder_physical_uri_from_path (client, evolution_directory, "calendar_path");
-	set_default_folder_physical_uri_from_path (client, evolution_directory, "tasks_path");
-
-	g_object_unref (client);
-}
diff --git a/shell/e-setup.h b/shell/e-setup.h
deleted file mode 100644
index 214dbcdd9e..0000000000
--- a/shell/e-setup.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-setup.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SETUP_H
-#define _E_SETUP_H
-
-#include <glib.h>
-
-gboolean  e_setup  (const char *evolution_directory);
-
-void  e_setup_check_config  (const char *evolution_directory);
-
-#endif /* _E_SETUP_H */
diff --git a/shell/e-shell.c b/shell/e-shell.c
index c0a7f6fc85..938967105d 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -28,7 +28,6 @@
 
 #include "e-util/e-dialog-utils.h"
 
-#include "e-setup.h"
 #include "e-shell-constants.h"
 #include "e-shell-offline-handler.h"
 #include "e-shell-settings-dialog.h"
@@ -914,7 +913,6 @@ e_shell_go_online (EShell *shell,
 		EComponentInfo *info = p->data;
 		CORBA_Environment ev;
 		GNOME_Evolution_Offline offline_interface;
-		const char *id;
 
 		CORBA_exception_init (&ev);
 
@@ -928,7 +926,7 @@ e_shell_go_online (EShell *shell,
 
 		GNOME_Evolution_Offline_goOnline (offline_interface, &ev);
 		if (ev._major != CORBA_NO_EXCEPTION)
-			g_warning ("Error putting component `%s' online.", id);
+			g_warning ("Error putting component `%s' online.", info->id);
 
 		CORBA_exception_free (&ev);
 	}
diff --git a/shell/main.c b/shell/main.c
index 2807600f68..6f56f6b4e9 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -28,7 +28,6 @@
 #include "e-icon-factory.h"
 #include "e-shell-constants.h"
 #include "e-shell-window.h"	/* FIXME */
-#include "e-setup.h"
 
 #include "e-shell.h"
 
@@ -591,10 +590,8 @@ main (int argc, char **argv)
 
 	gnome_window_icon_set_default_from_file (EVOLUTION_IMAGES "/evolution-inbox.png");
 
-	/* FIXME */
+	/* FIXME We shouldn't be using the old directory at all I think */
 	evolution_directory = g_build_filename (g_get_home_dir (), "evolution", NULL);
-	if (! e_setup (evolution_directory))
-		exit (1);
 	if (setup_only)
 		exit (0);