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

[Misc fixes and part of #2228, There should be no dialog boxes during

Browse Source 
2001-07-06  Jason Leach  <jleach@ximian.com>

	[Misc fixes and part of #2228, There should be no dialog boxes
	during startup.]

	* e-setup.c (e_setup): Check for searches.xml instead of
	shortcuts.xml, since shortcuts.xml doesn't really need to exist
	(and thus wouldn't be a necessary test whether ~/evolution was
	invalid) because shell can generate shortcuts.
	(copy_default_stuff): For first time users, only present a dialog
	if a problem occurred.  We've already clicked "Ok" on a dialog
	about copying files.
	(check_evolution_directory): Take out the "successfully installed"
	dialog on updates too.

svn path=/trunk/; revision=10864
This commit is contained in:
Jason Leach
2001-07-06 21:44:35 +00:00
committed by Jacob Leach
parent a8fbf376d8
commit 489fe60f9e
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
shell/ChangeLog
View File

@ -1,3 +1,18 @@
2001-07-06 Jason Leach <jleach@ximian.com>
[Misc fixes and part of #2228, There should be no dialog boxes
during startup.]
* e-setup.c (e_setup): Check for searches.xml instead of
shortcuts.xml, since shortcuts.xml doesn't really need to exist
(and thus wouldn't be a necessary test whether ~/evolution was
invalid) because shell can generate shortcuts.
(copy_default_stuff): For first time users, only present a dialog
if a problem occurred. We've already clicked "Ok" on a dialog
about copying files.
(check_evolution_directory): Take out the "successfully installed"
dialog on updates too.
2001-07-06 Ettore Perazzoli <ettore@ximian.com>
[This should fix #3873, Bizzarre crash after deleting a few

9
shell/e-setup.c
View File

@ -168,9 +168,6 @@ check_evolution_directory (const char *evolution_directory)
if (retval == FALSE)
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Could not update files correctly"));
else
e_notice (NULL, GNOME_MESSAGE_BOX_INFO,
_("Evolution files successfully installed."));
out:
@ -234,11 +231,9 @@ copy_default_stuff (const char *evolution_directory)
if (system (command) != 0) {
/* FIXME: Give more help. */
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Cannot copy files into\n`%s'."), evolution_directory);
_("An error occurred in copying files into\n`%s'."), evolution_directory);
retval = FALSE;
} else {
e_notice (NULL, GNOME_MESSAGE_BOX_INFO,
_("Evolution files successfully installed."));
retval = TRUE;
}
@ -337,7 +332,7 @@ e_setup (const char *evolution_directory)
g_free (file);
file = g_strdup_printf ("%s/shortcuts.xml", evolution_directory);
file = g_strdup_printf ("%s/searches.xml", evolution_directory);
if (stat (file, &statinfo) != 0) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("The directory `%s' exists but is not the\n"