callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New helper function to create the `~/evolution/private' directory.

Browse Source 
* e-setup.c (setup_bonobo_conf_private_directory): New helper
function to create the `~/evolution/private' directory.
(e_setup): Call it.

svn path=/trunk/; revision=15012
This commit is contained in:
Ettore Perazzoli
2001-12-13 00:45:09 +00:00
parent 3681ee8079
commit 8a2afc3517
2 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shell/ChangeLog
View File

@ -1,3 +1,12 @@
2001-12-12 Ettore Perazzoli <ettore@ximian.com>
[Fix #14838, saving passwords doesn't work. It is actually a
workaround for some obscure Bonobo-conf bug.]
* e-setup.c (setup_bonobo_conf_private_directory): New helper
function to create the `~/evolution/private' directory.
(e_setup): Call it.
2001-12-05 Ettore Perazzoli <ettore@ximian.com>
* e-shell-about-box.c: Add missing comma.

49
shell/e-setup.c
View File

@ -265,6 +265,52 @@ 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_concat_dir_and_file (evolution_directory, "private");
if (stat (name, &buf) == -1) {
if (mkdir (name, 0700) != 0) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Evolution could not create directory\n"
"%s:\n%s"),
name, strerror (errno));
free (name);
return FALSE;
}
free (name);
return TRUE;
}
if (S_ISDIR (buf.st_mode) && access (name, R_OK | W_OK | X_OK) == 0) {
free (name);
return TRUE;
}
if (S_ISDIR (buf.st_mode)) {
e_notice (NULL, GNOME_MESSAGE_BOX_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, GNOME_MESSAGE_BOX_ERROR,
_("File %s\n"
"should be removed to allow Evolution to work correctly.\n"
"Please remove this file and restart Evolution."),
name, strerror (errno));
}
free (name);
return FALSE;
}
gboolean
e_setup (const char *evolution_directory)
@ -360,6 +406,9 @@ e_setup (const char *evolution_directory)
}
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);