aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-08-08 22:04:20 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-08-08 22:12:15 +0800
commit0ae8e9e7b7c224915f474a4e635a8ccecd476c40 (patch)
tree22c78c968cd628b928db2e4f2182001fb27a54a0 /mail
parenta661dfebc6e3c5daeb7cf9bf3492eae989c4f590 (diff)
downloadgsoc2013-evolution-0ae8e9e7b7c224915f474a4e635a8ccecd476c40.tar
gsoc2013-evolution-0ae8e9e7b7c224915f474a4e635a8ccecd476c40.tar.gz
gsoc2013-evolution-0ae8e9e7b7c224915f474a4e635a8ccecd476c40.tar.bz2
gsoc2013-evolution-0ae8e9e7b7c224915f474a4e635a8ccecd476c40.tar.lz
gsoc2013-evolution-0ae8e9e7b7c224915f474a4e635a8ccecd476c40.tar.xz
gsoc2013-evolution-0ae8e9e7b7c224915f474a4e635a8ccecd476c40.tar.zst
gsoc2013-evolution-0ae8e9e7b7c224915f474a4e635a8ccecd476c40.zip
Return of the "mark messages as read" preference.
This reverses the removal of the "Mark messages as read" preference in commit e7247d6d60336861ed5c0ba05dd64e29f728349c. I apparently misjudged the popularity of this preference, as there's been a surprising amout of backlash and confusion as to its removal on the mailing list, IRC channel, and various distro-support forums. So, "mea culpa" for removing that one. Haven't heard a peep about the other removed preferences, however, so they will stay gone.
Diffstat (limited to 'mail')
-rw-r--r--mail/mail-config.ui62
1 files changed, 58 insertions, 4 deletions
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 224f659487..00a47c2736 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -1820,6 +1820,60 @@
</packing>
</child>
<child>
+ <object class="GtkHBox" id="hboxReadTimeout">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="chkMarkTimeout">
+ <property name="label" translatable="yes">_Mark messages as read after</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinMarkTimeout">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">if-valid</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lblSeconds">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">seconds</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkHBox" id="hboxHighlightColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1873,7 +1927,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -1902,7 +1956,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -1918,7 +1972,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -1934,7 +1988,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
</object>