← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kde-workspace/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/0011-fix-yet-another-fun-with-pointers-tabbing-segfault.patch

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2011-09-25 00:42:41 UTC
  • Revision ID: package-import@ubuntu.com-20110925004241-c5ck55dokn3yt1kg
Tags: 4:4.7.1-0ubuntu3
https://launchpad.net/bugs/854329
* Update debian/kdm.upstart to match latest gdm.upstart improvements:
  - Also export LC_MESSAGES with the rest of locale information
  - When kdm is shut down by a runlevel call, emit an upstart event that can
    be caught by plymouth so it can distinguish between the DM shutting down
    for a runlevel change vs. other causes (LP: #854329)
* Update patches for post-4.7.1 changes.  Add to debian/patches:
    0001-SVN_SILENT-made-messages-.desktop-file.patch
    0003-SVN_SILENT-made-messages-.desktop-file.patch
    0004-SVN_SILENT-made-messages-.desktop-file.patch
    0005-SVN_SILENT-made-messages-.desktop-file.patch
    0006-preferred-app-launchers-need-to-use-the-type-of-the-.patch
    0007-SVN_SILENT-made-messages-.desktop-file.patch
    0009-SVN_SILENT-made-messages-.desktop-file.patch
    0010-add-some-missing-connects-for-the-ruleswidget.patch
    0011-fix-yet-another-fun-with-pointers-tabbing-segfault.patch
    0013-catch-changeMaximize-recursion-from-setNoBorder.patch
    0014-Clear-thumbnails-for-deleted-windows.patch
    0015-Fix-pointer-accesses-in-tiling-code.patch
    0016-SVN_SILENT-made-messages-.desktop-file.patch
    0017-SVN_SILENT-made-messages-.desktop-file.patch
    0018-SVN_SILENT-made-messages-.desktop-file.patch
    0019-Test-for-widget-creation-before-deleting-property-at.patch
    0020-SVN_SILENT-made-messages-.desktop-file.patch
    0023-fix-kiosk-restrictions-for-user-switching-and-logout.patch
    0024-Fix-typo-use-the-right-signal-signature.patch
    0025-Repaint-old-area-of-the-thumbnail.patch
    0026-Use-Client-layoutMetric-to-access-shadowSize-instead.patch
    0027-ShowCalendarPopup-false-suppresses-calendar-popup-an.patch
    0028-show-the-keyboard-on-immediately-entering-a-text-are.patch
    0029-Repaint-the-whole-window-in-the-taskbar-thumbnail.patch
    0030-SVN_SILENT-made-messages-.desktop-file.patch
    0031-Fix-wrong-inital-tab-in-keyboard-kcm.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0011-fix-yet-another-fun-with-pointers-tabbing-segfault.patch
 
1
From f3ca7234ef4329b45bcd369aa49a70972a754302 Mon Sep 17 00:00:00 2001
 
2
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
 
3
Date: Thu, 8 Sep 2011 22:19:41 +0200
 
4
Subject: [PATCH 11/31] fix yet another fun-with-pointers tabbing segfault
 
5
 
 
6
BUG: 281596
 
7
---
 
8
 kwin/manage.cpp |    2 +-
 
9
 1 files changed, 1 insertions(+), 1 deletions(-)
 
10
 
 
11
diff --git a/kwin/manage.cpp b/kwin/manage.cpp
 
12
index a802623..d1b400f 100644
 
13
--- a/kwin/manage.cpp
 
14
+++ b/kwin/manage.cpp
 
15
@@ -316,7 +316,7 @@ bool Client::manage(Window w, bool isMapped)
 
16
     if (!noBorder()) {
 
17
         client_group = NULL;
 
18
         // Automatically add to previous groups on session restore
 
19
-        if (session && session->clientGroupClient && session->clientGroupClient != this)
 
20
+        if (session && session->clientGroupClient && session->clientGroupClient != this && session->clientGroupClient->clientGroup())
 
21
             session->clientGroupClient->clientGroup()->add(this, -1, true);
 
22
         else if (isMapped)
 
23
             // If the window is already mapped (Restarted KWin) add any windows that already have the
 
24
-- 
 
25
1.7.4.1
 
26