2012-05-16 [paul] 3.8.0cvs42

	* src/gtk/description_window.c
		fix bug 2624, 'dialog "Action Configuration" cannot be closed'

diff --git a/ChangeLog b/ChangeLog
index 20901bc7feb8dad5479b6d7e6a27e7a12e76f0fc..f6ba20db1a3abda5c3057de6a180f7e027cb24df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-16 [paul]      3.8.0cvs42
+
+       * src/gtk/description_window.c
+               fix bug 2624, 'dialog "Action Configuration" cannot be closed'
+
 2012-05-16 [paul]      3.8.0cvs41
 
        * src/common/ssl_certificate.c

diff --git a/PATCHSETS b/PATCHSETS
index e7031c403deb6fcb971c39030dc179c17ca8aa3d..42bddd34687ecbd6b64c2877b1c2c14b81e1bdc1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4358,3 +4358,4 @@
 ( cvs diff -u -r 1.155.2.100 -r 1.155.2.101 src/Makefile.am;  ) > 3.8.0cvs39.patchset
 ( cvs diff -u -r 1.83.2.188 -r 1.83.2.189 src/mimeview.c;  cvs diff -u -r 1.36.2.195 -r 1.36.2.196 src/common/utils.c;  ) > 3.8.0cvs40.patchset
 ( cvs diff -u -r 1.4.2.40 -r 1.4.2.41 src/common/ssl_certificate.c;  ) > 3.8.0cvs41.patchset
+( cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/gtk/description_window.c;  ) > 3.8.0cvs42.patchset

diff --git a/configure.ac b/configure.ac
index 1c7b7e98d5a948ec39cdabecaa031cd46c14ddfb..89ae7f3027993c5f0fe60f3ebcfa0e5aacf41b7e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index a1a2ce3dbca0585c2bdd8f89fc8b5764a3c6b524..3d74689ef52271029a80635c40e4e08ba63c448f 100644 (file)
--- a/src/gtk/description_window.c
+++ b/src/gtk/description_window.c
@@ -50,7 +50,7 @@ void description_window_create(DescriptionWindow *dwindow)
                description_create(dwindow);
        
                gtk_window_set_transient_for(GTK_WINDOW(dwindow->window), GTK_WINDOW(dwindow->parent));
-               gtk_window_set_modal(GTK_WINDOW(dwindow->parent), FALSE);
+               gtk_window_set_modal(GTK_WINDOW(dwindow->parent), TRUE);
                gtk_window_set_destroy_with_parent(GTK_WINDOW(dwindow->window), TRUE);
                gtk_widget_show(dwindow->window);