2008-09-12 [colin] 3.5.0cvs99
[claws.git] / src / inc.c
index 6350423577ab72adb7f941fdbb002d289aa19ca8..a15803c2d2393a78d56e31c81ea930afdb598d9d 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkprogressbar.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include "log.h"
 #include "hooks.h"
 
+#ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-sound.h>
+#else
+#include <hildon-widgets/hildon-banner.h>
+#include <hildon-widgets/hildon-system-sound.h>
+#endif
+#include <libosso.h>
+
+#ifdef CONIC
+#include <conicconnection.h>
+#include <conicconnectionevent.h>
+
+static ConIcConnection *maemo_connection = NULL;
+static gboolean maemo_warned_offline = FALSE;
+#endif
+#endif
+
 static GList *inc_dialog_list = NULL;
 
-static guint inc_lock_count = 0;
+guint inc_lock_count = 0;
 
 static GdkPixbuf *currentpix;
 static GdkPixbuf *errorpix;
@@ -72,7 +88,8 @@ static GdkPixbuf *okpix;
 #define MSGBUFSIZE     8192
 
 static void inc_finished               (MainWindow             *mainwin,
-                                        gboolean                new_messages);
+                                        gboolean                new_messages,
+                                        gboolean                autocheck);
 static gint inc_account_mail_real      (MainWindow             *mainwin,
                                         PrefsAccount           *account);
 
@@ -123,7 +140,8 @@ static gint inc_dialog_delete_cb    (GtkWidget      *widget,
                                         gpointer        data);
 
 static gint get_spool                  (FolderItem     *dest,
-                                        const gchar    *mbox);
+                                        const gchar    *mbox,
+                                        PrefsAccount   *account);
 
 static gint inc_spool_account(PrefsAccount *account);
 static gint inc_all_spool(void);
@@ -142,19 +160,21 @@ static void inc_notify_cmd                (gint new_msgs,
  * messages.  If @new_messages is FALSE, this function avoids unneeded
  * updating.
  **/
-static void inc_finished(MainWindow *mainwin, gboolean new_messages)
+static void inc_finished(MainWindow *mainwin, gboolean new_messages, gboolean autocheck)
 {
-       FolderItem *item;
-
        if (prefs_common.scan_all_after_inc)
                folderview_check_new(NULL);
 
-       if (!new_messages && !prefs_common.scan_all_after_inc) return;
+       if (!autocheck && new_messages && prefs_common.open_inbox_on_inc) {
+               FolderItem *item = NULL;
+
+               if (cur_account && cur_account->inbox)
+                       item = folder_find_item_from_identifier(cur_account->inbox);
+               if (item == NULL && cur_account->folder)
+                       item = cur_account->folder->inbox;
+               if (item == NULL)
+                       item = folder_get_default_inbox();
 
-       if (prefs_common.open_inbox_on_inc) {
-               item = cur_account && cur_account->inbox
-                       ? folder_find_item_from_identifier(cur_account->inbox)
-                       : folder_get_default_inbox();
                folderview_unselect(mainwin->folderview);
                folderview_select(mainwin->folderview, item);
        }
@@ -168,8 +188,8 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
        if (inc_lock_count) return;
 
        if (prefs_common.work_offline && 
-           !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+           !inc_offline_should_override(TRUE,
+               _("Claws Mail needs network access in order "
                  "to get mails.")))
                return;
 
@@ -182,6 +202,7 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
                if (execute_command_line(prefs_common.extinc_cmd, FALSE) < 0) {
                        main_window_unlock(mainwin);
                        inc_autocheck_timer_set();
+                       inc_unlock();
                        return;
                }
        } else {
@@ -190,7 +211,7 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
                        new_msgs += account_new_msgs;
        }
 
-       inc_finished(mainwin, new_msgs > 0);
+       inc_finished(mainwin, new_msgs > 0, FALSE);
        main_window_unlock(mainwin);
        inc_notify_cmd(new_msgs, notify);
        inc_autocheck_timer_set();
@@ -273,8 +294,8 @@ gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account)
        if (inc_lock_count) return 0;
 
        if (prefs_common.work_offline && 
-           !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+           !inc_offline_should_override(TRUE,
+               _("Claws Mail needs network access in order "
                  "to get mails.")))
                return 0;
 
@@ -283,7 +304,7 @@ gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account)
 
        new_msgs = inc_account_mail_real(mainwin, account);
 
-       inc_finished(mainwin, new_msgs > 0);
+       inc_finished(mainwin, new_msgs > 0, FALSE);
        main_window_unlock(mainwin);
        inc_autocheck_timer_set();
 
@@ -299,8 +320,8 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
        gint account_new_msgs = 0;
        
        if (prefs_common.work_offline && 
-           !inc_offline_should_override(
-               _("Sylpheed-Claws needs network access in order "
+           !inc_offline_should_override( (autocheck == FALSE),
+               _("Claws Mail needs network access in order "
                  "to get mails.")))
                return;
 
@@ -311,13 +332,24 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
 
        list = account_get_list();
        if (!list) {
-               inc_finished(mainwin, new_msgs > 0);
+               inc_finished(mainwin, new_msgs > 0, autocheck);
                main_window_unlock(mainwin);
                inc_notify_cmd(new_msgs, notify);
                inc_autocheck_timer_set();
                return;
        }
 
+       if (prefs_common.use_extinc && prefs_common.extinc_cmd) {
+               /* external incorporating program */
+               if (execute_command_line(prefs_common.extinc_cmd, FALSE) < 0) {
+                       log_error(LOG_PROTOCOL, _("%s failed\n"), prefs_common.extinc_cmd);
+                       
+                       main_window_unlock(mainwin);
+                       inc_autocheck_timer_set();
+                       return;
+               }
+       }
+       
        /* check local folders */
        account_new_msgs = inc_all_spool();
        if (account_new_msgs > 0)
@@ -355,16 +387,26 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
                new_msgs += inc_start(inc_dialog);
        }
 
-       inc_finished(mainwin, new_msgs > 0);
+       inc_finished(mainwin, new_msgs > 0, autocheck);
        main_window_unlock(mainwin);
        inc_notify_cmd(new_msgs, notify);
        inc_autocheck_timer_set();
 }
 
+static void inc_progress_dialog_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       g_return_if_fail(allocation != NULL);
+
+       prefs_common.receivewin_width = allocation->width;
+       prefs_common.receivewin_height = allocation->height;
+}
+
 static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
 {
        IncProgressDialog *dialog;
        ProgressDialog *progress;
+       static GdkGeometry geometry;
 
        dialog = g_new0(IncProgressDialog, 1);
 
@@ -375,7 +417,9 @@ static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
                         G_CALLBACK(inc_cancel_cb), dialog);
        g_signal_connect(G_OBJECT(progress->window), "delete_event",
                         G_CALLBACK(inc_dialog_delete_cb), dialog);
-       /* manage_window_set_transient(GTK_WINDOW(progress->window)); */
+       g_signal_connect(G_OBJECT(progress->window), "size_allocate",
+                        G_CALLBACK(inc_progress_dialog_size_allocate_cb), NULL);
+       /* manage_window_set_transient(GTK_WINDOW(progress->window)); */
 
        progress_dialog_get_fraction(progress);
 
@@ -386,6 +430,16 @@ static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
        stock_pixbuf_gdk(progress->treeview, STOCK_PIXMAP_ERROR,
                         &errorpix);
 
+       if (!geometry.min_height) {
+               geometry.min_width = 460;
+               geometry.min_height = 250;
+       }
+
+       gtk_window_set_geometry_hints(GTK_WINDOW(progress->window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(progress->window, prefs_common.receivewin_width,
+                                   prefs_common.receivewin_height);
+
        if (prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS ||
            (prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL &&
             !autocheck)) {
@@ -488,7 +542,6 @@ static gint inc_start(IncProgressDialog *inc_dialog)
        gchar *msg;
        gchar *fin_msg;
        FolderItem *processing, *inbox;
-       MsgInfo *msginfo;
        GSList *msglist, *msglist_element;
        gboolean cancelled = FALSE;
 
@@ -542,9 +595,9 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 }
 
        for (; inc_dialog->queue_list != NULL && !cancelled; inc_dialog->cur_row++) {
-               int cur = 0, total = 0;
                session = inc_dialog->queue_list->data;
                pop3_session = POP3_SESSION(session->session);
+               GSList *filtered, *unfiltered;
 
                if (pop3_session->pass == NULL) {
                        SET_PIXMAP_AND_TEXT(okpix, _("Cancelled"));
@@ -571,7 +624,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                                                 "Done (%d messages (%s) received)",
                                         pop3_session->cur_total_num),
                                         pop3_session->cur_total_num,
-                                        to_human_readable(pop3_session->cur_total_recv_bytes));
+                                        to_human_readable((goffset)pop3_session->cur_total_recv_bytes));
                        else
                                msg = g_strdup_printf(_("Done (no new messages)"));
                        SET_PIXMAP_AND_TEXT(okpix, msg);
@@ -630,25 +683,15 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 
                /* process messages */
                folder_item_update_freeze();
-               if (pop3_session->ac_prefs->filter_on_recv)
-                       statusbar_print_all(_("Filtering messages...\n"));
-               total = g_slist_length(msglist);
-
-               for(msglist_element = msglist; msglist_element != NULL; 
-                   msglist_element = msglist_element->next) {
-                       gchar *filename;
-                       msginfo = (MsgInfo *) msglist_element->data;
-                       filename = folder_item_fetch_msg(processing, msginfo->msgnum);
-                       g_free(filename);
-
-                       if (pop3_session->ac_prefs->filter_on_recv)
-                               statusbar_progress_all(cur++,total, prefs_common.statusbar_update_step);
+               
+               procmsg_msglist_filter(msglist, pop3_session->ac_prefs, 
+                               &filtered, &unfiltered, 
+                               pop3_session->ac_prefs->filter_on_recv);
 
-                       if (!pop3_session->ac_prefs->filter_on_recv || 
-                           !procmsg_msginfo_filter(msginfo))
-                               folder_item_move_msg(inbox, msginfo);
-               }
                filtering_move_and_copy_msgs(msglist);
+               if (unfiltered != NULL)         
+                       folder_item_move_msgs(inbox, unfiltered);
+
                for(msglist_element = msglist; msglist_element != NULL; 
                    msglist_element = msglist_element->next) {
                        MsgInfo *msginfo = (MsgInfo *)msglist_element->data;
@@ -656,10 +699,9 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                }
                folder_item_update_thaw();
                
-               statusbar_progress_all(0,0,0);
-               statusbar_pop_all();
-
                g_slist_free(msglist);
+               g_slist_free(filtered);
+               g_slist_free(unfiltered);
 
                statusbar_pop_all();
 
@@ -746,7 +788,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        g_free(buf);
 
        server = pop3_session->ac_prefs->recv_server;
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
        port = pop3_session->ac_prefs->set_popport ?
                pop3_session->ac_prefs->popport :
                pop3_session->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
@@ -759,7 +801,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                if (alertpanel_full(_("Insecure connection"),
                        _("This connection is configured to be secured "
                          "using SSL, but SSL is not available in this "
-                         "build of Sylpheed-Claws. \n\n"
+                         "build of Claws Mail. \n\n"
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
@@ -773,17 +815,17 @@ static IncState inc_pop3_session_do(IncSession *session)
 #endif
 
        buf = g_strdup_printf(_("Connecting to POP3 server: %s..."), server);
-       log_message("%s\n", buf);
+       statuswindow_print_all("%s", buf);
+       log_message(LOG_PROTOCOL, "%s\n", buf);
 
        progress_dialog_set_label(inc_dialog->dialog, buf);
+       GTK_EVENTS_FLUSH();
        g_free(buf);
 
        session_set_timeout(SESSION(pop3_session),
                            prefs_common.io_timeout_secs * 1000);
-
+       
        if (session_connect(SESSION(pop3_session), server, port) < 0) {
-               log_warning(_("Can't connect to POP3 server: %s:%d\n"),
-                           server, port);
                if(!prefs_common.no_recv_err_panel) {
                        if((prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS) ||
                            ((prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL) && focus_window)) {
@@ -792,9 +834,12 @@ static IncState inc_pop3_session_do(IncSession *session)
                        alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
                                         server, port);
                        manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
+               } else {
+                       log_error(LOG_PROTOCOL, _("Can't connect to POP3 server: %s:%d\n"),
+                           server, port);
                }
                session->inc_state = INC_CONNECT_ERROR;
-               statusbar_pop_all();
+               statuswindow_pop_all();
                return INC_CONNECT_ERROR;
        }
 
@@ -871,6 +916,7 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
        case POP3_GETAUTH_PASS:
        case POP3_GETAUTH_APOP:
                progress_dialog_set_label(dialog, _("Authenticating..."));
+               statuswindow_pop_all();
                statusbar_print_all(_("Retrieving messages from %s (%s) ..."),
                                    SESSION(session)->server,
                                    session->ac_prefs->account_name);
@@ -919,11 +965,11 @@ static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
        if (pop3_session->state == POP3_RETR ||
            pop3_session->state == POP3_RETR_RECV ||
            pop3_session->state == POP3_DELETE) {
-               Xstrdup_a(total_size_str, to_human_readable(total), return);
+               Xstrdup_a(total_size_str, to_human_readable((goffset)total), return);
                g_snprintf(buf, sizeof(buf),
                           _("Retrieving message (%d / %d) (%s / %s)"),
                           pop3_session->cur_msg, pop3_session->count,
-                          to_human_readable(cur_total), total_size_str);
+                          to_human_readable((goffset)cur_total), total_size_str);
                progress_dialog_set_label(inc_dialog->dialog, buf);
        }
 
@@ -945,7 +991,7 @@ static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
                                    pop3_session->cur_total_num),
                           pop3_session->cur_total_num,
                           to_human_readable
-                          (pop3_session->cur_total_recv_bytes));
+                          ((goffset)pop3_session->cur_total_recv_bytes));
                progress_dialog_list_set_status(inc_dialog->dialog,
                                                inc_dialog->cur_row,
                                                buf);
@@ -1071,7 +1117,7 @@ static gint inc_drop_message(Pop3Session *session, const gchar *file)
        } else
                inbox = folder_get_default_inbox();
        if (!inbox) {
-               g_unlink(file);
+               claws_unlink(file);
                return -1;
        }
 
@@ -1081,7 +1127,7 @@ static gint inc_drop_message(Pop3Session *session, const gchar *file)
        /* add msg file to drop folder */
        if ((msgnum = folder_item_add_msg(
                        dropfolder, file, NULL, TRUE)) < 0) {
-               g_unlink(file);
+               claws_unlink(file);
                return -1;
        }
 
@@ -1097,6 +1143,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
        switch (istate) {
        case INC_CONNECT_ERROR:
                log_msg = _("Connection failed.");
+               fatal_error = TRUE;
                if (prefs_common.no_recv_err_panel)
                        break;
                err_msg = g_strdup_printf(_("Connection to %s:%d failed."),
@@ -1105,6 +1152,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
                break;
        case INC_ERROR:
                log_msg = _("Error occurred while processing mail.");
+               fatal_error = TRUE;
                if (prefs_common.no_recv_err_panel)
                        break;
                if (session->error_msg)
@@ -1152,6 +1200,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
                break;
        case INC_AUTH_FAILED:
                log_msg = _("Authentication failed.");
+               fatal_error = TRUE;
                if (prefs_common.no_recv_err_panel)
                        break;
                if (session->error_msg)
@@ -1161,7 +1210,9 @@ static void inc_put_error(IncState istate, Pop3Session *session)
                        err_msg = g_strdup(log_msg);
                break;
        case INC_TIMEOUT:
-               log_msg = _("Session timed out.");
+               log_msg = _("Session timed out. You may be able to "
+                           "recover by increasing the timeout value in "
+                           "Preferences/Other.");
                if (prefs_common.no_recv_err_panel)
                        break;
                err_msg = g_strdup_printf(_("Connection to %s:%d timed out."), 
@@ -1174,12 +1225,15 @@ static void inc_put_error(IncState istate, Pop3Session *session)
 
        if (log_msg) {
                if (fatal_error)
-                       log_error("%s\n", log_msg);
+                       log_error(LOG_PROTOCOL, "%s\n", log_msg);
                else
-                       log_warning("%s\n", log_msg);
+                       log_warning(LOG_PROTOCOL, "%s\n", log_msg);
        }
+       if (prefs_common.no_recv_err_panel && fatal_error)
+               mainwindow_show_error();
+
        if (err_msg) {
-               alertpanel_error_log(err_msg);
+               alertpanel_error_log("%s", err_msg);
                g_free(err_msg);
        }
 }
@@ -1199,7 +1253,7 @@ static void inc_cancel(IncProgressDialog *dialog)
 
        session->inc_state = INC_CANCEL;
 
-       log_message(_("Incorporation cancelled\n"));
+       log_message(LOG_PROTOCOL, _("Incorporation cancelled\n"));
 }
 
 gboolean inc_is_active(void)
@@ -1244,18 +1298,23 @@ static gint inc_spool_account(PrefsAccount *account)
        } else
                inbox = folder_get_default_inbox();
 
-       if (is_file_exist(account->local_mbox))
-               mbox = g_strdup(account->local_mbox);
-       else if (is_dir_exist(account->local_mbox)) 
-               mbox = g_strconcat(account->local_mbox, G_DIR_SEPARATOR_S,
-                                  g_get_user_name(), NULL);
-       else {
-               debug_print("%s: local mailbox not found.\n", 
-                           account->local_mbox);
+       if (account->local_mbox) {
+               if (is_file_exist(account->local_mbox))
+                       mbox = g_strdup(account->local_mbox);
+               else if (is_dir_exist(account->local_mbox)) 
+                       mbox = g_strconcat(account->local_mbox, G_DIR_SEPARATOR_S,
+                                          g_get_user_name(), NULL);
+               else {
+                       debug_print("%s: local mailbox not found.\n", 
+                                   account->local_mbox);
+                       return -1;
+               }
+       } else {
+               debug_print("local mailbox not set in account info.\n");
                return -1;
-       }
-       
-       result = get_spool(inbox, mbox);
+       }       
+
+       result = get_spool(inbox, mbox, account);
        g_free(mbox);
        
        statusbar_pop_all();
@@ -1286,7 +1345,7 @@ static gint inc_all_spool(void)
        return new_msgs;
 }
 
-static gint get_spool(FolderItem *dest, const gchar *mbox)
+static gint get_spool(FolderItem *dest, const gchar *mbox, PrefsAccount *account)
 {
        gint msgs, size;
        gint lockfd;
@@ -1294,6 +1353,7 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(mbox != NULL, -1);
+       g_return_val_if_fail(account != NULL, -1);
 
        if (!is_file_exist(mbox) || (size = get_file_size(mbox)) == 0) {
                debug_print("%s: no messages in local mailbox.\n", mbox);
@@ -1304,10 +1364,10 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        if ((lockfd = lock_mbox(mbox, LOCK_FLOCK)) < 0)
                return -1;
 
-       g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox.%08x",
-                  get_tmp_dir(), G_DIR_SEPARATOR, (gint)mbox);
+       g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox.%p",
+                  get_tmp_dir(), G_DIR_SEPARATOR, mbox);
 
-       if (copy_mbox(mbox, tmp_mbox) < 0) {
+       if (copy_mbox(lockfd, tmp_mbox) < 0) {
                unlock_mbox(mbox, lockfd, LOCK_FLOCK);
                return -1;
        }
@@ -1315,21 +1375,21 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        debug_print("Getting new messages from %s into %s...\n",
                    mbox, dest->path);
 
-       msgs = proc_mbox(dest, tmp_mbox, TRUE);
+       msgs = proc_mbox(dest, tmp_mbox, account->filter_on_recv, account);
 
-       g_unlink(tmp_mbox);
+       claws_unlink(tmp_mbox);
        if (msgs >= 0) empty_mbox(mbox);
        unlock_mbox(mbox, lockfd, LOCK_FLOCK);
 
        return msgs;
 }
 
-void inc_lock(void)
+void inc_lock_real(void)
 {
        inc_lock_count++;
 }
 
-void inc_unlock(void)
+void inc_unlock_real(void)
 {
        if (inc_lock_count > 0)
                inc_lock_count--;
@@ -1338,15 +1398,21 @@ void inc_unlock(void)
 static guint autocheck_timer = 0;
 static gpointer autocheck_data = NULL;
 
+#ifdef MAEMO
+osso_context_t *get_osso_context(void);
+#endif
+
 static void inc_notify_cmd(gint new_msgs, gboolean notify)
 {
 
+#ifndef MAEMO
        gchar *buf, *numpos, *ret_str;
        gssize by_read = 0, by_written = 0;
 
        if (!(new_msgs && notify && prefs_common.newmail_notify_cmd &&
            *prefs_common.newmail_notify_cmd))
                     return;
+
        buf = g_strdup(prefs_common.newmail_notify_cmd);
        if ((numpos = strstr(buf, "%d")) != NULL) {
                gchar *buf2;
@@ -1367,12 +1433,65 @@ static void inc_notify_cmd(gint new_msgs, gboolean notify)
        execute_command_line(buf, TRUE);
 
        g_free(buf);
+
+#else
+       if (new_msgs) {
+               if (prefs_common.maemo_play_sound)
+                       hildon_play_system_sound("/usr/share/sounds/ui-new_email.wav");
+               if (prefs_common.maemo_show_banner) {
+                       gchar *info = g_strdup_printf(ngettext("Claws Mail: %d new message",
+                                                  "Claws Mail: %d new messages",
+                                                  new_msgs), new_msgs);
+                       osso_system_note_infoprint(get_osso_context(), info, NULL);
+                       g_free(info);
+               }
+       }
+#endif
 }
+
+#if (defined(MAEMO) && defined(CONIC))
+static void maemo_connection_event(ConIcConnection *connection, 
+                                  ConIcConnectionEvent *event,
+                                  gpointer user_data)
+{
+       ConIcConnectionStatus status =
+               con_ic_connection_event_get_status(event);
+       MainWindow *mainwin = (MainWindow *)user_data;
+       switch(status) {
+       case CON_IC_STATUS_CONNECTED:
+               debug_print("we're connected\n");
+               main_window_toggle_work_offline(mainwin, FALSE, FALSE);
+               break;
+       default:
+               debug_print("we're disconnected\n");
+               main_window_toggle_work_offline(mainwin, TRUE, FALSE);
+               maemo_warned_offline = FALSE;
+               break;
+       }
+}
+
+#endif
+
 void inc_autocheck_timer_init(MainWindow *mainwin)
 {
+#if (defined(MAEMO) && defined(CONIC))
+       GValue *val = g_new0(GValue, 1);
+       maemo_connection = con_ic_connection_new();
+
+       g_value_init(val, G_TYPE_BOOLEAN);
+       g_value_set_boolean(val, TRUE);
+       g_object_set_property(G_OBJECT(maemo_connection),
+                       "automatic-connection-events", val);
+       g_free(val);    
+       g_signal_connect (maemo_connection, "connection-event",
+                         G_CALLBACK(maemo_connection_event), mainwin); 
+       con_ic_connection_connect (maemo_connection,
+               CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED);
+       autocheck_data = mainwin;
+#else
        autocheck_data = mainwin;
        inc_autocheck_timer_set();
+#endif
 }
 
 static void inc_autocheck_timer_set_interval(guint interval)
@@ -1382,7 +1501,13 @@ static void inc_autocheck_timer_set_interval(guint interval)
           the common preferences */
        if (prefs_common.autochk_newmail && autocheck_data
            && prefs_common.work_offline == FALSE) {
-               autocheck_timer = gtk_timeout_add
+#if GLIB_CHECK_VERSION(2,14,0)
+               if (interval % 1000 == 0)
+                       autocheck_timer =
+                               g_timeout_add_seconds(interval/1000, inc_autocheck_func, autocheck_data);
+               else
+#endif
+               autocheck_timer = g_timeout_add
                        (interval, inc_autocheck_func, autocheck_data);
                debug_print("added timer = %d\n", autocheck_timer);
        }
@@ -1391,13 +1516,17 @@ static void inc_autocheck_timer_set_interval(guint interval)
 void inc_autocheck_timer_set(void)
 {
        inc_autocheck_timer_set_interval(prefs_common.autochk_itv * 60000);
+#if (defined(MAEMO) && defined(CONIC))
+       con_ic_connection_connect (maemo_connection,
+               CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED);
+#endif
 }
 
 void inc_autocheck_timer_remove(void)
 {
        if (autocheck_timer) {
                debug_print("removed timer = %d\n", autocheck_timer);
-               gtk_timeout_remove(autocheck_timer);
+               g_source_remove(autocheck_timer);
                autocheck_timer = 0;
        }
 }
@@ -1417,39 +1546,73 @@ static gint inc_autocheck_func(gpointer data)
        return FALSE;
 }
 
-gboolean inc_offline_should_override(const gchar *msg)
+gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg)
 {
        static time_t overridden_yes = 0;
        static time_t overridden_no  = 0;
        int length = 10; /* minutes */
        gint answer = G_ALERTDEFAULT;
-       
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       /* If no network connection is available, override is not possible */
+       if(!networkmanager_is_online(NULL))
+               return FALSE;
+#endif
+
+#if (defined(MAEMO) && defined(CONIC))
+       if (prefs_common.work_offline) {
+               if (force_ask && !maemo_warned_offline) {
+                       if (mainwindow_get_mainwindow())
+                               hildon_banner_show_information(
+                                       mainwindow_get_mainwindow()->window, 
+                                       NULL,
+                                       _("Unable to connect: you are offline."));
+                       maemo_warned_offline = TRUE;
+               }
+               return FALSE;
+       } else {
+               return TRUE;
+       }
+#endif 
+
        if (prefs_common.autochk_newmail)
                length = prefs_common.autochk_itv; /* minutes */
 
+       if (force_ask) {
+               overridden_no = (time_t)0;
+       }
+
        if (prefs_common.work_offline) {
                gchar *tmp = NULL;
                
                if (time(NULL) - overridden_yes < length * 60) /* seconds */
                         return TRUE;
-               else if (time(NULL) - overridden_no < 3) /* seconds */
+               else if (time(NULL) - overridden_no < length * 60) /* seconds */
                         return FALSE;
 
-               tmp = g_strdup_printf(
+               if (!force_ask)
+                       tmp = g_strdup_printf(
                                _("%s%sYou're working offline. Override for %d minutes?"),
                                msg?msg:"", 
                                msg?"\n\n":"",
                                length);
+               else
+                       tmp = g_strdup_printf(
+                               _("%s%sYou're working offline. Override?"),
+                               msg?msg:"", 
+                               msg?"\n\n":"");
 
                answer = alertpanel(_("Offline warning"), 
                               tmp,
-                              GTK_STOCK_NO, "+" GTK_STOCK_YES, _("On_ly once"));
+                              GTK_STOCK_NO, "+" GTK_STOCK_YES, 
+                               !force_ask? _("On_ly once"):NULL);
                g_free(tmp);
                if (answer == G_ALERTALTERNATE) {
                        overridden_yes = time(NULL);
                        return TRUE;
                } else if (answer == G_ALERTDEFAULT) {
-                       overridden_no  = time(NULL);
+                       if (!force_ask)
+                               overridden_no  = time(NULL);
                        return FALSE;
                } else {
                        overridden_yes = (time_t)0;