aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-09-15 02:50:50 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-09-15 02:56:15 +0800
commitc7f5d54cb7a978b2daf51cab0e1e3bae28a92a5d (patch)
treec49c024fbfc92531e14a759ce873014072218917 /mail
parent95fe9256305bad92697bf1043efcbd61238cf94b (diff)
downloadgsoc2013-evolution-c7f5d54cb7a978b2daf51cab0e1e3bae28a92a5d.tar.gz
gsoc2013-evolution-c7f5d54cb7a978b2daf51cab0e1e3bae28a92a5d.tar.zst
gsoc2013-evolution-c7f5d54cb7a978b2daf51cab0e1e3bae28a92a5d.zip
Kill the subject-thread plugin.
All this time I never realized the subject-thread plugin was nothing more than a stupid checkbox. The actual thread-by-subject code lives in the core mail library.
Diffstat (limited to 'mail')
-rw-r--r--mail/mail-config.ui33
1 files changed, 23 insertions, 10 deletions
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 6112eccd83..5538604789 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -258,8 +258,8 @@ For example: "Work" or "Personal"</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<accessibility>
- <relation type="labelled-by" target="identity-required-header"/>
<relation type="labelled-by" target="identity_address_label"/>
+ <relation type="labelled-by" target="identity-required-header"/>
</accessibility>
</object>
<packing>
@@ -304,8 +304,8 @@ For example: "Work" or "Personal"</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<accessibility>
- <relation type="labelled-by" target="identity_full_name_label"/>
<relation type="labelled-by" target="identity-required-header"/>
+ <relation type="labelled-by" target="identity_full_name_label"/>
</accessibility>
</object>
<packing>
@@ -420,8 +420,8 @@ For example: "Work" or "Personal"</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<accessibility>
- <relation type="labelled-by" target="identity-optional-header"/>
<relation type="labelled-by" target="identity_organization_label"/>
+ <relation type="labelled-by" target="identity-optional-header"/>
</accessibility>
</object>
<packing>
@@ -453,8 +453,8 @@ For example: "Work" or "Personal"</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<accessibility>
- <relation type="labelled-by" target="reply_to_label"/>
<relation type="labelled-by" target="identity-optional-header"/>
+ <relation type="labelled-by" target="reply_to_label"/>
</accessibility>
</object>
<packing>
@@ -1497,9 +1497,6 @@ For example: "Work" or "Personal"</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="EMFolderSelectionButton" id="drafts_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1549,6 +1546,9 @@ For example: "Work" or "Personal"</property>
<property name="bottom_attach">4</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -2628,6 +2628,19 @@ For example: "Work" or "Personal"</property>
<property name="position">4</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="thread-by-subject">
+ <property name="label" translatable="yes">F_all back to threading messages by subject</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="position">5</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -4993,15 +5006,15 @@ for display purposes only. </property>
</object>
<object class="GtkSizeGroup" id="composer-label-size-group">
<widgets>
- <widget name="lblForwardStyle"/>
- <widget name="lblReplyStyle"/>
<widget name="lblCharset"/>
+ <widget name="lblReplyStyle"/>
+ <widget name="lblForwardStyle"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="composer-combo-box-size-group">
<widgets>
- <widget name="comboboxForwardStyle"/>
<widget name="comboboxReplyStyle"/>
+ <widget name="comboboxForwardStyle"/>
</widgets>
</object>
</interface>