diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-29 01:04:16 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-29 01:04:16 +0800 |
| commit | 97b44e53eced4397ba2fd0c2ba6ccee2b72bcd9c (patch) | |
| tree | aa673577b5d193f54a5275c11c7265d1f2cc377c /x11-wm | |
| parent | 5451cd378d1be0b0ed183a60bb578783998d1ca1 (diff) | |
| download | marcuscom-ports-97b44e53eced4397ba2fd0c2ba6ccee2b72bcd9c.tar.gz marcuscom-ports-97b44e53eced4397ba2fd0c2ba6ccee2b72bcd9c.tar.zst marcuscom-ports-97b44e53eced4397ba2fd0c2ba6ccee2b72bcd9c.zip | |
Fix a crash in metacity when opening modal windows alone. See
http://bugzilla.gnome.org/show_bug.cgi?311819 for more details.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4344 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/metacity/Makefile | 3 | ||||
| -rw-r--r-- | x11-wm/metacity/files/patch-src_place.c | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index fe68c080e..e281b7d71 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,11 +3,12 @@ # Whom: Garrett Rooney <rooneg@electricjellyfish.net> # # $FreeBSD$ -# $MCom: ports/x11-wm/metacity/Makefile,v 1.52 2005/07/13 11:13:52 ahze Exp $ +# $MCom: ports/x11-wm/metacity/Makefile,v 1.53 2005/07/25 03:52:33 marcus Exp $ # PORTNAME= metacity PORTVERSION= 2.11.1 +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_place.c b/x11-wm/metacity/files/patch-src_place.c new file mode 100644 index 000000000..966f10fee --- /dev/null +++ b/x11-wm/metacity/files/patch-src_place.c @@ -0,0 +1,28 @@ +Index: src/place.c +=================================================================== +RCS file: /cvs/gnome/metacity/src/place.c,v +retrieving revision 1.43 +diff -p -u -r1.43 place.c +--- src/place.c 25 Jul 2005 02:12:58 -0000 1.43 ++++ src/place.c 28 Jul 2005 16:42:05 -0000 +@@ -369,20 +369,6 @@ avoid_being_obscured_as_second_modal_dia + "focus window\n", + window->desc); + } +- +- meta_topic (META_DEBUG_PLACEMENT, +- "Status:\n" +- " denied focus: %d\n" +- " modal: %d\n" +- " same app: %d\n" +- " overlaps %d\n", +- window->denied_focus_and_not_transient, +- window->wm_state_modal, +- meta_window_same_application (window, focus_window), +- meta_rectangle_intersect (&window->rect, +- &focus_window->rect, +- &overlap) +- ); + } + + static int |