From 94256b9919a932ff7b5f2bde1265dd8641215ed1 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@src.gnome.org>
Date: Sun, 1 Aug 2004 17:58:08 +0000
Subject: added last_version item.

 	* apps_evolution_shell.schemas.in.in: added last_version item.

 	* shell-errors.xml: added upgrade-remove-1-4 and
 	upgrade-remove-1-4-confirm dialogues.

 	* e-shell.c (remove_dir): utility to recursively delete a tree of
	files and folders.
 	(e_shell_attempt_upgrade): keep track of the last upgraded
 	version, if != current version, and < 1.5, and it exists, offer to
 	remove ~/evolution.  Confirm the offer before actually doing it.

 	* e-shell-window-commands.c: include gnome-about.
 	(command_help_faq): fix comment structure

 	* e-shell.c (attempt_upgrade): moved most of this into
 	e_shell_attempt_upgrade.
 	(e_shell_attempt_upgrade): moved most of this into
	attempt_upgrade, removed rev args.  It makes sense, really!
 	(e_shell_construct): call e_shell_attempt_upgrade instead.

svn path=/trunk/; revision=26788
---
 shell/shell-errors.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'shell/shell-errors.xml')

diff --git a/shell/shell-errors.xml b/shell/shell-errors.xml
index 052a35c09d..8e7d8678c6 100644
--- a/shell/shell-errors.xml
+++ b/shell/shell-errors.xml
@@ -20,6 +20,31 @@ If you choose to continue, you may not have access to some of your old data.
   <button stock="gtk-ok" label="Continue" response="GTK_RESPONSE_OK"/>
  </error>
 
+ <error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
+  <title>Delete old data from version {0}?</title>
+  <primary>Delete old data from version {0}?</primary>
+  <secondary>The previous version of evolution stored its data in a different location.
+
+If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.
+</secondary>
+  <button label="_Remind Me Later" response="GTK_RESPONSE_CANCEL"/>
+  <button label="_Keep Data" response="GTK_RESPONSE_ACCEPT"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
+ </error>
+
+ <error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
+  <title>Really delete old data?</title>
+  <primary>Really delete old data?</primary>
+  <secondary>The entire contents of the &quot;evolution&quot; directory is about to be be permanently removed.
+
+It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.
+
+Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.
+</secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
+ </error>
+
  <error id="noshell" type="error">
   <title>Cannot start Evolution</title>
   <primary>Evolution can not start.</primary>
-- 
cgit