AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Owen Taylor 2003-10-29 20:05:40 +00:00 committed by Owen Taylor
parent 6e6d4033f7
commit 6773cabf56
6 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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):

7
ChangeLog.pre-2-10
View File

@ -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):

7
ChangeLog.pre-2-4
View File

@ -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):

7
ChangeLog.pre-2-6
View File

@ -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):

7
ChangeLog.pre-2-8
View File

@ -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):

4
gdk/x11/gdkimage-x11.c
View File

@ -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 */