[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin/Plasma/5.13] /: Merge branch 'Plasma/5.12' into Plasma/5.13
From:       Martin_Flöser <null () kde ! org>
Date:       2018-05-20 13:43:39
Message-ID: E1fKOcd-0006jp-3Q () code ! kde ! org
[Download RAW message or body]

Git commit 9a9c34f352532e2569cd537390e2e0595e88a2b4 by Martin Fl=C3=B6ser.
Committed on 20/05/2018 at 13:41.
Pushed by graesslin into branch 'Plasma/5.13'.

Merge branch 'Plasma/5.12' into Plasma/5.13

M  +13   -5    rules.cpp
M  +1    -1    rules.h

https://commits.kde.org/kwin/9a9c34f352532e2569cd537390e2e0595e88a2b4

diff --cc rules.cpp
index 6bb91bf3c,e728b06bb..a6060cd84
--- a/rules.cpp
+++ b/rules.cpp
@@@ -741,7 -737,8 +746,9 @@@ bool Rules::discardUsed(bool withdrawn
      DISCARD_USED_FORCE_RULE(strictgeometry);
      DISCARD_USED_SET_RULE(shortcut);
      DISCARD_USED_FORCE_RULE(disableglobalshortcuts);
 +    DISCARD_USED_SET_RULE(desktopfile);
+ =

+     return changed;
  }
  #undef DISCARD_USED_SET_RULE
  #undef DISCARD_USED_FORCE_RULE

[prev in list] [next in list] [prev in thread] [next in thread]