From 62a4fb09124725720aa1bd5d46f594786df92c6f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 2 Jul 2012 11:52:01 -0400
Subject: Remove "last-upgraded-version" GSettings key.

AFAICT, this key does nothing useful and only confuses me every time I
read the EShell migration code.

The "version" key records the most recently used Evolution version.
That's all we need for migration.  And since downgrading Evolution is
not supported, we can assume this value will only increase over time.
---
 data/evolution.convert                  | 1 -
 data/org.gnome.evolution.gschema.xml.in | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'data')

diff --git a/data/evolution.convert b/data/evolution.convert
index a1ab31d5de..1246152013 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -1,6 +1,5 @@
 [org.gnome.evolution]
 version = /apps/evolution/version
-last-upgraded-version = /apps/evolution/last_version
 disabled-eplugins = /apps/evolution/eplugin/disabled
 
 [org.gnome.evolution.shell]
diff --git a/data/org.gnome.evolution.gschema.xml.in b/data/org.gnome.evolution.gschema.xml.in
index 3e8a2a7df4..c26881188d 100644
--- a/data/org.gnome.evolution.gschema.xml.in
+++ b/data/org.gnome.evolution.gschema.xml.in
@@ -2,13 +2,8 @@
   <schema gettext-domain="evolution" id="org.gnome.evolution" path="/org/gnome/evolution/">
     <key name="version" type="s">
       <default>''</default>
-      <_summary>Configuration version</_summary>
-      <_description>The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</_description>
-    </key>
-    <key name="last-upgraded-version" type="s">
-      <default>''</default>
-      <_summary>Last upgraded configuration version</_summary>
-      <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</_description>
+      <_summary>Previous Evolution version</_summary>
+      <_description>The most recently used version of Evolution, expressed as "major.minor.micro". This is used for data and settings migration from older to newer versions.</_description>
     </key>
     <key name="disabled-eplugins" type="as">
       <default>[]</default>
-- 
cgit v1.2.3