2007-10-13 [paul] 3.0.2cvs66

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 58dd6c25941ff5a11131d4e0c5785aad2d417e12..cc69d142445def5fe7fae3db6562fd599a5ad102 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -116,6 +116,7 @@
 #include "timing.h"
 
 #ifdef MAEMO
+#include <hildon-widgets/hildon-banner.h>
 #include <hildon-widgets/hildon-program.h>
 #include <gtk/gtkmain.h>
 #include <libosso.h>
@@ -212,7 +213,6 @@ 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)
@@ -298,6 +298,8 @@ static void claws_gtk_idle(void)
        g_usleep(50000);
 }
 
+static gboolean sc_starting = FALSE;
+
 static gboolean defer_check_all(void *data)
 {
        gboolean autochk = GPOINTER_TO_INT(data);
@@ -305,6 +307,11 @@ static gboolean defer_check_all(void *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;
 }
 
@@ -312,6 +319,11 @@ 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;
 }
 
@@ -325,6 +337,11 @@ static gboolean defer_jump(void *data)
                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;
 }
 
@@ -407,18 +424,20 @@ 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());
@@ -435,19 +454,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
@@ -622,7 +644,6 @@ static void sc_session_manager_connect(MainWindow *mainwin)
 #endif
 
 static gboolean sc_exiting = FALSE;
-static gboolean sc_starting = FALSE;
 static gboolean show_at_startup = TRUE;
 static gboolean claws_crashed_bool = FALSE;
 
@@ -768,6 +789,7 @@ int main(int argc, char *argv[])
        gboolean crash_file_present = FALSE;
        gint num_folder_class = 0;
        gboolean asked_for_migration = FALSE;
+       gboolean start_done = TRUE;
 
        START_TIMING("startup");
        
@@ -783,12 +805,13 @@ int main(int argc, char *argv[])
                return 0;
        }
 
-       prefs_prepare_cache();
        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();
@@ -835,7 +858,7 @@ int main(int argc, char *argv[])
        if (osso_context == NULL) {
                return OSSO_ERROR;
        }
-       static_hildonprogram = HILDON_PROGRAM(hildon_program_get_instance());
+       hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
        static_osso_context = osso_context;
 #endif 
        gdk_rgb_init();
@@ -1025,8 +1048,8 @@ int main(int argc, char *argv[])
 #ifdef MAEMO
        AppData *appdata;
        appdata = g_new0(AppData, 1);
-       appdata->program = static_hildonprogram;
-       appdata->window = mainwin->window;
+       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, 
@@ -1265,10 +1288,13 @@ int main(int argc, char *argv[])
        }
 
        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 && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
        } else if (cmd.receive && !cmd.target) {
+               start_done = FALSE;
                g_timeout_add(1000, defer_check, NULL);
        } else {
                gtk_widget_grab_focus(folderview->ctree);
@@ -1291,6 +1317,7 @@ int main(int argc, char *argv[])
        }
        
        if (cmd.target) {
+               start_done = FALSE;
                g_timeout_add(500, defer_jump, (gpointer)cmd.target);
        }
 
@@ -1298,7 +1325,11 @@ int main(int argc, char *argv[])
        
        compose_reopen_exit_drafts();
 
-       sc_starting = FALSE;
+       if (start_done) {
+               sc_starting = FALSE;
+               main_window_set_menu_sensitive(mainwin);
+               toolbar_main_set_sensitive(mainwin);
+       }
        END_TIMING();
 
        gtk_main();
@@ -1474,7 +1505,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.send = TRUE;
                } else if (!strncmp(argv[i], "--version", 9) ||
                           !strncmp(argv[i], "-v", 2)) {
-                       g_print("Claws Mail version " VERSION);
+                       g_print("Claws Mail version " VERSION "\n");
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
                        const gchar *p = argv[i + 1];
@@ -1521,7 +1552,7 @@ 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 'folder/sub_folder'"));
                        g_print("%s\n", _("  --online               switch to online mode"));
@@ -1531,6 +1562,8 @@ static void parse_cmd_opt(int argc, char *argv[])
                        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);
@@ -1539,8 +1572,10 @@ 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)) {
-                       g_print(RC_DIR);
+                       g_print(RC_DIR "\n");
                        exit(0);
+               } 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)) {
@@ -1707,10 +1742,15 @@ gboolean claws_is_starting(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
@@ -2051,10 +2091,6 @@ static void install_basic_sighandlers()
 }
 
 #ifdef MAEMO
-HildonProgram *hildon_program(void)
-{
-       return static_hildonprogram;
-}
 osso_context_t *get_osso_context(void)
 {
        return static_osso_context;