diff options
| -rw-r--r-- | mail/ChangeLog | 17 | ||||
| -rw-r--r-- | mail/em-junk-filter.c | 9 | ||||
| -rw-r--r-- | mail/em-junk-plugin.h | 2 | ||||
| -rw-r--r-- | mail/em-mailer-prefs.c | 14 | ||||
| -rw-r--r-- | mail/em-mailer-prefs.h | 1 | ||||
| -rw-r--r-- | mail/evolution-mail.schemas.in.in | 28 | ||||
| -rw-r--r-- | mail/mail-config.glade | 177 | ||||
| -rw-r--r-- | mail/mail-session.c | 20 | ||||
| -rw-r--r-- | mail/mail-session.h | 2 |
9 files changed, 262 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 75dd8c0fea..3f649bb622 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,20 @@ +2004-01-23 Radek Doulik <rodo@ximian.com> + + * em-junk-filter.c: use mail_session_get_sa_daemon_port + + * em-mailer-prefs.c (em_mailer_prefs_construct): added + check_incoming_imap + (em_mailer_prefs_apply): ditto + (settings_changed): set check_incoming_imap sensitivity by + check_incoming state + + * mail-session.c: add sa_daemon_port + (mail_session_init): init sa_daemon_port and check_junk_for_imap + (mail_session_check_junk_notify): watch for sa_daemon_port and + check_junk_for_imap + (mail_session_get_sa_daemon_port): new wrapper + (mail_session_set_sa_daemon_port): ditto + 2004-01-22 Jeffrey Stedfast <fejj@ximian.com> * em-junk-filter.c (em_junk_sa_test_spamd): Oops, when calling diff --git a/mail/em-junk-filter.c b/mail/em-junk-filter.c index 8a5623b191..bdd7213c05 100644 --- a/mail/em-junk-filter.c +++ b/mail/em-junk-filter.c @@ -182,12 +182,13 @@ em_junk_sa_test_spamd_running (int port) } #define SPAMD_PORT 7830 -#define MAX_SPAMD_PORT SPAMD_PORT +#define MAX_SPAMD_PORTS 1 static void em_junk_sa_test_spamd (void) { - int port = SPAMD_PORT; + int port = mail_session_get_sa_daemon_port (); + int i; char *argv[6] = { "/bin/sh", "-c", @@ -208,7 +209,7 @@ em_junk_sa_test_spamd (void) em_junk_sa_use_spamc = TRUE; em_junk_sa_spamd_port = -1; } else { - for ( ; port < MAX_SPAMD_PORT; port++) { + for (i = 0; i < MAX_SPAMD_PORTS; i ++, port ++) { if (em_junk_sa_test_spamd_running (port)) { em_junk_sa_use_spamc = TRUE; em_junk_sa_spamd_port = port; @@ -233,7 +234,7 @@ em_junk_sa_test_spamd (void) argv[i++] = "--daemonize"; argv[i] = NULL; - for ( ; port < MAX_SPAMD_PORT; port++) { + for (i = 0; i < MAX_SPAMD_PORTS; i++, port++) { d(fprintf (stderr, "trying to run spamd at port %d\n", port)); sprintf (port_buf, "%d", port); diff --git a/mail/em-junk-plugin.h b/mail/em-junk-plugin.h index bd4af4cf9a..a4edba8890 100644 --- a/mail/em-junk-plugin.h +++ b/mail/em-junk-plugin.h @@ -38,7 +38,7 @@ struct _EMJunkPlugin plugin has to call (*changed_cb) (); whenever configuration is changed to notify settings dialog about that change. if setup_widget is NULL, it means there is no UI configuration */ - + /* this is currently not used */ GtkWidget (*setup_widget) (void (*changed_cb) ()); void (*apply) (); }; diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index d5a80beef3..946baec956 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -160,6 +160,7 @@ settings_changed (GtkWidget *widget, gpointer user_data) { EMMailerPrefs *prefs = (EMMailerPrefs *) user_data; + gtk_widget_set_sensitive (GTK_WIDGET (prefs->check_incoming_imap), gtk_toggle_button_get_active (prefs->check_incoming)); if (prefs->control) evolution_config_control_changed (prefs->control); } @@ -397,7 +398,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) GtkTreeIter iter; char *font, *buf; GladeXML *gui; - gboolean bool; + gboolean bool, check_incoming; int val, i; gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "preferences_tab", NULL); @@ -649,10 +650,16 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) /* Junk prefs */ prefs->check_incoming = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkCheckIncomingMail")); - bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/junk/check_incoming", NULL); + check_incoming = bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/junk/check_incoming", NULL); gtk_toggle_button_set_active (prefs->check_incoming, bool); g_signal_connect (prefs->check_incoming, "toggled", G_CALLBACK (settings_changed), prefs); + prefs->check_incoming_imap = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkDoNotCheckIMAP")); + gtk_widget_set_sensitive (GTK_WIDGET (prefs->check_incoming_imap), check_incoming); + bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/junk/check_incoming_imap", NULL); + gtk_toggle_button_set_active (prefs->check_incoming_imap, !bool); + g_signal_connect (prefs->check_incoming_imap, "toggled", G_CALLBACK (settings_changed), prefs); + prefs->sa_local_tests_only = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkSALocalTestsOnly")); bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/junk/sa/local_only", NULL); gtk_toggle_button_set_active (prefs->sa_local_tests_only, bool); @@ -664,7 +671,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) g_signal_connect (prefs->sa_use_daemon, "toggled", G_CALLBACK (settings_changed), prefs); } - GtkWidget * em_mailer_prefs_new (void) { @@ -802,6 +808,8 @@ em_mailer_prefs_apply (EMMailerPrefs *prefs) /* junk prefs */ gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/junk/check_incoming", gtk_toggle_button_get_active (prefs->check_incoming), NULL); + gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/junk/check_incoming_imap", + !gtk_toggle_button_get_active (prefs->check_incoming_imap), NULL); gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/junk/sa/local_only", gtk_toggle_button_get_active (prefs->sa_local_tests_only), NULL); gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/junk/sa/use_daemon", diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index 3a182476ff..bf7a2cbfb8 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -116,6 +116,7 @@ struct _EMMailerPrefs { /* Junk prefs */ GtkToggleButton *check_incoming; + GtkToggleButton *check_incoming_imap; GtkToggleButton *sa_local_tests_only; GtkToggleButton *sa_use_daemon; }; diff --git a/mail/evolution-mail.schemas.in.in b/mail/evolution-mail.schemas.in.in index 7cb54fc2cf..cdc0dd4745 100644 --- a/mail/evolution-mail.schemas.in.in +++ b/mail/evolution-mail.schemas.in.in @@ -638,6 +638,20 @@ </schema> <schema> + <key>/schemas/apps/evolution/mail/junk/check_incoming_imap</key> + <applyto>/apps/evolution/mail/junk/check_incoming_imap</applyto> + <owner>evolution-mail</owner> + <type>bool</type> + <default>true</default> + <locale name="C"> + <short>Check incoming mail being junk for IMAP accounts</short> + <long> + Run junk test on incoming mail for IMAP accounts (only valid if check_incoming is set to true) + </long> + </locale> + </schema> + + <schema> <key>/schemas/apps/evolution/mail/junk/sa/local_only</key> <applyto>/apps/evolution/mail/junk/sa/local_only</applyto> <owner>evolution-mail</owner> @@ -665,6 +679,20 @@ </locale> </schema> + <schema> + <key>/schemas/apps/evolution/mail/junk/sa/daemon_port</key> + <applyto>/apps/evolution/mail/junk/sa/daemon_port</applyto> + <owner>evolution-mail</owner> + <type>int</type> + <default>7830</default> + <locale name="C"> + <short>spamd port</short> + <long> + port for starting user runned spamd + </long> + </locale> + </schema> + <!-- Account settings --> <schema> diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 70283e9153..acbe97b79c 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -11,6 +11,11 @@ <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GnomeDruid" id="druid"> @@ -158,6 +163,11 @@ Click "Apply" to save your settings.</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkNotebook" id="account_editor_notebook"> @@ -281,6 +291,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Make this my default account</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -630,6 +641,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Add new signature...</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <signal name="clicked" handler="sigAddNewClicked"/> </widget> <packing> @@ -1263,6 +1275,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">1</property> <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkButton" id="source_check_supported"> @@ -1271,6 +1287,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes"> _Check for supported types </property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> </widget> @@ -1296,6 +1313,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Re_member this password</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -1434,6 +1452,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Automatically check for new mail every</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -1885,6 +1904,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Ser_ver requires authentication</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -2008,6 +2028,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">1</property> <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkButton" id="transport_check_supported"> @@ -2016,6 +2040,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes"> _Check for supported types </property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> </widget> @@ -2095,6 +2120,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Remember this _password</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -2287,6 +2313,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Restore Defaults</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -2362,6 +2389,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Always _carbon-copy (Cc) to:</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -2383,6 +2411,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Always _blind carbon-copy (Bcc) to:</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -2602,6 +2631,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Always sign outgoing messages when using this account</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -2620,6 +2650,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Don't sign _meeting requests (for Outlook compatibility)</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -2638,6 +2669,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Al_ways encrypt to myself when sending encrypted mail</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -2656,6 +2688,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -2815,6 +2848,7 @@ For example: "Work" or "Personal"</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment28"> @@ -2823,6 +2857,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox175"> @@ -2887,6 +2925,7 @@ For example: "Work" or "Personal"</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment29"> @@ -2895,6 +2934,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox176"> @@ -2961,6 +3004,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-clear</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">3</property> @@ -2979,6 +3023,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-clear</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">3</property> @@ -2997,6 +3042,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">A_lso encrypt to self when sending encrypted mail</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3018,6 +3064,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Encrypt outgoing messages (by default)</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3054,6 +3101,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Digitally _sign outgoing messages (by default)</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3138,6 +3186,11 @@ For example: "Work" or "Personal"</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkHBox" id="toplevel"> @@ -3203,6 +3256,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-add</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -3215,6 +3269,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Edit</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -3227,6 +3282,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-remove</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> </widget> @@ -3274,6 +3330,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">De_fault</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -3286,6 +3343,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">E_nable</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> </widget> @@ -3313,6 +3371,11 @@ For example: "Work" or "Personal"</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkNotebook" id="toplevel"> @@ -3352,6 +3415,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Use the same fonts as other applications</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3406,6 +3470,7 @@ For example: "Work" or "Personal"</property> <property name="show_size">True</property> <property name="use_font_in_label">False</property> <property name="label_font_size">14</property> + <property name="focus_on_click">True</property> <signal name="font_set" handler="changed"/> </widget> <packing> @@ -3427,6 +3492,7 @@ For example: "Work" or "Personal"</property> <property name="show_size">True</property> <property name="use_font_in_label">False</property> <property name="label_font_size">14</property> + <property name="focus_on_click">True</property> <signal name="font_set" handler="changed"/> </widget> <packing> @@ -3526,6 +3592,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Mark messages as read after</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3667,6 +3734,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Highlight _quotations with</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3685,6 +3753,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -3770,6 +3839,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Empty _trash folders on exit</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3788,6 +3858,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Confirm when expunging a folder</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3848,6 +3919,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Do not notify me when new mail arrives</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3866,6 +3938,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Beep when new mail arrives</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3885,6 +3958,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Play sound file when new mail arrives</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4043,6 +4117,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Never load images off the net</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4061,6 +4136,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Load images if sender is in address book</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4080,6 +4156,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Always load images off the net</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4127,6 +4204,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Show animated images</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4145,6 +4223,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Prompt when sending HTML messages to contacts that don't want them</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4212,6 +4291,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -4230,6 +4310,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -4248,6 +4329,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -4266,6 +4348,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -4284,6 +4367,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -4412,6 +4496,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Restore defaults</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">2</property> @@ -4585,6 +4670,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-add</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">6</property> @@ -4600,6 +4686,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-remove</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -4668,6 +4755,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Check _Incoming Mail</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4678,6 +4766,59 @@ For example: "Work" or "Personal"</property> <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkHBox" id="hbox177"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label475"> + <property name="visible">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="chkDoNotCheckIMAP"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Do _Not Check Incoming Mail For IMAP Accounts</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -4707,6 +4848,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Local Tests Only</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4725,6 +4867,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Use _Daemon</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4799,6 +4942,11 @@ For example: "Work" or "Personal"</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkNotebook" id="toplevel"> @@ -4895,6 +5043,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hboxReplyStyle"> @@ -5093,6 +5245,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Format messages in _HTML</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -5111,6 +5264,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Automatically insert smiley images</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -5171,6 +5325,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Prompt when sending messages with an empty subject line</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -5189,6 +5344,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Pr_ompt when sending messages with only Bcc recipients defined</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -5334,6 +5490,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-add</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -5345,6 +5502,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Add Sc_ript</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <signal name="clicked" handler="cmdSignatureAddScriptClicked"/> </widget> </child> @@ -5357,6 +5515,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Edit</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -5368,6 +5527,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-remove</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> </widget> @@ -5601,6 +5761,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Enable</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <signal name="clicked" handler="spellLanguageEnable"/> </widget> </child> @@ -5647,6 +5808,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Check spelling while I _type</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -5693,6 +5855,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> <signal name="color_set" handler="spellColorSet"/> </widget> <packing> @@ -5772,6 +5935,11 @@ For example: "Work" or "Personal"</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkVBox" id="toplevel"> @@ -5860,6 +6028,7 @@ For example: "Work" or "Personal"</property> <property name="show_size">True</property> <property name="use_font_in_label">False</property> <property name="label_font_size">14</property> + <property name="focus_on_click">True</property> <signal name="font_set" handler="changed"/> </widget> <packing> @@ -5881,6 +6050,7 @@ For example: "Work" or "Personal"</property> <property name="show_size">True</property> <property name="use_font_in_label">False</property> <property name="label_font_size">14</property> + <property name="focus_on_click">True</property> <signal name="font_set" handler="changed"/> </widget> <packing> @@ -5931,6 +6101,11 @@ For example: "Work" or "Personal"</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="has_separator">True</property> <child internal-child="vbox"> @@ -5952,6 +6127,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Add Signature</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="response_id">0</property> </widget> </child> @@ -5964,6 +6140,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-cancel</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="response_id">0</property> </widget> </child> diff --git a/mail/mail-session.c b/mail/mail-session.c index 101ee56ecc..c51a1f7aaf 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -76,6 +76,7 @@ typedef struct _MailSession { /* spamassassin filter options */ gboolean sa_local_only; gboolean sa_use_daemon; + int sa_daemon_port; } MailSession; typedef struct _MailSessionClass { @@ -785,6 +786,18 @@ mail_session_set_sa_use_daemon (gboolean value) MAIL_SESSION (session)->sa_use_daemon = value; } +int +mail_session_get_sa_daemon_port () +{ + return MAIL_SESSION (session)->sa_daemon_port; +} + +void +mail_session_set_sa_daemon_port (int value) +{ + MAIL_SESSION (session)->sa_daemon_port = value; +} + static void mail_session_check_junk_notify (GConfClient *gconf, guint id, GConfEntry *entry, CamelSession *session) { @@ -798,10 +811,15 @@ mail_session_check_junk_notify (GConfClient *gconf, guint id, GConfEntry *entry, key ++; if (!strcmp (key, "check_incoming")) camel_session_set_check_junk (session, gconf_value_get_bool (gconf_entry_get_value (entry))); + else if (!strcmp (key, "check_incoming_imap")) + camel_session_set_check_junk_for_imap (session, gconf_value_get_bool (gconf_entry_get_value (entry))); else if (!strcmp (key, "local_only")) mail_session_set_sa_local_only (gconf_value_get_bool (gconf_entry_get_value (entry))); else if (!strcmp (key, "use_daemon")) mail_session_set_sa_use_daemon (gconf_value_get_bool (gconf_entry_get_value (entry))); + else if (!strcmp (key, "daemon_port")) + mail_session_set_sa_daemon_port (gconf_value_get_int (gconf_entry_get_value (entry))); + } } @@ -822,6 +840,8 @@ mail_session_init (const char *base_directory) gconf = mail_config_get_gconf_client (); gconf_client_add_dir (gconf, "/apps/evolution/mail/junk", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); camel_session_set_check_junk (session, gconf_client_get_bool (gconf, "/apps/evolution/mail/junk/check_incoming", NULL)); + camel_session_set_check_junk_for_imap (session, gconf_client_get_bool (gconf, "/apps/evolution/mail/junk/check_incoming_imap", NULL)); + mail_session_set_sa_daemon_port (gconf_client_get_int (gconf, "/apps/evolution/mail/junk/sa/daemon_port", NULL)); session_check_junk_notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/junk", (GConfClientNotifyFunc) mail_session_check_junk_notify, session, NULL, NULL); diff --git a/mail/mail-session.h b/mail/mail-session.h index 7fe591540c..9eb0dd446e 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -53,6 +53,8 @@ gboolean mail_session_get_sa_local_only (void); void mail_session_set_sa_local_only (gboolean value); gboolean mail_session_get_sa_use_daemon (void); void mail_session_set_sa_use_daemon (gboolean value); +void mail_session_set_sa_daemon_port (int value); +int mail_session_get_sa_daemon_port (void); extern CamelSession *session; |