2007-07-20 [colin] 2.10.0cvs49
[claws.git] / src / main.c
index 22a9298163275a6a5483f3520f33a98f095381fb..66835aa39da5ec5766c0168a0dd63ab69570574d 100644 (file)
@@ -4,7 +4,7 @@
  *
  * 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"
 #endif
 #include "stock_pixmap.h"
-
+#ifdef HAVE_VALGRIND
+#include "valgrind.h"
+#endif
 #if USE_OPENSSL
 #  include "ssl.h"
 #endif
 
 #include "timing.h"
 
+#ifdef MAEMO
+#include <hildon-widgets/hildon-program.h>
+#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;
 
@@ -121,7 +148,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,
@@ -158,9 +185,6 @@ static void lock_socket_input_cb    (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
 
-gchar *get_socket_name         (void);
-
-
 static void open_compose_new           (const gchar    *address,
                                         GPtrArray      *attach_files);
 
@@ -186,6 +210,36 @@ static void exit_claws                     (MainWindow *mainwin);
 }
 
 static MainWindow *static_mainwindow;
+
+#ifdef MAEMO
+static HildonProgram *static_hildonprogram;
+static osso_context_t *static_osso_context;
+
+void exit_event_handler(gboolean die_now, gpointer data)
+{
+       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;
+
+    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
@@ -259,7 +313,14 @@ static gboolean defer_check(void *data)
 
 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);
        return FALSE;
 }
 
@@ -271,8 +332,15 @@ static void chk_update_val(GtkWidget *widget, gpointer data)
 
 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;
        GtkWidget *keep_backup_chk;
@@ -306,7 +374,7 @@ backup_mode:
                GTK_EVENTS_FLUSH();
                
                r = copy_dir(old_cfg_dir, new_cfg_dir);
-               gtk_widget_destroy(window);
+               label_window_destroy(window);
                
                /* if copy failed, we'll remove the partially copied
                 * new directory */
@@ -324,7 +392,7 @@ backup_mode:
                GTK_EVENTS_FLUSH();
                
                r = g_rename(old_cfg_dir, new_cfg_dir);
-               gtk_widget_destroy(window);
+               label_window_destroy(window);
                
                /* if g_rename failed, we'll try to copy */
                if (r != 0) {
@@ -551,9 +619,53 @@ static void sc_session_manager_connect(MainWindow *mainwin)
 
 static gboolean sc_exiting = FALSE;
 static gboolean sc_starting = 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
 
 int main(int argc, char *argv[])
 {
+#ifdef MAEMO
+       osso_context_t *osso_context;
+       osso_return_t result;
+#endif
        gchar *userrc;
        MainWindow *mainwin;
        FolderView *folderview;
@@ -614,6 +726,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;
+       }
+       static_hildonprogram = 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());
@@ -664,13 +784,16 @@ int main(int argc, char *argv[])
                 * 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");
+                       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");
+                       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");
+                       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;
                }
                
@@ -714,11 +837,20 @@ 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");
 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
@@ -737,8 +869,10 @@ 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();
@@ -765,7 +899,29 @@ int main(int argc, char *argv[])
        news_gtk_init();
 
        mainwin = main_window_create();
+#ifdef MAEMO
+       AppData *appdata;
+       appdata = g_new0(AppData, 1);
+       appdata->program = static_hildonprogram;
+       appdata->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;
+       }
 
+       /* 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
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 
@@ -823,7 +979,10 @@ int main(int argc, char *argv[])
        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);
@@ -839,7 +998,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();
@@ -895,15 +1054,22 @@ 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);
                if (folder_get_list() != NULL) {
                        alertpanel_error(_("Claws Mail has detected a configured "
-                                  "mailbox, but is it incomplete. It is "
+                                  "mailbox, but it is incomplete. It is "
                                   "possibly due to a failing IMAP account. Use "
-                                  "\"Rebuild folder tree\" on the mailbox's folder "
-                                  "to try to fix it."));
+                                  "\"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 "
@@ -917,6 +1083,36 @@ int main(int argc, char *argv[])
        
        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
@@ -927,11 +1123,17 @@ 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) {
                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) {
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
-       } else if (cmd.receive) {
+       } else if (cmd.receive && !cmd.target) {
                g_timeout_add(1000, defer_check, NULL);
        } else {
                gtk_widget_grab_focus(folderview->ctree);
@@ -959,11 +1161,16 @@ int main(int argc, char *argv[])
 
        prefs_destroy_cache();
        
+       compose_reopen_exit_drafts();
+
        sc_starting = FALSE;
        END_TIMING();
-       
+
        gtk_main();
 
+#ifdef MAEMO
+       osso_deinitialize(osso_context);
+#endif
        exit_claws(mainwin);
 
        return 0;
@@ -975,9 +1182,10 @@ 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);
 }
 
@@ -1000,6 +1208,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 */
@@ -1008,6 +1217,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();
@@ -1020,7 +1230,8 @@ 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();
@@ -1059,6 +1270,7 @@ static void exit_claws(MainWindow *mainwin)
        prefs_other_done();
        prefs_receive_done();
        prefs_send_done();
+       tags_write_tags();
 #ifdef USE_ASPELL       
        prefs_spelling_done();
        gtkaspell_checkers_quit();
@@ -1097,17 +1309,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);
@@ -1226,19 +1444,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;
@@ -1259,14 +1464,19 @@ static void initial_processing(FolderItem *item, gpointer data)
        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)
 {
@@ -1312,27 +1522,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;
                }
@@ -1340,6 +1542,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();
@@ -1359,7 +1566,7 @@ gboolean claws_is_starting(void)
  * CLAWS: want this public so crash dialog can delete the
  * lock file too
  */
-gchar *get_socket_name(void)
+gchar *claws_get_socket_name(void)
 {
        static gchar *filename = NULL;
 
@@ -1393,8 +1600,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);
@@ -1480,8 +1691,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)) {
+                       printf("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;
@@ -1500,7 +1723,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
 
@@ -1546,6 +1769,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);
@@ -1593,7 +1818,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);
        }
@@ -1617,6 +1842,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;
 
@@ -1628,6 +1854,9 @@ static void send_queue(void)
                        if (res) {
                                folder_item_scan(folder->queue);
                        }
+                       
+                       if (res < 0)
+                               error = TRUE;
                }
        }
        if (errstr) {
@@ -1636,7 +1865,7 @@ static void send_queue(void)
                g_free(errstr);
                alertpanel_error_log(tmp);
                g_free(tmp);
-       } else {
+       } else if (error) {
                alertpanel_error_log("Some errors occurred "
                                "while sending queued messages.");
        }
@@ -1684,3 +1913,14 @@ static void install_basic_sighandlers()
        sigprocmask(SIG_UNBLOCK, &mask, 0);
 #endif /* !G_OS_WIN32 */
 }
+
+#ifdef MAEMO
+HildonProgram *hildon_program(void)
+{
+       return static_hildonprogram;
+}
+osso_context_t *get_osso_context(void)
+{
+       return static_osso_context;
+}
+#endif