2008-09-25 [colin] 3.5.0cvs129

	* src/main.c
		Load standard plugins only on first run

diff --git a/ChangeLog b/ChangeLog
index 03850a15ef8823914effdb4edbe55e8e8fe3a1ac..6c6668f9ff0d3e2111da4165f614abeac0e9d121 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-25 [colin]     3.5.0cvs129
+
+       * src/main.c
+               Load standard plugins only on first run
+
 2008-09-25 [colin]     3.5.0cvs128
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index 384a3e1ac8299efddbd96694bd1237bd841e5dac..aafdb0a17ef8eb402e1b6669ebe823b963d62060 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3540,3 +3540,4 @@
 ( cvs diff -u -r 1.36.2.149 -r 1.36.2.150 src/common/utils.c;  ) > 3.5.0cvs126.patchset
 ( cvs diff -u -r 1.65.2.60 -r 1.65.2.61 src/codeconv.c;  ) > 3.5.0cvs127.patchset
 ( cvs diff -u -r 1.65.2.61 -r 1.65.2.62 src/codeconv.c;  ) > 3.5.0cvs128.patchset
+( cvs diff -u -r 1.115.2.207 -r 1.115.2.208 src/main.c;  ) > 3.5.0cvs129.patchset

diff --git a/configure.ac b/configure.ac
index 3e553a726161d94b3fb48bbebd7301a123cc0ff1..1650cb5f411e2fcd626a7c26fe20e8f36620d998 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=128
+EXTRA_VERSION=129
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index e38a69eab85b15e200f1bb253fad0b03414e47ae..f3ad3dfa59d84fd480ee8567c570f12ebc7b7a0f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -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");
 
@@ -1416,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()) {
@@ -1435,6 +1437,7 @@ int main(int argc, char *argv[])
 #endif
                        exit(1);
                }
+               never_ran = TRUE;
        }
 
        
@@ -1540,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()) {