2008-02-18 [colin] 3.3.0cvs16
[claws.git] / src / main.c
index 43b722ee847da05b31c18c5f06bf6c8b1601fd5c..cc949cd25fada5e17f9ee2ee2af0518236a31cf1 100644 (file)
@@ -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 <sys/types.h>
 #ifdef G_OS_UNIX
 #  include <signal.h>
+#  include <errno.h>
+#  include <fcntl.h>
 #endif
+#ifdef HAVE_LIBSM
+#include <X11/SM/SMlib.h>
+#endif
+
 #include "wizard.h"
 #ifdef HAVE_STARTUP_NOTIFICATION
 # define SN_API_NOT_YET_FROZEN
 # include <gdk/gdkx.h>
 #endif
 
-#include "sylpheed.h"
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+#include <dbus/dbus-glib.h>
+#include <NetworkManager.h>
+#endif
+
+#include "claws.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
@@ -66,6 +77,7 @@
 #include "prefs_summaries.h"
 #include "prefs_themes.h"
 #include "prefs_other.h"
+#include "prefs_logging.h"
 #include "prefs_send.h"
 #include "prefs_wrapping.h"
 #include "prefs_compose_writing.h"
 #include "imap_gtk.h"
 #include "news_gtk.h"
 #include "matcher.h"
+#include "tags.h"
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
+#include "nntp-thread.h"
 #endif
 #include "stock_pixmap.h"
-
-#if USE_OPENSSL
+#ifdef HAVE_VALGRIND
+#include "valgrind.h"
+#endif
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 #  include "ssl.h"
 #endif
 
 
 #include "crash.h"
 
+#include "timing.h"
+
+#ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-program.h>
+#else
+#include <hildon-widgets/hildon-banner.h>
+#include <hildon-widgets/hildon-program.h>
+#endif
+#include <gtk/gtkmain.h>
+#include <libosso.h>
+#include <libgnomevfs/gnome-vfs-volume.h>
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+
+#define OSSO_NAME    "claws_mail"
+#define OSSO_SERVICE "com.nokia."OSSO_NAME
+#define OSSO_OBJECT  "/com/nokia/"OSSO_NAME
+#define OSSO_IFACE   "com.nokia."OSSO_NAME
+
+typedef struct _AppData AppData;
+struct _AppData {
+    HildonProgram *program;
+    HildonWindow *window;
+    osso_context_t *osso_context;
+};
+
+static GnomeVFSVolumeMonitor *volmon;
+#endif
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+/* Went offline due to NetworkManager */
+static gboolean went_offline_nm;
+#endif
+
 gchar *prog_version;
-#ifdef CRASH_DIALOG
 gchar *argv0;
+
+#ifdef MAEMO
+HildonProgram *hildon_program;
 #endif
 
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -116,7 +170,7 @@ static SnDisplay *sn_display = NULL;
 
 static gint lock_socket = -1;
 static gint lock_socket_tag = 0;
-
+static gchar *x_display = NULL;
 typedef enum 
 {
        ONLINE_MODE_DONT_CHANGE,
@@ -152,11 +206,6 @@ static gint lock_socket_remove             (void);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
-#ifndef CLAWS                                   
-static 
-#endif
-gchar *get_socket_name         (void);
-
 
 static void open_compose_new           (const gchar    *address,
                                         GPtrArray      *attach_files);
@@ -165,7 +214,15 @@ static void send_queue                     (void);
 static void initial_processing         (FolderItem *item, gpointer data);
 static void quit_signal_handler         (int sig);
 static void install_basic_sighandlers   (void);
-static void exit_sylpheed              (MainWindow *mainwin);
+#if (defined linux && defined SIGIO)
+static void install_memory_sighandler   (void);
+#endif
+static void exit_claws                 (MainWindow *mainwin);
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev,
+                                                                                                                                                                        gpointer data);
+#endif
 
 #define MAKE_DIR_IF_NOT_EXIST(dir) \
 { \
@@ -184,6 +241,53 @@ static void exit_sylpheed          (MainWindow *mainwin);
 
 static MainWindow *static_mainwindow;
 
+#ifdef MAEMO
+static osso_context_t *static_osso_context;
+
+void exit_event_handler(gboolean die_now, gpointer data)
+{
+       AppData *appdata;
+       appdata = (AppData *) data;
+       /* Do whatever application needs to do before exiting */
+       exit_claws(static_mainwindow);
+       hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL,
+                                   _("Exiting..."));
+
+}
+
+/* Callback for hardware D-BUS events */
+void hw_event_handler(osso_hw_state_t *state, gpointer data)
+{
+       AppData *appdata;
+       appdata = (AppData *) data;
+
+       if (state->shutdown_ind) {
+               exit_claws(static_mainwindow);
+               hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL,
+                       _("Exiting..."));
+       }
+}
+
+/* Callback for normal D-BUS messages */
+gint dbus_req_handler(const gchar * interface, const gchar * method,
+                      GArray * arguments, gpointer data,
+                      osso_rpc_t * retval)
+{
+    AppData *appdata;
+    appdata = (AppData *) data;
+
+    if (!strcmp(method, "top_application")) {
+           osso_rpc_free_val(retval);
+           return OSSO_OK;
+    }
+    osso_system_note_infoprint(appdata->osso_context, method, retval);
+    osso_rpc_free_val(retval);
+
+    return OSSO_OK;
+}
+#endif
+static gboolean emergency_exit = FALSE;
+
 #ifdef HAVE_STARTUP_NOTIFICATION
 static void sn_error_trap_push(SnDisplay *display, Display *xdisplay)
 {
@@ -228,7 +332,7 @@ static void startup_notification_complete(gboolean with_window)
 }
 #endif /* HAVE_STARTUP_NOTIFICATION */
 
-void sylpheed_gtk_idle(void) 
+static void claws_gtk_idle(void) 
 {
        while(gtk_events_pending()) {
                gtk_main_iteration();
@@ -236,82 +340,635 @@ void sylpheed_gtk_idle(void)
        g_usleep(50000);
 }
 
-gboolean defer_check_all(void *data)
+static gboolean sc_starting = FALSE;
+
+static gboolean defer_check_all(void *data)
 {
        gboolean autochk = GPOINTER_TO_INT(data);
 
        inc_all_account_mail(static_mainwindow, autochk, 
                        prefs_common.newmail_notify_manu);
 
+       if (sc_starting) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(static_mainwindow);
+               toolbar_main_set_sensitive(static_mainwindow);
+       }
        return FALSE;
 }
 
-gboolean defer_check(void *data)
+static gboolean defer_check(void *data)
 {
        inc_mail(static_mainwindow, prefs_common.newmail_notify_manu);
 
+       if (sc_starting) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(static_mainwindow);
+               toolbar_main_set_sensitive(static_mainwindow);
+       }
        return FALSE;
 }
 
 static gboolean defer_jump(void *data)
 {
-       mainwindow_jump_to(data);
+       if (cmd.receive_all) {
+               defer_check_all(GINT_TO_POINTER(FALSE));
+       } else if (prefs_common.chk_on_startup) {
+               defer_check_all(GINT_TO_POINTER(TRUE));
+       } else if (cmd.receive) {
+               defer_check(NULL);
+       } 
+       mainwindow_jump_to(data, FALSE);
+       if (sc_starting) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(static_mainwindow);
+               toolbar_main_set_sensitive(static_mainwindow);
+       }
        return FALSE;
 }
 
-static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir)
+static void chk_update_val(GtkWidget *widget, gpointer data)
 {
-       gchar *message = g_strdup_printf(_("Configuration for Sylpheed-Claws %s found.\n"
-                        "Do you want to migrate this configuration?"),
-                        !strcmp(old_cfg_dir, OLD_GTK1_RC_DIR)?
-                               _("1.0.5 or previous"):_("1.9.15 or previous"));
+        gboolean *val = (gboolean *)data;
+       *val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
+static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir, const gchar *oldversion)
+{
+       gchar *message = g_strdup_printf(_("Configuration for %s found.\n"
+                        "Do you want to migrate this configuration?"), oldversion);
+       gchar *message2 = g_strdup_printf(_("\n\nYour Sylpheed filtering rules can be converted by a\n"
+                            "script available at %s."), TOOLS_URI);
+
+       if (!strcmp(oldversion, "Sylpheed"))
+               message = g_strconcat(message, message2, NULL);
+       g_free(message2);
+
        gint r = 0;
        GtkWidget *window = NULL;
-       if (alertpanel(_("Migration of configuration"),
-                      message,
-                      GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE) {
+       GtkWidget *keep_backup_chk;
+       GtkTooltips *tips = gtk_tooltips_new();
+       gboolean backup = TRUE;
+
+       keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_backup_chk), TRUE);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), keep_backup_chk,
+                            _("Keeping a backup will allow you to go back to an "
+                              "older version, but may take a while if you have "
+                              "cached IMAP or News data, and will take some extra "
+                              "room on your disk."),
+                            NULL);
+
+       g_signal_connect(G_OBJECT(keep_backup_chk), "toggled", 
+                       G_CALLBACK(chk_update_val), &backup);
+
+       if (alertpanel_full(_("Migration of configuration"), message,
+                       GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL, FALSE,
+                       keep_backup_chk, ALERT_QUESTION, G_ALERTDEFAULT) != G_ALERTALTERNATE) {
                return FALSE;
        }
        
-       window = label_window_create(_("Copying configuration..."));
-       GTK_EVENTS_FLUSH();
-       r = copy_dir(old_cfg_dir, new_cfg_dir);
-       gtk_widget_destroy(window);
-       if (r != 0) {
-               alertpanel_error(_("Migration failed!"));
+       /* we can either do a fast migration requiring not any extra disk
+        * space, or a slow one that copies the old configuration and leaves
+        * it in place. */
+       if (backup) {
+backup_mode:
+               window = label_window_create(_("Copying configuration... This may take a while..."));
+               GTK_EVENTS_FLUSH();
+               
+               r = copy_dir(old_cfg_dir, new_cfg_dir);
+               label_window_destroy(window);
+               
+               /* if copy failed, we'll remove the partially copied
+                * new directory */
+               if (r != 0) {
+                       alertpanel_error(_("Migration failed!"));
+                       remove_dir_recursive(new_cfg_dir);
+               } else {
+                       if (!backup) {
+                               /* fast mode failed, but we don't want backup */
+                               remove_dir_recursive(old_cfg_dir);
+                       }
+               }
+       } else {
+               window = label_window_create(_("Migrating configuration..."));
+               GTK_EVENTS_FLUSH();
+               
+               r = g_rename(old_cfg_dir, new_cfg_dir);
+               label_window_destroy(window);
+               
+               /* if g_rename failed, we'll try to copy */
+               if (r != 0) {
+                       FILE_OP_ERROR(new_cfg_dir, "g_rename failed, trying copy\n");
+                       goto backup_mode;
+               }
        }
        return (r == 0);
 }
 
+static int migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
+{
+       FILE *oldfp, *newfp;
+       gchar *plugin_path, *old_plugin_path, *new_plugin_path;
+       gchar buf[BUFFSIZE];
+       gboolean err = FALSE;
+
+       oldfp = g_fopen(old_rc, "r");
+       if (!oldfp)
+               return -1;
+       newfp = g_fopen(new_rc, "w");
+       if (!newfp) {
+               fclose(oldfp);
+               return -1;
+       }
+       
+       plugin_path = g_strdup(get_plugin_dir());
+       new_plugin_path = g_strdup(plugin_path);
+       
+       if (strstr(plugin_path, "/claws-mail/")) {
+               gchar *end = g_strdup(strstr(plugin_path, "/claws-mail/")+strlen("/claws-mail/"));
+               *(strstr(plugin_path, "/claws-mail/")) = '\0';
+               old_plugin_path = g_strconcat(plugin_path, "/sylpheed-claws/", end, NULL);
+               g_free(end);
+       } else {
+               old_plugin_path = g_strdup(new_plugin_path);
+       }
+       debug_print("replacing %s with %s\n", old_plugin_path, new_plugin_path);
+       while (fgets(buf, sizeof(buf), oldfp)) {
+               if (strncmp(buf, old_plugin_path, strlen(old_plugin_path))) {
+                       err |= (fputs(buf, newfp) == EOF);
+               } else {
+                       debug_print("->replacing %s", buf);
+                       debug_print("  with %s%s", new_plugin_path, buf+strlen(old_plugin_path));
+                       err |= (fputs(new_plugin_path, newfp) == EOF);
+                       err |= (fputs(buf+strlen(old_plugin_path), newfp) == EOF);
+               }
+       }
+       g_free(plugin_path);
+       g_free(new_plugin_path);
+       g_free(old_plugin_path);
+       fclose(oldfp);
+       if (fclose(newfp) == EOF)
+               err = TRUE;
+       
+       return (err ? -1:0);
+}
+
+#ifdef HAVE_LIBSM
+static void
+sc_client_set_value (MainWindow *mainwin,
+                 gchar       *name,
+                 char        *type,
+                 int          num_vals,
+                 SmPropValue *vals)
+{
+       SmProp *proplist[1];
+       SmProp prop;
+
+       prop.name = name;
+       prop.type = type;
+       prop.num_vals = num_vals;
+       prop.vals = vals;
+
+       proplist[0]= &prop;
+       if (mainwin->smc_conn)
+               SmcSetProperties ((SmcConn) mainwin->smc_conn, 1, proplist);
+}
+
+static void sc_die_callback (SmcConn smc_conn, SmPointer client_data)
+{
+       clean_quit(NULL);
+}
+
+static void sc_save_complete_callback(SmcConn smc_conn, SmPointer client_data)
+{
+}
+
+static void sc_shutdown_cancelled_callback (SmcConn smc_conn, SmPointer client_data)
+{
+       MainWindow *mainwin = (MainWindow *)client_data;
+       if (mainwin->smc_conn)
+               SmcSaveYourselfDone ((SmcConn) mainwin->smc_conn, TRUE);
+}
+
+static void sc_save_yourself_callback (SmcConn   smc_conn,
+                              SmPointer client_data,
+                              int       save_style,
+                              gboolean  shutdown,
+                              int       interact_style,
+                              gboolean  fast) {
+
+       MainWindow *mainwin = (MainWindow *)client_data;
+       if (mainwin->smc_conn)
+               SmcSaveYourselfDone ((SmcConn) mainwin->smc_conn, TRUE);
+}
+
+static IceIOErrorHandler sc_ice_installed_handler;
+
+static void sc_ice_io_error_handler (IceConn connection)
+{
+       if (sc_ice_installed_handler)
+               (*sc_ice_installed_handler) (connection);
+}
+static gboolean sc_process_ice_messages (GIOChannel   *source,
+                     GIOCondition  condition,
+                     gpointer      data)
+{
+       IceConn connection = (IceConn) data;
+       IceProcessMessagesStatus status;
+
+       status = IceProcessMessages (connection, NULL, NULL);
+
+       if (status == IceProcessMessagesIOError) {
+               IcePointer context = IceGetConnectionContext (connection);
+
+               if (context && GTK_IS_OBJECT (context)) {
+               guint disconnect_id = g_signal_lookup ("disconnect", G_OBJECT_TYPE (context));
+
+               if (disconnect_id > 0)
+                       g_signal_emit (context, disconnect_id, 0);
+               } else {
+                       IceSetShutdownNegotiation (connection, False);
+                       IceCloseConnection (connection);
+               }
+       }
+
+       return TRUE;
+}
+
+static void new_ice_connection (IceConn connection, IcePointer client_data, Bool opening,
+                   IcePointer *watch_data)
+{
+       guint input_id;
+
+       if (opening) {
+               GIOChannel *channel;
+               /* Make sure we don't pass on these file descriptors to any
+               exec'ed children */
+               fcntl(IceConnectionNumber(connection),F_SETFD,
+               fcntl(IceConnectionNumber(connection),F_GETFD,0) | FD_CLOEXEC);
+
+               channel = g_io_channel_unix_new (IceConnectionNumber (connection));
+               input_id = g_io_add_watch (channel,
+               G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
+               sc_process_ice_messages,
+               connection);
+               g_io_channel_unref (channel);
+
+               *watch_data = (IcePointer) GUINT_TO_POINTER (input_id);
+       } else {
+               input_id = GPOINTER_TO_UINT ((gpointer) *watch_data);
+               g_source_remove (input_id);
+       }
+}
+
+static void sc_session_manager_connect(MainWindow *mainwin)
+{
+       static gboolean connected = FALSE;
+       SmcCallbacks      callbacks;
+       gchar            *client_id;
+       IceIOErrorHandler default_handler;
+
+       if (connected)
+               return;
+       connected = TRUE;
+
+
+       sc_ice_installed_handler = IceSetIOErrorHandler (NULL);
+       default_handler = IceSetIOErrorHandler (sc_ice_io_error_handler);
+
+       if (sc_ice_installed_handler == default_handler)
+               sc_ice_installed_handler = NULL;
+
+       IceAddConnectionWatch (new_ice_connection, NULL);
+      
+      
+       callbacks.save_yourself.callback      = sc_save_yourself_callback;
+       callbacks.die.callback                = sc_die_callback;
+       callbacks.save_complete.callback      = sc_save_complete_callback;
+       callbacks.shutdown_cancelled.callback = sc_shutdown_cancelled_callback;
+
+       callbacks.save_yourself.client_data =
+               callbacks.die.client_data =
+               callbacks.save_complete.client_data =
+               callbacks.shutdown_cancelled.client_data = (SmPointer) mainwin;
+       if (g_getenv ("SESSION_MANAGER")) {
+               gchar error_string_ret[256] = "";
+
+               mainwin->smc_conn = (gpointer)
+                       SmcOpenConnection (NULL, mainwin,
+                               SmProtoMajor, SmProtoMinor,
+                               SmcSaveYourselfProcMask | SmcDieProcMask |
+                               SmcSaveCompleteProcMask |
+                               SmcShutdownCancelledProcMask,
+                               &callbacks,
+                               NULL, &client_id,
+                               256, error_string_ret);
+
+               if (error_string_ret[0] || mainwin->smc_conn == NULL)
+                       g_warning ("While connecting to session manager:\n%s.",
+                               error_string_ret);
+               else {
+                       SmPropValue *vals;
+                       vals = g_new (SmPropValue, 1);
+                       vals[0].length = strlen(argv0);
+                       vals[0].value = argv0;
+                       sc_client_set_value (mainwin, SmCloneCommand, SmLISTofARRAY8, 1, vals);
+                       sc_client_set_value (mainwin, SmRestartCommand, SmLISTofARRAY8, 1, vals);
+                       sc_client_set_value (mainwin, SmProgram, SmARRAY8, 1, vals);
+
+                       vals[0].length = strlen(g_get_user_name()?g_get_user_name():"");
+                       vals[0].value = g_strdup(g_get_user_name()?g_get_user_name():"");
+                       sc_client_set_value (mainwin, SmUserID, SmARRAY8, 1, vals);
+               }
+       }
+}
+#endif
+
+static gboolean sc_exiting = FALSE;
+static gboolean show_at_startup = TRUE;
+static gboolean claws_crashed_bool = FALSE;
+
+gboolean claws_crashed(void) {
+       return claws_crashed_bool;
+}
+
+void main_set_show_at_startup(gboolean show)
+{
+       show_at_startup = show;
+}
+
+#ifdef MAEMO
+static void main_vol_mount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin)
+{
+       gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
+       gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+       g_free (uri);
+       if (mount_path) {
+               if(!strcmp(mount_path, prefs_common.data_root)) {
+                       gtk_widget_set_sensitive(mainwin->window, TRUE);
+                       inc_unlock();
+               }
+       }
+       g_free(mount_path);
+}
+static void main_vol_unmount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin)
+{
+       gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
+       gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+       g_free (uri);
+       if (mount_path) {
+               if(!strcmp(mount_path, prefs_common.data_root)) {
+                       gtk_widget_set_sensitive(mainwin->window, FALSE);
+                       inc_lock();
+               }
+       }
+       g_free(mount_path);
+}
+#endif
+
+#ifdef G_OS_WIN32
+static FILE* win32_debug_fp=NULL;
+static guint win32_log_handler_app_id;
+static guint win32_log_handler_glib_id;
+static guint win32_log_handler_gtk_id;
+
+static void win32_print_stdout(const gchar *string)
+{
+       if (win32_debug_fp) {
+               fprintf(win32_debug_fp, string);
+               fflush(win32_debug_fp);
+       }
+}
+
+static void win32_print_stderr(const gchar *string)
+{
+       if (win32_debug_fp) {
+               fprintf(win32_debug_fp, string);
+               fflush(win32_debug_fp);
+       }
+}
+
+static void win32_log(const gchar *log_domain, GLogLevelFlags log_level, const gchar* message, gpointer user_data)
+{
+       if (win32_debug_fp) {
+               const gchar* type;
+
+               switch(log_level & G_LOG_LEVEL_MASK)
+               {
+                       case G_LOG_LEVEL_ERROR:
+                               type="error";
+                               break;
+                       case G_LOG_LEVEL_CRITICAL:
+                               type="critical";
+                               break;
+                       case G_LOG_LEVEL_WARNING:
+                               type="warning";
+                               break;
+                       case G_LOG_LEVEL_MESSAGE:
+                               type="message";
+                               break;
+                       case G_LOG_LEVEL_INFO:
+                               type="info";
+                               break;
+                       case G_LOG_LEVEL_DEBUG:
+                               type="debug";
+                               break;
+                       default:
+                               type="N/A";
+               }
+               if (log_domain)
+                       fprintf(win32_debug_fp, "%s: %s: %s", log_domain, type, message);
+               else
+                       fprintf(win32_debug_fp, "%s: %s", type, message);
+               fflush(win32_debug_fp);
+       }
+}
+
+static void win32_open_log(void)
+{
+       if (is_file_exist("claws-win32.log")) {
+               if (rename_force("claws-win32.log", "claws-win32.log.bak") < 0)
+                       FILE_OP_ERROR("claws-win32.log", "rename");
+       }
+       win32_debug_fp = fopen("claws-win32.log", "w");
+       if (win32_debug_fp)
+       {
+               g_set_print_handler(win32_print_stdout);
+               g_set_printerr_handler(win32_print_stdout);
+               win32_log_handler_app_id = g_log_set_handler(NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+                     | G_LOG_FLAG_RECURSION, win32_log, NULL);
+               win32_log_handler_glib_id = g_log_set_handler("GLib", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+                     | G_LOG_FLAG_RECURSION, win32_log, NULL);
+               win32_log_handler_gtk_id = g_log_set_handler("Gtk", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+                     | G_LOG_FLAG_RECURSION, win32_log, NULL);
+       }
+}
+
+static void win32_close_log(void)
+{
+       if (win32_debug_fp)
+       {
+               g_log_remove_handler("", win32_log_handler_app_id);
+               g_log_remove_handler("GLib", win32_log_handler_glib_id);
+               g_log_remove_handler("Gtk", win32_log_handler_gtk_id);
+               fclose(win32_debug_fp);
+               win32_debug_fp=NULL;
+       }
+}              
+#endif
+
+static void main_dump_features_list(gboolean show_debug_only)
+/* display compiled-in features list */
+{
+       if (show_debug_only && !debug_get_mode())
+               return;
+
+       if (show_debug_only)
+               debug_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+                          gtk_major_version, gtk_minor_version, gtk_micro_version,
+                          glib_major_version, glib_minor_version, glib_micro_version);
+       else
+               g_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+                          gtk_major_version, gtk_minor_version, gtk_micro_version,
+                          glib_major_version, glib_minor_version, glib_micro_version);
+       if (show_debug_only)
+               debug_print("Compiled-in features:\n");
+       else
+               g_print("Compiled-in features:\n");
+#if HAVE_LIBCOMPFACE
+       if (show_debug_only)
+               debug_print(" compface\n");
+       else
+               g_print(" compface\n");
+#endif
+#if USE_ASPELL
+       if (show_debug_only)
+               debug_print(" aspell\n");
+       else
+               g_print(" aspell\n");
+#endif
+#if USE_GNUTLS
+       if (show_debug_only)
+               debug_print(" gnutls\n");
+       else
+               g_print(" gnutls\n");
+#endif
+#if INET6
+       if (show_debug_only)
+               debug_print(" ipv6\n");
+       else
+               g_print(" ipv6\n");
+#endif
+#if HAVE_ICONV
+       if (show_debug_only)
+               debug_print(" iconv\n");
+       else
+               g_print(" iconv\n");
+#endif
+#if USE_JPILOT
+       if (show_debug_only)
+               debug_print(" jpilot\n");
+       else
+               g_print(" jpilot\n");
+#endif
+#if USE_LDAP
+       if (show_debug_only)
+               debug_print(" ldap\n");
+       else
+               g_print(" ldap\n");
+#endif
+#if HAVE_LIBETPAN
+       if (show_debug_only)
+               debug_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
+       else
+               g_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
+#endif
+#if USE_GNOMEPRINT
+       if (show_debug_only)
+               debug_print(" gnomeprint\n");
+       else
+               g_print(" gnomeprint\n");
+#endif
+#if HAVE_LIBSM
+       if (show_debug_only)
+               debug_print(" libsm\n");
+       else
+               g_print(" libsm\n");
+#endif
+#if HAVE_NETWORKMANAGER_SUPPORT
+       if (show_debug_only)
+               debug_print(" NetworkManager\n");
+       else
+               g_print(" NetworkManager\n");
+#endif
+#if USE_OPENSSL
+       if (show_debug_only)
+               debug_print(" openssl\n");
+       else
+               g_print(" openssl\n");
+#endif
+}
+
 int main(int argc, char *argv[])
 {
+#ifdef MAEMO
+       osso_context_t *osso_context;
+       osso_return_t result;
+#endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       DBusGConnection *connection;
+  GError *error;
+  DBusGProxy *proxy;
+#endif
        gchar *userrc;
        MainWindow *mainwin;
        FolderView *folderview;
        GdkPixbuf *icon;
        gboolean crash_file_present = FALSE;
        gint num_folder_class = 0;
-       if (!sylpheed_init(&argc, &argv)) {
+       gboolean asked_for_migration = FALSE;
+       gboolean start_done = TRUE;
+
+       START_TIMING("startup");
+       
+       sc_starting = TRUE;
+
+#ifdef G_OS_WIN32
+       win32_open_log();
+#endif
+       if (!claws_init(&argc, &argv)) {
+#ifdef G_OS_WIN32
+               win32_close_log();
+#endif
                return 0;
        }
 
+       main_dump_features_list(TRUE);
+
        prog_version = PROG_VERSION;
-#ifdef CRASH_DIALOG
        argv0 = g_strdup(argv[0]);
-#endif
 
        parse_cmd_opt(argc, argv);
 
+       prefs_prepare_cache();
+
 #ifdef CRASH_DIALOG
        if (cmd.crash) {
                gtk_set_locale();
                gtk_init(&argc, &argv);
                crash_main(cmd.crash_params);
+#ifdef G_OS_WIN32
+               win32_close_log();
+#endif
                return 0;
        }
        crash_install_handlers();
 #endif
        install_basic_sighandlers();
+#if (defined linux && defined SIGIO)
+       install_memory_sighandler();
+#endif
        sock_init();
 
        /* check and create unix domain socket for remote operation */
@@ -326,7 +983,7 @@ int main(int argc, char *argv[])
        }
 
        if (cmd.status || cmd.status_full) {
-               puts("0 Sylpheed-Claws not running.");
+               puts("0 Claws Mail not running.");
                lock_socket_remove();
                return 0;
        }
@@ -340,6 +997,37 @@ int main(int argc, char *argv[])
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       went_offline_nm = FALSE;
+       error = NULL;
+       proxy = NULL;
+  connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
+
+  if(!connection) {
+               debug_print("Failed to open connection to system bus: %s\n", error->message);
+               g_error_free(error);
+       }
+       else {
+               proxy = dbus_g_proxy_new_for_name(connection,
+                                                                                                                                                       "org.freedesktop.NetworkManager",
+                                                                                                                                                       "/org/freedesktop/NetworkManager",
+                                                                                                                                                       "org.freedesktop.NetworkManager");
+               dbus_g_proxy_add_signal(proxy,"StateChange", G_TYPE_UINT, G_TYPE_INVALID);
+               dbus_g_proxy_connect_signal(proxy, "StateChange",
+                       G_CALLBACK(networkmanager_state_change_cb),
+                       NULL,NULL);
+       }
+#endif
+
+
+#ifdef MAEMO
+       osso_context = osso_initialize(OSSO_SERVICE, "2.8.1", TRUE, NULL);
+       if (osso_context == NULL) {
+               return OSSO_ERROR;
+       }
+       hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
+       static_osso_context = osso_context;
+#endif 
        gdk_rgb_init();
        gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
        gtk_widget_set_default_visual(gdk_rgb_get_visual());
@@ -351,20 +1039,26 @@ int main(int argc, char *argv[])
        /* check that we're not on a too recent/old gtk+ */
 #if GTK_CHECK_VERSION(2, 9, 0)
        if (gtk_check_version(2, 9, 0) != NULL) {
-               alertpanel_error(_("Sylpheed-Claws has been compiled with "
+               alertpanel_error(_("Claws Mail has been compiled with "
                                   "a more recent GTK+ library than is "
                                   "currently available. This will cause "
-                                  "crashes. Please upgrade GTK+ or recompile "
-                                  "Sylpheed-Claws."));
+                                  "crashes. You need to upgrade GTK+ or "
+                                  "recompile Claws Mail."));
+#ifdef G_OS_WIN32
+               win32_close_log();
+#endif
                exit(1);
        }
 #else
        if (gtk_check_version(2, 9, 0) == NULL) {
-               alertpanel_error(_("Sylpheed-Claws has been compiled with "
-                                  "an an older GTK+ library than is "
+               alertpanel_error(_("Claws Mail has been compiled with "
+                                  "an older GTK+ library than is "
                                   "currently available. This will cause "
-                                  "crashes. Please recompile "
-                                  "Sylpheed-Claws."));
+                                  "crashes. You need to recompile "
+                                  "Claws Mail."));
+#ifdef G_OS_WIN32
+               win32_close_log();
+#endif
                exit(1);
        }
 #endif 
@@ -378,16 +1072,56 @@ int main(int argc, char *argv[])
        gtk_rc_parse(userrc);
        g_free(userrc);
 
+#ifdef G_OS_WIN32
+       CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
+#else
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
+#endif
+       
+       /* no config dir exists. See if we can migrate an old config. */
        if (!is_dir_exist(RC_DIR)) {
+               prefs_destroy_cache();
                gboolean r = FALSE;
-               if (is_dir_exist(OLD_GTK2_RC_DIR))
-                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR);
-               else if (is_dir_exist(OLD_GTK1_RC_DIR))
-                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR);
-               if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0)
+               
+               /* if one of the old dirs exist, we'll ask if the user 
+                * want to migrates, and r will be TRUE if he said yes
+                * and migration succeeded, and FALSE otherwise.
+                */
+               if (is_dir_exist(OLD_GTK2_RC_DIR)) {
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0 (or older)"));
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(OLDER_GTK2_RC_DIR)) {
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15 (or older)"));
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(OLD_GTK1_RC_DIR)) {
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5 (or older)"));
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(SYLPHEED_RC_DIR)) {
+                       r = migrate_old_config(SYLPHEED_RC_DIR, RC_DIR, "Sylpheed");
+                       asked_for_migration = TRUE;
+               }
+               
+               /* If migration failed or the user didn't want to do it,
+                * we create a new one (and we'll hit wizard later). 
+                */
+               if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
                        exit(1);
        }
+       }
+       
+
+       if (!is_file_exist(RC_DIR G_DIR_SEPARATOR_S COMMON_RC) &&
+           is_file_exist(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC)) {
+               /* post 2.6 name change */
+               migrate_common_rc(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC,
+                         RC_DIR G_DIR_SEPARATOR_S COMMON_RC);
+       }
+
+       if (!cmd.exit)
+               plugin_load_all("Common");
 
        userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
        gtk_rc_parse(userrc);
@@ -397,11 +1131,11 @@ int main(int argc, char *argv[])
        gtk_accel_map_load (userrc);
        g_free(userrc);
 
-       gtk_settings_set_long_property(gtk_settings_get_default(), 
-                                      "gtk-can-change-accels",
-                                      (glong)TRUE, "XProperty");
-
+#ifdef G_OS_WIN32
+       CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_rc_dir(), 1, win32_close_log(););
+#else
        CHDIR_RETURN_VAL_IF_FAIL(get_rc_dir(), 1);
+#endif
 
        MAKE_DIR_IF_NOT_EXIST(get_mail_base_dir());
        MAKE_DIR_IF_NOT_EXIST(get_imap_cache_dir());
@@ -415,13 +1149,26 @@ int main(int argc, char *argv[])
        remove_all_files(get_tmp_dir());
        remove_all_files(get_mime_tmp_dir());
 
-       if (is_file_exist("sylpheed.log")) {
-               if (rename_force("sylpheed.log", "sylpheed.log.bak") < 0)
-                       FILE_OP_ERROR("sylpheed.log", "rename");
+       if (!cmd.crash && crash_file_present)
+               claws_crashed_bool = TRUE;
+
+       if (is_file_exist("claws.log")) {
+               if (rename_force("claws.log", "claws.log.bak") < 0)
+                       FILE_OP_ERROR("claws.log", "rename");
+       }
+       set_log_file(LOG_PROTOCOL, "claws.log");
+
+       if (is_file_exist("filtering.log")) {
+               if (rename_force("filtering.log", "filtering.log.bak") < 0)
+                       FILE_OP_ERROR("filtering.log", "rename");
        }
-       set_log_file("sylpheed.log");
+       set_log_file(LOG_DEBUG_FILTERING, "filtering.log");
 
+#ifdef G_OS_WIN32
+       CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
+#else
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
+#endif
 
        folder_system_init();
        prefs_common_read_config();
@@ -438,25 +1185,23 @@ int main(int argc, char *argv[])
        prefs_summaries_init();
        prefs_message_init();
        prefs_other_init();
+       prefs_logging_init();
        prefs_receive_init();
        prefs_send_init();
+       tags_read_tags();
 #ifdef USE_ASPELL
        gtkaspell_checkers_init();
        prefs_spelling_init();
 #endif
-       
+
        sock_set_io_timeout(prefs_common.io_timeout_secs);
-#ifdef HAVE_LIBETPAN
-       imap_main_set_timeout(prefs_common.io_timeout_secs);
-#endif
        prefs_actions_read_config();
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
        addressbook_read_file();
-       renderer_read_config();
 
        gtkut_widget_init();
-       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_ICON, &icon);
+       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
        gtk_window_set_default_icon(icon);
 
        folderview_initialize();
@@ -464,9 +1209,40 @@ int main(int argc, char *argv[])
        mh_gtk_init();
        imap_gtk_init();
        news_gtk_init();
-               
-       mainwin = main_window_create
-               (prefs_common.sep_folder | prefs_common.sep_msg << 1);
+
+       mainwin = main_window_create();
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+               networkmanager_state_change_cb(proxy,NULL,mainwin);
+#endif
+
+#ifdef MAEMO
+       AppData *appdata;
+       appdata = g_new0(AppData, 1);
+       appdata->program = hildon_program;
+       appdata->window = HILDON_WINDOW(mainwin->window);
+       appdata->osso_context = osso_context;
+       result = osso_rpc_set_cb_f(appdata->osso_context, 
+                OSSO_SERVICE, 
+                OSSO_OBJECT, 
+                OSSO_IFACE,
+                dbus_req_handler, appdata);
+       if (result != OSSO_OK) {
+               return OSSO_ERROR;
+       }
+
+#ifndef CHINOOK
+       /* Add handler for Exit D-BUS messages */
+       result = osso_application_set_exit_cb(appdata->osso_context,
+                                               exit_event_handler,
+                                               (gpointer) appdata);
+       if (result != OSSO_OK) {
+               return OSSO_ERROR;
+       }
+#endif
+       osso_hw_set_event_cb( appdata->osso_context,
+                               NULL, hw_event_handler, (gpointer) appdata );
+#endif
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 
@@ -481,27 +1257,67 @@ int main(int argc, char *argv[])
                                        mainwin);
 #endif
 
+
        prefs_account_init();
        account_read_config_all();
 
+       /* If we can't read a folder list or don't have accounts,
+        * it means the configuration's not done. Either this is
+        * a brand new install, either a failed/refused migration.
+        * So we'll start the wizard.
+        */
        if (folder_read_list() < 0) {
-               if (!run_wizard(mainwin, TRUE))
+               prefs_destroy_cache();
+               
+               /* if run_wizard returns FALSE it's because it's
+                * been cancelled. We can't do much but exit.
+                * however, if the user was asked for a migration,
+                * we remove the newly created directory so that
+                * he's asked again for migration on next launch.*/
+               if (!run_wizard(mainwin, TRUE)) {
+                       if (asked_for_migration)
+                               remove_dir_recursive(RC_DIR);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
                        exit(1);
+               }
+               main_window_reflect_prefs_all_now();
                folder_write_list();
        }
 
        if (!account_get_list()) {
-               if (!run_wizard(mainwin, FALSE))
+               prefs_destroy_cache();
+               if (!run_wizard(mainwin, FALSE)) {
+                       if (asked_for_migration)
+                               remove_dir_recursive(RC_DIR);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
                        exit(1);
-               account_read_config_all();
-               if(!account_get_list())
-                       exit_sylpheed(mainwin);
+               }
+               if(!account_get_list()) {
+                       exit_claws(mainwin);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
+                       exit(1);
+               }
        }
 
-       main_window_popup(mainwin);
+       
+       toolbar_main_set_sensitive(mainwin);
+       main_window_set_menu_sensitive(mainwin);
+
+       /* if crashed, show window early so that the user
+        * sees what's happening */
+       if (claws_crashed())
+               main_window_popup(mainwin);
 
 #ifdef HAVE_LIBETPAN
        imap_main_init(prefs_common.skip_ssl_cert_check);
+       imap_main_set_timeout(prefs_common.io_timeout_secs);
+       nntp_main_init(prefs_common.skip_ssl_cert_check);
 #endif 
        account_set_missing_folder();
        folder_set_missing_folders();
@@ -509,14 +1325,14 @@ int main(int argc, char *argv[])
 
        prefs_matcher_read_config();
 
-       /* make one all-folder processing before using sylpheed */
+       /* make one all-folder processing before using claws */
        main_window_cursor_wait(mainwin);
        folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
 
-       /* if Sylpheed crashed, rebuild caches */
-       if (!cmd.crash && crash_file_present) {
+       /* if claws crashed, rebuild caches */
+       if (claws_crashed()) {
                GTK_EVENTS_FLUSH();
-               debug_print("Sylpheed-Claws crashed, checking for new messages in local folders\n");
+               debug_print("Claws Mail crashed, checking for new messages in local folders\n");
                folder_item_update_thaw();
                folderview_check_new(NULL);
                folder_clean_cache_memory_force();
@@ -527,6 +1343,10 @@ int main(int argc, char *argv[])
 
        inc_autocheck_timer_init(mainwin);
 
+       /* ignore SIGPIPE signal for preventing sudden death of program */
+#ifdef G_OS_UNIX
+       signal(SIGPIPE, SIG_IGN);
+#endif
        if (cmd.online_mode == ONLINE_MODE_OFFLINE) {
                main_window_toggle_work_offline(mainwin, TRUE, FALSE);
        }
@@ -543,7 +1363,7 @@ int main(int argc, char *argv[])
                cmd.status_full_folders = NULL;
        }
 
-       sylpheed_register_idle_function(sylpheed_gtk_idle);
+       claws_register_idle_function(claws_gtk_idle);
 
        prefs_toolbar_init();
 
@@ -565,35 +1385,97 @@ int main(int argc, char *argv[])
        }
 
        plugin_load_standard_plugins ();
-       
+      
+       /* if not crashed, show window now */
+       if (!claws_crashed()) {
+               /* apart if something told not to show */
+               if (show_at_startup)
+                       main_window_popup(mainwin);
+       }
+
        if (!folder_have_mailbox()) {
+               prefs_destroy_cache();
                main_window_cursor_normal(mainwin);
-               alertpanel_error(_("Sylpheed-Claws has detected a configured "
+               if (folder_get_list() != NULL) {
+                       alertpanel_error(_("Claws Mail has detected a configured "
+                                  "mailbox, but it is incomplete. It is "
+                                  "possibly due to a failing IMAP account. Use "
+                                  "\"Rebuild folder tree\" on the mailbox parent "
+                                  "folder's context menu to try to fix it."));
+               } else {
+                       alertpanel_error(_("Claws Mail has detected a configured "
                                   "mailbox, but could not load it. It is "
                                   "probably provided by an out-of-date "
                                   "external plugin. Please reinstall the "
                                   "plugin and try again."));
-               exit(1);
+                       exit_claws(mainwin);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
+                       exit(1);
+               }
        }
        
        static_mainwindow = mainwin;
 
+#ifdef MAEMO
+       if (prefs_common.data_root != NULL && *prefs_common.data_root != '\0') {
+               GnomeVFSVolume *vol = NULL;
+               gchar *uri, *mount_path;
+
+               volmon = gnome_vfs_get_volume_monitor();
+               vol = gnome_vfs_volume_monitor_get_volume_for_path(volmon, prefs_common.data_root);
+
+               uri = gnome_vfs_volume_get_activation_uri (vol);
+               mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+               g_free(uri);
+
+               if (vol == NULL || !gnome_vfs_volume_is_mounted(vol) 
+                   || strcmp(mount_path, prefs_common.data_root)) {
+                       alertpanel_error(_("Claws Mail can not start without its data volume (%s)."), 
+                               prefs_common.data_root);
+                       g_free(mount_path);
+                       gnome_vfs_volume_unref(vol);
+                       exit_claws(mainwin);
+                       exit(1);
+               }
+               g_free(mount_path);
+               gnome_vfs_volume_unref(vol);
+               g_signal_connect(G_OBJECT(volmon), 
+                               "volume-mounted", G_CALLBACK(main_vol_mount_cb), mainwin);
+               g_signal_connect(G_OBJECT(volmon), 
+                               "volume-unmounted", G_CALLBACK(main_vol_unmount_cb), mainwin);
+       }
+#endif
+
 #ifdef HAVE_STARTUP_NOTIFICATION
        startup_notification_complete(FALSE);
 #endif
+#ifdef HAVE_LIBSM
+       sc_session_manager_connect(mainwin);
+#endif
+
        folder_item_update_thaw();
        gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
        main_window_cursor_normal(mainwin);
 
-       if (cmd.receive_all) {
+       if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
+           folder_find_item_from_identifier(prefs_common.last_opened_folder) != NULL &&
+           !claws_crashed()) {
+               cmd.target = prefs_common.last_opened_folder;
+       }
+
+       if (cmd.receive_all && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
-       } else if (prefs_common.chk_on_startup) {
+       } else if (prefs_common.chk_on_startup && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
-       } else if (cmd.receive) {
+       } else if (cmd.receive && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check, NULL);
-       } else {
-               gtk_widget_grab_focus(folderview->ctree);
-       }
+       } 
+       gtk_widget_grab_focus(folderview->ctree);
 
        if (cmd.compose) {
                open_compose_new(cmd.compose_mailto, cmd.attach_files);
@@ -612,57 +1494,88 @@ int main(int argc, char *argv[])
        }
        
        if (cmd.target) {
+               start_done = FALSE;
                g_timeout_add(500, defer_jump, (gpointer)cmd.target);
        }
 
+       prefs_destroy_cache();
+       
+       compose_reopen_exit_drafts();
+
+       if (start_done) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(mainwin);
+               toolbar_main_set_sensitive(mainwin);
+       }
+       END_TIMING();
+
        gtk_main();
 
-       exit_sylpheed(mainwin);
+#ifdef MAEMO
+       osso_deinitialize(osso_context);
+#endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       if(proxy)
+               g_object_unref(proxy);
+       if(connection)
+               dbus_g_connection_unref(connection);
+#endif
+#ifdef G_OS_WIN32
+       win32_close_log();
+#endif
+       utils_free_regex();
+       exit_claws(mainwin);
 
        return 0;
 }
 
 static void save_all_caches(FolderItem *item, gpointer data)
 {
-       gint free_caches = GPOINTER_TO_INT(data);
        if (!item->cache) {
                return;
        }
 
-       if (item->opened)
+       if (item->opened) {
                folder_item_close(item);
-       
-       if (free_caches)
-               folder_item_free_cache(item, TRUE);
-       else
-               folder_item_write_cache(item);
+       }
+
+       folder_item_free_cache(item, TRUE);
 }
 
-static void exit_sylpheed(MainWindow *mainwin)
+static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
 
+       sc_exiting = TRUE;
+
        debug_print("shutting down\n");
        inc_autocheck_timer_remove();
 
-       if (prefs_common.clean_on_exit) {
+       if (prefs_common.clean_on_exit && !emergency_exit) {
                main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
        }
 
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       if (prefs_common.work_offline && went_offline_nm)
+               prefs_common.work_offline = FALSE;
+#endif
+
        /* save prefs for opened folder */
        if(mainwin->folderview->opened) {
                FolderItem *item;
 
                item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
                summary_save_prefs_to_folderitem(mainwin->folderview->summaryview, item);
+               prefs_common.last_opened_folder = folder_item_get_identifier(item);
        }
 
        /* save all state before exiting */
+       folder_func_to_all_folders(save_all_caches, NULL);
        folder_write_list();
-       folder_func_to_all_folders(save_all_caches, GINT_TO_POINTER(1));
 
        main_window_get_size(mainwin);
        main_window_get_position(mainwin);
+
        prefs_common_write_config();
        account_write_config_all();
        addressbook_export_to_file();
@@ -675,10 +1588,12 @@ static void exit_sylpheed(MainWindow *mainwin)
        remove_all_files(get_tmp_dir());
        remove_all_files(get_mime_tmp_dir());
 
-       close_log_file();
+       close_log_file(LOG_PROTOCOL);
+       close_log_file(LOG_DEBUG_FILTERING);
 
 #ifdef HAVE_LIBETPAN
        imap_main_done();
+       nntp_main_done();
 #endif
        /* delete crashfile */
        if (!cmd.crash)
@@ -686,6 +1601,12 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        lock_socket_remove();
 
+#ifdef HAVE_LIBSM
+       if (mainwin->smc_conn)
+               SmcCloseConnection ((SmcConn)mainwin->smc_conn, 0, NULL);
+       mainwin->smc_conn = NULL;
+#endif
+
        main_window_destroy_all();
        
        plugin_unload_all("GTK2");
@@ -707,13 +1628,15 @@ static void exit_sylpheed(MainWindow *mainwin)
        prefs_message_done();
        prefs_other_done();
        prefs_receive_done();
+       prefs_logging_done();
        prefs_send_done();
+       tags_write_tags();
 #ifdef USE_ASPELL       
        prefs_spelling_done();
        gtkaspell_checkers_quit();
 #endif
-       sylpheed_done();
-
+       plugin_unload_all("Common");
+       claws_done();
 }
 
 static void parse_cmd_opt(int argc, char *argv[])
@@ -746,17 +1669,23 @@ static void parse_cmd_opt(int argc, char *argv[])
                        }
                } else if (!strncmp(argv[i], "--attach", 8)) {
                        const gchar *p = argv[i + 1];
-                       gchar *file;
+                       gchar *file = NULL;
 
                        while (p && *p != '\0' && *p != '-') {
                                if (!cmd.attach_files) {
                                        cmd.attach_files = g_ptr_array_new();
                                }
-                               if (*p != G_DIR_SEPARATOR) {
-                                       file = g_strconcat(sylpheed_get_startup_dir(),
+                               if ((file = g_filename_from_uri(p, NULL, NULL)) != NULL) {
+                                       if (!is_file_exist(file)) {
+                                               g_free(file);
+                                               file = NULL;
+                                       }
+                               }
+                               if (file == NULL && *p != G_DIR_SEPARATOR) {
+                                       file = g_strconcat(claws_get_startup_dir(),
                                                           G_DIR_SEPARATOR_S,
                                                           p, NULL);
-                               } else {
+                               } else if (file == NULL) {
                                        file = g_strdup(p);
                                }
                                g_ptr_array_add(cmd.attach_files, file);
@@ -765,8 +1694,14 @@ static void parse_cmd_opt(int argc, char *argv[])
                        }
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
-               } else if (!strncmp(argv[i], "--version", 9)) {
-                       puts("Sylpheed-Claws version " VERSION);
+               } else if (!strncmp(argv[i], "--version-full", 14) ||
+                          !strncmp(argv[i], "-V", 2)) {
+                       g_print("Claws Mail version " VERSION "\n");
+                       main_dump_features_list(FALSE);
+                       exit(0);
+               } else if (!strncmp(argv[i], "--version", 9) ||
+                          !strncmp(argv[i], "-v", 2)) {
+                       g_print("Claws Mail version " VERSION "\n");
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
                        const gchar *p = argv[i + 1];
@@ -798,7 +1733,8 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.online_mode = ONLINE_MODE_ONLINE;
                } else if (!strncmp(argv[i], "--offline", 9)) {
                        cmd.online_mode = ONLINE_MODE_OFFLINE;
-               } else if (!strncmp(argv[i], "--help", 6)) {
+               } else if (!strncmp(argv[i], "--help", 6) ||
+                          !strncmp(argv[i], "-h", 2)) {
                        gchar *base = g_path_get_basename(argv[0]);
                        g_print(_("Usage: %s [OPTION]...\n"), base);
 
@@ -812,16 +1748,19 @@ static void parse_cmd_opt(int argc, char *argv[])
                        g_print("%s\n", _("  --send                 send all queued messages"));
                        g_print("%s\n", _("  --status [folder]...   show the total number of messages"));
                        g_print("%s\n", _("  --status-full [folder]...\n"
-                              "                         show the status of each folder"));
+                                         "                         show the status of each folder"));
                        g_print("%s\n", _("  --select folder[/msg]  jumps to the specified folder/message\n" 
-                                         "                         folder is a folder id like '#mh/Mailbox/inbox'"));
+                                         "                         folder is a folder id like 'folder/sub_folder'"));
                        g_print("%s\n", _("  --online               switch to online mode"));
                        g_print("%s\n", _("  --offline              switch to offline mode"));
-                       g_print("%s\n", _("  --exit                 exit Sylpheed-Claws"));
+                       g_print("%s\n", _("  --exit --quit -q       exit Claws Mail"));
                        g_print("%s\n", _("  --debug                debug mode"));
-                       g_print("%s\n", _("  --help                 display this help and exit"));
-                       g_print("%s\n", _("  --version              output version information and exit"));
+                       g_print("%s\n", _("  --help -h              display this help and exit"));
+                       g_print("%s\n", _("  --version -v           output version information and exit"));
+                       g_print("%s\n", _("  --version-full -V      output version and built-in features information and exit"));
                        g_print("%s\n", _("  --config-dir           output configuration directory"));
+                       g_print("%s\n", _("  --alternate-config-dir [dir]\n"
+                                         "                         use specified configuration directory"));
 
                        g_free(base);
                        exit(1);
@@ -830,9 +1769,13 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.crash_params = g_strdup(argv[i + 1]);
                        i++;
                } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
-                       puts(RC_DIR);
+                       g_print(RC_DIR "\n");
                        exit(0);
-               } else if (!strncmp(argv[i], "--exit", 6)) {
+               } else if (!strncmp(argv[i], "--alternate-config-dir", sizeof "--alternate-config-dir" - 1) && i+1 < argc) {
+                       set_rc_dir(argv[i+1]);
+               } else if (!strncmp(argv[i], "--exit", 6) ||
+                          !strncmp(argv[i], "--quit", 6) ||
+                          !strncmp(argv[i], "-q", 2)) {
                        cmd.exit = TRUE;
                } else if (!strncmp(argv[i], "--select", 8) && i+1 < argc) {
                        cmd.target = argv[i+1];
@@ -850,15 +1793,23 @@ static void parse_cmd_opt(int argc, char *argv[])
                                                cmd.compose_mailto = p;
                                        }
                                }
+                       } else if (!strncmp(argv[i], "file://", 7)) {
+                               cmd.target = argv[i];
                        } else if (strstr(argv[i], "://")) {
                                const gchar *p = argv[i];
                                if (p && *p != '\0' && *p != '-') {
                                        cmd.subscribe = TRUE;
                                        cmd.subscribe_uri = p;
                                }
+                       } else if (!strcmp(argv[i], "--sync")) {
+                               /* gtk debug */
+                       } else if (is_dir_exist(argv[i]) || is_file_exist(argv[i])) {
+                               cmd.target = argv[i];
+                       } else {
+                               g_print(_("Unknown option\n"));
+                               exit(1);
                        }
                }
-               
        }
 
        if (cmd.attach_files && cmd.compose == FALSE) {
@@ -867,19 +1818,6 @@ static void parse_cmd_opt(int argc, char *argv[])
        }
 }
 
-static gint get_queued_message_num(void)
-{
-       FolderItem *queue;
-
-       queue = folder_get_default_queue();
-       if (!queue) {
-               return -1;
-       }
-
-       folder_item_scan(queue);
-       return queue->total_msgs;
-}
-
 static void initial_processing(FolderItem *item, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
@@ -890,28 +1828,32 @@ static void initial_processing(FolderItem *item, gpointer data)
                              item->path 
                              ? item->path 
                              : _("top level folder"));
-       debug_print("%s\n", buf);
        g_free(buf);
 
        
        if (item->prefs->enable_processing) {
+               item->processing_pending = TRUE;
                folder_item_apply_processing(item);
+               item->processing_pending = FALSE;
        }
 
-       debug_print("done.\n");
        STATUSBAR_POP(mainwin);
 }
 
-static void draft_all_messages(void)
+static gboolean draft_all_messages(void)
 {
        GList *compose_list = NULL;
        
-       while ((compose_list = compose_get_compose_list()) != NULL) {
+       compose_clear_exit_drafts();
+       compose_list = compose_get_compose_list();
+       while (compose_list != NULL) {
                Compose *c = (Compose*)compose_list->data;
-               compose_draft(c);
-       }       
+               if (!compose_draft(c, COMPOSE_DRAFT_FOR_EXIT))
+                       return FALSE;
+               compose_list = compose_get_compose_list();
+       }
+       return TRUE;
 }
-
 gboolean clean_quit(gpointer data)
 {
        static gboolean firstrun = TRUE;
@@ -938,8 +1880,8 @@ gboolean clean_quit(gpointer data)
        }
                
        draft_all_messages();
-
-       exit_sylpheed(static_mainwindow);
+       emergency_exit = TRUE;
+       exit_claws(static_mainwindow);
        exit(0);
 
        return FALSE;
@@ -949,52 +1891,69 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
        
+       if (sc_exiting == TRUE) {
+               debug_print("exit pending\n");
+               return;
+       }
+       sc_exiting = TRUE;
+       debug_print("exiting\n");
        if (compose_get_compose_list()) {
-               gint val = alertpanel(_("Really quit?"),
-                              _("Composing message exists."),
-                              _("_Save to Draft"), _("_Discard them"), _("Do_n't quit"));
-               switch (val) {
-                       case G_ALERTOTHER:
-                               return;
-                       case G_ALERTALTERNATE:
-                               break;
-                       default:
-                               draft_all_messages();
+               if (!draft_all_messages()) {
+                       main_window_popup(mainwin);
+                       sc_exiting = FALSE;
+                       return;
                }
-
-               manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
-       if (prefs_common.warn_queued_on_exit && get_queued_message_num() > 0) {
+       if (prefs_common.warn_queued_on_exit && procmsg_have_queued_mails_fast()) {
                if (alertpanel(_("Queued messages"),
                               _("Some unsent messages are queued. Exit now?"),
                               GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
                    != G_ALERTALTERNATE) {
+                       main_window_popup(mainwin);
+                       sc_exiting = FALSE;
                        return;
                }
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
        sock_cleanup();
+#ifdef HAVE_VALGRIND
+       if (RUNNING_ON_VALGRIND) {
+               summary_clear_list(mainwin->summaryview);
+       }
+#endif
        if (folderview_get_selected_item(mainwin->folderview))
                folder_item_close(folderview_get_selected_item(mainwin->folderview));
        gtk_main_quit();
 }
 
+gboolean claws_is_exiting(void)
+{
+       return sc_exiting;
+}
+
+gboolean claws_is_starting(void)
+{
+       return sc_starting;
+}
+
 /*
  * CLAWS: want this public so crash dialog can delete the
  * lock file too
  */
-#ifndef CLAWS
-static
-#endif
-gchar *get_socket_name(void)
+gchar *claws_get_socket_name(void)
 {
        static gchar *filename = NULL;
-
+       const gchar *socket_dir = NULL;
+       
+       if (rc_dir_is_alt())
+               socket_dir = get_rc_dir();
+       else
+               socket_dir = g_get_tmp_dir();
        if (filename == NULL) {
-               filename = g_strdup_printf("%s%csylpheed-claws-%d",
-                                          g_get_tmp_dir(), G_DIR_SEPARATOR,
+               filename = g_strdup_printf("%s%cclaws-mail-%d",
+                                          socket_dir, G_DIR_SEPARATOR,
 #if HAVE_GETUID
                                           getuid());
 #else
@@ -1010,7 +1969,7 @@ static gchar *get_crashfile_name(void)
        static gchar *filename = NULL;
 
        if (filename == NULL) {
-               filename = g_strdup_printf("%s%csylpheed-crashed",
+               filename = g_strdup_printf("%s%cclaws-crashed",
                                           get_tmp_dir(), G_DIR_SEPARATOR);
        }
 
@@ -1022,8 +1981,12 @@ static gint prohibit_duplicate_launch(void)
        gint uxsock;
        gchar *path;
 
-       path = get_socket_name();
+       path = claws_get_socket_name();
        uxsock = fd_connect_unix(path);
+       
+       if (x_display == NULL)
+               x_display = g_strdup(g_getenv("DISPLAY"));
+
        if (uxsock < 0) {
                g_unlink(path);
                return fd_open_unix(path);
@@ -1031,7 +1994,7 @@ static gint prohibit_duplicate_launch(void)
 
        /* remote command mode */
 
-       debug_print("another Sylpheed-Claws instance is already running.\n");
+       debug_print("another Claws Mail instance is already running.\n");
 
        if (cmd.receive_all) {
                fd_write_all(uxsock, "receive_all\n", 12);
@@ -1109,8 +2072,20 @@ static gint prohibit_duplicate_launch(void)
                gchar *str = g_strdup_printf("select %s\n", cmd.target);
                fd_write_all(uxsock, str, strlen(str));
                g_free(str);
-       } else
-               fd_write_all(uxsock, "popup\n", 6);
+       } else {
+               gchar buf[BUFSIZ];
+               fd_write_all(uxsock, "get_display\n", 12);
+               memset(buf, 0, sizeof(buf));
+               fd_gets(uxsock, buf, sizeof(buf));
+               if (strcmp2(buf, x_display)) {
+                       g_print("Claws Mail is already running on display %s.\n",
+                               buf);
+               } else {
+                       fd_close(uxsock);
+                       uxsock = fd_connect_unix(path);
+                       fd_write_all(uxsock, "popup\n", 6);
+               }
+       }
 
        fd_close(uxsock);
        return -1;
@@ -1129,7 +2104,7 @@ static gint lock_socket_remove(void)
                gdk_input_remove(lock_socket_tag);
        }
        fd_close(lock_socket);
-       filename = get_socket_name();
+       filename = claws_get_socket_name();
        g_unlink(filename);
 #endif
 
@@ -1175,6 +2150,8 @@ static void lock_socket_input_cb(gpointer data,
 
        if (!strncmp(buf, "popup", 5)) {
                main_window_popup(mainwin);
+       } else if (!strncmp(buf, "get_display", 11)) {
+               fd_write_all(sock, x_display, strlen(x_display));
        } else if (!strncmp(buf, "receive_all", 11)) {
                inc_all_account_mail(mainwin, FALSE,
                                     prefs_common.newmail_notify_manu);
@@ -1222,7 +2199,7 @@ static void lock_socket_input_cb(gpointer data,
                if (folders) g_ptr_array_free(folders, TRUE);
        } else if (!strncmp(buf, "select ", 7)) {
                const gchar *target = buf+7;
-               mainwindow_jump_to(target);
+               mainwindow_jump_to(target, TRUE);
        } else if (!strncmp(buf, "exit", 4)) {
                app_will_exit(NULL, mainwin);
        }
@@ -1246,6 +2223,7 @@ static void send_queue(void)
 {
        GList *list;
        gchar *errstr = NULL;
+       gboolean error = FALSE;
        for (list = folder_get_list(); list != NULL; list = list->next) {
                Folder *folder = list->data;
 
@@ -1257,15 +2235,16 @@ static void send_queue(void)
                        if (res) {
                                folder_item_scan(folder->queue);
                        }
+                       
+                       if (res < 0)
+                               error = TRUE;
                }
        }
        if (errstr) {
-               gchar *tmp = g_strdup_printf(_("Some errors occurred "
+               alertpanel_error_log(_("Some errors occurred "
                                "while sending queued messages:\n%s"), errstr);
                g_free(errstr);
-               alertpanel_error_log(tmp);
-               g_free(tmp);
-       } else {
+       } else if (error) {
                alertpanel_error_log("Some errors occurred "
                                "while sending queued messages.");
        }
@@ -1273,14 +2252,6 @@ static void send_queue(void)
 
 static void quit_signal_handler(int sig)
 {
-#ifdef SIGPIPE
-       if (sig == SIGPIPE) {
-               debug_print("caugth SIGPIPE, maybe X closing!\n");
-               folder_write_list();
-               folder_func_to_all_folders(save_all_caches, GINT_TO_POINTER(0));
-               return; 
-       }
-#endif
        debug_print("Quitting on signal %d\n", sig);
 
        g_timeout_add(0, clean_quit, NULL);
@@ -1303,9 +2274,6 @@ static void install_basic_sighandlers()
 #ifdef SIGHUP
        sigaddset(&mask, SIGHUP);
 #endif
-#ifdef SIGPIPE
-       sigaddset(&mask, SIGPIPE);
-#endif
 
        act.sa_handler = quit_signal_handler;
        act.sa_mask    = mask;
@@ -1320,10 +2288,163 @@ static void install_basic_sighandlers()
 #ifdef SIGHUP
        sigaction(SIGHUP, &act, 0);
 #endif 
-#ifdef SIGPIPE
-       sigaction(SIGPIPE, &act, 0);
-#endif 
 
        sigprocmask(SIG_UNBLOCK, &mask, 0);
 #endif /* !G_OS_WIN32 */
 }
+
+#if (defined linux && defined SIGIO)
+static int mem_notify_fd = 0;
+
+static gboolean clean_caches(gpointer unused)
+{
+       if (static_mainwindow && static_mainwindow->lock_count > 0)
+               return TRUE;
+       debug_print("/dev/mem_notify: callback: Freeing some memory now!\n");
+       folder_clean_cache_memory_force();
+       return FALSE;
+}
+
+static void memory_signal_handler(int sig)
+{
+       debug_print("/dev/mem_notify: Kernel says we should free up some memory!\n");
+       g_timeout_add(10, clean_caches, NULL); 
+}
+
+static void install_memory_sighandler()
+{
+       sigset_t    mask;
+       struct sigaction act;
+       int flags;
+
+       mem_notify_fd = open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
+       if (mem_notify_fd == -1) {
+               debug_print("/dev/mem_notify not available (%s)\n", 
+                       strerror(errno));
+               return;
+       }
+       
+       fcntl(mem_notify_fd, F_SETOWN, getpid());
+       flags = fcntl(mem_notify_fd, F_GETFL);
+       fcntl(mem_notify_fd, flags|FASYNC);
+
+       sigemptyset(&mask);
+
+       sigaddset(&mask, SIGIO);
+
+       act.sa_handler = memory_signal_handler;
+       act.sa_mask    = mask;
+       act.sa_flags   = 0;
+
+       sigaction(SIGIO, &act, 0);
+
+       sigprocmask(SIG_UNBLOCK, &mask, 0);
+
+       debug_print("/dev/mem_notify: installed handler\n");
+}
+#endif /* linux && SIGIO */
+
+#ifdef MAEMO
+osso_context_t *get_osso_context(void)
+{
+       return static_osso_context;
+}
+#endif
+
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev,
+                                        gpointer data)
+{
+       MainWindow *mainWin;
+
+       mainWin = NULL;
+       if (static_mainwindow)
+               mainWin = static_mainwindow;
+       else if (data)
+               mainWin = (MainWindow*)data;
+       
+       if (!prefs_common.use_networkmanager)
+               return;
+
+       if (mainWin) {
+               GError *error;
+               gboolean online;
+
+               error = NULL;           
+               online = networkmanager_is_online(&error);
+               if(!error) {
+                       if(online && went_offline_nm) {
+                               went_offline_nm = FALSE;
+                               main_window_toggle_work_offline(mainWin, FALSE, FALSE);
+                               debug_print("NetworkManager: Went online\n");
+                               log_message(LOG_PROTOCOL, _("NetworkManager: network is online."));
+                       }
+                       else if(!online) {
+                               went_offline_nm = TRUE;
+                               main_window_toggle_work_offline(mainWin, TRUE, FALSE);
+                               debug_print("NetworkManager: Went offline\n");
+                               log_message(LOG_PROTOCOL, _("NetworkManager: network is offline."));
+                       }
+               }
+               else {
+                       debug_print("Failed to get online information from NetworkManager: %s\n",
+                                                        error->message);
+                       g_error_free(error);
+               }
+       }
+       else
+               debug_print("NetworkManager: Cannot change connection state because "
+                                                "main window does not exist\n");
+}
+
+/* Returns true (and sets error appropriately, if given) in case of error */
+gboolean networkmanager_is_online(GError **error)
+{
+       DBusGConnection *connection;
+       DBusGProxy *proxy;
+       GError *tmp_error;
+       gboolean retVal;
+       guint32 state;
+
+       if (!prefs_common.use_networkmanager)
+               return TRUE;
+
+       tmp_error = NULL;
+       proxy = NULL;
+       connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &tmp_error);
+
+       if(!connection) {
+               /* If calling code doesn't do error checking, at least print some debug */
+               if((error == NULL) || (*error == NULL))
+                       debug_print("Failed to open connection to system bus: %s\n",
+                                                        tmp_error->message);
+               g_propagate_error(error, tmp_error);
+               return TRUE;
+       }
+
+       proxy = dbus_g_proxy_new_for_name(connection,
+                       "org.freedesktop.NetworkManager",
+                       "/org/freedesktop/NetworkManager",
+                       "org.freedesktop.NetworkManager");
+
+       retVal = dbus_g_proxy_call(proxy,"state",&tmp_error, G_TYPE_INVALID,
+                       G_TYPE_UINT, &state, G_TYPE_INVALID);
+
+       if(proxy)
+               g_object_unref(proxy);
+       if(connection)
+               dbus_g_connection_unref(connection);
+
+       if(!retVal) {
+               /* If calling code doesn't do error checking, at least print some debug */
+               if((error == NULL) || (*error == NULL))
+                       debug_print("Failed to get state info from NetworkManager: %s\n",
+                                                        tmp_error->message);
+               g_propagate_error(error, tmp_error);
+               return TRUE;
+       }
+
+       return (state == NM_STATE_CONNECTED || state == NM_STATE_UNKNOWN);
+}
+#endif