New. Check that things that need to be in the config db are. Right now it

	* e-setup.c (e_setup_check_db): New. Check that things that need
	to be in the config db are. Right now it sets up the default
	folders.

	* e-shell.c (e_shell_construct): Call e_setup_check_db after
	getting the config db.

	* e-shell-constants.h: Add E_SUMMARY_URI, E_LOCAL_INBOX_URI, etc.

	* e-shortcuts.c (e_shortcuts_add_default_group): Use
	E_LOCAL_INBOX_URI, etc.

	* e-shell-view.c: #define FALLBACK_URI to E_SUMMARY_URI

svn path=/trunk/; revision=16405

1 files changed, 27 insertions, 0 deletions

diff --git a/shell/e-setup.c b/shell/e-setup.c
index 31c16eca2b..088aa010c2 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -41,6 +41,7 @@
 #include <gal/widgets/e-gui-utils.h>
 
 #include "e-local-folder.h"
+#include "e-shell-constants.h"
 
 #include "e-setup.h"
 
@@ -413,3 +414,29 @@ e_setup (const char *evolution_directory)
 	   Check if it is up to date. */
 	return check_evolution_directory (evolution_directory);
 }
+
+
+void
+e_setup_check_db (Bonobo_ConfigDatabase db)
+{
+	gboolean def;
+
+	if (bonobo_config_get_string_with_default (db, "/DefaultFolder/mail_path", NULL, &def) == NULL) {
+		bonobo_config_set_string (db, "/DefaultFolder/mail_path",
+					  E_LOCAL_INBOX_URI, NULL);
+		bonobo_config_set_string (db, "/DefaultFolder/mail_uri",
+					  E_LOCAL_INBOX_URI, NULL);
+		bonobo_config_set_string (db, "/DefaultFolder/contacts_path",
+					  E_LOCAL_CONTACTS_URI, NULL);
+		bonobo_config_set_string (db, "/DefaultFolder/contacts_uri",
+					  E_LOCAL_CONTACTS_URI, NULL);
+		bonobo_config_set_string (db, "/DefaultFolder/calendar_path",
+					  E_LOCAL_CALENDAR_URI, NULL);
+		bonobo_config_set_string (db, "/DefaultFolder/calendar_uri",
+					  E_LOCAL_CALENDAR_URI, NULL);
+		bonobo_config_set_string (db, "/DefaultFolder/tasks_path",
+					  E_LOCAL_TASKS_URI, NULL);
+		bonobo_config_set_string (db, "/DefaultFolder/tasks_uri",
+					  E_LOCAL_TASKS_URI, NULL);
+	}
+}