2007-11-20 [colin] 3.1.0cvs11
[claws.git] / src / main.c
index ba7324a275d5595eb2d29ac831e6219cfad1622d..7e69f2f2295dbda1445857a4de3e5054fb61c55b 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -71,6 +71,7 @@
 #include "prefs_summaries.h"
 #include "prefs_themes.h"
 #include "prefs_other.h"
+#include "prefs_logging.h"
 #include "prefs_send.h"
 #include "prefs_wrapping.h"
 #include "prefs_compose_writing.h"
 #include "imap_gtk.h"
 #include "news_gtk.h"
 #include "matcher.h"
+#include "tags.h"
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
+#include "nntp-thread.h"
 #endif
 #include "stock_pixmap.h"
-
-#if USE_OPENSSL
+#ifdef HAVE_VALGRIND
+#include "valgrind.h"
+#endif
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 #  include "ssl.h"
 #endif
 
 
 #include "timing.h"
 
+#ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-program.h>
+#else
+#include <hildon-widgets/hildon-banner.h>
+#include <hildon-widgets/hildon-program.h>
+#endif
+#include <gtk/gtkmain.h>
+#include <libosso.h>
+#include <libgnomevfs/gnome-vfs-volume.h>
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+
+#define OSSO_NAME    "claws_mail"
+#define OSSO_SERVICE "com.nokia."OSSO_NAME
+#define OSSO_OBJECT  "/com/nokia/"OSSO_NAME
+#define OSSO_IFACE   "com.nokia."OSSO_NAME
+
+typedef struct _AppData AppData;
+struct _AppData {
+    HildonProgram *program;
+    HildonWindow *window;
+    osso_context_t *osso_context;
+};
+
+static GnomeVFSVolumeMonitor *volmon;
+#endif
+
 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;
@@ -121,7 +159,7 @@ static SnDisplay *sn_display = NULL;
 
 static gint lock_socket = -1;
 static gint lock_socket_tag = 0;
-
+static gchar *x_display = NULL;
 typedef enum 
 {
        ONLINE_MODE_DONT_CHANGE,
@@ -157,11 +195,6 @@ static gint lock_socket_remove             (void);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
-#ifndef CLAWS                                   
-static 
-#endif
-gchar *get_socket_name         (void);
-
 
 static void open_compose_new           (const gchar    *address,
                                         GPtrArray      *attach_files);
@@ -188,6 +221,39 @@ static void exit_claws                     (MainWindow *mainwin);
 }
 
 static MainWindow *static_mainwindow;
+
+#ifdef MAEMO
+static osso_context_t *static_osso_context;
+
+void exit_event_handler(gboolean die_now, gpointer data)
+{
+       AppData *appdata;
+       appdata = (AppData *) data;
+       /* Do whatever application needs to do before exiting */
+       exit_claws(static_mainwindow);
+       hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL,
+                                   _("Exiting..."));
+
+}
+
+/* Callback for normal D-BUS messages */
+gint dbus_req_handler(const gchar * interface, const gchar * method,
+                      GArray * arguments, gpointer data,
+                      osso_rpc_t * retval)
+{
+    AppData *appdata;
+    appdata = (AppData *) data;
+
+    if (!strcmp(method, "top_application")) {
+           osso_rpc_free_val(retval);
+           return OSSO_OK;
+    }
+    osso_system_note_infoprint(appdata->osso_context, method, retval);
+    osso_rpc_free_val(retval);
+
+    return OSSO_OK;
+}
+#endif
 static gboolean emergency_exit = FALSE;
 
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -234,7 +300,7 @@ static void startup_notification_complete(gboolean with_window)
 }
 #endif /* HAVE_STARTUP_NOTIFICATION */
 
-void claws_gtk_idle(void) 
+static void claws_gtk_idle(void) 
 {
        while(gtk_events_pending()) {
                gtk_main_iteration();
@@ -242,63 +308,146 @@ void claws_gtk_idle(void)
        g_usleep(50000);
 }
 
-gboolean defer_check_all(void *data)
+static gboolean sc_starting = FALSE;
+
+static gboolean defer_check_all(void *data)
 {
        gboolean autochk = GPOINTER_TO_INT(data);
 
        inc_all_account_mail(static_mainwindow, autochk, 
                        prefs_common.newmail_notify_manu);
 
+       if (sc_starting) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(static_mainwindow);
+               toolbar_main_set_sensitive(static_mainwindow);
+       }
        return FALSE;
 }
 
-gboolean defer_check(void *data)
+static gboolean defer_check(void *data)
 {
        inc_mail(static_mainwindow, prefs_common.newmail_notify_manu);
 
+       if (sc_starting) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(static_mainwindow);
+               toolbar_main_set_sensitive(static_mainwindow);
+       }
        return FALSE;
 }
 
 static gboolean defer_jump(void *data)
 {
-       mainwindow_jump_to(data);
+       if (cmd.receive_all) {
+               defer_check_all(GINT_TO_POINTER(FALSE));
+       } else if (prefs_common.chk_on_startup) {
+               defer_check_all(GINT_TO_POINTER(TRUE));
+       } else if (cmd.receive) {
+               defer_check(NULL);
+       } 
+       mainwindow_jump_to(data, FALSE);
+       if (sc_starting) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(static_mainwindow);
+               toolbar_main_set_sensitive(static_mainwindow);
+       }
        return FALSE;
 }
 
+static void chk_update_val(GtkWidget *widget, gpointer data)
+{
+        gboolean *val = (gboolean *)data;
+       *val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
 static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir, const gchar *oldversion)
 {
-       gchar *message = g_strdup_printf(_("Configuration for %s (or previous) found.\n"
+       gchar *message = g_strdup_printf(_("Configuration for %s found.\n"
                         "Do you want to migrate this configuration?"), oldversion);
+       gchar *message2 = g_strdup_printf(_("\n\nYour Sylpheed filtering rules can be converted by a\n"
+                            "script available at %s."), TOOLS_URI);
+
+       if (!strcmp(oldversion, "Sylpheed"))
+               message = g_strconcat(message, message2, NULL);
+       g_free(message2);
+
        gint r = 0;
        GtkWidget *window = NULL;
-       if (alertpanel(_("Migration of configuration"),
-                      message,
-                      GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE) {
+       GtkWidget *keep_backup_chk;
+       GtkTooltips *tips = gtk_tooltips_new();
+       gboolean backup = TRUE;
+
+       keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_backup_chk), TRUE);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), keep_backup_chk,
+                            _("Keeping a backup will allow you to go back to an "
+                              "older version, but may take a while if you have "
+                              "cached IMAP or News data, and will take some extra "
+                              "room on your disk."),
+                            NULL);
+
+       g_signal_connect(G_OBJECT(keep_backup_chk), "toggled", 
+                       G_CALLBACK(chk_update_val), &backup);
+
+       if (alertpanel_full(_("Migration of configuration"), message,
+                       GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL, FALSE,
+                       keep_backup_chk, ALERT_QUESTION, G_ALERTDEFAULT) != G_ALERTALTERNATE) {
                return FALSE;
        }
        
-       window = label_window_create(_("Copying configuration..."));
-       GTK_EVENTS_FLUSH();
-       r = copy_dir(old_cfg_dir, new_cfg_dir);
-       gtk_widget_destroy(window);
-       if (r != 0) {
-               alertpanel_error(_("Migration failed!"));
+       /* we can either do a fast migration requiring not any extra disk
+        * space, or a slow one that copies the old configuration and leaves
+        * it in place. */
+       if (backup) {
+backup_mode:
+               window = label_window_create(_("Copying configuration... This may take a while..."));
+               GTK_EVENTS_FLUSH();
+               
+               r = copy_dir(old_cfg_dir, new_cfg_dir);
+               label_window_destroy(window);
+               
+               /* if copy failed, we'll remove the partially copied
+                * new directory */
+               if (r != 0) {
+                       alertpanel_error(_("Migration failed!"));
+                       remove_dir_recursive(new_cfg_dir);
+               } else {
+                       if (!backup) {
+                               /* fast mode failed, but we don't want backup */
+                               remove_dir_recursive(old_cfg_dir);
+                       }
+               }
+       } else {
+               window = label_window_create(_("Migrating configuration..."));
+               GTK_EVENTS_FLUSH();
+               
+               r = g_rename(old_cfg_dir, new_cfg_dir);
+               label_window_destroy(window);
+               
+               /* if g_rename failed, we'll try to copy */
+               if (r != 0) {
+                       FILE_OP_ERROR(new_cfg_dir, "g_rename failed, trying copy\n");
+                       goto backup_mode;
+               }
        }
        return (r == 0);
 }
 
-static 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());
@@ -315,19 +464,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
@@ -501,31 +653,221 @@ static void sc_session_manager_connect(MainWindow *mainwin)
 }
 #endif
 
+static gboolean sc_exiting = FALSE;
+static gboolean show_at_startup = TRUE;
+static gboolean claws_crashed_bool = FALSE;
+
+gboolean claws_crashed(void) {
+       return claws_crashed_bool;
+}
+
+void main_set_show_at_startup(gboolean show)
+{
+       show_at_startup = show;
+}
+
+#ifdef MAEMO
+static void main_vol_mount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin)
+{
+       gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
+       gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+       g_free (uri);
+       if (mount_path) {
+               if(!strcmp(mount_path, prefs_common.data_root)) {
+                       gtk_widget_set_sensitive(mainwin->window, TRUE);
+                       inc_unlock();
+               }
+       }
+       g_free(mount_path);
+}
+static void main_vol_unmount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin)
+{
+       gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
+       gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+       g_free (uri);
+       if (mount_path) {
+               if(!strcmp(mount_path, prefs_common.data_root)) {
+                       gtk_widget_set_sensitive(mainwin->window, FALSE);
+                       inc_lock();
+               }
+       }
+       g_free(mount_path);
+}
+#endif
+
+#ifdef G_OS_WIN32
+static FILE* win32_debug_fp=NULL;
+static guint win32_log_handler_app_id;
+static guint win32_log_handler_glib_id;
+static guint win32_log_handler_gtk_id;
+
+static void win32_print_stdout(const gchar *string)
+{
+       if (win32_debug_fp) {
+               fprintf(win32_debug_fp, string);
+               fflush(win32_debug_fp);
+       }
+}
+
+static void win32_print_stderr(const gchar *string)
+{
+       if (win32_debug_fp) {
+               fprintf(win32_debug_fp, string);
+               fflush(win32_debug_fp);
+       }
+}
+
+static void win32_log(const gchar *log_domain, GLogLevelFlags log_level, const gchar* message, gpointer user_data)
+{
+       if (win32_debug_fp) {
+               const gchar* type;
+
+               switch(log_level & G_LOG_LEVEL_MASK)
+               {
+                       case G_LOG_LEVEL_ERROR:
+                               type="error";
+                               break;
+                       case G_LOG_LEVEL_CRITICAL:
+                               type="critical";
+                               break;
+                       case G_LOG_LEVEL_WARNING:
+                               type="warning";
+                               break;
+                       case G_LOG_LEVEL_MESSAGE:
+                               type="message";
+                               break;
+                       case G_LOG_LEVEL_INFO:
+                               type="info";
+                               break;
+                       case G_LOG_LEVEL_DEBUG:
+                               type="debug";
+                               break;
+                       default:
+                               type="N/A";
+               }
+               if (log_domain)
+                       fprintf(win32_debug_fp, "%s: %s: %s", log_domain, type, message);
+               else
+                       fprintf(win32_debug_fp, "%s: %s", type, message);
+               fflush(win32_debug_fp);
+       }
+}
+
+static void win32_open_log(void)
+{
+       if (is_file_exist("claws-win32.log")) {
+               if (rename_force("claws-win32.log", "claws-win32.log.bak") < 0)
+                       FILE_OP_ERROR("claws-win32.log", "rename");
+       }
+       win32_debug_fp = fopen("claws-win32.log", "w");
+       if (win32_debug_fp)
+       {
+               g_set_print_handler(win32_print_stdout);
+               g_set_printerr_handler(win32_print_stdout);
+               win32_log_handler_app_id = g_log_set_handler(NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+                     | G_LOG_FLAG_RECURSION, win32_log, NULL);
+               win32_log_handler_glib_id = g_log_set_handler("GLib", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+                     | G_LOG_FLAG_RECURSION, win32_log, NULL);
+               win32_log_handler_gtk_id = g_log_set_handler("Gtk", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
+                     | G_LOG_FLAG_RECURSION, win32_log, NULL);
+       }
+}
+
+static void win32_close_log(void)
+{
+       if (win32_debug_fp)
+       {
+               g_log_remove_handler("", win32_log_handler_app_id);
+               g_log_remove_handler("GLib", win32_log_handler_glib_id);
+               g_log_remove_handler("Gtk", win32_log_handler_gtk_id);
+               fclose(win32_debug_fp);
+               win32_debug_fp=NULL;
+       }
+}              
+#endif
+
 int main(int argc, char *argv[])
 {
+#ifdef MAEMO
+       osso_context_t *osso_context;
+       osso_return_t result;
+#endif
        gchar *userrc;
        MainWindow *mainwin;
        FolderView *folderview;
        GdkPixbuf *icon;
        gboolean crash_file_present = FALSE;
        gint num_folder_class = 0;
+       gboolean asked_for_migration = FALSE;
+       gboolean start_done = TRUE;
+
        START_TIMING("startup");
        
+       sc_starting = TRUE;
+
+#ifdef G_OS_WIN32
+       win32_open_log();
+#endif
        if (!claws_init(&argc, &argv)) {
+#ifdef G_OS_WIN32
+               win32_close_log();
+#endif
                return 0;
        }
 
-       prefs_prepare_cache();
+       debug_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+                  gtk_major_version, gtk_minor_version, gtk_micro_version,
+                  glib_major_version, glib_minor_version, glib_micro_version);
+       debug_print("Compiled-in features:\n");
+#if HAVE_LIBCOMPFACE
+       debug_print(" compface\n");
+#endif
+#if USE_ASPELL
+       debug_print(" aspell\n");
+#endif
+#if USE_GNUTLS
+       debug_print(" gnutls\n");
+#endif
+#if INET6
+       debug_print(" ipv6\n");
+#endif
+#if HAVE_ICONV
+       debug_print(" iconv\n");
+#endif
+#if USE_JPILOT
+       debug_print(" jpilot\n");
+#endif
+#if USE_LDAP
+       debug_print(" ldap\n");
+#endif
+#if HAVE_LIBETPAN
+       debug_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
+#endif
+#if USE_GNOMEPRINT
+       debug_print(" gnomeprint\n");
+#endif
+#if HAVE_LIBSM
+       debug_print(" libsm\n");
+#endif
+#if USE_OPENSSL
+       debug_print(" openssl\n");
+#endif
+
        prog_version = PROG_VERSION;
        argv0 = g_strdup(argv[0]);
 
        parse_cmd_opt(argc, argv);
 
+       prefs_prepare_cache();
+
 #ifdef CRASH_DIALOG
        if (cmd.crash) {
                gtk_set_locale();
                gtk_init(&argc, &argv);
                crash_main(cmd.crash_params);
+#ifdef G_OS_WIN32
+               win32_close_log();
+#endif
                return 0;
        }
        crash_install_handlers();
@@ -559,6 +901,14 @@ int main(int argc, char *argv[])
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
+#ifdef MAEMO
+       osso_context = osso_initialize(OSSO_SERVICE, "2.8.1", TRUE, NULL);
+       if (osso_context == NULL) {
+               return OSSO_ERROR;
+       }
+       hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
+       static_osso_context = osso_context;
+#endif 
        gdk_rgb_init();
        gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
        gtk_widget_set_default_visual(gdk_rgb_get_visual());
@@ -575,6 +925,9 @@ int main(int argc, char *argv[])
                                   "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
@@ -584,6 +937,9 @@ int main(int argc, char *argv[])
                                   "currently available. This will cause "
                                   "crashes. You need to recompile "
                                   "Claws Mail."));
+#ifdef G_OS_WIN32
+               win32_close_log();
+#endif
                exit(1);
        }
 #endif 
@@ -597,19 +953,47 @@ int main(int argc, char *argv[])
        gtk_rc_parse(userrc);
        g_free(userrc);
 
+#ifdef G_OS_WIN32
+       CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
+#else
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
+#endif
+       
+       /* no config dir exists. See if we can migrate an old config. */
        if (!is_dir_exist(RC_DIR)) {
                prefs_destroy_cache();
                gboolean r = FALSE;
-               if (is_dir_exist(OLD_GTK2_RC_DIR))
-                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0"));
-               else if (is_dir_exist(OLDER_GTK2_RC_DIR))
-                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15"));
-               else if (is_dir_exist(OLD_GTK1_RC_DIR))
-                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5"));
-               if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0)
+               
+               /* if one of the old dirs exist, we'll ask if the user 
+                * want to migrates, and r will be TRUE if he said yes
+                * and migration succeeded, and FALSE otherwise.
+                */
+               if (is_dir_exist(OLD_GTK2_RC_DIR)) {
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0 (or older)"));
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(OLDER_GTK2_RC_DIR)) {
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15 (or older)"));
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(OLD_GTK1_RC_DIR)) {
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5 (or older)"));
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(SYLPHEED_RC_DIR)) {
+                       r = migrate_old_config(SYLPHEED_RC_DIR, RC_DIR, "Sylpheed");
+                       asked_for_migration = TRUE;
+               }
+               
+               /* If migration failed or the user didn't want to do it,
+                * we create a new one (and we'll hit wizard later). 
+                */
+               if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
                        exit(1);
        }
+       }
+       
+
        if (!is_file_exist(RC_DIR G_DIR_SEPARATOR_S COMMON_RC) &&
            is_file_exist(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC)) {
                /* post 2.6 name change */
@@ -628,11 +1012,11 @@ int main(int argc, char *argv[])
        gtk_accel_map_load (userrc);
        g_free(userrc);
 
-       gtk_settings_set_long_property(gtk_settings_get_default(), 
-                                      "gtk-can-change-accels",
-                                      (glong)TRUE, "XProperty");
-
+#ifdef G_OS_WIN32
+       CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_rc_dir(), 1, win32_close_log(););
+#else
        CHDIR_RETURN_VAL_IF_FAIL(get_rc_dir(), 1);
+#endif
 
        MAKE_DIR_IF_NOT_EXIST(get_mail_base_dir());
        MAKE_DIR_IF_NOT_EXIST(get_imap_cache_dir());
@@ -646,13 +1030,26 @@ int main(int argc, char *argv[])
        remove_all_files(get_tmp_dir());
        remove_all_files(get_mime_tmp_dir());
 
+       if (!cmd.crash && crash_file_present)
+               claws_crashed_bool = TRUE;
+
        if (is_file_exist("claws.log")) {
                if (rename_force("claws.log", "claws.log.bak") < 0)
                        FILE_OP_ERROR("claws.log", "rename");
        }
-       set_log_file("claws.log");
+       set_log_file(LOG_PROTOCOL, "claws.log");
+
+       if (is_file_exist("filtering.log")) {
+               if (rename_force("filtering.log", "filtering.log.bak") < 0)
+                       FILE_OP_ERROR("filtering.log", "rename");
+       }
+       set_log_file(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();
@@ -669,22 +1066,20 @@ int main(int argc, char *argv[])
        prefs_summaries_init();
        prefs_message_init();
        prefs_other_init();
+       prefs_logging_init();
        prefs_receive_init();
        prefs_send_init();
+       tags_read_tags();
 #ifdef USE_ASPELL
        gtkaspell_checkers_init();
        prefs_spelling_init();
 #endif
-       
+
        sock_set_io_timeout(prefs_common.io_timeout_secs);
-#ifdef HAVE_LIBETPAN
-       imap_main_set_timeout(prefs_common.io_timeout_secs);
-#endif
        prefs_actions_read_config();
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
        addressbook_read_file();
-       renderer_read_config();
 
        gtkut_widget_init();
        stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
@@ -696,8 +1091,32 @@ int main(int argc, char *argv[])
        imap_gtk_init();
        news_gtk_init();
 
-       mainwin = main_window_create
-               (prefs_common.sep_folder | prefs_common.sep_msg << 1);
+       mainwin = main_window_create();
+#ifdef MAEMO
+       AppData *appdata;
+       appdata = g_new0(AppData, 1);
+       appdata->program = hildon_program;
+       appdata->window = HILDON_WINDOW(mainwin->window);
+       appdata->osso_context = osso_context;
+       result = osso_rpc_set_cb_f(appdata->osso_context, 
+                OSSO_SERVICE, 
+                OSSO_OBJECT, 
+                OSSO_IFACE,
+                dbus_req_handler, appdata);
+       if (result != OSSO_OK) {
+               return OSSO_ERROR;
+       }
+
+#ifndef CHINOOK
+       /* Add handler for Exit D-BUS messages */
+       result = osso_application_set_exit_cb(appdata->osso_context,
+                                               exit_event_handler,
+                                               (gpointer) appdata);
+       if (result != OSSO_OK) {
+               return OSSO_ERROR;
+       }
+#endif
+#endif
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 
@@ -715,31 +1134,63 @@ int main(int argc, char *argv[])
        prefs_account_init();
        account_read_config_all();
 
+       /* If we can't read a folder list or don't have accounts,
+        * it means the configuration's not done. Either this is
+        * a brand new install, either a failed/refused migration.
+        * So we'll start the wizard.
+        */
        if (folder_read_list() < 0) {
                prefs_destroy_cache();
-               if (!run_wizard(mainwin, TRUE))
+               
+               /* if run_wizard returns FALSE it's because it's
+                * been cancelled. We can't do much but exit.
+                * however, if the user was asked for a migration,
+                * we remove the newly created directory so that
+                * he's asked again for migration on next launch.*/
+               if (!run_wizard(mainwin, TRUE)) {
+                       if (asked_for_migration)
+                               remove_dir_recursive(RC_DIR);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
                        exit(1);
+               }
                main_window_reflect_prefs_all_now();
                folder_write_list();
        }
 
        if (!account_get_list()) {
                prefs_destroy_cache();
-               if (!run_wizard(mainwin, FALSE))
+               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())
+               }
+               if(!account_get_list()) {
                        exit_claws(mainwin);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
+                       exit(1);
+               }
        }
 
        
        toolbar_main_set_sensitive(mainwin);
        main_window_set_menu_sensitive(mainwin);
 
-       main_window_popup(mainwin);
+       /* if crashed, show window early so that the user
+        * sees what's happening */
+       if (claws_crashed())
+               main_window_popup(mainwin);
 
 #ifdef HAVE_LIBETPAN
        imap_main_init(prefs_common.skip_ssl_cert_check);
+       imap_main_set_timeout(prefs_common.io_timeout_secs);
+       nntp_main_init(prefs_common.skip_ssl_cert_check);
 #endif 
        account_set_missing_folder();
        folder_set_missing_folders();
@@ -752,7 +1203,7 @@ int main(int argc, char *argv[])
        folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
 
        /* if claws crashed, rebuild caches */
-       if (!cmd.crash && crash_file_present) {
+       if (claws_crashed()) {
                GTK_EVENTS_FLUSH();
                debug_print("Claws Mail crashed, checking for new messages in local folders\n");
                folder_item_update_thaw();
@@ -807,20 +1258,69 @@ int main(int argc, char *argv[])
        }
 
        plugin_load_standard_plugins ();
-       
+      
+       /* if not crashed, show window now */
+       if (!claws_crashed()) {
+               /* apart if something told not to show */
+               if (show_at_startup)
+                       main_window_popup(mainwin);
+       }
+       
        if (!folder_have_mailbox()) {
                prefs_destroy_cache();
                main_window_cursor_normal(mainwin);
-               alertpanel_error(_("Claws Mail has detected a configured "
+               if (folder_get_list() != NULL) {
+                       alertpanel_error(_("Claws Mail has detected a configured "
+                                  "mailbox, but it is incomplete. It is "
+                                  "possibly due to a failing IMAP account. Use "
+                                  "\"Rebuild folder tree\" on the mailbox parent "
+                                  "folder's context menu to try to fix it."));
+               } else {
+                       alertpanel_error(_("Claws Mail has detected a configured "
                                   "mailbox, but could not load it. It is "
                                   "probably provided by an out-of-date "
                                   "external plugin. Please reinstall the "
                                   "plugin and try again."));
-               exit(1);
+                       exit_claws(mainwin);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
+                       exit(1);
+               }
        }
        
        static_mainwindow = mainwin;
 
+#ifdef MAEMO
+       if (prefs_common.data_root != NULL && *prefs_common.data_root != '\0') {
+               GnomeVFSVolume *vol = NULL;
+               gchar *uri, *mount_path;
+
+               volmon = gnome_vfs_get_volume_monitor();
+               vol = gnome_vfs_volume_monitor_get_volume_for_path(volmon, prefs_common.data_root);
+
+               uri = gnome_vfs_volume_get_activation_uri (vol);
+               mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
+               g_free(uri);
+
+               if (vol == NULL || !gnome_vfs_volume_is_mounted(vol) 
+                   || strcmp(mount_path, prefs_common.data_root)) {
+                       alertpanel_error(_("Claws Mail can not start without its data volume (%s)."), 
+                               prefs_common.data_root);
+                       g_free(mount_path);
+                       gnome_vfs_volume_unref(vol);
+                       exit_claws(mainwin);
+                       exit(1);
+               }
+               g_free(mount_path);
+               gnome_vfs_volume_unref(vol);
+               g_signal_connect(G_OBJECT(volmon), 
+                               "volume-mounted", G_CALLBACK(main_vol_mount_cb), mainwin);
+               g_signal_connect(G_OBJECT(volmon), 
+                               "volume-unmounted", G_CALLBACK(main_vol_unmount_cb), mainwin);
+       }
+#endif
+
 #ifdef HAVE_STARTUP_NOTIFICATION
        startup_notification_complete(FALSE);
 #endif
@@ -831,11 +1331,20 @@ int main(int argc, char *argv[])
        gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
        main_window_cursor_normal(mainwin);
 
-       if (cmd.receive_all) {
+       if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
+           folder_find_item_from_identifier(prefs_common.last_opened_folder) != NULL &&
+           !claws_crashed()) {
+               cmd.target = prefs_common.last_opened_folder;
+       }
+
+       if (cmd.receive_all && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
-       } else if (prefs_common.chk_on_startup) {
+       } else if (prefs_common.chk_on_startup && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
-       } else if (cmd.receive) {
+       } else if (cmd.receive && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check, NULL);
        } else {
                gtk_widget_grab_focus(folderview->ctree);
@@ -858,13 +1367,29 @@ int main(int argc, char *argv[])
        }
        
        if (cmd.target) {
+               start_done = FALSE;
                g_timeout_add(500, defer_jump, (gpointer)cmd.target);
        }
 
        prefs_destroy_cache();
+       
+       compose_reopen_exit_drafts();
+
+       if (start_done) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(mainwin);
+               toolbar_main_set_sensitive(mainwin);
+       }
        END_TIMING();
+
        gtk_main();
 
+#ifdef MAEMO
+       osso_deinitialize(osso_context);
+#endif
+#ifdef G_OS_WIN32
+       win32_close_log();
+#endif
        exit_claws(mainwin);
 
        return 0;
@@ -876,14 +1401,13 @@ static void save_all_caches(FolderItem *item, gpointer data)
                return;
        }
 
-       if (item->opened)
+       if (item->opened) {
                folder_item_close(item);
-       
+       }
+
        folder_item_free_cache(item, TRUE);
 }
 
-static gboolean sc_exiting = FALSE;
-
 static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
@@ -903,6 +1427,7 @@ static void exit_claws(MainWindow *mainwin)
 
                item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
                summary_save_prefs_to_folderitem(mainwin->folderview->summaryview, item);
+               prefs_common.last_opened_folder = folder_item_get_identifier(item);
        }
 
        /* save all state before exiting */
@@ -911,6 +1436,7 @@ static void exit_claws(MainWindow *mainwin)
 
        main_window_get_size(mainwin);
        main_window_get_position(mainwin);
+
        prefs_common_write_config();
        account_write_config_all();
        addressbook_export_to_file();
@@ -923,10 +1449,12 @@ static void exit_claws(MainWindow *mainwin)
        remove_all_files(get_tmp_dir());
        remove_all_files(get_mime_tmp_dir());
 
-       close_log_file();
+       close_log_file(LOG_PROTOCOL);
+       close_log_file(LOG_DEBUG_FILTERING);
 
 #ifdef HAVE_LIBETPAN
        imap_main_done();
+       nntp_main_done();
 #endif
        /* delete crashfile */
        if (!cmd.crash)
@@ -961,7 +1489,9 @@ 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       
        prefs_spelling_done();
        gtkaspell_checkers_quit();
@@ -1000,17 +1530,23 @@ static void parse_cmd_opt(int argc, char *argv[])
                        }
                } else if (!strncmp(argv[i], "--attach", 8)) {
                        const gchar *p = argv[i + 1];
-                       gchar *file;
+                       gchar *file = NULL;
 
                        while (p && *p != '\0' && *p != '-') {
                                if (!cmd.attach_files) {
                                        cmd.attach_files = g_ptr_array_new();
                                }
-                               if (*p != G_DIR_SEPARATOR) {
+                               if ((file = g_filename_from_uri(p, NULL, NULL)) != NULL) {
+                                       if (!is_file_exist(file)) {
+                                               g_free(file);
+                                               file = NULL;
+                                       }
+                               }
+                               if (file == NULL && *p != G_DIR_SEPARATOR) {
                                        file = g_strconcat(claws_get_startup_dir(),
                                                           G_DIR_SEPARATOR_S,
                                                           p, NULL);
-                               } else {
+                               } else if (file == NULL) {
                                        file = g_strdup(p);
                                }
                                g_ptr_array_add(cmd.attach_files, file);
@@ -1019,8 +1555,9 @@ static void parse_cmd_opt(int argc, char *argv[])
                        }
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
-               } else if (!strncmp(argv[i], "--version", 9)) {
-                       puts("Claws Mail version " VERSION);
+               } else if (!strncmp(argv[i], "--version", 9) ||
+                          !strncmp(argv[i], "-v", 2)) {
+                       g_print("Claws Mail version " VERSION "\n");
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
                        const gchar *p = argv[i + 1];
@@ -1052,7 +1589,8 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.online_mode = ONLINE_MODE_ONLINE;
                } else if (!strncmp(argv[i], "--offline", 9)) {
                        cmd.online_mode = ONLINE_MODE_OFFLINE;
-               } else if (!strncmp(argv[i], "--help", 6)) {
+               } else if (!strncmp(argv[i], "--help", 6) ||
+                          !strncmp(argv[i], "-h", 2)) {
                        gchar *base = g_path_get_basename(argv[0]);
                        g_print(_("Usage: %s [OPTION]...\n"), base);
 
@@ -1066,16 +1604,18 @@ static void parse_cmd_opt(int argc, char *argv[])
                        g_print("%s\n", _("  --send                 send all queued messages"));
                        g_print("%s\n", _("  --status [folder]...   show the total number of messages"));
                        g_print("%s\n", _("  --status-full [folder]...\n"
-                              "                         show the status of each folder"));
+                                         "                         show the status of each folder"));
                        g_print("%s\n", _("  --select folder[/msg]  jumps to the specified folder/message\n" 
-                                         "                         folder is a folder id like '#mh/Mailbox/inbox'"));
+                                         "                         folder is a folder id like 'folder/sub_folder'"));
                        g_print("%s\n", _("  --online               switch to online mode"));
                        g_print("%s\n", _("  --offline              switch to offline mode"));
-                       g_print("%s\n", _("  --exit                 exit Claws Mail"));
+                       g_print("%s\n", _("  --exit --quit -q       exit Claws Mail"));
                        g_print("%s\n", _("  --debug                debug mode"));
-                       g_print("%s\n", _("  --help                 display this help and exit"));
-                       g_print("%s\n", _("  --version              output version information and exit"));
+                       g_print("%s\n", _("  --help -h              display this help and exit"));
+                       g_print("%s\n", _("  --version -v           output version information and exit"));
                        g_print("%s\n", _("  --config-dir           output configuration directory"));
+                       g_print("%s\n", _("  --alternate-config-dir [dir]\n"
+                                         "                         use specified configuration directory"));
 
                        g_free(base);
                        exit(1);
@@ -1084,9 +1624,13 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.crash_params = g_strdup(argv[i + 1]);
                        i++;
                } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
-                       puts(RC_DIR);
+                       g_print(RC_DIR "\n");
                        exit(0);
-               } else if (!strncmp(argv[i], "--exit", 6)) {
+               } else if (!strncmp(argv[i], "--alternate-config-dir", sizeof "--alternate-config-dir" - 1) && i+1 < argc) {
+                       set_rc_dir(argv[i+1]);
+               } else if (!strncmp(argv[i], "--exit", 6) ||
+                          !strncmp(argv[i], "--quit", 6) ||
+                          !strncmp(argv[i], "-q", 2)) {
                        cmd.exit = TRUE;
                } else if (!strncmp(argv[i], "--select", 8) && i+1 < argc) {
                        cmd.target = argv[i+1];
@@ -1110,9 +1654,13 @@ static void parse_cmd_opt(int argc, char *argv[])
                                        cmd.subscribe = TRUE;
                                        cmd.subscribe_uri = p;
                                }
+                       } else if (!strcmp(argv[i], "--sync")) {
+                               /* gtk debug */
+                       } else {
+                               g_print(_("Unknown option\n"));
+                               exit(1);
                        }
                }
-               
        }
 
        if (cmd.attach_files && cmd.compose == FALSE) {
@@ -1121,19 +1669,6 @@ static void parse_cmd_opt(int argc, char *argv[])
        }
 }
 
-static gint get_queued_message_num(void)
-{
-       FolderItem *queue;
-
-       queue = folder_get_default_queue();
-       if (!queue) {
-               return -1;
-       }
-
-       folder_item_scan(queue);
-       return queue->total_msgs;
-}
-
 static void initial_processing(FolderItem *item, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
@@ -1148,20 +1683,27 @@ 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);
 }
 
-static void draft_all_messages(void)
+static gboolean draft_all_messages(void)
 {
        GList *compose_list = NULL;
        
-       while ((compose_list = compose_get_compose_list()) != NULL) {
+       compose_clear_exit_drafts();
+       compose_list = compose_get_compose_list();
+       while (compose_list != NULL) {
                Compose *c = (Compose*)compose_list->data;
-               compose_draft(c);
-       }       
+               if (!compose_draft(c, COMPOSE_DRAFT_FOR_EXIT))
+                       return FALSE;
+               compose_list = compose_get_compose_list();
+       }
+       return TRUE;
 }
 gboolean clean_quit(gpointer data)
 {
@@ -1207,27 +1749,19 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        sc_exiting = TRUE;
        debug_print("exiting\n");
        if (compose_get_compose_list()) {
-               gint val = alertpanel(_("Really quit?"),
-                              _("Composing message exists."),
-                              _("_Save to Draft"), _("_Discard them"), _("Do_n't quit"));
-               switch (val) {
-                       case G_ALERTOTHER:
-                               sc_exiting = FALSE;
-                               return;
-                       case G_ALERTALTERNATE:
-                               break;
-                       default:
-                               draft_all_messages();
+               if (!draft_all_messages()) {
+                       main_window_popup(mainwin);
+                       sc_exiting = FALSE;
+                       return;
                }
-
-               manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
-       if (prefs_common.warn_queued_on_exit && get_queued_message_num() > 0) {
+       if (prefs_common.warn_queued_on_exit && procmsg_have_queued_mails_fast()) {
                if (alertpanel(_("Queued messages"),
                               _("Some unsent messages are queued. Exit now?"),
                               GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
                    != G_ALERTALTERNATE) {
+                       main_window_popup(mainwin);
                        sc_exiting = FALSE;
                        return;
                }
@@ -1235,6 +1769,11 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        }
 
        sock_cleanup();
+#ifdef HAVE_VALGRIND
+       if (RUNNING_ON_VALGRIND) {
+               summary_clear_list(mainwin->summaryview);
+       }
+#endif
        if (folderview_get_selected_item(mainwin->folderview))
                folder_item_close(folderview_get_selected_item(mainwin->folderview));
        gtk_main_quit();
@@ -1245,20 +1784,27 @@ gboolean claws_is_exiting(void)
        return sc_exiting;
 }
 
+gboolean claws_is_starting(void)
+{
+       return sc_starting;
+}
+
 /*
  * CLAWS: want this public so crash dialog can delete the
  * lock file too
  */
-#ifndef CLAWS
-static
-#endif
-gchar *get_socket_name(void)
+gchar *claws_get_socket_name(void)
 {
        static gchar *filename = NULL;
-
+       const gchar *socket_dir = NULL;
+       
+       if (rc_dir_is_alt())
+               socket_dir = get_rc_dir();
+       else
+               socket_dir = g_get_tmp_dir();
        if (filename == NULL) {
                filename = g_strdup_printf("%s%cclaws-mail-%d",
-                                          g_get_tmp_dir(), G_DIR_SEPARATOR,
+                                          socket_dir, G_DIR_SEPARATOR,
 #if HAVE_GETUID
                                           getuid());
 #else
@@ -1286,8 +1832,12 @@ static gint prohibit_duplicate_launch(void)
        gint uxsock;
        gchar *path;
 
-       path = get_socket_name();
+       path = claws_get_socket_name();
        uxsock = fd_connect_unix(path);
+       
+       if (x_display == NULL)
+               x_display = g_strdup(g_getenv("DISPLAY"));
+
        if (uxsock < 0) {
                g_unlink(path);
                return fd_open_unix(path);
@@ -1373,8 +1923,20 @@ static gint prohibit_duplicate_launch(void)
                gchar *str = g_strdup_printf("select %s\n", cmd.target);
                fd_write_all(uxsock, str, strlen(str));
                g_free(str);
-       } else
-               fd_write_all(uxsock, "popup\n", 6);
+       } else {
+               gchar buf[BUFSIZ];
+               fd_write_all(uxsock, "get_display\n", 12);
+               memset(buf, 0, sizeof(buf));
+               fd_gets(uxsock, buf, sizeof(buf));
+               if (strcmp2(buf, x_display)) {
+                       g_print("Claws Mail is already running on display %s.\n",
+                               buf);
+               } else {
+                       fd_close(uxsock);
+                       uxsock = fd_connect_unix(path);
+                       fd_write_all(uxsock, "popup\n", 6);
+               }
+       }
 
        fd_close(uxsock);
        return -1;
@@ -1393,7 +1955,7 @@ static gint lock_socket_remove(void)
                gdk_input_remove(lock_socket_tag);
        }
        fd_close(lock_socket);
-       filename = get_socket_name();
+       filename = claws_get_socket_name();
        g_unlink(filename);
 #endif
 
@@ -1439,6 +2001,8 @@ static void lock_socket_input_cb(gpointer data,
 
        if (!strncmp(buf, "popup", 5)) {
                main_window_popup(mainwin);
+       } else if (!strncmp(buf, "get_display", 11)) {
+               fd_write_all(sock, x_display, strlen(x_display));
        } else if (!strncmp(buf, "receive_all", 11)) {
                inc_all_account_mail(mainwin, FALSE,
                                     prefs_common.newmail_notify_manu);
@@ -1486,7 +2050,7 @@ static void lock_socket_input_cb(gpointer data,
                if (folders) g_ptr_array_free(folders, TRUE);
        } else if (!strncmp(buf, "select ", 7)) {
                const gchar *target = buf+7;
-               mainwindow_jump_to(target);
+               mainwindow_jump_to(target, TRUE);
        } else if (!strncmp(buf, "exit", 4)) {
                app_will_exit(NULL, mainwin);
        }
@@ -1510,6 +2074,7 @@ static void send_queue(void)
 {
        GList *list;
        gchar *errstr = NULL;
+       gboolean error = FALSE;
        for (list = folder_get_list(); list != NULL; list = list->next) {
                Folder *folder = list->data;
 
@@ -1521,15 +2086,16 @@ static void send_queue(void)
                        if (res) {
                                folder_item_scan(folder->queue);
                        }
+                       
+                       if (res < 0)
+                               error = TRUE;
                }
        }
        if (errstr) {
-               gchar *tmp = g_strdup_printf(_("Some errors occurred "
+               alertpanel_error_log(_("Some errors occurred "
                                "while sending queued messages:\n%s"), errstr);
                g_free(errstr);
-               alertpanel_error_log(tmp);
-               g_free(tmp);
-       } else {
+       } else if (error) {
                alertpanel_error_log("Some errors occurred "
                                "while sending queued messages.");
        }
@@ -1577,3 +2143,10 @@ static void install_basic_sighandlers()
        sigprocmask(SIG_UNBLOCK, &mask, 0);
 #endif /* !G_OS_WIN32 */
 }
+
+#ifdef MAEMO
+osso_context_t *get_osso_context(void)
+{
+       return static_osso_context;
+}
+#endif