talons

commit 8e3d33f1c20b569fcefa688aa2dba52fe25e1473
parent e02ad2cdb6dd93f537b45236634fc81ed622a614
Author: Colin Leroy <colin@colino.net>
Date:   Thu, 25 Sep 2008 06:34:01 +0000

2008-09-25 [colin]	3.5.0cvs129

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

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/main.c
 | 
6
+++++-

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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()) {