talons

commit 64387f9cc1ac81a1c78b9396cbf532ee916c4da0
parent 223f02a692871d819c31e716448a5566fc2ea086
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sun,  3 Jul 2011 17:52:12 +0000

2011-07-03 [paul]	3.7.9cvs30

	* src/main.c
		do main_window_popup(mainwin); on plugin load error, or
		else the warning dialogue and mainwindow stays minimised
		and hidden

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

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-03 [paul]	3.7.9cvs30
+
+	* src/main.c
+		do main_window_popup(mainwin); on plugin load error, or
+		else the warning dialogue and mainwindow stays minimised
+		and hidden
+
 2011-07-03 [paul]	3.7.9cvs29
 
 	* src/wizard.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4181,3 +4181,4 @@
 ( cvs diff -u -r 1.274.2.324 -r 1.274.2.325 src/mainwindow.c;  ) > 3.7.9cvs27.patchset
 ( cvs diff -u -r 1.274.2.325 -r 1.274.2.326 src/mainwindow.c;  cvs diff -u -r 1.39.2.60 -r 1.39.2.61 src/mainwindow.h;  cvs diff -u -r 1.395.2.428 -r 1.395.2.429 src/summaryview.c;  ) > 3.7.9cvs28.patchset
 ( cvs diff -u -r 1.1.2.83 -r 1.1.2.84 src/wizard.c;  ) > 3.7.9cvs29.patchset
+( cvs diff -u -r 1.115.2.238 -r 1.115.2.239 src/main.c;  ) > 3.7.9cvs30.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -1536,6 +1536,7 @@ int main(int argc, char *argv[])
 			num_plugins++;
 		}
 		main_window_cursor_normal(mainwin);
+		main_window_popup(mainwin);
 		alertpanel_warning(ngettext(
 				     "The following plugin failed to load. "
 				     "Check the Plugins configuration "