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

diff --git a/ChangeLog b/ChangeLog
index 22b92d3e8f470bd0b614652b138ff8c450740e53..a4fb11525a136be3edb2daf5decd129483d5fd15 100644 (file)
--- 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
index 1a2962c0b98e210df383e8af652ec40f2663ad2e..0d9ff63d1493cb263d52bc787a16fa89bacadff6 100644 (file)
--- 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
index 9d62c2496779d36bfdbaddf70a42698ec130ecda..37c4f6a22c14fe3cb4c3d0ac531ef040ef41f725 100644 (file)
--- 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
index 697f91c5cab27d0f844f2ac34d03c7d26a354f37..13d40a401923023140a9cf971d4c79a35eb5d592 100644 (file)
--- 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 "