[evolution] Kill the subject-thread plugin.

[Matthew Barnes <mbarnes src gnome org>]

commit c7f5d54cb7a978b2daf51cab0e1e3bae28a92a5d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Sep 14 14:50:50 2010 -0400

    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.

 configure.ac                                       |    3 +-
 mail/mail-config.ui                                |   33 ++++++---
 modules/mail/e-mail-shell-settings.c               |    4 +
 modules/mail/em-mailer-prefs.c                     |    5 ++
 plugins/subject-thread/Makefile.am                 |   25 -------
 .../org-gnome-subject-thread.eplug.xml             |   14 ----
 plugins/subject-thread/subject-thread.c            |   76 --------------------
 7 files changed, 33 insertions(+), 127 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2041bab..6b47460 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1465,7 +1465,7 @@ plugins_base_always="calendar-file calendar-http itip-formatter default-source a
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN"
 dist_plugins_base="$plugins_base_always calendar-weather sa-junk-plugin bogo-junk-plugin"
 
-plugins_standard_always="bbdb subject-thread save-calendar mail-to-task mailing-list-actions prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline dbx-import"
+plugins_standard_always="bbdb save-calendar mail-to-task mailing-list-actions prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline dbx-import"
 
 plugins_standard="$plugins_standard_always"
 dist_plugins_standard="$plugins_standard audio-inline image-inline pst-import"
@@ -1842,7 +1842,6 @@ plugins/pst-import/Makefile
 plugins/publish-calendar/Makefile
 plugins/sa-junk-plugin/Makefile
 plugins/save-calendar/Makefile
-plugins/subject-thread/Makefile
 plugins/templates/Makefile
 plugins/tnef-attachments/Makefile
 plugins/vcard-inline/Makefile
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 6112ecc..5538604 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>
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index ca51acf..690a0ef 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -186,6 +186,10 @@ e_mail_shell_settings_init (EShell *shell)
 		"/apps/evolution/mail/display/side_bar_search");
 
 	e_shell_settings_install_property_for_key (
+		"mail-thread-by-subject",
+		"/apps/evolution/mail/display/thread_subject");
+
+	e_shell_settings_install_property_for_key (
 		"mail-use-custom-fonts",
 		"/apps/evolution/mail/display/fonts/use_custom");
 
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 21f233f..570da0e 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -847,6 +847,11 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		e_binding_transform_color_to_string,
 		NULL, NULL);
 
+	widget = e_builder_get_widget (prefs->builder, "thread-by-subject");
+	e_mutual_binding_new (
+		shell_settings, "mail-thread-by-subject",
+		widget, "active");
+
 	/* Deleting Mail */
 	widget = e_builder_get_widget (prefs->builder, "chkEmptyTrashOnExit");
 	e_mutual_binding_new (