2008-09-25 [colin] 3.5.0cvs129

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index cfccbf49526b4540e2e488f8192d1ac209bfc9e2..f3ad3dfa59d84fd480ee8567c570f12ebc7b7a0f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -802,7 +802,7 @@ static void win32_open_log(void)
                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");
+       win32_debug_fp = g_fopen("claws-win32.log", "w");
        if (win32_debug_fp)
        {
                g_set_print_handler(win32_print_stdout);
@@ -1053,6 +1053,7 @@ int main(int argc, char *argv[])
        gboolean start_done = TRUE;
        GtkUIManager *gui_manager = NULL;
        GSList *plug_list = NULL;
+       gboolean never_ran = TRUE;
 
        START_TIMING("startup");
 
@@ -1121,6 +1122,13 @@ int main(int argc, char *argv[])
        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;
@@ -1409,6 +1417,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 +1437,7 @@ int main(int argc, char *argv[])
 #endif
                        exit(1);
                }
+               never_ran = TRUE;
        }
 
        
@@ -1533,7 +1543,8 @@ int main(int argc, char *argv[])
                g_slist_free(plug_list);
        }
 
-       plugin_load_standard_plugins ();
+       if (never_ran)
+               plugin_load_standard_plugins ();
       
        /* if not crashed, show window now */
        if (!claws_crashed()) {