From e4ff73ed1669f587e59b787330eb46c17af643c1 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 20 May 2004 14:17:33 +0000 Subject: remove "use daemon" handling code 2004-05-20 Radek Doulik * em-mailer-prefs.c (em_mailer_prefs_construct): remove "use daemon" handling code Fixes #56909 svn path=/trunk/; revision=26010 --- mail/ChangeLog | 7 ++ mail/em-mailer-prefs.c | 5 - mail/mail-config.glade | 264 +++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 228 insertions(+), 48 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index d2b7461fb8..d0cfe3a972 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2004-05-20 Radek Doulik + + * em-mailer-prefs.c (em_mailer_prefs_construct): remove "use + daemon" handling code + + Fixes #56909 + 2004-05-20 Not Zed ** See #58388. diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index ff85c36c3a..ebb1742d05 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -955,11 +955,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) toggle_button_init (prefs, prefs->sa_local_tests_only, FALSE, "/apps/evolution/mail/junk/sa/local_only", G_CALLBACK (toggle_button_toggled)); - - prefs->sa_use_daemon = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkSAUseDaemon")); - toggle_button_init (prefs, prefs->sa_use_daemon, FALSE, - "/apps/evolution/mail/junk/sa/use_daemon", - G_CALLBACK (toggle_button_toggled)); } GtkWidget * diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 3e9fa8922b..6af147cd34 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -11,6 +11,11 @@ False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -153,6 +158,11 @@ Click "Apply" to save your settings. False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -668,6 +678,7 @@ For example: "Work" or "Personal" Add Ne_w Signature... True GTK_RELIEF_NORMAL + True @@ -787,6 +798,7 @@ For example: "Work" or "Personal" _Make this my default account True GTK_RELIEF_NORMAL + True False False True @@ -1218,6 +1230,7 @@ For example: "Work" or "Personal" Mailbox location False False + False @@ -1589,6 +1602,7 @@ For example: "Work" or "Personal" Ch_eck for Supported Types True GTK_RELIEF_NORMAL + True 0 @@ -1612,6 +1626,7 @@ For example: "Work" or "Personal" Re_member password True GTK_RELIEF_NORMAL + True False False True @@ -1766,6 +1781,7 @@ For example: "Work" or "Personal" Automatically check for _new mail every True GTK_RELIEF_NORMAL + True False False True @@ -2183,6 +2199,7 @@ For example: "Work" or "Personal" Ser_ver requires authentication True GTK_RELIEF_NORMAL + True False False True @@ -2630,6 +2647,7 @@ For example: "Work" or "Personal" Ch_eck for Supported Types True GTK_RELIEF_NORMAL + True 0 @@ -2672,6 +2690,7 @@ For example: "Work" or "Personal" Remember _password True GTK_RELIEF_NORMAL + True False False True @@ -2954,6 +2973,7 @@ For example: "Work" or "Personal" gtk-revert-to-saved True GTK_RELIEF_NORMAL + True 0 @@ -3102,6 +3122,7 @@ For example: "Work" or "Personal" Alway_s carbon-copy (cc) to: True GTK_RELIEF_NORMAL + True False False True @@ -3217,6 +3238,7 @@ For example: "Work" or "Personal" Always _blind carbon-copy (bcc) to: True GTK_RELIEF_NORMAL + True False False True @@ -3510,6 +3532,7 @@ For example: "Work" or "Personal" Always _sign outgoing messages when using this account True GTK_RELIEF_NORMAL + True False False True @@ -3528,6 +3551,7 @@ For example: "Work" or "Personal" Don't sign _meeting requests (for Outlook compatibility) True GTK_RELIEF_NORMAL + True False False True @@ -3546,6 +3570,7 @@ For example: "Work" or "Personal" Al_ways encrypt to myself when sending encrypted mail True GTK_RELIEF_NORMAL + True True False True @@ -3564,6 +3589,7 @@ For example: "Work" or "Personal" Always _trust keys in my keyring when encrypting True GTK_RELIEF_NORMAL + True False False True @@ -3716,6 +3742,7 @@ For example: "Work" or "Personal" A_lso encrypt to self when sending encrypted mail True GTK_RELIEF_NORMAL + True False False True @@ -3737,6 +3764,7 @@ For example: "Work" or "Personal" _Encrypt outgoing messages (by default) True GTK_RELIEF_NORMAL + True False False True @@ -3758,6 +3786,7 @@ For example: "Work" or "Personal" _Digitally sign outgoing messages (by default) True GTK_RELIEF_NORMAL + True False False True @@ -3848,6 +3877,7 @@ For example: "Work" or "Personal" True True GTK_RELIEF_NORMAL + True @@ -3856,6 +3886,10 @@ For example: "Work" or "Personal" 0.5 0 0 + 0 + 0 + 0 + 0 @@ -3919,6 +3953,7 @@ For example: "Work" or "Personal" gtk-clear True GTK_RELIEF_NORMAL + True 0 @@ -3948,6 +3983,7 @@ For example: "Work" or "Personal" True True GTK_RELIEF_NORMAL + True @@ -3956,6 +3992,10 @@ For example: "Work" or "Personal" 0.5 0 0 + 0 + 0 + 0 + 0 @@ -4019,6 +4059,7 @@ For example: "Work" or "Personal" gtk-clear True GTK_RELIEF_NORMAL + True 0 @@ -4093,6 +4134,11 @@ For example: "Work" or "Personal" False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -4135,6 +4181,7 @@ For example: "Work" or "Personal" gtk-add True GTK_RELIEF_NORMAL + True @@ -4145,6 +4192,7 @@ For example: "Work" or "Personal" True True GTK_RELIEF_NORMAL + True @@ -4153,6 +4201,10 @@ For example: "Work" or "Personal" 0.5 0 0 + 0 + 0 + 0 + 0 @@ -4213,6 +4265,7 @@ For example: "Work" or "Personal" gtk-remove True GTK_RELIEF_NORMAL + True @@ -4238,6 +4291,7 @@ For example: "Work" or "Personal" De_fault True GTK_RELIEF_NORMAL + True @@ -4250,6 +4304,7 @@ For example: "Work" or "Personal" E_nable True GTK_RELIEF_NORMAL + True @@ -4277,6 +4332,11 @@ For example: "Work" or "Personal" False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -4371,6 +4431,7 @@ For example: "Work" or "Personal" _Use the same fonts as other applications True GTK_RELIEF_NORMAL + True False False True @@ -4425,6 +4486,7 @@ For example: "Work" or "Personal" True False 14 + True @@ -4446,6 +4508,7 @@ For example: "Work" or "Personal" True False 14 + True @@ -4601,6 +4664,7 @@ For example: "Work" or "Personal" _Mark messages as read after True GTK_RELIEF_NORMAL + True False False True @@ -4672,6 +4736,7 @@ For example: "Work" or "Personal" Highlight _quotations with True GTK_RELIEF_NORMAL + True True False True @@ -4690,6 +4755,7 @@ For example: "Work" or "Personal" True False Pick a color + True 0 @@ -4907,6 +4973,7 @@ For example: "Work" or "Personal" Empty trash folders on e_xit True GTK_RELIEF_NORMAL + True False False True @@ -4945,6 +5012,7 @@ For example: "Work" or "Personal" Confirm _when expunging a folder True GTK_RELIEF_NORMAL + True False False True @@ -5061,6 +5129,7 @@ For example: "Work" or "Personal" _Do not notify me when new mail arrives True GTK_RELIEF_NORMAL + True True False True @@ -5079,6 +5148,7 @@ For example: "Work" or "Personal" Beep w_hen new mail arrives True GTK_RELIEF_NORMAL + True False False True @@ -5098,6 +5168,7 @@ For example: "Work" or "Personal" Play sound file when new mail arri_ves True GTK_RELIEF_NORMAL + True False False True @@ -5145,6 +5216,7 @@ For example: "Work" or "Personal" Execute Command... False False + False @@ -5296,6 +5368,7 @@ For example: "Work" or "Personal" _Show animated images True GTK_RELIEF_NORMAL + True False False True @@ -5314,6 +5387,7 @@ For example: "Work" or "Personal" _Prompt when sending HTML messages to contacts that don't want them True GTK_RELIEF_NORMAL + True False False True @@ -5406,6 +5480,7 @@ For example: "Work" or "Personal" _Never load images from the Internet True GTK_RELIEF_NORMAL + True False False True @@ -5424,6 +5499,7 @@ For example: "Work" or "Personal" _Load images if sender is in address book True GTK_RELIEF_NORMAL + True False False True @@ -5443,6 +5519,7 @@ For example: "Work" or "Personal" _Always load images from the Internet True GTK_RELIEF_NORMAL + True False False True @@ -5572,6 +5649,7 @@ For example: "Work" or "Personal" True False Pick a color + True 1 @@ -5590,6 +5668,7 @@ For example: "Work" or "Personal" True False Pick a color + True 1 @@ -5608,6 +5687,7 @@ For example: "Work" or "Personal" True False Pick a color + True 1 @@ -5626,6 +5706,7 @@ For example: "Work" or "Personal" True False Pick a color + True 1 @@ -5644,6 +5725,7 @@ For example: "Work" or "Personal" True False Pick a color + True 1 @@ -5778,6 +5860,7 @@ For example: "Work" or "Personal" gtk-revert-to-saved True GTK_RELIEF_NORMAL + True 0 @@ -5964,6 +6047,7 @@ For example: "Work" or "Personal" gtk-add True GTK_RELIEF_NORMAL + True 0 @@ -5979,6 +6063,7 @@ For example: "Work" or "Personal" gtk-remove True GTK_RELIEF_NORMAL + True 0 @@ -6031,13 +6116,13 @@ For example: "Work" or "Personal" 12 True False - 12 + 18 True False - 6 + 12 @@ -6064,7 +6149,7 @@ For example: "Work" or "Personal" True False - 12 + 0 @@ -6088,32 +6173,49 @@ For example: "Work" or "Personal" - + True - 1 - 1 False - 2 - 6 + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + True Checks incoming mail messages to be Junk True - Check _Incoming Mail + Check _incoming mail for junk True GTK_RELIEF_NORMAL + True False False True - 0 - 1 - 0 - 1 - + 0 + False + False @@ -6142,7 +6244,7 @@ For example: "Work" or "Personal" True False - 6 + 12 @@ -6166,15 +6268,15 @@ For example: "Work" or "Personal" - + True False - 12 + 0 - + True - + False False GTK_JUSTIFY_LEFT @@ -6193,28 +6295,49 @@ For example: "Work" or "Personal" - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 6 + + + + True + True + I_nclude remote tests + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + - + True False - 6 + 0 - + True - True - _Local Tests Only - True - GTK_RELIEF_NORMAL - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -6224,15 +6347,18 @@ For example: "Work" or "Personal" - + True - True - Use _Daemon - True - GTK_RELIEF_NORMAL - False - False - True + <small>This will make the the filter more reliable, but slower</small> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -6241,12 +6367,17 @@ For example: "Work" or "Personal" + + 0 + False + False + 0 - True - True + False + False @@ -6299,6 +6430,11 @@ For example: "Work" or "Personal" False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -6393,6 +6529,7 @@ For example: "Work" or "Personal" Format messages in _HTML True GTK_RELIEF_NORMAL + True False False True @@ -6411,6 +6548,7 @@ For example: "Work" or "Personal" Automatically _insert smiley images True GTK_RELIEF_NORMAL + True False False True @@ -6462,6 +6600,10 @@ For example: "Work" or "Personal" 0.5 0 1 + 0 + 0 + 0 + 0 @@ -6770,6 +6912,7 @@ For example: "Work" or "Personal" _Prompt when sending messages with an empty subject line True GTK_RELIEF_NORMAL + True False False True @@ -6788,6 +6931,7 @@ For example: "Work" or "Personal" Pr_ompt when sending messages with only Bcc recipients defined True GTK_RELIEF_NORMAL + True False False True @@ -6982,6 +7126,7 @@ For example: "Work" or "Personal" gtk-add True GTK_RELIEF_NORMAL + True @@ -6991,6 +7136,7 @@ For example: "Work" or "Personal" True True GTK_RELIEF_NORMAL + True @@ -7000,6 +7146,10 @@ For example: "Work" or "Personal" 0.5 0 0 + 0 + 0 + 0 + 0 @@ -7057,6 +7207,7 @@ For example: "Work" or "Personal" True True GTK_RELIEF_NORMAL + True @@ -7065,6 +7216,10 @@ For example: "Work" or "Personal" 0.5 0 0 + 0 + 0 + 0 + 0 @@ -7124,6 +7279,7 @@ For example: "Work" or "Personal" gtk-remove True GTK_RELIEF_NORMAL + True @@ -7459,6 +7615,7 @@ For example: "Work" or "Personal" _Enable True GTK_RELIEF_NORMAL + True 0 @@ -7569,6 +7726,7 @@ For example: "Work" or "Personal" Check spelling while I _type True GTK_RELIEF_NORMAL + True False False True @@ -7615,6 +7773,7 @@ For example: "Work" or "Personal" True False Pick a color + True 0 @@ -7686,6 +7845,11 @@ For example: "Work" or "Personal" False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -7819,6 +7983,7 @@ For example: "Work" or "Personal" True False 14 + True @@ -7840,6 +8005,7 @@ For example: "Work" or "Personal" True False 14 + True @@ -7883,6 +8049,11 @@ For example: "Work" or "Personal" False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST False @@ -7902,6 +8073,7 @@ For example: "Work" or "Personal" True True GTK_RELIEF_NORMAL + True 0 @@ -7911,6 +8083,10 @@ For example: "Work" or "Personal" 0.5 0 0 + 0 + 0 + 0 + 0 @@ -7970,6 +8146,7 @@ For example: "Work" or "Personal" gtk-cancel True GTK_RELIEF_NORMAL + True 0 @@ -8135,6 +8312,7 @@ for display purposes only. 10 False False + False -- cgit