aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-mailer-prefs.c
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-03-03 14:39:14 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-03-03 14:39:14 +0800
commit467bbf6fb6b0b215d7b6bd18a6b84acd839a08f9 (patch)
tree9bb0cb5e2fb74fbea57f5dfd818a4769349f8990 /mail/em-mailer-prefs.c
parent9b2a16eb3e313e3057a8ac785fecacf54c8266a0 (diff)
downloadgsoc2013-evolution-467bbf6fb6b0b215d7b6bd18a6b84acd839a08f9.tar.gz
gsoc2013-evolution-467bbf6fb6b0b215d7b6bd18a6b84acd839a08f9.tar.zst
gsoc2013-evolution-467bbf6fb6b0b215d7b6bd18a6b84acd839a08f9.zip
if we have the folder opened already, and its the outbox, then use the
2004-03-03 Not Zed <NotZed@Ximian.com> * em-inline-filter.c (emif_scan): * em-folder-tree-model.c (em_folder_tree_model_set_folder_info): if we have the folder opened already, and its the outbox, then use the total count instead of unread count. Bit of hack, but copies mail-folder-cache stuff. * mail-component.c (mc_add_store): renamed from mail_component_add_store, internal call. Added a done callback. (mc_add_local_store): renamed from mc_add_store, callback for local store. (mail_component_add_store): call mc_add_store to do the work. (mc_add_local_store_done): ugh, the target of all this shit - note all the default folders now they should be setup. * mail-folder-cache.c (mail_note_folder): clean up the logic a bit. was gonna do osmething else but it didn't work. 2004-03-02 Not Zed <NotZed@Ximian.com> * mail-send-recv.c (mail_send): if we're already sending, up the again count to tell it we need to re-send again. (receive_done): if we've been asked to run a send again while we were already running it, run it again to make sure we didn't miss any new messages. See bug #46839. * em-mailer-prefs.c (em_mailer_prefs_construct): update check_incoming_imap changes for merge conflicts. (settings_changed): i have no idea what these changes jeff did do, but check_incoming_imap is no longer needed, so i've deleted most of it. 2004-02-27 Not Zed <NotZed@Ximian.com> * em-format.c (emf_multipart_encrypted, emf_multipart_signed): If validation fails, display as multipart/mixed rather than unkown attachment type, and make the error a little clearer that its an error. See #52939. 2004-02-26 Not Zed <NotZed@Ximian.com> * message-list.c (regen_list_regened): NOOP if the folder has changed. * mail-session.c (mail_session_check_junk_notify): remove check_incoming_imap test. (mail_session_init): " * evolution-mail.schemas.in.in: Remove check_incoming_imap option. * mail-config.glade: Remove check incoming imap checkbox. * em-mailer-prefs.c (em_mailer_prefs_construct): remove check_incoming_imap test. (em_mailer_prefs_apply): " (settings_changed): " svn path=/trunk/; revision=24944
Diffstat (limited to 'mail/em-mailer-prefs.c')
-rw-r--r--mail/em-mailer-prefs.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 9f12c4522c..ff8c789be0 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -159,16 +159,6 @@ static void
settings_changed (GtkWidget *widget, gpointer user_data)
{
EMMailerPrefs *prefs = (EMMailerPrefs *) user_data;
- gboolean check_incoming, locked = FALSE;
-
- if (prefs->check_incoming && prefs->check_incoming_imap) {
- /* this callback can get called in _construct() before
- * these widgets have been created */
- if ((check_incoming = gtk_toggle_button_get_active (prefs->check_incoming)))
- locked = gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/junk/sa/check_incoming_imap", NULL);
-
- gtk_widget_set_sensitive (GTK_WIDGET (prefs->check_incoming_imap), check_incoming && !locked);
- }
if (prefs->control)
evolution_config_control_changed (prefs->control);
@@ -465,7 +455,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs)
GtkTreeIter iter;
char *font, *buf;
GladeXML *gui;
- gboolean locked, check_incoming;
+ gboolean locked;
int val, i;
gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "preferences_tab", NULL);
@@ -756,20 +746,11 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs)
emmp_header_remove_sensitivity (prefs);
/* Junk prefs */
- prefs->check_incoming_imap = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkDoNotCheckIMAP"));
- toggle_button_init (prefs->check_incoming_imap, prefs->gconf,
- "/apps/evolution/mail/junk/sa/check_incoming_imap",
- TRUE, G_CALLBACK (settings_changed), prefs);
-
prefs->check_incoming = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkCheckIncomingMail"));
toggle_button_init (prefs->check_incoming, prefs->gconf,
"/apps/evolution/mail/junk/sa/check_incoming",
FALSE, G_CALLBACK (settings_changed), prefs);
-
- check_incoming = gtk_toggle_button_get_active (prefs->check_incoming);
- if (!gtk_toggle_button_get_active (prefs->check_incoming))
- gtk_widget_set_sensitive ((GtkWidget *) prefs->check_incoming_imap, FALSE);
-
+
prefs->sa_local_tests_only = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkSALocalTestsOnly"));
toggle_button_init (prefs->sa_local_tests_only, prefs->gconf,
"/apps/evolution/mail/junk/sa/local_only",
@@ -918,8 +899,6 @@ 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",