Move the call to gdk_error_trap_pop() to the right place, fixing a problem

Wed Oct 29 15:01:32 2003  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): Move
        the call to gdk_error_trap_pop() to the right place,
        fixing a problem where we'd pop() too many times
        when bailing out. (#123302, Thomas Leonard)

diff --git a/ChangeLog b/ChangeLog
index d6d39ad9aa5ae8e70e3817a2491b55e5c440158a..b7b1a4ec2ed77ef87f45bc6e0c38b2afdc84748a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 29 15:01:32 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): Move
+       the call to gdk_error_trap_pop() to the right place,
+       fixing a problem where we'd pop() too many times 
+       when bailing out. (#123302, Thomas Leonard)
+       
 Wed Oct 29 12:50:02 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserutils.c (delegate_set_current_folder): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d6d39ad9aa5ae8e70e3817a2491b55e5c440158a..b7b1a4ec2ed77ef87f45bc6e0c38b2afdc84748a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Oct 29 15:01:32 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): Move
+       the call to gdk_error_trap_pop() to the right place,
+       fixing a problem where we'd pop() too many times 
+       when bailing out. (#123302, Thomas Leonard)
+       
 Wed Oct 29 12:50:02 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserutils.c (delegate_set_current_folder): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d6d39ad9aa5ae8e70e3817a2491b55e5c440158a..b7b1a4ec2ed77ef87f45bc6e0c38b2afdc84748a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Oct 29 15:01:32 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): Move
+       the call to gdk_error_trap_pop() to the right place,
+       fixing a problem where we'd pop() too many times 
+       when bailing out. (#123302, Thomas Leonard)
+       
 Wed Oct 29 12:50:02 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserutils.c (delegate_set_current_folder): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d6d39ad9aa5ae8e70e3817a2491b55e5c440158a..b7b1a4ec2ed77ef87f45bc6e0c38b2afdc84748a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Oct 29 15:01:32 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): Move
+       the call to gdk_error_trap_pop() to the right place,
+       fixing a problem where we'd pop() too many times 
+       when bailing out. (#123302, Thomas Leonard)
+       
 Wed Oct 29 12:50:02 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserutils.c (delegate_set_current_folder): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d6d39ad9aa5ae8e70e3817a2491b55e5c440158a..b7b1a4ec2ed77ef87f45bc6e0c38b2afdc84748a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Oct 29 15:01:32 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): Move
+       the call to gdk_error_trap_pop() to the right place,
+       fixing a problem where we'd pop() too many times 
+       when bailing out. (#123302, Thomas Leonard)
+       
 Wed Oct 29 12:50:02 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilechooserutils.c (delegate_set_current_folder): 

diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index dda05578592cb5ac69cb1731f82bcdee82d25339..dafb34d9ffcf7abfedb66c2362b1a85c9a8a390b 100644 (file)
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -652,6 +652,8 @@ _gdk_x11_copy_to_image (GdkDrawable    *drawable,
        }
     }
 
+  gdk_error_trap_pop ();
+
  out:
   
   if (have_grab)
@@ -660,8 +662,6 @@ _gdk_x11_copy_to_image (GdkDrawable    *drawable,
       have_grab = FALSE;
     }
   
-  gdk_error_trap_pop ();
-
   if (success && !image)
     {
       /* We "succeeded", but could get no content for the image so return junk */