2012-11-15 [wwp] 3.9.0cvs3
[claws.git] / src / main.c
index e3df50307d7744590f26941c8c539242002d2753..6e9b246c25035068a542ec723621e5dc2dcab089 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 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
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
 
 #include <stdio.h>
 #include <stdlib.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>
-#include <fcntl.h>
+#endif
+
+#if HAVE_FLOCK
+#include <sys/file.h>
 #endif
 
 #include "wizard.h"
 # include <gdk/gdkx.h>
 #endif
 
+#ifdef HAVE_DBUS_GLIB
+#include <dbus/dbus-glib.h>
+#endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+#include <NetworkManager.h>
+#endif
+#ifdef HAVE_VALGRIND
+#include <valgrind.h>
+#endif
+
 #include "claws.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "manage_window.h"
 #include "alertpanel.h"
 #include "statusbar.h"
-#include "addressbook.h"
+#ifndef USE_NEW_ADDRBOOK
+       #include "addressbook.h"
+#else
+       #include "addressbook-dbus.h"
+#endif
 #include "compose.h"
 #include "folder.h"
+#include "folder_item_prefs.h"
 #include "setup.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "news_gtk.h"
 #include "matcher.h"
 #include "tags.h"
+#include "hooks.h"
+#include "menu.h"
+#include "quicksearch.h"
+#include "advsearch.h"
+
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
+#include "nntp-thread.h"
 #endif
 #include "stock_pixmap.h"
-#ifdef HAVE_VALGRIND
-#include "valgrind.h"
-#endif
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
 #  include "ssl.h"
 #endif
 
 #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>
-#include <gtk/gtkmain.h>
+#endif
 #include <libosso.h>
 #include <libgnomevfs/gnome-vfs-volume.h>
 #include <libgnomevfs/gnome-vfs-volume-monitor.h>
@@ -138,9 +166,26 @@ struct _AppData {
 static GnomeVFSVolumeMonitor *volmon;
 #endif
 
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+/* Went offline due to NetworkManager */
+static gboolean went_offline_nm;
+#endif
+
+#if !defined(NM_CHECK_VERSION)
+#define NM_CHECK_VERSION(x,y,z) 0
+#endif
+
+#ifdef HAVE_DBUS_GLIB
+static DBusGProxy *awn_proxy = NULL;
+#endif
+
 gchar *prog_version;
 gchar *argv0;
 
+#ifdef MAEMO
+HildonProgram *hildon_program;
+#endif
+
 #ifdef HAVE_STARTUP_NOTIFICATION
 static SnLauncheeContext *sn_context = NULL;
 static SnDisplay *sn_display = NULL;
@@ -159,11 +204,19 @@ typedef enum
 static struct RemoteCmd {
        gboolean receive;
        gboolean receive_all;
+       gboolean cancel_receiving;
        gboolean compose;
        const gchar *compose_mailto;
-       GPtrArray *attach_files;
+       GList *attach_files;
+       gboolean search;
+       const gchar *search_folder;
+       const gchar *search_type;
+       const gchar *search_request;
+       gboolean search_recursive;
        gboolean status;
        gboolean status_full;
+       gboolean statistics;
+       gboolean reset_statistics;
        GPtrArray *status_folders;
        GPtrArray *status_full_folders;
        gboolean send;
@@ -176,6 +229,10 @@ static struct RemoteCmd {
        const gchar *target;
 } cmd;
 
+SessionStats session_stats;
+
+static void reset_statistics(void);
+               
 static void parse_cmd_opt(int argc, char *argv[]);
 
 static gint prohibit_duplicate_launch  (void);
@@ -183,17 +240,25 @@ static gchar * get_crashfile_name (void);
 static gint lock_socket_remove         (void);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
-                                        GdkInputCondition condition);
+                                        GIOCondition      condition);
 
 static void open_compose_new           (const gchar    *address,
-                                        GPtrArray      *attach_files);
+                                        GList          *attach_files);
 
 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);
+#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) \
 { \
        if (!is_dir_exist(dir)) { \
@@ -212,7 +277,6 @@ static void exit_claws                      (MainWindow *mainwin);
 static MainWindow *static_mainwindow;
 
 #ifdef MAEMO
-static HildonProgram *static_hildonprogram;
 static osso_context_t *static_osso_context;
 
 void exit_event_handler(gboolean die_now, gpointer data)
@@ -226,6 +290,19 @@ void exit_event_handler(gboolean die_now, gpointer data)
 
 }
 
+/* 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,
@@ -267,12 +344,12 @@ static void startup_notification_complete(gboolean with_window)
                 * if we have been launched from a menu.
                 * We have to display a window, so let it be very little */
                hack = gtk_window_new(GTK_WINDOW_POPUP);
-               gtk_widget_set_uposition(hack, 0, 0);
+               gtk_window_move(GTK_WINDOW(hack), 0, 0);
                gtk_widget_set_size_request(hack, 1, 1);
                gtk_widget_show(hack);
        }
 
-       xdisplay = GDK_DISPLAY();
+       xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
        sn_display = sn_display_new(xdisplay,
                                sn_error_trap_push,
                                sn_error_trap_pop);
@@ -298,6 +375,8 @@ static void claws_gtk_idle(void)
        g_usleep(50000);
 }
 
+static gboolean sc_starting = FALSE;
+
 static gboolean defer_check_all(void *data)
 {
        gboolean autochk = GPOINTER_TO_INT(data);
@@ -305,6 +384,11 @@ static gboolean defer_check_all(void *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;
 }
 
@@ -312,6 +396,11 @@ 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;
 }
 
@@ -325,6 +414,11 @@ static gboolean defer_jump(void *data)
                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;
 }
 
@@ -348,17 +442,15 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
        gint r = 0;
        GtkWidget *window = NULL;
        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,
+       CLAWS_SET_TIP(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);
+                              "room on your disk."));
 
        g_signal_connect(G_OBJECT(keep_backup_chk), "toggled", 
                        G_CALLBACK(chk_update_val), &backup);
@@ -407,18 +499,20 @@ backup_mode:
        return (r == 0);
 }
 
-static void migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
+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;
+               return -1;
        newfp = g_fopen(new_rc, "w");
        if (!newfp) {
                fclose(oldfp);
-               return;
+               return -1;
        }
        
        plugin_path = g_strdup(get_plugin_dir());
@@ -435,19 +529,22 @@ static void migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
        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))) {
-                       fputs(buf, newfp);
+                       err |= (fputs(buf, newfp) == EOF);
                } else {
                        debug_print("->replacing %s", buf);
                        debug_print("  with %s%s", new_plugin_path, buf+strlen(old_plugin_path));
-                       fputs(new_plugin_path, newfp);
-                       fputs(buf+strlen(old_plugin_path), newfp);
+                       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);
-       fclose(newfp);
+       if (fclose(newfp) == EOF)
+               err = TRUE;
+       
+       return (err ? -1:0);
 }
 
 #ifdef HAVE_LIBSM
@@ -507,8 +604,8 @@ static void sc_ice_io_error_handler (IceConn connection)
                (*sc_ice_installed_handler) (connection);
 }
 static gboolean sc_process_ice_messages (GIOChannel   *source,
-                     GIOCondition  condition,
-                     gpointer      data)
+                                        GIOCondition  condition,
+                                        gpointer      data)
 {
        IceConn connection = (IceConn) data;
        IceProcessMessagesStatus status;
@@ -622,7 +719,6 @@ static void sc_session_manager_connect(MainWindow *mainwin)
 #endif
 
 static gboolean sc_exiting = FALSE;
-static gboolean sc_starting = FALSE;
 static gboolean show_at_startup = TRUE;
 static gboolean claws_crashed_bool = FALSE;
 
@@ -664,11 +760,313 @@ static void main_vol_unmount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol,
 }
 #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)
+{
+       gchar *logfile = g_strconcat(g_get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log", NULL);
+       gchar *oldlogfile = g_strconcat(g_get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log.bak", NULL);
+
+       if (is_file_exist(logfile)) {
+               if (rename_force(logfile, oldlogfile) < 0)
+                       FILE_OP_ERROR(logfile, "rename");
+       }
+       win32_debug_fp = g_fopen(logfile, "w");
+       g_free(logfile);
+       g_free(oldlogfile);
+       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("runtime 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("runtime 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("buildtime 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("buildtime 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_ENCHANT
+       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 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
+}
+
+#ifdef HAVE_DBUS_GLIB
+static guint dbus_item_hook_id = -1;
+static guint dbus_folder_hook_id = -1;
+
+static void uninstall_dbus_status_handler(void)
+{
+       if(awn_proxy)
+               g_object_unref(awn_proxy);
+       awn_proxy = NULL;
+       if (dbus_item_hook_id != -1)
+               hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, dbus_item_hook_id);
+       if (dbus_folder_hook_id != -1)
+               hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, dbus_folder_hook_id);
+}
+
+static void dbus_update(FolderItem *removed_item)
+{
+       guint new, unread, unreadmarked, marked, total;
+       guint replied, forwarded, locked, ignored, watched;
+       gchar *buf;
+       GError *error = NULL;
+
+       folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total,
+                               &replied, &forwarded, &locked, &ignored,
+                               &watched);
+       if (removed_item) {
+               total -= removed_item->total_msgs;
+               new -= removed_item->new_msgs;
+               unread -= removed_item->unread_msgs;
+       }
+
+       if (new > 0) {
+               buf = g_strdup_printf("%d", new);
+               dbus_g_proxy_call(awn_proxy, "SetInfoByName", &error,
+                       G_TYPE_STRING, "claws-mail",
+                       G_TYPE_STRING, buf,
+                       G_TYPE_INVALID, G_TYPE_INVALID);
+               g_free(buf);
+               
+       } else {
+               dbus_g_proxy_call(awn_proxy, "UnsetInfoByName", &error, G_TYPE_STRING,
+                       "claws-mail", G_TYPE_INVALID, G_TYPE_INVALID);
+       }
+       if (error) {
+               debug_print("%s\n", error->message);
+               g_error_free(error);
+       }
+}
+
+static gboolean dbus_status_update_folder_hook(gpointer source, gpointer data)
+{
+       FolderUpdateData *hookdata;
+       hookdata = source;
+       if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM)
+               dbus_update(hookdata->item);
+       else
+               dbus_update(NULL);
+
+       return FALSE;
+}
+
+static gboolean dbus_status_update_item_hook(gpointer source, gpointer data)
+{
+       dbus_update(NULL);
+
+       return FALSE;
+}
+
+static void install_dbus_status_handler(void)
+{
+       GError *tmp_error = NULL;
+       DBusGConnection *connection = dbus_g_bus_get(DBUS_BUS_SESSION, &tmp_error);
+       
+       if(!connection) {
+               /* If calling code doesn't do error checking, at least print some debug */
+               debug_print("Failed to open connection to session bus: %s\n",
+                                tmp_error->message);
+               g_error_free(tmp_error);
+               return;
+       }
+       awn_proxy = dbus_g_proxy_new_for_name(connection,
+                       "com.google.code.Awn",
+                       "/com/google/code/Awn",
+                       "com.google.code.Awn");
+       dbus_item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, dbus_status_update_item_hook, NULL);
+       if (dbus_item_hook_id == -1) {
+               g_warning(_("Failed to register folder item update hook"));
+               uninstall_dbus_status_handler();
+               return;
+       }
+
+       dbus_folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, dbus_status_update_folder_hook, NULL);
+       if (dbus_folder_hook_id == -1) {
+               g_warning(_("Failed to register folder update hook"));
+               uninstall_dbus_status_handler();
+               return;
+       }
+}
+#endif
+
+static void reset_statistics(void)
+{
+       /* (re-)initialize session statistics */
+       session_stats.received = 0;
+       session_stats.sent = 0;
+       session_stats.replied = 0;
+       session_stats.forwarded = 0;
+       session_stats.time_started = time(NULL);
+}
+               
 int main(int argc, char *argv[])
 {
 #ifdef MAEMO
        osso_context_t *osso_context;
        osso_return_t result;
+#endif
+#ifdef HAVE_DBUS_GLIB
+       DBusGConnection *connection;
+       GError *error;
+#endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       DBusGProxy *nm_proxy;
 #endif
        gchar *userrc;
        MainWindow *mainwin;
@@ -677,35 +1075,33 @@ int main(int argc, char *argv[])
        gboolean crash_file_present = FALSE;
        gint num_folder_class = 0;
        gboolean asked_for_migration = FALSE;
+       gboolean start_done = TRUE;
+       GSList *plug_list = NULL;
+       gboolean never_ran = FALSE;
+       gboolean mainwin_shown = FALSE;
 
        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;
        }
 
-       prefs_prepare_cache();
        prog_version = PROG_VERSION;
        argv0 = g_strdup(argv[0]);
 
        parse_cmd_opt(argc, argv);
 
-#ifdef CRASH_DIALOG
-       if (cmd.crash) {
-               gtk_set_locale();
-               gtk_init(&argc, &argv);
-               crash_main(cmd.crash_params);
-               return 0;
-       }
-       crash_install_handlers();
-#endif
-       install_basic_sighandlers();
        sock_init();
 
        /* check and create unix domain socket for remote operation */
-#ifdef G_OS_UNIX
        lock_socket = prohibit_duplicate_launch();
        if (lock_socket < 0) {
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -715,7 +1111,28 @@ int main(int argc, char *argv[])
                return 0;
        }
 
-       if (cmd.status || cmd.status_full) {
+       main_dump_features_list(TRUE);
+       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
+
+       if (cmd.status || cmd.status_full || cmd.search ||
+               cmd.statistics || cmd.reset_statistics || cmd.cancel_receiving) {
                puts("0 Claws Mail not running.");
                lock_socket_remove();
                return 0;
@@ -723,60 +1140,84 @@ int main(int argc, char *argv[])
        
        if (cmd.exit)
                return 0;
-#endif
        if (!g_thread_supported())
                g_thread_init(NULL);
 
+       reset_statistics();
+       
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
+#ifdef G_OS_WIN32
+       gtk_settings_set_string_property(gtk_settings_get_default(),
+                       "gtk-theme-name",
+                       "MS-Windows",
+                       "XProperty");
+#endif
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       went_offline_nm = FALSE;
+       nm_proxy = NULL;
+#endif
+#ifdef HAVE_DBUS_GLIB
+       error = 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 {
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+               nm_proxy = dbus_g_proxy_new_for_name(connection,
+                       "org.freedesktop.NetworkManager",
+                       "/org/freedesktop/NetworkManager",
+                       "org.freedesktop.NetworkManager");
+               if (nm_proxy) {
+#if NM_CHECK_VERSION(0,8,992)
+                       dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
+                       dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
+                               G_CALLBACK(networkmanager_state_change_cb),
+                               NULL,NULL);
+#else
+                       dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
+                       dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
+                               G_CALLBACK(networkmanager_state_change_cb),
+                               NULL,NULL);
+#endif
+               }
+#endif
+               install_dbus_status_handler();
+       }
+#endif
+
+
 #ifdef MAEMO
        osso_context = osso_initialize(OSSO_SERVICE, "2.8.1", TRUE, NULL);
        if (osso_context == NULL) {
                return OSSO_ERROR;
        }
-       static_hildonprogram = HILDON_PROGRAM(hildon_program_get_instance());
+       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());
+       gtk_widget_set_default_colormap(
+               gdk_screen_get_system_colormap(
+                       gdk_screen_get_default()));
+
+       gtkut_create_ui_manager();
+
+       /* Create container for all the menus we will be adding */
+       MENUITEM_ADDUI("/", "Menus", NULL, GTK_UI_MANAGER_MENUBAR);
 
        if (!g_thread_supported()) {
                g_error(_("g_thread is not supported by glib.\n"));
        }
 
-       /* 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(_("Claws Mail has been compiled with "
-                                  "a more recent GTK+ library than is "
-                                  "currently available. This will cause "
-                                  "crashes. You need to upgrade GTK+ or "
-                                  "recompile Claws Mail."));
-               exit(1);
-       }
+#ifdef G_OS_WIN32
+       CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
 #else
-       if (gtk_check_version(2, 9, 0) == NULL) {
-               alertpanel_error(_("Claws Mail has been compiled with "
-                                  "an older GTK+ library than is "
-                                  "currently available. This will cause "
-                                  "crashes. You need to recompile "
-                                  "Claws Mail."));
-               exit(1);
-       }
-#endif 
-       /* parse gtkrc files */
-       userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
-                            NULL);
-       gtk_rc_parse(userrc);
-       g_free(userrc);
-       userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk",
-                            G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
-       gtk_rc_parse(userrc);
-       g_free(userrc);
-
        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)) {
@@ -804,8 +1245,20 @@ int main(int argc, char *argv[])
                /* 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)
-                       exit(1);
+               if (r == FALSE && !is_dir_exist(RC_DIR)) {
+#ifdef G_OS_UNIX
+                       if (copy_dir(SYSCONFDIR "/skel/.claws-mail", RC_DIR) < 0) {
+#endif
+                               if (!is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+#ifdef G_OS_WIN32
+                                       win32_close_log();
+#endif
+                                       exit(1);
+                               }
+#ifdef G_OS_UNIX
+                       }
+#endif
+               }
        }
        
 
@@ -827,7 +1280,11 @@ int main(int argc, char *argv[])
        gtk_accel_map_load (userrc);
        g_free(userrc);
 
+#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());
@@ -856,7 +1313,11 @@ int main(int argc, char *argv[])
        }
        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();
@@ -877,21 +1338,28 @@ int main(int argc, char *argv[])
        prefs_receive_init();
        prefs_send_init();
        tags_read_tags();
-#ifdef USE_ASPELL
+       matcher_init();
+#ifdef USE_ENCHANT
        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(); */
+#ifndef USE_NEW_ADDRBOOK
        addressbook_read_file();
-       renderer_read_config();
-
+#else
+       g_clear_error(&error);
+       if (! addressbook_start_service(&error)) {
+               g_warning("%s", error->message);
+               g_clear_error(&error);
+       }
+       else {
+               addressbook_install_hooks(&error);
+       }
+#endif
        gtkut_widget_init();
        stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
        gtk_window_set_default_icon(icon);
@@ -903,11 +1371,16 @@ int main(int argc, char *argv[])
        news_gtk_init();
 
        mainwin = main_window_create();
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       networkmanager_state_change_cb(nm_proxy,NULL,mainwin);
+#endif
+
 #ifdef MAEMO
        AppData *appdata;
        appdata = g_new0(AppData, 1);
-       appdata->program = static_hildonprogram;
-       appdata->window = mainwin->window;
+       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, 
@@ -918,6 +1391,7 @@ int main(int argc, char *argv[])
                return OSSO_ERROR;
        }
 
+#ifndef CHINOOK
        /* Add handler for Exit D-BUS messages */
        result = osso_application_set_exit_cb(appdata->osso_context,
                                                exit_event_handler,
@@ -925,24 +1399,24 @@ int main(int argc, char *argv[])
        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;
 
-       gtk_clist_freeze(GTK_CLIST(mainwin->folderview->ctree));
+       gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree));
        folder_item_update_freeze();
 
-       /* register the callback of unix domain socket input */
-#ifdef G_OS_UNIX
-       lock_socket_tag = gdk_input_add(lock_socket,
-                                       GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
-                                       lock_socket_input_cb,
-                                       mainwin);
-#endif
-
        prefs_account_init();
        account_read_config_all();
 
+#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 
        /* 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.
@@ -959,10 +1433,14 @@ int main(int argc, char *argv[])
                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();
+               never_ran = TRUE;
        }
 
        if (!account_get_list()) {
@@ -970,13 +1448,19 @@ int main(int argc, char *argv[])
                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_claws(mainwin);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
                        exit(1);
                }
+               never_ran = TRUE;
        }
 
        
@@ -985,17 +1469,17 @@ int main(int argc, char *argv[])
 
        /* if crashed, show window early so that the user
         * sees what's happening */
-       if (claws_crashed())
+       if (claws_crashed()) {
                main_window_popup(mainwin);
+               mainwin_shown = TRUE;
+       }
 
-#ifdef HAVE_LIBETPAN
-       imap_main_init(prefs_common.skip_ssl_cert_check);
-#endif 
        account_set_missing_folder();
        folder_set_missing_folders();
        folderview_set(folderview);
 
        prefs_matcher_read_config();
+       quicksearch_set_search_strings(mainwin->summaryview->quicksearch);
 
        /* make one all-folder processing before using claws */
        main_window_cursor_wait(mainwin);
@@ -1048,23 +1532,47 @@ int main(int argc, char *argv[])
                prefs_matcher_read_config();
        }
        
-       if (plugin_get_unloaded_list() != NULL) {
+       if ((plug_list = plugin_get_unloaded_list()) != NULL) {
+               GSList *cur;
+               gchar *list = NULL;
+               gint num_plugins = 0;
+               for (cur = plug_list; cur; cur = cur->next) {
+                       Plugin *plugin = (Plugin *)cur->data;
+                       gchar *tmp = g_strdup_printf("%s\n%s",
+                               list? list:"",
+                               plugin_get_name(plugin));
+                       g_free(list);
+                       list = tmp;
+                       num_plugins++;
+               }
                main_window_cursor_normal(mainwin);
-               alertpanel_warning(_("Some plugin(s) failed to load. "
+               main_window_popup(mainwin);
+               mainwin_shown = TRUE;
+               alertpanel_warning(ngettext(
+                                    "The following plugin failed to load. "
+                                    "Check the Plugins configuration "
+                                    "for more information:\n%s",
+                                    "The following plugins failed to load. "
                                     "Check the Plugins configuration "
-                                    "for more information."));
+                                    "for more information:\n%s", 
+                                    num_plugins), 
+                                    list);
                main_window_cursor_wait(mainwin);
+               g_free(list);
+               g_slist_free(plug_list);
        }
 
-       plugin_load_standard_plugins ();
-      
+       if (never_ran) {
+               prefs_common_write_config();
+               plugin_load_standard_plugins ();
+       }
        /* if not crashed, show window now */
-       if (!claws_crashed()) {
+       if (!mainwin_shown) {
                /* 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);
@@ -1081,6 +1589,9 @@ int main(int argc, char *argv[])
                                   "external plugin. Please reinstall the "
                                   "plugin and try again."));
                        exit_claws(mainwin);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
                        exit(1);
                }
        }
@@ -1123,8 +1634,9 @@ int main(int argc, char *argv[])
 #ifdef HAVE_LIBSM
        sc_session_manager_connect(mainwin);
 #endif
+
        folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
+       gtk_cmclist_thaw(GTK_CMCLIST(mainwin->folderview->ctree));
        main_window_cursor_normal(mainwin);
 
        if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
@@ -1134,21 +1646,23 @@ int main(int argc, char *argv[])
        }
 
        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 && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
        } 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);
        }
        if (cmd.attach_files) {
-               ptr_array_free_strings(cmd.attach_files);
-               g_ptr_array_free(cmd.attach_files, TRUE);
+               list_free_strings(cmd.attach_files);
+               g_list_free(cmd.attach_files);
                cmd.attach_files = NULL;
        }
        if (cmd.subscribe) {
@@ -1160,6 +1674,7 @@ int main(int argc, char *argv[])
        }
        
        if (cmd.target) {
+               start_done = FALSE;
                g_timeout_add(500, defer_jump, (gpointer)cmd.target);
        }
 
@@ -1167,7 +1682,18 @@ int main(int argc, char *argv[])
        
        compose_reopen_exit_drafts();
 
-       sc_starting = FALSE;
+       if (start_done) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(mainwin);
+               toolbar_main_set_sensitive(mainwin);
+       }
+
+       /* register the callback of unix domain socket input */
+       lock_socket_tag = claws_input_add(lock_socket,
+                                       G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
+                                       lock_socket_input_cb,
+                                       mainwin, TRUE);
+
        END_TIMING();
 
        gtk_main();
@@ -1175,6 +1701,19 @@ int main(int argc, char *argv[])
 #ifdef MAEMO
        osso_deinitialize(osso_context);
 #endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       if(nm_proxy)
+               g_object_unref(nm_proxy);
+#endif
+#ifdef HAVE_DBUS_GLIB
+       uninstall_dbus_status_handler();
+       if(connection)
+               dbus_g_connection_unref(connection);
+#endif
+#ifdef G_OS_WIN32
+       win32_close_log();
+#endif
+       utils_free_regex();
        exit_claws(mainwin);
 
        return 0;
@@ -1196,21 +1735,23 @@ static void save_all_caches(FolderItem *item, gpointer data)
 static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
+       gboolean have_connectivity;
 
        sc_exiting = TRUE;
 
        debug_print("shutting down\n");
        inc_autocheck_timer_remove();
 
-       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);
+               item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(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);
        }
@@ -1224,8 +1765,9 @@ static void exit_claws(MainWindow *mainwin)
 
        prefs_common_write_config();
        account_write_config_all();
+#ifndef USE_NEW_ADDRBOOK
        addressbook_export_to_file();
-
+#endif
        filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
        gtk_accel_map_save(filename);
        g_free(filename);
@@ -1237,12 +1779,18 @@ static void exit_claws(MainWindow *mainwin)
        close_log_file(LOG_PROTOCOL);
        close_log_file(LOG_DEBUG_FILTERING);
 
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       have_connectivity = networkmanager_is_online(NULL); 
+#else
+       have_connectivity = TRUE;
+#endif
 #ifdef HAVE_LIBETPAN
-       imap_main_done();
+       imap_main_done(have_connectivity);
+       nntp_main_done(have_connectivity);
 #endif
        /* delete crashfile */
        if (!cmd.crash)
-               g_unlink(get_crashfile_name());
+               claws_unlink(get_crashfile_name());
 
        lock_socket_remove();
 
@@ -1256,10 +1804,12 @@ static void exit_claws(MainWindow *mainwin)
        
        plugin_unload_all("GTK2");
 
+       matcher_done();
        prefs_toolbar_done();
 
+#ifndef USE_NEW_ADDRBOOK
        addressbook_destroy();
-
+#endif
        prefs_themes_done();
        prefs_fonts_done();
        prefs_ext_prog_done();
@@ -1273,9 +1823,10 @@ static void exit_claws(MainWindow *mainwin)
        prefs_message_done();
        prefs_other_done();
        prefs_receive_done();
+       prefs_logging_done();
        prefs_send_done();
        tags_write_tags();
-#ifdef USE_ASPELL       
+#ifdef USE_ENCHANT       
        prefs_spelling_done();
        gtkaspell_checkers_quit();
 #endif
@@ -1283,8 +1834,97 @@ static void exit_claws(MainWindow *mainwin)
        claws_done();
 }
 
+#define G_STRING_APPEND_ENCODED_URI(gstring,source)    \
+       {                                               \
+               gchar tmpbuf[BUFFSIZE];                 \
+               encode_uri(tmpbuf, BUFFSIZE, (source)); \
+               g_string_append((gstring), tmpbuf);     \
+       }
+
+#define G_PRINT_EXIT(msg)      \
+       {                       \
+               g_print(msg);   \
+               exit(1);        \
+       }
+
+static GString * parse_cmd_compose_from_file(const gchar *fn)
+{
+       GString *headers = g_string_new(NULL);
+       GString *body = g_string_new(NULL);
+       gchar *to = NULL;
+       gchar *h;
+       gchar *v;
+       gchar fb[BUFFSIZE];
+       FILE *fp;
+       gboolean isstdin;
+
+       if (fn == NULL || *fn == '\0')
+               G_PRINT_EXIT(_("Missing filename\n"));
+       isstdin = (*fn == '-' && *(fn + 1) == '\0');
+       if (isstdin)
+               fp = stdin;
+       else {
+               fp = g_fopen(fn, "r");
+               if (!fp)
+                       G_PRINT_EXIT(_("Cannot open filename for reading\n"));
+       }
+
+       while (fgets(fb, sizeof(fb), fp)) {
+               gchar *tmp;     
+               strretchomp(fb);
+               if (*fb == '\0')
+                       break;
+               h = fb;
+               while (*h && *h != ':') { ++h; } /* search colon */
+               if (*h == '\0')
+                       G_PRINT_EXIT(_("Malformed header\n"));
+               v = h + 1;
+               while (*v && *v == ' ') { ++v; } /* trim value start */
+               *h = '\0';
+               tmp = g_ascii_strdown(fb, -1); /* get header name */
+               if (!strcmp(tmp, "to")) {
+                       if (to != NULL)
+                               G_PRINT_EXIT(_("Duplicated 'To:' header\n"));
+                       to = g_strdup(v);
+               } else {
+                       g_string_append_c(headers, '&');
+                       g_string_append(headers, tmp);
+                       g_string_append_c(headers, '=');
+#if GLIB_CHECK_VERSION(2,16,0)
+                       g_string_append_uri_escaped(headers, v, NULL, TRUE);
+#else
+                       G_STRING_APPEND_ENCODED_URI(headers, v);
+#endif 
+               }
+               g_free(tmp);
+       }
+       if (to == NULL)
+               G_PRINT_EXIT(_("Missing required 'To:' header\n"));
+       g_string_append(body, to);
+       g_free(to);
+       g_string_append(body, "?body=");
+       while (fgets(fb, sizeof(fb), fp)) {
+#if GLIB_CHECK_VERSION(2,16,0)
+               g_string_append_uri_escaped(body, fb, NULL, TRUE);
+#else
+               G_STRING_APPEND_ENCODED_URI(body, fb);
+#endif
+       }
+       if (!isstdin)
+               fclose(fp);
+       /* append the remaining headers */
+       g_string_append(body, headers->str);
+       g_string_free(headers, TRUE);
+
+       return body;
+}
+
+#undef G_STRING_APPEND_ENCODED_URI
+#undef G_PRINT_EXIT
+
 static void parse_cmd_opt(int argc, char *argv[])
 {
+       AttachInfo *ainfo;
        gint i;
 
        for (i = 1; i < argc; i++) {
@@ -1292,8 +1932,17 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.receive_all = TRUE;
                } else if (!strncmp(argv[i], "--receive", 9)) {
                        cmd.receive = TRUE;
+               } else if (!strncmp(argv[i], "--cancel-receiving", 18)) {
+                       cmd.cancel_receiving = TRUE;
+               } else if (!strncmp(argv[i], "--compose-from-file", 19)) {
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
+
+                       GString *mailto = parse_cmd_compose_from_file(p);
+                       cmd.compose = TRUE;
+                       cmd.compose_mailto = mailto->str;
+                       i++;
                } else if (!strncmp(argv[i], "--compose", 9)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
 
                        cmd.compose = TRUE;
                        cmd.compose_mailto = NULL;
@@ -1306,19 +1955,16 @@ static void parse_cmd_opt(int argc, char *argv[])
                                i++;
                        }
                } else if (!strncmp(argv[i], "--subscribe", 11)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
                        if (p && *p != '\0' && *p != '-') {
                                cmd.subscribe = TRUE;
                                cmd.subscribe_uri = p;
                        }
                } else if (!strncmp(argv[i], "--attach", 8)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
                        gchar *file = NULL;
 
                        while (p && *p != '\0' && *p != '-') {
-                               if (!cmd.attach_files) {
-                                       cmd.attach_files = g_ptr_array_new();
-                               }
                                if ((file = g_filename_from_uri(p, NULL, NULL)) != NULL) {
                                        if (!is_file_exist(file)) {
                                                g_free(file);
@@ -1332,18 +1978,25 @@ static void parse_cmd_opt(int argc, char *argv[])
                                } else if (file == NULL) {
                                        file = g_strdup(p);
                                }
-                               g_ptr_array_add(cmd.attach_files, file);
+                               ainfo = g_new0(AttachInfo, 1);
+                               ainfo->file = file;
+                               cmd.attach_files = g_list_append(cmd.attach_files, ainfo);
                                i++;
-                               p = argv[i + 1];
+                               p = (i+1 < argc)?argv[i+1]:NULL;
                        }
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
+               } 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)) {
-                       puts("Claws Mail version " VERSION);
+                       g_print("Claws Mail version " VERSION "\n");
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
  
                        cmd.status_full = TRUE;
                        while (p && *p != '\0' && *p != '-') {
@@ -1354,10 +2007,10 @@ static void parse_cmd_opt(int argc, char *argv[])
                                g_ptr_array_add(cmd.status_full_folders,
                                                g_strdup(p));
                                i++;
-                               p = argv[i + 1];
+                               p = (i+1 < argc)?argv[i+1]:NULL;
                        }
                } else if (!strncmp(argv[i], "--status", 8)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
  
                        cmd.status = TRUE;
                        while (p && *p != '\0' && *p != '-') {
@@ -1366,28 +2019,57 @@ static void parse_cmd_opt(int argc, char *argv[])
                                g_ptr_array_add(cmd.status_folders,
                                                g_strdup(p));
                                i++;
-                               p = argv[i + 1];
+                               p = (i+1 < argc)?argv[i+1]:NULL;
                        }
+               } else if (!strncmp(argv[i], "--search", 8)) {
+                       cmd.search_folder    = (i+1 < argc)?argv[i+1]:NULL;
+                       cmd.search_type      = (i+2 < argc)?argv[i+2]:NULL;
+                       cmd.search_request   = (i+3 < argc)?argv[i+3]:NULL;
+                       const char* rec      = (i+4 < argc)?argv[i+4]:NULL;
+                       cmd.search_recursive = TRUE;
+                       if (rec && (tolower(*rec)=='n' || tolower(*rec)=='f' || *rec=='0'))
+                               cmd.search_recursive = FALSE;
+                       if (cmd.search_folder && cmd.search_type && cmd.search_request)
+                               cmd.search = TRUE;
                } else if (!strncmp(argv[i], "--online", 8)) {
                        cmd.online_mode = ONLINE_MODE_ONLINE;
                } else if (!strncmp(argv[i], "--offline", 9)) {
                        cmd.online_mode = ONLINE_MODE_OFFLINE;
+               } else if (!strncmp(argv[i], "--statistics", 12)) {
+                       cmd.statistics = TRUE;
+               } else if (!strncmp(argv[i], "--reset-statistics", 18)) {
+                       cmd.reset_statistics = TRUE;
                } 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);
 
                        g_print("%s\n", _("  --compose [address]    open composition window"));
+                       g_print("%s\n", _("  --compose-from-file file\n"
+                                         "                         open composition window with data from given file;\n"
+                                         "                         use - as file name for reading from standard input;\n"
+                                         "                         content format: headers first (To: required) until an\n"
+                                         "                         empty line, then mail body until end of file."));
                        g_print("%s\n", _("  --subscribe [uri]      subscribe to the given URI if possible"));
                        g_print("%s\n", _("  --attach file1 [file2]...\n"
-                                 "                         open composition window with specified files\n"
-                                 "                         attached"));
+                                         "                         open composition window with specified files\n"
+                                         "                         attached"));
                        g_print("%s\n", _("  --receive              receive new messages"));
                        g_print("%s\n", _("  --receive-all          receive new messages of all accounts"));
+                       g_print("%s\n", _("  --cancel-receiving     cancel receiving of messages"));
+                       g_print("%s\n", _("  --search folder type request [recursive]\n"
+                                         "                         searches mail\n"
+                                         "                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
+                                         "                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: tag\n"
+                                         "                         request: search string\n"
+                                         "                         recursive: false if arg. starts with 0, n, N, f or F"));
+
                        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", _("  --statistics           show session statistics"));
+                       g_print("%s\n", _("  --reset-statistics     reset session statistics"));
                        g_print("%s\n", _("  --select folder[/msg]  jumps to the specified folder/message\n" 
                                          "                         folder is a folder id like 'folder/sub_folder'"));
                        g_print("%s\n", _("  --online               switch to online mode"));
@@ -1396,17 +2078,22 @@ static void parse_cmd_opt(int argc, char *argv[])
                        g_print("%s\n", _("  --debug                debug mode"));
                        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);
                } else if (!strncmp(argv[i], "--crash", 7)) {
                        cmd.crash = TRUE;
-                       cmd.crash_params = g_strdup(argv[i + 1]);
+                       cmd.crash_params = g_strdup((i+1 < argc)?argv[i+1]:NULL);
                        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], "--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)) {
@@ -1415,7 +2102,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.target = argv[i+1];
                } else if (i == 1 && argc == 2) {
                        /* only one parameter. Do something intelligent about it */
-                       if (strstr(argv[i], "@") && !strstr(argv[i], "://")) {
+                       if ((strstr(argv[i], "@")||!strncmp(argv[i], "mailto:", 7)) && !strstr(argv[i], "://")) {
                                const gchar *p = argv[i];
 
                                cmd.compose = TRUE;
@@ -1427,6 +2114,11 @@ 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 (!strncmp(argv[i], "?attach=file://", strlen("?attach=file://"))) {
+                               cmd.compose = TRUE;
+                               cmd.compose_mailto = argv[i];
                        } else if (strstr(argv[i], "://")) {
                                const gchar *p = argv[i];
                                if (p && *p != '\0' && *p != '-') {
@@ -1435,6 +2127,8 @@ static void parse_cmd_opt(int argc, char *argv[])
                                }
                        } 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);
@@ -1453,7 +2147,7 @@ static void initial_processing(FolderItem *item, gpointer data)
        MainWindow *mainwin = (MainWindow *)data;
        gchar *buf;
 
-       g_return_if_fail(item);
+       cm_return_if_fail(item);
        buf = g_strdup_printf(_("Processing (%s)..."), 
                              item->path 
                              ? item->path 
@@ -1462,7 +2156,9 @@ static void initial_processing(FolderItem *item, gpointer data)
 
        
        if (item->prefs->enable_processing) {
+               item->processing_pending = TRUE;
                folder_item_apply_processing(item);
+               item->processing_pending = FALSE;
        }
 
        STATUSBAR_POP(mainwin);
@@ -1519,6 +2215,10 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
        
+       if (gtk_main_level() == 0) {
+               debug_print("not even started\n");
+               return;
+       }
        if (sc_exiting == TRUE) {
                debug_print("exit pending\n");
                return;
@@ -1573,10 +2273,15 @@ gboolean claws_is_starting(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%cclaws-mail-%d",
-                                          g_get_tmp_dir(), G_DIR_SEPARATOR,
+                                          socket_dir, G_DIR_SEPARATOR,
 #if HAVE_GETUID
                                           getuid());
 #else
@@ -1602,19 +2307,76 @@ static gchar *get_crashfile_name(void)
 static gint prohibit_duplicate_launch(void)
 {
        gint uxsock;
+       GList *curr;
+#ifdef G_OS_UNIX
        gchar *path;
 
        path = claws_get_socket_name();
+       /* Try to connect to the control socket */
        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);
-       }
+#if HAVE_FLOCK
+               gchar *socket_lock;
+               gint lock_fd;
+               gint ret;
+               /* If connect failed, no other process is running.
+                * Unlink the potentially existing socket, then
+                * open it. This has to be done locking a temporary
+                * file to avoid the race condition where another
+                * process could have created the socket just in
+                * between.
+                */
+               socket_lock = g_strconcat(path, ".lock",
+                                         NULL);
+               lock_fd = g_open(socket_lock, O_RDWR|O_CREAT, 0);
+               if (lock_fd < 0) {
+                       debug_print("Couldn't open %s: %s (%d)\n", socket_lock,
+                               strerror(errno), errno);
+                       g_free(socket_lock);
+                       return -1;
+               }
+               if (flock(lock_fd, LOCK_EX) < 0) {
+                       debug_print("Couldn't lock %s: %s (%d)\n", socket_lock,
+                               strerror(errno), errno);
+                       close(lock_fd);
+                       g_free(socket_lock);
+                       return -1;
+               }
+#endif
 
+               claws_unlink(path);
+               debug_print("Opening socket %s\n", path);
+               ret = fd_open_unix(path);
+#if HAVE_FLOCK
+               flock(lock_fd, LOCK_UN);
+               claws_unlink(socket_lock);
+               g_free(socket_lock);
+#endif
+               return ret;
+       }
+#else
+        HANDLE hmutex;
+
+        hmutex = CreateMutexA(NULL, FALSE, "ClawsMail");
+        if (!hmutex) {
+                debug_print("cannot create Mutex\n");
+                return -1;
+        }
+        if (GetLastError() != ERROR_ALREADY_EXISTS) {
+                uxsock = fd_open_inet(50216);
+                if (uxsock < 0)
+                        return 0;
+                return uxsock;
+        }
+
+        uxsock = fd_connect_inet(50216);
+        if (uxsock < 0)
+                return -1;
+#endif
        /* remote command mode */
 
        debug_print("another Claws Mail instance is already running.\n");
@@ -1623,9 +2385,10 @@ static gint prohibit_duplicate_launch(void)
                fd_write_all(uxsock, "receive_all\n", 12);
        } else if (cmd.receive) {
                fd_write_all(uxsock, "receive\n", 8);
+       } else if (cmd.cancel_receiving) {
+               fd_write_all(uxsock, "cancel_receiving\n", 17);
        } else if (cmd.compose && cmd.attach_files) {
                gchar *str, *compose_str;
-               gint i;
 
                if (cmd.compose_mailto) {
                        compose_str = g_strdup_printf("compose_attach %s\n",
@@ -1637,8 +2400,8 @@ static gint prohibit_duplicate_launch(void)
                fd_write_all(uxsock, compose_str, strlen(compose_str));
                g_free(compose_str);
 
-               for (i = 0; i < cmd.attach_files->len; i++) {
-                       str = g_ptr_array_index(cmd.attach_files, i);
+               for (curr = cmd.attach_files; curr != NULL ; curr = curr->next) {
+                       str = (gchar *) ((AttachInfo *)curr->data)->file;
                        fd_write_all(uxsock, str, strlen(str));
                        fd_write_all(uxsock, "\n", 1);
                }
@@ -1691,23 +2454,50 @@ static gint prohibit_duplicate_launch(void)
                }
        } else if (cmd.exit) {
                fd_write_all(uxsock, "exit\n", 5);
+       } else if (cmd.statistics) {
+               gchar buf[BUFSIZ];
+               fd_write(uxsock, "statistics\n", 11);
+               for (;;) {
+                       fd_gets(uxsock, buf, sizeof(buf));
+                       if (!strncmp(buf, ".\n", 2)) break;
+                       fputs(buf, stdout);
+               }
+       } else if (cmd.reset_statistics) {
+               fd_write(uxsock, "reset_statistics\n", 17);
        } else if (cmd.target) {
                gchar *str = g_strdup_printf("select %s\n", cmd.target);
                fd_write_all(uxsock, str, strlen(str));
                g_free(str);
+       } else if (cmd.search) {
+               gchar buf[BUFFSIZE];
+               gchar *str =
+                       g_strdup_printf("search %s\n%s\n%s\n%c\n",
+                                                       cmd.search_folder, cmd.search_type, cmd.search_request,
+                                                       (cmd.search_recursive==TRUE)?'1':'0');
+               fd_write_all(uxsock, str, strlen(str));
+               g_free(str);
+               for (;;) {
+                       fd_gets(uxsock, buf, sizeof(buf));
+                       if (!strncmp(buf, ".\n", 2)) break;
+                       fputs(buf, stdout);
+               }
        } else {
+#ifndef G_OS_WIN32
                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)) {
-                       printf("Claws Mail is already running on display %s.\n",
+                       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);
                }
+#else
+               fd_write_all(uxsock, "popup\n", 6);
+#endif
        }
 
        fd_close(uxsock);
@@ -1718,17 +2508,19 @@ static gint lock_socket_remove(void)
 {
 #ifdef G_OS_UNIX
        gchar *filename;
-
+#endif
        if (lock_socket < 0) {
                return -1;
        }
 
        if (lock_socket_tag > 0) {
-               gdk_input_remove(lock_socket_tag);
+               g_source_remove(lock_socket_tag);
        }
        fd_close(lock_socket);
+
+#ifdef G_OS_UNIX
        filename = claws_get_socket_name();
-       g_unlink(filename);
+       claws_unlink(filename);
 #endif
 
        return 0;
@@ -1762,7 +2554,7 @@ static GPtrArray *get_folder_item_list(gint sock)
 
 static void lock_socket_input_cb(gpointer data,
                                 gint source,
-                                GdkInputCondition condition)
+                                GIOCondition condition)
 {
        MainWindow *mainwin = (MainWindow *)data;
        gint sock;
@@ -1780,22 +2572,34 @@ static void lock_socket_input_cb(gpointer data,
                                     prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "receive", 7)) {
                inc_mail(mainwin, prefs_common.newmail_notify_manu);
+       } else if (!strncmp(buf, "cancel_receiving", 16)) {
+               inc_cancel_all();
+               imap_cancel_all();
        } else if (!strncmp(buf, "compose_attach", 14)) {
-               GPtrArray *files;
+               GList *files = NULL, *curr;
+               AttachInfo *ainfo;
                gchar *mailto;
 
                mailto = g_strdup(buf + strlen("compose_attach") + 1);
-               files = g_ptr_array_new();
                while (fd_gets(sock, buf, sizeof(buf)) > 0) {
-                       if (buf[0] == '.' && buf[1] == '\n') {
-                               break;
-                       }
                        strretchomp(buf);
-                       g_ptr_array_add(files, g_strdup(buf));
+                       if (!strcmp2(buf, "."))
+                               break;
+                               
+                       ainfo = g_new0(AttachInfo, 1);
+                       ainfo->file = g_strdup(buf);
+                       files = g_list_append(files, ainfo);
                }
                open_compose_new(mailto, files);
-               ptr_array_free_strings(files);
-               g_ptr_array_free(files, TRUE);
+               
+               curr = g_list_first(files);
+               while (curr != NULL) {
+                       ainfo = (AttachInfo *)curr->data;
+                       g_free(ainfo->file);
+                       g_free(ainfo);
+                       curr = curr->next;
+               }
+               g_list_free(files);
                g_free(mailto);
        } else if (!strncmp(buf, "compose", 7)) {
                open_compose_new(buf + strlen("compose") + 1, NULL);
@@ -1820,17 +2624,149 @@ static void lock_socket_input_cb(gpointer data,
                fd_write_all(sock, ".\n", 2);
                g_free(status);
                if (folders) g_ptr_array_free(folders, TRUE);
+       } else if (!strncmp(buf, "statistics", 10)) {
+               gchar tmp[BUFSIZ];
+
+               g_snprintf(tmp, sizeof(tmp), _("Session statistics\n"));
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               if (prefs_common.date_format) {
+                       struct tm *lt;
+                       gint len = 100;
+                       gchar date[len];
+
+                       lt = localtime(&session_stats.time_started);
+                       fast_strftime(date, len, prefs_common.date_format, lt);
+                       g_snprintf(tmp, sizeof(tmp), _("Started: %s\n"),
+                                       lt ? date : ctime(&session_stats.time_started));
+               } else
+                       g_snprintf(tmp, sizeof(tmp), _("Started: %s\n"),
+                                       ctime(&session_stats.time_started));
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               fd_write_all(sock, "\n", 1);
+
+               g_snprintf(tmp, sizeof(tmp), _("Incoming traffic\n"));
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               g_snprintf(tmp, sizeof(tmp), _("Received messages: %d\n"),
+                               session_stats.received);
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               fd_write_all(sock, "\n", 1);
+
+               g_snprintf(tmp, sizeof(tmp), _("Outgoing traffic\n"));
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               g_snprintf(tmp, sizeof(tmp), _("New/redirected messages: %d\n"),
+                               session_stats.sent);
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               g_snprintf(tmp, sizeof(tmp), _("Replied messages: %d\n"),
+                               session_stats.replied);
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               g_snprintf(tmp, sizeof(tmp), _("Forwarded messages: %d\n"),
+                               session_stats.forwarded);
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               g_snprintf(tmp, sizeof(tmp), _("Total outgoing messages: %d\n"),
+                               (session_stats.sent + session_stats.replied +
+                                session_stats.forwarded));
+               fd_write_all(sock, tmp, strlen(tmp));
+
+               fd_write_all(sock, ".\n", 2);
+       } else if (!strncmp(buf, "reset_statistics", 16)) {
+               reset_statistics();
        } else if (!strncmp(buf, "select ", 7)) {
                const gchar *target = buf+7;
                mainwindow_jump_to(target, TRUE);
+       } else if (!strncmp(buf, "search ", 7)) {
+               FolderItem* folderItem = NULL;
+               GSList *messages = NULL;
+               gchar *folder_name = NULL;
+               gchar *request = NULL;
+               AdvancedSearch *search;
+               gboolean recursive;
+               AdvancedSearchType searchType = ADVANCED_SEARCH_EXTENDED;
+               
+               search = advsearch_new();
+
+               folder_name = g_strdup(buf+7);
+               strretchomp(folder_name);
+
+               if (fd_gets(sock, buf, sizeof(buf)) <= 0) 
+                       goto search_exit;
+
+               switch (toupper(buf[0])) {
+               case 'S': searchType = ADVANCED_SEARCH_SUBJECT; break;
+               case 'F': searchType = ADVANCED_SEARCH_FROM; break;
+               case 'T': searchType = ADVANCED_SEARCH_TO; break;
+               case 'M': searchType = ADVANCED_SEARCH_MIXED; break;
+               case 'G': searchType = ADVANCED_SEARCH_TAG; break;
+               case 'E': searchType = ADVANCED_SEARCH_EXTENDED; break;
+               }
+
+               if (fd_gets(sock, buf, sizeof(buf)) <= 0) 
+                       goto search_exit;
+
+               request = g_strdup(buf);
+               strretchomp(request);
+
+               recursive = TRUE;
+               if (fd_gets(sock, buf, sizeof(buf)) > 0)
+                       recursive = buf[0] != '0';
+
+               debug_print("search: %s %i %s %i\n", folder_name, searchType, request, recursive);
+
+               if (folder_name)
+                       folderItem = folder_find_item_from_identifier(folder_name);
+
+               if (folder_name && folderItem == NULL) {
+                       debug_print("Unknown folder item : '%s', searching folder\n",folder_name);
+                       Folder* folder = folder_find_from_path(folder_name);
+                       if (folder != NULL)
+                               folderItem = FOLDER_ITEM(folder->node->data);
+                       else
+                               debug_print("Unknown folder: '%s'\n",folder_name);
+               } else {
+                       debug_print("%s %s\n",folderItem->name, folderItem->path);
+               }
+
+               if (folderItem != NULL) {
+                       advsearch_set(search, searchType, request);
+                       advsearch_search_msgs_in_folders(search, &messages, folderItem, recursive);
+               } else {
+                       g_print("Folder '%s' not found.\n'", folder_name);
+               }
+
+               GSList *cur;
+               for (cur = messages; cur != NULL; cur = cur->next) {
+                       MsgInfo* msg = (MsgInfo *)cur->data;
+                       gchar *file = procmsg_get_message_file_path(msg);
+                       fd_write_all(sock, file, strlen(file));
+                       fd_write_all(sock, "\n", 1);
+                       g_free(file);
+               }
+               fd_write_all(sock, ".\n", 2);
+
+search_exit:
+               g_free(folder_name);
+               g_free(request);
+               advsearch_free(search);
+               if (messages != NULL)
+                       procmsg_msg_list_free(messages);
        } else if (!strncmp(buf, "exit", 4)) {
+               if (prefs_common.clean_on_exit && !prefs_common.ask_on_clean) {
+                       procmsg_empty_all_trash();
+                }
                app_will_exit(NULL, mainwin);
        }
-
        fd_close(sock);
+
 }
 
-static void open_compose_new(const gchar *address, GPtrArray *attach_files)
+static void open_compose_new(const gchar *address, GList *attach_files)
 {
        gchar *addr = NULL;
 
@@ -1864,11 +2800,9 @@ static void send_queue(void)
                }
        }
        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 if (error) {
                alertpanel_error_log("Some errors occurred "
                                "while sending queued messages.");
@@ -1918,13 +2852,165 @@ static void install_basic_sighandlers()
 #endif /* !G_OS_WIN32 */
 }
 
-#ifdef MAEMO
-HildonProgram *hildon_program(void)
+#if (defined linux && defined SIGIO)
+static int mem_notify_fd = 0;
+
+static gboolean clean_caches(gpointer unused)
 {
-       return static_hildonprogram;
+       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 = g_open("/dev/mem_notify", O_RDONLY|O_NONBLOCK, 0);
+       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.\n"));
+                       }
+                       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.\n"));
+                       }
+               }
+               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 = NULL;
+       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;
+       }
+#if NM_CHECK_VERSION(0,8,992)
+       return (state == NM_STATE_CONNECTED_LOCAL ||
+               state == NM_STATE_CONNECTED_SITE ||
+               state == NM_STATE_CONNECTED_GLOBAL ||
+               state == NM_STATE_UNKNOWN);
+#else
+       return (state == NM_STATE_CONNECTED ||
+               state == NM_STATE_UNKNOWN);
+#endif
+}
+#endif