diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-02-23 14:29:14 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-02-23 14:29:14 +0800 |
| commit | b11f43dede4a77e9d2ace9981d3d9c4592de3654 (patch) | |
| tree | 7314a8f74226981ee5afb1cb70088d2894ad3810 /x11-wm/metacity | |
| parent | 9a86c86aff1033c5af7b40fc4d434140a785ef87 (diff) | |
| download | marcuscom-ports-b11f43dede4a77e9d2ace9981d3d9c4592de3654.tar.gz marcuscom-ports-b11f43dede4a77e9d2ace9981d3d9c4592de3654.tar.zst marcuscom-ports-b11f43dede4a77e9d2ace9981d3d9c4592de3654.zip | |
Fix a crash cause by the very ill-behaved openssh-askpass. See
http://bugzilla.gnome.org/show_bug.cgi?id=168207 for more details.
Reported by: Vladimir Grebenschikov <vova@sw.ru>
Obtained from: GNOME CVS
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3698 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-wm/metacity')
| -rw-r--r-- | x11-wm/metacity/Makefile | 1 | ||||
| -rw-r--r-- | x11-wm/metacity/files/patch-src_window.c | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 6b4ace971..0cf86137e 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -7,6 +7,7 @@ PORTNAME= metacity PORTVERSION= 2.9.21 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/x11-wm/metacity/files/patch-src_window.c b/x11-wm/metacity/files/patch-src_window.c new file mode 100644 index 000000000..e7b66f2bf --- /dev/null +++ b/x11-wm/metacity/files/patch-src_window.c @@ -0,0 +1,11 @@ +--- src/window.c.orig Wed Feb 23 01:24:01 2005 ++++ src/window.c Wed Feb 23 01:24:17 2005 +@@ -648,7 +648,7 @@ + parent = meta_display_lookup_x_window (window->display, + window->xtransient_for); + +- if (parent) ++ if (parent && parent->workspace) + { + meta_topic (META_DEBUG_PLACEMENT, + "Putting window %s on same workspace as parent %s\n", |