diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 01:09:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 01:09:33 +0800 |
| commit | c9ec8c3f4dce2b02c91268529977770364ef87fe (patch) | |
| tree | d574f2be1b5438407e59e2fead1321766c9bbc83 /plugins/sa-junk-plugin | |
| parent | 6fec6bf39467dd32625847be1b021a7e5bc94d76 (diff) | |
| parent | 96538878911586a9e9ca26b81e1916c04e538980 (diff) | |
| download | gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.gz gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.zst gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.zip | |
Merge branch 'express2'
Diffstat (limited to 'plugins/sa-junk-plugin')
| -rw-r--r-- | plugins/sa-junk-plugin/em-junk-filter.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index f52cd8c4ae..537831a07e 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -41,6 +41,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include "mail/em-config.h" +#include "shell/e-shell.h" #include <gconf/gconf-client.h> @@ -920,6 +921,7 @@ use_remote_tests_cb (GtkWidget *widget, gpointer data) GtkWidget * org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { + EShell *shell; GtkWidget *check, *vbox, *label; gchar *text = g_strdup_printf (" <small>%s</small>", _("This will make SpamAssassin more reliable, but slower")); guint n_rows; @@ -942,7 +944,13 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact gtk_table_attach ( GTK_TABLE (data->parent), vbox, 0, 1, n_rows, n_rows+1, 0, 0, 0, 0); - gtk_widget_show_all (vbox); - return (GtkWidget *)vbox; + + shell = e_shell_get_default (); + if (e_shell_get_express_mode (shell)) + gtk_widget_hide (vbox); + else + gtk_widget_show_all (vbox); + + return vbox; } |