2005-10-03 [colin] 1.9.15cvs1

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f3d592bcb296b7cf0930ec0a0586a98cbbc5f088..a197f579a343f1c506f492c4bdcc81eb5ef0f413 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -229,6 +229,23 @@ void sylpheed_gtk_idle(void)
        usleep(50000);
 }
 
+gboolean defer_check_all(void *data)
+{
+       gboolean autochk = GPOINTER_TO_INT(data);
+
+       inc_all_account_mail(static_mainwindow, autochk, 
+                       prefs_common.newmail_notify_manu);
+
+       return FALSE;
+}
+
+gboolean defer_check(void *data)
+{
+       inc_mail(static_mainwindow, prefs_common.newmail_notify_manu);
+
+       return FALSE;
+}
+
 int main(int argc, char *argv[])
 {
        gchar *userrc;
@@ -464,13 +481,11 @@ int main(int argc, char *argv[])
 #endif
 
        if (cmd.receive_all)
-               inc_all_account_mail(mainwin, FALSE, 
-                                    prefs_common.newmail_notify_manu);
+               g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
        else if (prefs_common.chk_on_startup)
-               inc_all_account_mail(mainwin, TRUE, 
-                                    prefs_common.newmail_notify_manu);
+               g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
        else if (cmd.receive)
-               inc_mail(mainwin, prefs_common.newmail_notify_manu);
+               g_timeout_add(1000, defer_check, NULL);
        else
                gtk_widget_grab_focus(folderview->ctree);
 
@@ -764,11 +779,11 @@ gboolean clean_quit(gpointer data)
 void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
-       
+
        if (compose_get_compose_list()) {
                gint val = alertpanel(_("Really quit?"),
                               _("Composing message exists."),
-                              _("Draft them"), _("Discard them"), _("Don't quit"));
+                              _("_Save to Draft"), _("_Discard them"), _("Do_n't quit"));
                switch (val) {
                        case G_ALERTOTHER:
                                return;
@@ -777,7 +792,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
                        default:
                                draft_all_messages();
                }
-               
+
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }