brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

surround the XDeleteProperty() call with a

Browse Source 
2006-10-01  Elijah Newren  <newren gmail com>

	* src/window-props.c (set_title_text): surround the
	XDeleteProperty() call with a
	meta_error_trap_push/meta_error_trap_pop pair to prevent a crash
	when closing a remote instance of gedit (and perhaps other apps).
	#358514.
This commit is contained in:
Elijah Newren 2006-10-01 21:36:10 +00:00 committed by Elijah Newren
parent b694312f1c
commit 79eb53bd53
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-10-01 Elijah Newren <newren gmail com>
* src/window-props.c (set_title_text): surround the
XDeleteProperty() call with a
meta_error_trap_push/meta_error_trap_pop pair to prevent a crash
when closing a remote instance of gedit (and perhaps other apps).
#358514.
2006-10-01 Elijah Newren <newren gmail com> 2006-10-01 Elijah Newren <newren gmail com>
Fix longstanding focus bug with mouse (not sloppy) focus mode with Fix longstanding focus bug with mouse (not sloppy) focus mode with

11
src/window-props.c
View File

@ -22,6 +22,7 @@
#include <config.h> #include <config.h>
#include "window-props.h" #include "window-props.h"
#include "errors.h"
#include "xprops.h" #include "xprops.h"
#include "frame.h" #include "frame.h"
#include "group.h" #include "group.h"
@ -248,9 +249,13 @@ set_title_text (MetaWindow *window,
/* Bug 330671 -- Don't forget to clear _NET_WM_VISIBLE_(ICON_)NAME */ /* Bug 330671 -- Don't forget to clear _NET_WM_VISIBLE_(ICON_)NAME */
if (!modified && previous_was_modified) if (!modified && previous_was_modified)
XDeleteProperty (window->display->xdisplay, {
window->xwindow, meta_error_trap_push (window->display);
atom); XDeleteProperty (window->display->xdisplay,
window->xwindow,
atom);
meta_error_trap_pop (window->display, FALSE);
}
return modified; return modified;
} }