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

Add missing error traps. (#149011, Thomas Leonard)

Browse Source 
Mon Aug  2 01:02:57 2004  Matthias Clasen  <maclas@gmx.de>

	* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed):
	(gdk_check_wm_desktop_changed): Add missing error
	traps.  (#149011, Thomas Leonard)
This commit is contained in:
Matthias Clasen 2004-08-02 05:04:33 +00:00 committed by Matthias Clasen
parent aeeb19670b
commit 856064b036
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Aug 2 01:02:57 2004 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed):
(gdk_check_wm_desktop_changed): Add missing error
traps. (#149011, Thomas Leonard)
Mon Aug 2 00:21:26 2004 Matthias Clasen <maclas@gmx.de> Mon Aug 2 00:21:26 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (blink_cb): Add the same warning * gtk/gtktextview.c (blink_cb): Add the same warning

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Mon Aug 2 01:02:57 2004 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed):
(gdk_check_wm_desktop_changed): Add missing error
traps. (#149011, Thomas Leonard)
Mon Aug 2 00:21:26 2004 Matthias Clasen <maclas@gmx.de> Mon Aug 2 00:21:26 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (blink_cb): Add the same warning * gtk/gtktextview.c (blink_cb): Add the same warning

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Mon Aug 2 01:02:57 2004 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed):
(gdk_check_wm_desktop_changed): Add missing error
traps. (#149011, Thomas Leonard)
Mon Aug 2 00:21:26 2004 Matthias Clasen <maclas@gmx.de> Mon Aug 2 00:21:26 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (blink_cb): Add the same warning * gtk/gtktextview.c (blink_cb): Add the same warning

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Mon Aug 2 01:02:57 2004 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed):
(gdk_check_wm_desktop_changed): Add missing error
traps. (#149011, Thomas Leonard)
Mon Aug 2 00:21:26 2004 Matthias Clasen <maclas@gmx.de> Mon Aug 2 00:21:26 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (blink_cb): Add the same warning * gtk/gtktextview.c (blink_cb): Add the same warning

6
gdk/x11/gdkevents-x11.c
View File

@ -462,12 +462,15 @@ gdk_check_wm_desktop_changed (GdkWindow *window)
{ {
gulong *desktop; gulong *desktop;
type = None;
gdk_error_trap_push ();
XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
GDK_WINDOW_XID (window), GDK_WINDOW_XID (window),
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP"), gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type, 0, G_MAXLONG, False, XA_CARDINAL, &type,
&format, &nitems, &format, &nitems,
&bytes_after, (guchar **)&desktop); &bytes_after, (guchar **)&desktop);
gdk_error_trap_pop ();
if (type != None) if (type != None)
{ {
@ -501,10 +504,13 @@ gdk_check_wm_state_changed (GdkWindow *window)
toplevel->have_maxhorz = FALSE; toplevel->have_maxhorz = FALSE;
toplevel->have_fullscreen = FALSE; toplevel->have_fullscreen = FALSE;
type = None;
gdk_error_trap_push ();
XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window), XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"), gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"),
0, G_MAXLONG, False, XA_ATOM, &type, &format, &nitems, 0, G_MAXLONG, False, XA_ATOM, &type, &format, &nitems,
&bytes_after, (guchar **)&atoms); &bytes_after, (guchar **)&atoms);
gdk_error_trap_pop ();
if (type != None) if (type != None)
{ {