rpms/kdebase-workspace/F-9 kdebase-workspace-4.0.5-kwin-compositing.patch, NONE, 1.1 kdebase-workspace-4.0.5-kwin-shortcuts.patch, NONE, 1.1 kdebase-workspace.spec, 1.87, 1.88

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.5-kwin-compositing.patch 
	kdebase-workspace-4.0.5-kwin-shortcuts.patch 
Log Message:
some more kwin fixes, will make an update of this


kdebase-workspace-4.0.5-kwin-compositing.patch:

--- NEW FILE kdebase-workspace-4.0.5-kwin-compositing.patch ---
--- kwin/composite.cpp	(revision 817156)
+++ kwin/composite.cpp	(working copy)
@@ -320,7 +320,7 @@
     ToplevelList tmp = windows;
     windows.clear();
     foreach( Toplevel* c, tmp )
-        if( c->readyForPainting())
+//        if( c->readyForPainting())
             windows.append( c );
     foreach( Toplevel* c, windows )
         { // This could be possibly optimized WRT obscuring, but that'd need being already


kdebase-workspace-4.0.5-kwin-shortcuts.patch:

--- NEW FILE kdebase-workspace-4.0.5-kwin-shortcuts.patch ---
--- kwin/useractions.cpp	(revision 815185)
+++ kwin/useractions.cpp	(revision 815186)
@@ -399,7 +399,7 @@
     if( ok )
         client_keys_client->setShortcut( KShortcut( client_keys_dialog->shortcut()).toString());
     closeActivePopup();
-    delete client_keys_dialog;
+    client_keys_dialog->deleteLater();
     client_keys_dialog = NULL;
     client_keys_client = NULL;
     }
@@ -410,8 +410,15 @@
     QAction* action = client_keys->action( key.toLatin1().constData() );
     if( !c->shortcut().isEmpty())
         {
-        action->setShortcuts(c->shortcut());
-        connect(action, SIGNAL(triggered(bool)), c, SLOT(shortcutActivated()));
+        if( action == NULL ) // new shortcut
+            {
+            action = client_keys->addAction( key );
+            connect( action, SIGNAL(triggered(bool)), c, SLOT(shortcutActivated()));
+            }
+        // no autoloading, since it's configured explicitly here and is not meant to be reused
+        // (the key is the window id anyway, which is kind of random)
+        qobject_cast< KAction* >( action )->setGlobalShortcut(
+            c->shortcut(), KAction::ActiveShortcut, KAction::NoAutoloading );
         action->setEnabled( true );
         }
     else


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdebase-workspace.spec	16 Jun 2008 15:01:07 -0000	1.87
+++ kdebase-workspace.spec	17 Jun 2008 13:15:35 -0000	1.88
@@ -26,6 +26,10 @@
 Patch10: kdebase-workspace-4.0.4-klipper-url.patch
 #Â kdebug:163146: Kwin on maximize doesn't respect the panel size with 2 monitors 
 Patch11: kdebase-workspace-4.0.5-plasma-xinerama.patch
+# fix disappearing windows with KWin compositing on
+Patch12: kdebase-workspace-4.0.5-kwin-compositing.patch
+#Â kdebug:161342 make per-window shortcut not crash and make it work
+Patch13: kdebase-workspace-4.0.5-kwin-shortcuts.patch
 
 # upstream patches:
 # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
@@ -162,6 +166,8 @@
 %patch8 -p0 -b .krdb
 %patch10 -p1 -b .klipper-url
 %patch11 -p0 -b .plasma-xinerama
+%patch12 -p0 -b .kwin-compositing
+%patch13 -p0 -b .kwin-shortcuts
 
 # upstream patches
 %patch101 -p1 -b .menu-switch
@@ -296,7 +302,9 @@
 
 %changelog
 * Mon Jun 16 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-2
-- kdebug#163146: Kwin on maximize doesn't respect the panel size with 2 monitors
+- KWin on maximize doesn't respect the panel size with 2 monitors (kdebug#163146)
+- fix disappearing windows with KWin compositing on
+- make per-window shortcuts not crash kwin and make them work (kdebug:161342)
 
 * Sun Jun 01 2008 Than Ngo <than at redhat.com> - 4.0.5-1
 - 4.0.5