New default user setup.

svn path=/trunk/; revision=2846

25 files changed, 80 insertions, 22 deletions

diff --git a/default_user/Main_Shortcuts.xml b/default_user/Main_Shortcuts.xml
deleted file mode 100644
index c96ddd199e..0000000000
--- a/default_user/Main_Shortcuts.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0">
-<shortcutpane>
-  <shortcut><uri name="file:///../folders/Today/"/></shortcut>
-  <shortcut><uri name="file:///../folders/Inbox/"/></shortcut>
-  <shortcut><uri name="file:///../folders/Calendar/"/></shortcut>
-  <shortcut><uri name="file:///../folders/Contacts/"/></shortcut>
-  <shortcut><uri name="file:///../folders/Tasks/"/></shortcut>
-</shortcutpane>
\ No newline at end of file
diff --git a/default_user/Makefile.am b/default_user/Makefile.am
index d93df2cb0c..27bf515c18 100644
--- a/default_user/Makefile.am
+++ b/default_user/Makefile.am
@@ -1,11 +1,4 @@
-shortcutdir = $(datadir)/evolution/default_user/shortcuts
-shortcut_DATA = 		\
-	Main_Shortcuts.xml 	\
-	Other_Shortcuts.xml
-
-inboxdir = $(datadir)/evolution/default_user/folders/Inbox
-inbox_DATA = 			\
-	Inbox.mbox	 	
-
-
+SUBDIRS = local
 
+defaultdir = $(prefix)/share/evolution/default_user
+default_DATA = shortcuts.xml
\ No newline at end of file
diff --git a/default_user/Other_Shortcuts.xml b/default_user/Other_Shortcuts.xml
deleted file mode 100644
index e19f75f975..0000000000
--- a/default_user/Other_Shortcuts.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0">
-<shortcutpane>
-  <shortcut><uri name="file:///../folders/Drafts/"/></shortcut>
-</shortcutpane>
\ No newline at end of file
diff --git a/default_user/local/.cvsignore b/default_user/local/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/default_user/local/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/default_user/local/Calendar/.cvsignore b/default_user/local/Calendar/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/default_user/local/Calendar/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/default_user/local/Calendar/Makefile.am b/default_user/local/Calendar/Makefile.am
new file mode 100644
index 0000000000..a70c25d104
--- /dev/null
+++ b/default_user/local/Calendar/Makefile.am
@@ -0,0 +1,2 @@
+defaultcalendardir = $(datadir)/evolution/default_user/local/Calendar
+defaultcalendar_DATA = folder-metadata.xml
\ No newline at end of file
diff --git a/default_user/local/Calendar/folder-metadata.xml b/default_user/local/Calendar/folder-metadata.xml
new file mode 100644
index 0000000000..9313cb5f50
--- /dev/null
+++ b/default_user/local/Calendar/folder-metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<efolder>
+	<type>calendar</type>
+	<description>Calendar items</description>
+</efolder>
diff --git a/default_user/local/Contacts/.cvsignore b/default_user/local/Contacts/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/default_user/local/Contacts/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/default_user/local/Contacts/Makefile.am b/default_user/local/Contacts/Makefile.am
new file mode 100644
index 0000000000..9300f2e8dd
--- /dev/null
+++ b/default_user/local/Contacts/Makefile.am
@@ -0,0 +1,2 @@
+defaultcalendardir = $(datadir)/evolution/default_user/local/Contacts
+defaultcalendar_DATA = folder-metadata.xml
\ No newline at end of file
diff --git a/default_user/local/Contacts/folder-metadata.xml b/default_user/local/Contacts/folder-metadata.xml
new file mode 100644
index 0000000000..dcee1ec826
--- /dev/null
+++ b/default_user/local/Contacts/folder-metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<efolder>
+	<type>contacts</type>
+	<description>Contacts</description>
+</efolder>
diff --git a/default_user/local/Drafts/.cvsignore b/default_user/local/Drafts/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/default_user/local/Drafts/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/default_user/local/Drafts/Makefile.am b/default_user/local/Drafts/Makefile.am
new file mode 100644
index 0000000000..fc5739ead6
--- /dev/null
+++ b/default_user/local/Drafts/Makefile.am
@@ -0,0 +1,2 @@
+defaultcalendardir = $(datadir)/evolution/default_user/local/Drafts
+defaultcalendar_DATA = folder-metadata.xml
\ No newline at end of file
diff --git a/default_user/local/Drafts/folder-metadata.xml b/default_user/local/Drafts/folder-metadata.xml
new file mode 100644
index 0000000000..ee9cafe3b2
--- /dev/null
+++ b/default_user/local/Drafts/folder-metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<efolder>
+	<type>mail</type>
+	<description>Drafts</description>
+</efolder>
diff --git a/default_user/local/Inbox/.cvsignore b/default_user/local/Inbox/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/default_user/local/Inbox/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/default_user/local/Inbox/Makefile.am b/default_user/local/Inbox/Makefile.am
new file mode 100644
index 0000000000..80c773c387
--- /dev/null
+++ b/default_user/local/Inbox/Makefile.am
@@ -0,0 +1,2 @@
+defaultcalendardir = $(datadir)/evolution/default_user/local/Inbox
+defaultcalendar_DATA = folder-metadata.xml
\ No newline at end of file
diff --git a/default_user/local/Inbox/folder-metadata.xml b/default_user/local/Inbox/folder-metadata.xml
new file mode 100644
index 0000000000..64cfbadfc3
--- /dev/null
+++ b/default_user/local/Inbox/folder-metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<efolder>
+	<type>mail</type>
+	<description>Inbox folder</description>
+</efolder>
diff --git a/default_user/Inbox.mbox b/default_user/local/Inbox/mbox
index 57df16271b..57df16271b 100644
--- a/default_user/Inbox.mbox
+++ b/default_user/local/Inbox/mbox
diff --git a/default_user/local/Makefile.am b/default_user/local/Makefile.am
new file mode 100644
index 0000000000..8758e7de0c
--- /dev/null
+++ b/default_user/local/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS =					\
+	Calendar				\
+	Contacts				\
+	Drafts					\
+	Inbox					\
+	Outbox					\
+	Trash
\ No newline at end of file
diff --git a/default_user/local/Outbox/.cvsignore b/default_user/local/Outbox/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/default_user/local/Outbox/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/default_user/local/Outbox/Makefile.am b/default_user/local/Outbox/Makefile.am
new file mode 100644
index 0000000000..634aa6f720
--- /dev/null
+++ b/default_user/local/Outbox/Makefile.am
@@ -0,0 +1,2 @@
+defaultcalendardir = $(datadir)/evolution/default_user/local/Outbox
+defaultcalendar_DATA = folder-metadata.xml
\ No newline at end of file
diff --git a/default_user/local/Outbox/folder-metadata.xml b/default_user/local/Outbox/folder-metadata.xml
new file mode 100644
index 0000000000..4452fb9e0c
--- /dev/null
+++ b/default_user/local/Outbox/folder-metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<efolder>
+	<type>mail</type>
+	<description>Outbox</description>
+</efolder>
diff --git a/default_user/local/Trash/.cvsignore b/default_user/local/Trash/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/default_user/local/Trash/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/default_user/local/Trash/Makefile.am b/default_user/local/Trash/Makefile.am
new file mode 100644
index 0000000000..67a838c1b7
--- /dev/null
+++ b/default_user/local/Trash/Makefile.am
@@ -0,0 +1,2 @@
+defaultcalendardir = $(datadir)/evolution/default_user/local/Trash
+defaultcalendar_DATA = folder-metadata.xml
\ No newline at end of file
diff --git a/default_user/local/Trash/folder-metadata.xml b/default_user/local/Trash/folder-metadata.xml
new file mode 100644
index 0000000000..6f1acf7a4a
--- /dev/null
+++ b/default_user/local/Trash/folder-metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<efolder>
+	<type>mail</type>
+	<description>Trash</description>
+</efolder>
diff --git a/default_user/shortcuts.xml b/default_user/shortcuts.xml
new file mode 100644
index 0000000000..516b234b72
--- /dev/null
+++ b/default_user/shortcuts.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<shortcuts>
+	<group title="Evolution shortcuts">
+		<item>evolution:/local/Inbox</item>
+		<item>evolution:/local/Outbox</item>
+		<item>evolution:/local/Trash</item>
+		<item>evolution:/local/Drafts</item>
+		<item>evolution:/local/Calendar</item>
+		<item>evolution:/local/Contacts</item>
+	</group>
+
+	<group title="Personal shortcuts">
+	</group>
+</shortcuts>