2012-11-15 [wwp] 3.9.0cvs3
[claws.git] / src / main.c
index 56efad3803dc64a99d9b114bbf18d348713967d0..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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 #ifdef HAVE_LIBSM
 #include <X11/SM/SMlib.h>
 #endif
-#ifdef USE_GNUTLS
-#include <pthread.h>
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
+
+#if HAVE_FLOCK
+#include <sys/file.h>
 #endif
 
 #include "wizard.h"
@@ -62,6 +62,9 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
 #include <NetworkManager.h>
 #endif
+#ifdef HAVE_VALGRIND
+#include <valgrind.h>
+#endif
 
 #include "claws.h"
 #include "main.h"
@@ -95,9 +98,14 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #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"
@@ -112,16 +120,15 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #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 (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 #  include "ssl.h"
 #endif
 
@@ -164,6 +171,10 @@ static GnomeVFSVolumeMonitor *volmon;
 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
@@ -193,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;
@@ -210,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);
@@ -217,10 +240,10 @@ 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);
@@ -326,7 +349,7 @@ static void startup_notification_complete(gboolean with_window)
                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);
@@ -419,7 +442,6 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
        gint r = 0;
        GtkWidget *window = NULL;
        GtkWidget *keep_backup_chk;
-       CLAWS_TIP_DECL();
        gboolean backup = TRUE;
 
        keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
@@ -582,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;
@@ -798,11 +820,16 @@ static void win32_log(const gchar *log_domain, GLogLevelFlags log_level, const g
 
 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");
+       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("claws-win32.log", "w");
+       win32_debug_fp = g_fopen(logfile, "w");
+       g_free(logfile);
+       g_free(oldlogfile);
        if (win32_debug_fp)
        {
                g_set_print_handler(win32_print_stdout);
@@ -904,12 +931,6 @@ static void main_dump_features_list(gboolean show_debug_only)
        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");
@@ -922,12 +943,6 @@ static void main_dump_features_list(gboolean show_debug_only)
        else
                g_print(" NetworkManager\n");
 #endif
-#if USE_OPENSSL
-       if (show_debug_only)
-               debug_print(" openssl\n");
-       else
-               g_print(" openssl\n");
-#endif
 }
 
 #ifdef HAVE_DBUS_GLIB
@@ -974,7 +989,7 @@ static void dbus_update(FolderItem *removed_item)
                        "claws-mail", G_TYPE_INVALID, G_TYPE_INVALID);
        }
        if (error) {
-               debug_print("%s", error->message);
+               debug_print("%s\n", error->message);
                g_error_free(error);
        }
 }
@@ -1030,6 +1045,16 @@ static void install_dbus_status_handler(void)
 }
 #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
@@ -1051,8 +1076,9 @@ int main(int argc, char *argv[])
        gint num_folder_class = 0;
        gboolean asked_for_migration = FALSE;
        gboolean start_done = TRUE;
-       GtkUIManager *gui_manager = NULL;
        GSList *plug_list = NULL;
+       gboolean never_ran = FALSE;
+       gboolean mainwin_shown = FALSE;
 
        START_TIMING("startup");
 
@@ -1068,13 +1094,24 @@ int main(int argc, char *argv[])
                return 0;
        }
 
-       main_dump_features_list(TRUE);
-
        prog_version = PROG_VERSION;
        argv0 = g_strdup(argv[0]);
 
        parse_cmd_opt(argc, argv);
 
+       sock_init();
+
+       /* check and create unix domain socket for remote operation */
+       lock_socket = prohibit_duplicate_launch();
+       if (lock_socket < 0) {
+#ifdef HAVE_STARTUP_NOTIFICATION
+               if(gtk_init_check(&argc, &argv))
+                       startup_notification_complete(TRUE);
+#endif
+               return 0;
+       }
+
+       main_dump_features_list(TRUE);
        prefs_prepare_cache();
 
 #ifdef CRASH_DIALOG
@@ -1093,20 +1130,9 @@ int main(int argc, char *argv[])
 #if (defined linux && defined SIGIO)
        install_memory_sighandler();
 #endif
-       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
-               if(gtk_init_check(&argc, &argv))
-                       startup_notification_complete(TRUE);
-#endif
-               return 0;
-       }
-
-       if (cmd.status || cmd.status_full) {
+       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;
@@ -1114,13 +1140,21 @@ 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;
@@ -1140,10 +1174,17 @@ int main(int argc, char *argv[])
                        "/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();
@@ -1159,9 +1200,11 @@ int main(int argc, char *argv[])
        hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
        static_osso_context = osso_context;
 #endif 
-       gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
+       gtk_widget_set_default_colormap(
+               gdk_screen_get_system_colormap(
+                       gdk_screen_get_default()));
 
-       gui_manager = gtkut_create_ui_manager();
+       gtkut_create_ui_manager();
 
        /* Create container for all the menus we will be adding */
        MENUITEM_ADDUI("/", "Menus", NULL, GTK_UI_MANAGER_MENUBAR);
@@ -1170,33 +1213,6 @@ int main(int argc, char *argv[])
                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."));
-#ifdef G_OS_WIN32
-               win32_close_log();
-#endif
-               exit(1);
-       }
-#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."));
-#ifdef G_OS_WIN32
-               win32_close_log();
-#endif
-               exit(1);
-       }
-#endif 
-
 #ifdef G_OS_WIN32
        CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
 #else
@@ -1229,12 +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) {
+               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();
+                                       win32_close_log();
 #endif
-                       exit(1);
-       }
+                                       exit(1);
+                               }
+#ifdef G_OS_UNIX
+                       }
+#endif
+               }
        }
        
 
@@ -1314,6 +1338,7 @@ int main(int argc, char *argv[])
        prefs_receive_init();
        prefs_send_init();
        tags_read_tags();
+       matcher_init();
 #ifdef USE_ENCHANT
        gtkaspell_checkers_init();
        prefs_spelling_init();
@@ -1323,8 +1348,18 @@ int main(int argc, char *argv[])
        prefs_actions_read_config();
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
+#ifndef USE_NEW_ADDRBOOK
        addressbook_read_file();
-
+#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);
@@ -1374,18 +1409,14 @@ int main(int argc, char *argv[])
        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 = claws_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.
@@ -1409,6 +1440,7 @@ int main(int argc, char *argv[])
                }
                main_window_reflect_prefs_all_now();
                folder_write_list();
+               never_ran = TRUE;
        }
 
        if (!account_get_list()) {
@@ -1428,6 +1460,7 @@ int main(int argc, char *argv[])
 #endif
                        exit(1);
                }
+               never_ran = TRUE;
        }
 
        
@@ -1436,23 +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 USE_GNUTLS
-       gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif
-
-#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();
        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);
@@ -1519,6 +1546,8 @@ int main(int argc, char *argv[])
                        num_plugins++;
                }
                main_window_cursor_normal(mainwin);
+               main_window_popup(mainwin);
+               mainwin_shown = TRUE;
                alertpanel_warning(ngettext(
                                     "The following plugin failed to load. "
                                     "Check the Plugins configuration "
@@ -1533,10 +1562,12 @@ int main(int argc, char *argv[])
                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);
@@ -1630,8 +1661,8 @@ int main(int argc, char *argv[])
                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) {
@@ -1656,6 +1687,13 @@ int main(int argc, char *argv[])
                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();
@@ -1697,6 +1735,7 @@ static void save_all_caches(FolderItem *item, gpointer data)
 static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
+       gboolean have_connectivity;
 
        sc_exiting = TRUE;
 
@@ -1726,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);
@@ -1739,9 +1779,14 @@ 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();
-       nntp_main_done();
+       imap_main_done(have_connectivity);
+       nntp_main_done(have_connectivity);
 #endif
        /* delete crashfile */
        if (!cmd.crash)
@@ -1759,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();
@@ -1787,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++) {
@@ -1796,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;
@@ -1810,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);
@@ -1836,9 +1978,11 @@ 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;
@@ -1852,7 +1996,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        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 != '-') {
@@ -1863,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 != '-') {
@@ -1875,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"));
+                       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"));
@@ -1914,7 +2087,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        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)) {
                        g_print(RC_DIR "\n");
@@ -1974,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 
@@ -2134,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) {
+#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);
-               return fd_open_unix(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");
@@ -2155,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",
@@ -2169,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);
                }
@@ -2223,11 +2454,35 @@ 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));
@@ -2240,6 +2495,9 @@ static gint prohibit_duplicate_launch(void)
                        uxsock = fd_connect_unix(path);
                        fd_write_all(uxsock, "popup\n", 6);
                }
+#else
+               fd_write_all(uxsock, "popup\n", 6);
+#endif
        }
 
        fd_close(uxsock);
@@ -2250,7 +2508,7 @@ static gint lock_socket_remove(void)
 {
 #ifdef G_OS_UNIX
        gchar *filename;
-
+#endif
        if (lock_socket < 0) {
                return -1;
        }
@@ -2259,6 +2517,8 @@ static gint lock_socket_remove(void)
                g_source_remove(lock_socket_tag);
        }
        fd_close(lock_socket);
+
+#ifdef G_OS_UNIX
        filename = claws_get_socket_name();
        claws_unlink(filename);
 #endif
@@ -2294,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;
@@ -2312,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);
@@ -2352,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;
 
@@ -2472,7 +2876,7 @@ static void install_memory_sighandler()
        struct sigaction act;
        int flags;
 
-       mem_notify_fd = open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
+       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));
@@ -2599,7 +3003,14 @@ gboolean networkmanager_is_online(GError **error)
                g_propagate_error(error, tmp_error);
                return TRUE;
        }
-
-       return (state == NM_STATE_CONNECTED || state == NM_STATE_UNKNOWN);
+#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