2009-01-09 [colin] 3.7.0cvs24
[claws.git] / src / main.c
index cfccbf49526b4540e2e488f8192d1ac209bfc9e2..af10176612683659a9fde468427bd1165ced5324 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #ifdef HAVE_LIBSM
 #include <X11/SM/SMlib.h>
 #endif
-#ifdef USE_GNUTLS
-#include <pthread.h>
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif
 
 #include "wizard.h"
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -121,7 +116,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #ifdef HAVE_VALGRIND
 #include "valgrind.h"
 #endif
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 #  include "ssl.h"
 #endif
 
@@ -798,11 +793,16 @@ static void win32_log(const gchar *log_domain, GLogLevelFlags log_level, const g
 
 static void win32_open_log(void)
 {
-       if (is_file_exist("claws-win32.log")) {
-               if (rename_force("claws-win32.log", "claws-win32.log.bak") < 0)
-                       FILE_OP_ERROR("claws-win32.log", "rename");
+       gchar *logfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "claws-win32.log", NULL);
+       gchar *oldlogfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "claws-win32.log.bak", NULL);
+
+       if (is_file_exist(logfile)) {
+               if (rename_force(logfile, oldlogfile) < 0)
+                       FILE_OP_ERROR(logfile, "rename");
        }
-       win32_debug_fp = fopen("claws-win32.log", "w");
+       win32_debug_fp = g_fopen(logfile, "w");
+       g_free(logfile);
+       g_free(oldlogfile);
        if (win32_debug_fp)
        {
                g_set_print_handler(win32_print_stdout);
@@ -922,12 +922,6 @@ static void main_dump_features_list(gboolean show_debug_only)
        else
                g_print(" NetworkManager\n");
 #endif
-#if USE_OPENSSL
-       if (show_debug_only)
-               debug_print(" openssl\n");
-       else
-               g_print(" openssl\n");
-#endif
 }
 
 #ifdef HAVE_DBUS_GLIB
@@ -974,7 +968,7 @@ static void dbus_update(FolderItem *removed_item)
                        "claws-mail", G_TYPE_INVALID, G_TYPE_INVALID);
        }
        if (error) {
-               debug_print("%s", error->message);
+               debug_print("%s\n", error->message);
                g_error_free(error);
        }
 }
@@ -1053,7 +1047,7 @@ int main(int argc, char *argv[])
        gboolean start_done = TRUE;
        GtkUIManager *gui_manager = NULL;
        GSList *plug_list = NULL;
-
+       gboolean never_ran = FALSE;
        START_TIMING("startup");
 
        sc_starting = TRUE;
@@ -1096,7 +1090,6 @@ int main(int argc, char *argv[])
        sock_init();
 
        /* check and create unix domain socket for remote operation */
-#ifdef G_OS_UNIX
        lock_socket = prohibit_duplicate_launch();
        if (lock_socket < 0) {
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -1114,13 +1107,19 @@ int main(int argc, char *argv[])
        
        if (cmd.exit)
                return 0;
-#endif
        if (!g_thread_supported())
                g_thread_init(NULL);
 
        gtk_set_locale();
        gtk_init(&argc, &argv);
 
+#ifdef G_OS_WIN32
+       gtk_settings_set_string_property(gtk_settings_get_default(),
+                       "gtk-theme-name",
+                       "MS-Windows",
+                       "XProperty");
+#endif
+
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
        went_offline_nm = FALSE;
        nm_proxy = NULL;
@@ -1375,12 +1374,10 @@ int main(int argc, char *argv[])
        folder_item_update_freeze();
 
        /* register the callback of unix domain socket input */
-#ifdef G_OS_UNIX
        lock_socket_tag = claws_input_add(lock_socket,
                                        GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
                                        lock_socket_input_cb,
-                                       mainwin);
-#endif
+                                       mainwin, TRUE);
 
 
        prefs_account_init();
@@ -1409,6 +1406,7 @@ int main(int argc, char *argv[])
                }
                main_window_reflect_prefs_all_now();
                folder_write_list();
+               never_ran = TRUE;
        }
 
        if (!account_get_list()) {
@@ -1428,6 +1426,7 @@ int main(int argc, char *argv[])
 #endif
                        exit(1);
                }
+               never_ran = TRUE;
        }
 
        
@@ -1439,10 +1438,6 @@ int main(int argc, char *argv[])
        if (claws_crashed())
                main_window_popup(mainwin);
 
-#ifdef USE_GNUTLS
-       gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif
-
 #ifdef HAVE_LIBETPAN
        imap_main_init(prefs_common.skip_ssl_cert_check);
        imap_main_set_timeout(prefs_common.io_timeout_secs);
@@ -1533,8 +1528,10 @@ int main(int argc, char *argv[])
                g_slist_free(plug_list);
        }
 
-       plugin_load_standard_plugins ();
-      
+       if (never_ran) {
+               prefs_common_write_config();
+               plugin_load_standard_plugins ();
+       }
        /* if not crashed, show window now */
        if (!claws_crashed()) {
                /* apart if something told not to show */
@@ -1797,7 +1794,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                } else if (!strncmp(argv[i], "--receive", 9)) {
                        cmd.receive = TRUE;
                } else if (!strncmp(argv[i], "--compose", 9)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
 
                        cmd.compose = TRUE;
                        cmd.compose_mailto = NULL;
@@ -1810,13 +1807,13 @@ static void parse_cmd_opt(int argc, char *argv[])
                                i++;
                        }
                } else if (!strncmp(argv[i], "--subscribe", 11)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
                        if (p && *p != '\0' && *p != '-') {
                                cmd.subscribe = TRUE;
                                cmd.subscribe_uri = p;
                        }
                } else if (!strncmp(argv[i], "--attach", 8)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
                        gchar *file = NULL;
 
                        while (p && *p != '\0' && *p != '-') {
@@ -1838,7 +1835,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                                }
                                g_ptr_array_add(cmd.attach_files, file);
                                i++;
-                               p = argv[i + 1];
+                               p = (i+1 < argc)?argv[i+1]:NULL;
                        }
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
@@ -1852,7 +1849,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        g_print("Claws Mail version " VERSION "\n");
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
  
                        cmd.status_full = TRUE;
                        while (p && *p != '\0' && *p != '-') {
@@ -1863,10 +1860,10 @@ static void parse_cmd_opt(int argc, char *argv[])
                                g_ptr_array_add(cmd.status_full_folders,
                                                g_strdup(p));
                                i++;
-                               p = argv[i + 1];
+                               p = (i+1 < argc)?argv[i+1]:NULL;
                        }
                } else if (!strncmp(argv[i], "--status", 8)) {
-                       const gchar *p = argv[i + 1];
+                       const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
  
                        cmd.status = TRUE;
                        while (p && *p != '\0' && *p != '-') {
@@ -1875,7 +1872,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                                g_ptr_array_add(cmd.status_folders,
                                                g_strdup(p));
                                i++;
-                               p = argv[i + 1];
+                               p = (i+1 < argc)?argv[i+1]:NULL;
                        }
                } else if (!strncmp(argv[i], "--online", 8)) {
                        cmd.online_mode = ONLINE_MODE_ONLINE;
@@ -1914,7 +1911,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        exit(1);
                } else if (!strncmp(argv[i], "--crash", 7)) {
                        cmd.crash = TRUE;
-                       cmd.crash_params = g_strdup(argv[i + 1]);
+                       cmd.crash_params = g_strdup((i+1 < argc)?argv[i+1]:NULL);
                        i++;
                } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
                        g_print(RC_DIR "\n");
@@ -2134,6 +2131,7 @@ static gchar *get_crashfile_name(void)
 static gint prohibit_duplicate_launch(void)
 {
        gint uxsock;
+#ifdef G_OS_UNIX
        gchar *path;
 
        path = claws_get_socket_name();
@@ -2146,7 +2144,25 @@ static gint prohibit_duplicate_launch(void)
                claws_unlink(path);
                return fd_open_unix(path);
        }
-
+#else
+        HANDLE hmutex;
+
+        hmutex = CreateMutexA(NULL, FALSE, "ClawsMail");
+        if (!hmutex) {
+                debug_print("cannot create Mutex\n");
+                return -1;
+        }
+        if (GetLastError() != ERROR_ALREADY_EXISTS) {
+                uxsock = fd_open_inet(50216);
+                if (uxsock < 0)
+                        return 0;
+                return uxsock;
+        }
+
+        uxsock = fd_connect_inet(50216);
+        if (uxsock < 0)
+                return -1;
+#endif
        /* remote command mode */
 
        debug_print("another Claws Mail instance is already running.\n");
@@ -2228,6 +2244,7 @@ static gint prohibit_duplicate_launch(void)
                fd_write_all(uxsock, str, strlen(str));
                g_free(str);
        } else {
+#ifndef G_OS_WIN32
                gchar buf[BUFSIZ];
                fd_write_all(uxsock, "get_display\n", 12);
                memset(buf, 0, sizeof(buf));
@@ -2240,6 +2257,9 @@ static gint prohibit_duplicate_launch(void)
                        uxsock = fd_connect_unix(path);
                        fd_write_all(uxsock, "popup\n", 6);
                }
+#else
+               fd_write_all(uxsock, "popup\n", 6);
+#endif
        }
 
        fd_close(uxsock);
@@ -2250,7 +2270,7 @@ static gint lock_socket_remove(void)
 {
 #ifdef G_OS_UNIX
        gchar *filename;
-
+#endif
        if (lock_socket < 0) {
                return -1;
        }
@@ -2259,6 +2279,8 @@ static gint lock_socket_remove(void)
                g_source_remove(lock_socket_tag);
        }
        fd_close(lock_socket);
+
+#ifdef G_OS_UNIX
        filename = claws_get_socket_name();
        claws_unlink(filename);
 #endif
@@ -2319,10 +2341,9 @@ static void lock_socket_input_cb(gpointer data,
                mailto = g_strdup(buf + strlen("compose_attach") + 1);
                files = g_ptr_array_new();
                while (fd_gets(sock, buf, sizeof(buf)) > 0) {
-                       if (buf[0] == '.' && buf[1] == '\n') {
-                               break;
-                       }
                        strretchomp(buf);
+                       if (!strcmp2(buf, "."))
+                               break;
                        g_ptr_array_add(files, g_strdup(buf));
                }
                open_compose_new(mailto, files);