aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-04-09 00:05:35 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-04-09 00:05:35 +0800
commitd6f441c493086215a7f3a1a8e34c345822802033 (patch)
treefa5bc886a8d7e155422f3b499975d47c540070d6
parent26312e0ff1c739003831f22a0b6935b911a9ec89 (diff)
downloadgsoc2013-evolution-d6f441c493086215a7f3a1a8e34c345822802033.tar
gsoc2013-evolution-d6f441c493086215a7f3a1a8e34c345822802033.tar.gz
gsoc2013-evolution-d6f441c493086215a7f3a1a8e34c345822802033.tar.bz2
gsoc2013-evolution-d6f441c493086215a7f3a1a8e34c345822802033.tar.lz
gsoc2013-evolution-d6f441c493086215a7f3a1a8e34c345822802033.tar.xz
gsoc2013-evolution-d6f441c493086215a7f3a1a8e34c345822802033.tar.zst
gsoc2013-evolution-d6f441c493086215a7f3a1a8e34c345822802033.zip
(setup_bonobo_conf_private_directory): Removed.
(e_setup): Do not call here. Also, removed hacks for ~/evolution/config and ~/evolution/local/Trash. svn path=/trunk/; revision=20760
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-setup.c84
2 files changed, 6 insertions, 84 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index e9c4e7a909..247e3fdce1 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-08 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-setup.c (setup_bonobo_conf_private_directory): Removed.
+ (e_setup): Do not call here. Also, removed hacks for
+ ~/evolution/config and ~/evolution/local/Trash.
+
2003-04-08 Dan Winship <danw@ximian.com>
* glade/evolution-startup-wizard.glade: Remove the color specs so
diff --git a/shell/e-setup.c b/shell/e-setup.c
index 8103c9431d..6cd0726b2f 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -229,52 +229,6 @@ e_shell_rm_dir (const char *path)
}
-/* FIXME: This is a workaround for bonobo-conf breakage. */
-static gboolean
-setup_bonobo_conf_private_directory (const char *evolution_directory)
-{
- char *name;
- struct stat buf;
-
- name = g_build_filename (evolution_directory, "private", NULL);
- if (stat (name, &buf) == -1) {
- if (mkdir (name, 0700) != 0) {
- e_notice (NULL, GTK_MESSAGE_ERROR,
- _("Evolution could not create directory\n"
- "%s:\n%s"),
- name, strerror (errno));
- g_free (name);
- return FALSE;
- }
-
- g_free (name);
- return TRUE;
- }
-
- if (S_ISDIR (buf.st_mode) && access (name, R_OK | W_OK | X_OK) == 0) {
- g_free (name);
- return TRUE;
- }
-
- if (S_ISDIR (buf.st_mode)) {
- e_notice (NULL, GTK_MESSAGE_ERROR,
- _("Directory %s\n"
- "does not have the right permissions. Please make it\n"
- "readable and executable and restart Evolution."),
- name);
- } else {
- e_notice (NULL, GTK_MESSAGE_ERROR,
- _("File %s\n"
- "should be removed to allow Evolution to work correctly.\n"
- "Please remove this file and restart Evolution."),
- name, strerror (errno));
- }
-
- g_free (name);
- return FALSE;
-}
-
-
gboolean
e_setup (const char *evolution_directory)
{
@@ -305,44 +259,6 @@ e_setup (const char *evolution_directory)
}
g_free (file);
- /* If the user has an old-style config file, replace it with
- * the new-style config directory. FIXME: This should be
- * temporary.
- */
- file = g_strdup_printf ("%s/config", evolution_directory);
- if (stat (file, &statinfo) == 0 && ! S_ISDIR (statinfo.st_mode)) {
- char *old = g_strdup_printf ("%s.old", file);
-
- rename (file, old);
- mkdir (file, 0700);
- g_free (old);
- }
- g_free (file);
-
- /* If the user has an old style trash folder, remove it so it gets
- * replaced by the new vfolder-based trash folder. FIXME: This should
- * go away at some point. */
- file = g_strdup_printf ("%s/local/Trash", evolution_directory);
- if (stat (file, &statinfo) == 0 && S_ISDIR (statinfo.st_mode)) {
- EFolder *local_folder;
-
- local_folder = e_local_folder_new_from_path (file);
- if (local_folder != NULL
- && strcmp (e_folder_get_type_string (local_folder), "mail") == 0) {
- char *old = g_strdup_printf ("%s.old", file);
-
- rename (file, old);
- g_free (old);
- }
-
- if (local_folder != NULL)
- g_object_unref (local_folder);
- }
- g_free (file);
-
- if (! setup_bonobo_conf_private_directory (evolution_directory))
- return FALSE;
-
/* User has evolution directory...
Check if it is up to date. */
return check_evolution_directory (evolution_directory);