2012-11-15 [wwp] 3.9.0cvs3
[claws.git] / src / main.c
index 3c12d92b3b9bfbc9e38d560be2262fae722b25cd..6e9b246c25035068a542ec723621e5dc2dcab089 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 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"
 #include <X11/SM/SMlib.h>
 #endif
 
+#if HAVE_FLOCK
+#include <sys/file.h>
+#endif
+
 #include "wizard.h"
 #ifdef HAVE_STARTUP_NOTIFICATION
 # define SN_API_NOT_YET_FROZEN
 #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 "hooks.h"
 #include "menu.h"
 #include "quicksearch.h"
+#include "advsearch.h"
 
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
@@ -193,9 +204,10 @@ 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;
@@ -203,6 +215,8 @@ static struct RemoteCmd {
        gboolean search_recursive;
        gboolean status;
        gboolean status_full;
+       gboolean statistics;
+       gboolean reset_statistics;
        GPtrArray *status_folders;
        GPtrArray *status_full_folders;
        gboolean send;
@@ -215,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);
@@ -222,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);
@@ -424,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"));
@@ -587,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;
@@ -1028,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
@@ -1049,9 +1076,10 @@ 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");
 
        sc_starting = TRUE;
@@ -1066,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
@@ -1091,19 +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 */
-       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 || cmd.search) {
+       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,6 +1143,8 @@ int main(int argc, char *argv[])
        if (!g_thread_supported())
                g_thread_init(NULL);
 
+       reset_statistics();
+       
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
@@ -1173,7 +1204,7 @@ int main(int argc, char *argv[])
                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);
@@ -1182,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
@@ -1334,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();
@@ -1343,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);
@@ -1394,13 +1409,6 @@ 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 */
-       lock_socket_tag = claws_input_add(lock_socket,
-                                       GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
-                                       lock_socket_input_cb,
-                                       mainwin, TRUE);
-
-
        prefs_account_init();
        account_read_config_all();
 
@@ -1461,8 +1469,10 @@ 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;
+       }
 
        account_set_missing_folder();
        folder_set_missing_folders();
@@ -1537,6 +1547,7 @@ int main(int argc, char *argv[])
                }
                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 "
@@ -1556,7 +1567,7 @@ int main(int argc, char *argv[])
                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);
@@ -1650,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) {
@@ -1676,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();
@@ -1747,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);
@@ -1785,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();
@@ -1903,6 +1924,7 @@ static GString * parse_cmd_compose_from_file(const gchar *fn)
 
 static void parse_cmd_opt(int argc, char *argv[])
 {
+       AttachInfo *ainfo;
        gint i;
 
        for (i = 1; i < argc; i++) {
@@ -1910,6 +1932,8 @@ 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;
 
@@ -1941,9 +1965,6 @@ static void parse_cmd_opt(int argc, char *argv[])
                        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);
@@ -1957,7 +1978,9 @@ 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 = (i+1 < argc)?argv[i+1]:NULL;
                        }
@@ -2012,6 +2035,10 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.online_mode = ONLINE_MODE_ONLINE;
                } else if (!strncmp(argv[i], "--offline", 9)) {
                        cmd.online_mode = ONLINE_MODE_OFFLINE;
+               } else if (!strncmp(argv[i], "--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]);
@@ -2025,21 +2052,24 @@ static void parse_cmd_opt(int argc, char *argv[])
                                          "                         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", _("  --search folder type request [recursive]"));
-                       g_print("%s\n", _("                         searches mail"));
-                       g_print("%s\n", _("                         folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\""));
-                       g_print("%s\n", _("                         type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: tag"));
-                       g_print("%s\n", _("                         request: search string"));
-                       g_print("%s\n", _("                         recursive: false if arg. starts with 0, n, N, f or F"));
+                       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"));
@@ -2277,18 +2307,56 @@ 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;
@@ -2317,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",
@@ -2331,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);
                }
@@ -2385,6 +2454,16 @@ 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));
@@ -2475,13 +2554,11 @@ 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;
        gchar buf[BUFFSIZE];
-       /* re-use the same quicksearch (& avoid matcher_list mem.leaks) */
-       static QuickSearch *quicksearch = NULL;
 
        sock = fd_accept(source);
        fd_gets(sock, buf, sizeof(buf));
@@ -2495,21 +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) {
                        strretchomp(buf);
                        if (!strcmp2(buf, "."))
                                break;
-                       g_ptr_array_add(files, g_strdup(buf));
+                               
+                       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);
@@ -2534,45 +2624,106 @@ 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, *request;
-               QuickSearchType searchType = QUICK_SEARCH_EXTENDED;
+               gchar *folder_name = NULL;
+               gchar *request = NULL;
+               AdvancedSearch *search;
                gboolean recursive;
-
-               if (quicksearch==NULL)
-                       quicksearch = quicksearch_new_nogui();
+               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) {
-                       g_free(folder_name);
-                       folder_name=NULL;
-               }
-               searchType = quicksearch_type(buf);
-               if (fd_gets(sock, buf, sizeof(buf)) <= 0) {
-                       g_free(folder_name);
-                       folder_name=NULL;
+               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)
-                       if (buf[0]=='0')
-                               recursive = FALSE;
+                       recursive = buf[0] != '0';
 
-               debug_print("search: %s %i %s %i\n",folder_name,searchType,request,recursive);
+               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("Unknow folder item : '%s', searching folder\n",folder_name);
+                       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);
@@ -2580,17 +2731,17 @@ static void lock_socket_input_cb(gpointer data,
                                debug_print("Unknown folder: '%s'\n",folder_name);
                } else {
                        debug_print("%s %s\n",folderItem->name, folderItem->path);
-        }
+               }
+
                if (folderItem != NULL) {
-                       quicksearch_set(quicksearch, searchType, request);
-                       quicksearch_set_recursive(quicksearch, recursive);
-                       search_msgs_in_folders(&messages, quicksearch, folderItem);
+                       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) {
+               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));
@@ -2599,10 +2750,12 @@ static void lock_socket_input_cb(gpointer data,
                }
                fd_write_all(sock, ".\n", 2);
 
-               if (messages != NULL)
-                       procmsg_msg_list_free(messages);
+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();
@@ -2613,7 +2766,7 @@ static void lock_socket_input_cb(gpointer data,
 
 }
 
-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;