metacity 3.32.0

This commit is contained in:
Yaakov Selkowitz 2019-05-05 14:52:15 -04:00
parent 59e7b74f05
commit e29e21e452
4 changed files with 8 additions and 77 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ metacity-2.30.0.tar.bz2
/metacity-3.26.0.tar.xz
/metacity-3.28.0.tar.xz
/metacity-3.30.1.tar.xz
/metacity-3.32.0.tar.xz

View File

@ -1,72 +0,0 @@
From 074af8f87ef89b13ff326fb5d04ee424bbfd4ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
Date: Thu, 29 Nov 2018 15:17:58 +0200
Subject: [PATCH] revert "unminimize windows with initial IconicState if first
known on MapRequest"
According to ICCCM client is allowed to go from Withdrawn to Iconic
state. Also there are x11 apps that has -iconic command line option
that was broken.
Revert 6875256e63fbfd4500ddd27a7bf1aafc8d4c1ca3 commit to restore
previous behaviour.
https://gitlab.gnome.org/GNOME/metacity/issues/4
---
src/core/display.c | 38 +++++++++++++-------------------------
1 file changed, 13 insertions(+), 25 deletions(-)
diff --git a/src/core/display.c b/src/core/display.c
index ed0aaf7f..273c97c5 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2297,34 +2297,22 @@ event_callback (XEvent *event,
{
window = meta_window_new (display, event->xmaprequest.window, FALSE,
META_EFFECT_TYPE_CREATE);
-
- /* The window might have initial iconic state, but this is a
- * MapRequest, fall through to ensure it is unminimized in
- * that case.
- */
}
- else if (frame_was_receiver)
+ /* if frame was receiver it's some malicious send event or something */
+ else if (!frame_was_receiver && window)
{
- g_warning ("Map requests on the frame window are unexpected");
- break;
- }
-
- /* Double check that creating the MetaWindow succeeded */
- if (window == NULL)
- break;
-
- meta_verbose ("MapRequest on %s mapped = %d minimized = %d\n",
- window->desc, window->mapped, window->minimized);
-
- if (window->minimized)
- {
- meta_window_unminimize (window);
- if (window->workspace != window->screen->active_workspace)
+ meta_verbose ("MapRequest on %s mapped = %d minimized = %d\n",
+ window->desc, window->mapped, window->minimized);
+ if (window->minimized)
{
- meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n",
- window->mapped, window->minimized);
- meta_window_change_workspace (window,
- window->screen->active_workspace);
+ meta_window_unminimize (window);
+ if (window->workspace != window->screen->active_workspace)
+ {
+ meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n",
+ window->mapped, window->minimized);
+ meta_window_change_workspace (window,
+ window->screen->active_workspace);
+ }
}
}
break;
--
2.18.1

View File

@ -1,10 +1,9 @@
Summary: Unobtrusive window manager
Name: metacity
Version: 3.30.1
Release: 3%{?dist}
Version: 3.32.0
Release: 1%{?dist}
URL: http://download.gnome.org/sources/metacity/
Source0: http://download.gnome.org/sources/metacity/3.30/metacity-%{version}.tar.xz
Patch1: metacity-ggo04.patch
Source0: http://download.gnome.org/sources/metacity/3.32/metacity-%{version}.tar.xz
License: GPLv2+
@ -116,6 +115,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_mandir}/man1/metacity-window-demo.1.gz
%changelog
* Sun May 05 2019 Yaakov Selkowitz <yselkowi@redhat.com> - 3.32.0-1
- new version
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.30.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (metacity-3.30.1.tar.xz) = 4dce2ea6483f8b7d83fa26f7155fdac33b14a8dfa6fba79756cafb4246c6800074171e016f268e3802551eebb715f224b5770477cbdcbc49907cd9cae711dbd2
SHA512 (metacity-3.32.0.tar.xz) = 2260411b9ab07fcd1aee8152d700f1e2aa7f1f0753cae6dab82a55cac2cac186a5c9f42377a311a6f90a53ba8ba200d9f5d73a770abc76b558896cd58c30abde