diff options
| author | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
| commit | 8650fb139a9143f04615de74ff569bce3e0c4ce3 (patch) | |
| tree | 89a41d08f179a5359b8eaee0c9344b8a5bf07cb3 /data | |
| parent | 04b7c97275ae420dca43f3e65c2ef54d02f01bdd (diff) | |
| download | gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.gz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.zst gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.zip | |
Bug 540362: [webkit-composer] Use webkit for composer
Merge wip/webkit-composer branch into master.
Diffstat (limited to 'data')
| -rw-r--r-- | data/evolution.convert | 1 | ||||
| -rw-r--r-- | data/org.gnome.evolution.mail.gschema.xml.in | 15 |
2 files changed, 10 insertions, 6 deletions
diff --git a/data/evolution.convert b/data/evolution.convert index 60ff3bbc4b..d25e6f48ea 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -128,7 +128,6 @@ composer-show-post-from = /apps/evolution/mail/composer/show_post_from composer-show-post-reply-to = /apps/evolution/mail/composer/show_post_reply_to composer-show-reply-to = /apps/evolution/mail/composer/show_mail_reply_to composer-sign-reply-if-signed = /apps/evolution/mail/composer/sign_reply_if_signed -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 diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index c1b2e25545..c13540db63 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -95,11 +95,6 @@ <_summary>Send HTML mail by default</_summary> <_description>Send HTML mail by default.</_description> </key> - <key name="composer-spell-color" type="s"> - <default>'#FFFF00000000'</default> - <_summary>Spell checking color</_summary> - <_description>Underline color for misspelled words when using inline spelling.</_description> - </key> <key name="composer-spell-languages" type="as"> <default>[]</default> <_summary>Spell checking languages</_summary> @@ -165,6 +160,16 @@ <_summary>List of localized 'Re'</_summary> <_description>Comma-separated list of localized 'Re' abbreviations to skip in a subject text when replying to a message, as an addition to the standard "Re" prefix. An example is 'SV,AV'.</_description> </key> + <key name="composer-developer-mode" type="b"> + <default>false</default> + <_summary>Enable developer mode</_summary> + <_description>Enables some hidden actions and tools aimed for development and debugging.</_description> + </key> + <key name="composer-word-wrap-length" type="i"> + <default>71</default> + <_summary>Number of characters for wrapping</_summary> + <_description>Will autowrap lines after given number of characters.</_description> + </key> <key name="drag-and-drop-save-file-format" type="s"> <default>'mbox'</default> <_summary>Save file format for drag-and-drop operation</_summary> |