aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-content.c2
-rw-r--r--modules/mail/e-mail-shell-sidebar.c26
-rw-r--r--modules/mail/e-mail-shell-view-actions.c2
-rw-r--r--modules/mail/e-mail-shell-view-actions.h4
-rw-r--r--modules/mail/em-composer-prefs.c9
-rw-r--r--modules/mail/em-mailer-prefs.c10
6 files changed, 37 insertions, 16 deletions
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index eb2cbf679e..ecd592f32b 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -616,7 +616,7 @@ mail_shell_content_set_folder (EMailReader *reader,
key = STATE_KEY_GROUP_BY_THREADS;
value = g_key_file_get_boolean (key_file, group_name, key, &error);
if (error != NULL) {
- value = FALSE;
+ value = TRUE;
g_clear_error (&error);
}
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 491d5068d7..ac736a0a67 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -201,8 +201,8 @@ guess_screen_width (EMailShellSidebar *sidebar)
screen, gtk_widget_get_window (toplevel));
else {
/* We don't know in which monitor the window manager
- * will put us. So we will just use the geometry of the
- * first monitor.
+ * will put us. So we will just use the geometry of
+ * the first monitor.
*/
monitor = 0;
}
@@ -218,18 +218,21 @@ guess_screen_width (EMailShellSidebar *sidebar)
}
static void
-mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition)
+mail_shell_sidebar_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
{
/* We override the normal size-request handler so that we can
- * spit out a treeview with a suitable width. We measure the length
- * of a typical string and use that as the requisition's width.
+ * spit out a treeview with a suitable width. We measure the
+ * length of a typical string and use that as the requisition's
+ * width.
*
- * EMFolderTreeClass, our parent class, is based on GtkTreeView, which
- * doesn't really have a good way of figuring out a minimum width for
- * the tree. This is really GTK+'s fault at large, as it only has
- * "minimum size / allocated size", instead of "minimum size / preferred
- * size / allocated size". Hopefully the extended-layout branch of GTK+
- * will get merged soon and then we can remove this crap.
+ * EMFolderTreeClass, our parent class, is based on GtkTreeView,
+ * which doesn't really have a good way of figuring out a minimum
+ * width for the tree. This is really GTK+'s fault at large, as
+ * it only has "minimum size / allocated size", instead of
+ * "minimum size / preferred size / allocated size". Hopefully
+ * the extended-layout branch of GTK+ will get merged soon and
+ * then we can remove this crap.
*/
EMailShellSidebar *sidebar;
@@ -256,7 +259,6 @@ mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition)
/* Thickness of frame shadow plus some slack for padding. */
border = 2 * style->xthickness + 4;
-
sidebar_width = ink_rect.width + border;
sidebar_width = MIN (sidebar_width, screen_width / 4);
requisition->width = MAX (requisition->width, sidebar_width);
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 9bac5dfb4a..3ba34e68c0 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1160,7 +1160,7 @@ static GtkRadioActionEntry mail_filter_entries[] = {
MAIL_FILTER_LAST_5_DAYS_MESSAGES },
{ "mail-filter-messages-not-junk",
- "mail-mark-notjunk",
+ "mail-mark-not-junk",
N_("Messages Not Junk"),
NULL,
NULL, /* XXX Add a tooltip! */
diff --git a/modules/mail/e-mail-shell-view-actions.h b/modules/mail/e-mail-shell-view-actions.h
index 34f6e6c8f9..cc7552e27c 100644
--- a/modules/mail/e-mail-shell-view-actions.h
+++ b/modules/mail/e-mail-shell-view-actions.h
@@ -109,8 +109,8 @@
E_SHELL_WINDOW_ACTION ((window), "mail-mark-important")
#define E_SHELL_WINDOW_ACTION_MAIL_MARK_JUNK(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-mark-junk")
-#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOTJUNK(window) \
- E_SHELL_WINDOW_ACTION ((window), "mail-mark-notjunk")
+#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOT_JUNK(window) \
+ E_SHELL_WINDOW_ACTION ((window), "mail-mark-not-junk")
#define E_SHELL_WINDOW_ACTION_MAIL_MARK_READ(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-mark-read")
#define E_SHELL_WINDOW_ACTION_MAIL_MARK_UNIMPORTANT(window) \
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index c817653d20..7c0f39ea31 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -36,6 +36,7 @@
#include "em-composer-prefs.h"
#include "composer/e-msg-composer.h"
+#include "shell/e-shell-utils.h"
#include <glib/gi18n.h>
#include <glib/gstdio.h>
@@ -550,6 +551,14 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
signature_tree_view, "selected",
widget, "signature");
+ /* Sanitize the dialog for Express mode */
+ e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
+ "chkOutlookFilenames",
+ "vboxTopPosting",
+ "labelAlerts",
+ "chkPromptEmptySubject",
+ NULL);
+
/* get our toplevel widget */
target = em_config_target_new_prefs (ec, client);
e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 4fb910a396..11795a92d8 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -42,6 +42,7 @@
#include "e-util/e-datetime-format.h"
#include "e-util/e-util-private.h"
#include "widgets/misc/e-charset-combo-box.h"
+#include "shell/e-shell-utils.h"
#include "e-mail-label-manager.h"
#include "e-mail-reader-utils.h"
@@ -1214,6 +1215,15 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
g_signal_connect (G_OBJECT (prefs->junk_header_add), "clicked", G_CALLBACK (jh_add_cb), prefs);
g_signal_connect (G_OBJECT (prefs->junk_header_remove), "clicked", G_CALLBACK (jh_remove_cb), prefs);
+ /* Sanitize the dialog for Express mode */
+ e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
+ "hboxReadTimeout",
+ "hboxMailSizeLimit",
+ "hboxShrinkAddresses",
+ "magic_spacebar_checkbox",
+ "hboxEnableSearchFolders",
+ NULL);
+
/* get our toplevel widget */
target = em_config_target_new_prefs(ec, prefs->gconf);
e_config_set_target((EConfig *)ec, (EConfigTarget *)target);
generated by cgit (git 2.34.1) at 2024-11-20 18:56:34 +0800