sync with sylpheed 0.4.66cvs6

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 59641e06f4671e4e4ff432b3b4c1d42d6329f455..fc7ef416d967f9e65ffe5e449fbc35c2a4c02a40 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -39,6 +39,7 @@
 #include "account.h"
 #include "mainwindow.h"
 #include "manage_window.h"
+#include "inc.h"
 #include "menu.h"
 #include "gtkutils.h"
 #include "utils.h"
@@ -313,6 +314,9 @@ static void prefs_account_privacy_create    (void);
 #endif /* USE_GPGME */
 static void prefs_account_advanced_create      (void);
 
+static gint prefs_account_deleted              (GtkWidget      *widget,
+                                                GdkEventAny    *event,
+                                                gpointer        data);
 static void prefs_account_key_pressed          (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
@@ -424,6 +428,8 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
 
        debug_print(_("Opening account preferences window...\n"));
 
+       inc_autocheck_timer_remove();
+
        cancelled = FALSE;
 
        if (!ac_prefs) {
@@ -478,6 +484,8 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
        gtk_main();
        gtk_widget_hide(dialog.window);
 
+       inc_autocheck_timer_set();
+
        if (cancelled && new_account) {
                g_free(ac_prefs);
                return NULL;
@@ -496,7 +504,7 @@ static void prefs_account_create(void)
        /* create dialog */
        prefs_dialog_create(&dialog);
        gtk_signal_connect(GTK_OBJECT(dialog.window), "delete_event",
-                          GTK_SIGNAL_FUNC(prefs_account_cancel), NULL);
+                          GTK_SIGNAL_FUNC(prefs_account_deleted), NULL);
        gtk_signal_connect(GTK_OBJECT(dialog.window), "key_press_event",
                           GTK_SIGNAL_FUNC(prefs_account_key_pressed), NULL);
        gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_in_event",
@@ -881,8 +889,9 @@ static void prefs_account_receive_create(void)
                           _("Remove messages on server when received"));
        PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
                           _("Receive all messages on server"));
-       PACK_CHECK_BUTTON (vbox2, recvatgetall_chkbtn,
-                          _("Receive at getting from all accounts"));
+       PACK_CHECK_BUTTON
+                       (vbox2, recvatgetall_chkbtn,
+                                        _("`Receive all' checks for new mail on this account"));
        PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
                           _("Filter messages on receiving"));
 
@@ -1198,6 +1207,13 @@ static void prefs_account_advanced_create(void)
        advanced.domain_entry           = entry_domain;
 }
 
+static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
+                                 gpointer data)
+{
+       prefs_account_cancel();
+       return TRUE;
+}
+
 static void prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                      gpointer data)
 {