From c7f5d54cb7a978b2daf51cab0e1e3bae28a92a5d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Sep 2010 14:50:50 -0400 Subject: 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(-) delete mode 100644 plugins/subject-thread/Makefile.am delete mode 100644 plugins/subject-thread/org-gnome-subject-thread.eplug.xml delete mode 100644 plugins/subject-thread/subject-thread.c diff --git a/configure.ac b/configure.ac index 2041bab345..6b47460a5d 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 6112eccd83..5538604789 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -258,8 +258,8 @@ For example: "Work" or "Personal" True ● - + @@ -304,8 +304,8 @@ For example: "Work" or "Personal" True ● - + @@ -420,8 +420,8 @@ For example: "Work" or "Personal" True ● - + @@ -453,8 +453,8 @@ For example: "Work" or "Personal" True ● - + @@ -1496,9 +1496,6 @@ For example: "Work" or "Personal" 5 - - - True @@ -1549,6 +1546,9 @@ For example: "Work" or "Personal" 4 + + + @@ -2628,6 +2628,19 @@ For example: "Work" or "Personal" 4 + + + F_all back to threading messages by subject + True + True + False + True + True + + + 5 + + @@ -4993,15 +5006,15 @@ for display purposes only. - - + + - + diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index ca51acf72f..690a0ef5b8 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -185,6 +185,10 @@ e_mail_shell_settings_init (EShell *shell) "mail-side-bar-search", "/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 21f233fd61..570da0ebff 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 ( diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am deleted file mode 100644 index c03d4040ed..0000000000 --- a/plugins/subject-thread/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -plugin_LTLIBRARIES = liborg-gnome-subject-thread.la - -@EVO_PLUGIN_RULE@ - -plugin_DATA = org-gnome-subject-thread.eplug - -liborg_gnome_subject_thread_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) - -liborg_gnome_subject_thread_la_SOURCES = subject-thread.c -liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - -liborg_gnome_subject_thread_la_LIBADD = \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_LIBS) - -EXTRA_DIST = org-gnome-subject-thread.eplug.xml - -BUILT_SOURCES = $(plugin_DATA) -CLEANFILES = $(BUILT_SOURCES) - --include $(top_srcdir)/git.mk diff --git a/plugins/subject-thread/org-gnome-subject-thread.eplug.xml b/plugins/subject-thread/org-gnome-subject-thread.eplug.xml deleted file mode 100644 index dfc94ec223..0000000000 --- a/plugins/subject-thread/org-gnome-subject-thread.eplug.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - <_description>Sort mail message threads by subject. - - - - - - - - diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c deleted file mode 100644 index 26012d3461..0000000000 --- a/plugins/subject-thread/subject-thread.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * JP Rosevear - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include - -#define GCONF_KEY "/apps/evolution/mail/display/thread_subject" - -GtkWidget *org_gnome_subject_thread_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); -gint e_plugin_lib_enable (EPlugin *ep, gint enable); - -gint -e_plugin_lib_enable (EPlugin *ep, gint enable) -{ - return 0; -} - -static void -toggled_cb (GtkWidget *widget, EConfig *config) -{ - EMConfigTargetPrefs *target = (EMConfigTargetPrefs *) config->target; - - /* Save the new setting to gconf */ - gconf_client_set_bool (target->gconf, GCONF_KEY, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)), NULL); -} - -GtkWidget * -org_gnome_subject_thread_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) -{ - GtkWidget *check; - EMConfigTargetPrefs *target = (EMConfigTargetPrefs *) hook_data->config->target; - - /* Create the checkbox we will display, complete with mnemonic that is unique in the dialog */ - check = gtk_check_button_new_with_mnemonic (_("F_all back to threading messages by subject")); - - /* Set the toggle button to the current gconf setting */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gconf_client_get_bool (target->gconf, GCONF_KEY, NULL)); - - /* Listen for the item being toggled on and off */ - g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (toggled_cb), hook_data->config); - - /* Pack the checkbox in the parent widget and show it */ - gtk_box_pack_start (GTK_BOX (hook_data->parent), check, FALSE, FALSE, 0); - gtk_widget_show (check); - - return check; -} -- cgit v1.2.3