diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/window-props.c | 11 |
2 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,13 @@ 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> + Fix longstanding focus bug with mouse (not sloppy) focus mode with popup override-redirect windows, particularly mozilla and firefox's location bar autocompletion. #357695. diff --git a/src/window-props.c b/src/window-props.c index daf4c03c..92026e08 100644 --- a/src/window-props.c +++ b/src/window-props.c @@ -22,6 +22,7 @@ #include <config.h> #include "window-props.h" +#include "errors.h" #include "xprops.h" #include "frame.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 */ if (!modified && previous_was_modified) - XDeleteProperty (window->display->xdisplay, - window->xwindow, - atom); + { + meta_error_trap_push (window->display); + XDeleteProperty (window->display->xdisplay, + window->xwindow, + atom); + meta_error_trap_pop (window->display, FALSE); + } return modified; } |