diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-06-09 01:18:04 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-06-09 01:47:22 +0800 |
| commit | b4fbbde6ab7deb247f1db19558489a868c75467d (patch) | |
| tree | d8dd0d1950cf35719391ec60474e5fa0844e1165 /data | |
| parent | f92f3a1f453b037427539f2c0e3968d56fde8696 (diff) | |
| download | gsoc2013-evolution-b4fbbde6ab7deb247f1db19558489a868c75467d.tar gsoc2013-evolution-b4fbbde6ab7deb247f1db19558489a868c75467d.tar.gz gsoc2013-evolution-b4fbbde6ab7deb247f1db19558489a868c75467d.tar.bz2 gsoc2013-evolution-b4fbbde6ab7deb247f1db19558489a868c75467d.tar.lz gsoc2013-evolution-b4fbbde6ab7deb247f1db19558489a868c75467d.tar.xz gsoc2013-evolution-b4fbbde6ab7deb247f1db19558489a868c75467d.tar.zst gsoc2013-evolution-b4fbbde6ab7deb247f1db19558489a868c75467d.zip | |
Remove "enable-local" and "enable-vfolders" GSettings key.
We have built-in ESources for the 'local' and 'vfolder' mail stores,
and can now track their enabled state as we would any other mail store.
Diffstat (limited to 'data')
| -rw-r--r-- | data/evolution.convert | 2 | ||||
| -rw-r--r-- | data/org.gnome.evolution.mail.gschema.xml.in | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/data/evolution.convert b/data/evolution.convert index a748520316..f10ff273f1 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -136,8 +136,6 @@ composer-spell-color = /apps/evolution/mail/composer/spell_color composer-spell-languages = /apps/evolution/mail/composer/spell_languages composer-top-signature = /apps/evolution/mail/composer/top_signature default-account = /apps/evolution/mail/default_account -enable-local = /apps/evolution/mail/display/enable_local -enable-vfolders = /apps/evolution/mail/display/enable_vfolders error-level = /apps/evolution/mail/display/error_level error-timeout = /apps/evolution/mail/display/error_timeout filters-log-actions = /apps/evolution/mail/filters/log diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index ae54f0c6d0..b6d1ec7b1d 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -240,20 +240,10 @@ <_summary>Show deleted messages in the message-list</_summary> <_description>Show deleted messages (with a strike-through) in the message-list.</_description> </key> - <key name="enable-local" type="b"> - <default>true</default> - <_summary>Enable local folders</_summary> - <_description>Whether to show local folders (On This Computer) in a folder tree</_description> - </key> <key name="enable-unmatched" type="b"> <default>true</default> <_summary>Enable Unmatched search folder</_summary> - <_description>Enable Unmatched search folder within Search Folders. It does nothing if 'enable-vfolders' is false.</_description> - </key> - <key name="enable-vfolders" type="b"> - <default>true</default> - <_summary>Enable search folders</_summary> - <_description>Enable search folders on startup.</_description> + <_description>Enable Unmatched search folder within Search Folders. It does nothing if Search Folders are disabled.</_description> </key> <key name="safe-list" type="b"> <default>false</default> |