Commit 6773cabf authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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)
parent 6e6d4033
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):
......
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):
......
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):
......
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):
......
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):
......
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment