← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/kdebase-workspace/intrepid

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_17_kwin_branch.diff

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter, Roderick B. Greening, Harald Sitter
  • Date: 2008-10-10 16:27:23 UTC
  • Revision ID: james.westby@ubuntu.com-20081010162723-5of2nvjd7lffh3by
Tags: 4:4.1.2-0ubuntu7
https://launchpad.net/bugs/278482
https://launchpad.net/bugs/280746
[ Roderick B. Greening ]
* Reverted kubuntu_17_kwin_branch.diff
  - remove references from kde-window-manager.install 
* Remove tooltip window preview from kubuntu_17_kwin_branch.diff
  - and add to kubuntu_20_plasma_tooltips.diff

[ Harald Sitter ]
* Add kubuntu_900_fix_klipper_crash.diff from upstream SVN (LP: #278482)
* KDM should prefer user image resources (default would only
  use images defined by the administrator) (LP: #280746)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_17_kwin_branch.diff
7628
7628
Index: kdebase-workspace-4.1.2/kwin/effects/CMakeLists.txt
7629
7629
===================================================================
7630
7630
--- kdebase-workspace-4.1.2.orig/kwin/effects/CMakeLists.txt    2008-10-06 07:26:31.000000000 -0400
7631
 
+++ kdebase-workspace-4.1.2/kwin/effects/CMakeLists.txt 2008-10-06 11:44:12.000000000 -0400
7632
 
@@ -50,7 +50,7 @@
7633
 
     shadow.cpp
7634
 
     showfps.cpp
7635
 
     showpaint.cpp
7636
 
-    #taskbarthumbnail.cpp # Enable when plasma has tooltips again
7637
 
+    taskbarthumbnail.cpp # Enable when plasma has tooltips again. (Which it does with our Kubuntu patch)
7638
 
     thumbnailaside.cpp
7639
 
     zoom.cpp
7640
 
     )
7641
 
@@ -72,7 +72,7 @@
7642
 
     shadow.desktop
7643
 
     showfps.desktop
7644
 
     showpaint.desktop
7645
 
-    #taskbarthumbnail.desktop # Enable when plasma has tooltips again
7646
 
+    taskbarthumbnail.desktop # Enable when plasma has tooltips again. (Which it does with our Kubuntu patch)
7647
 
     thumbnailaside.desktop
7648
 
     zoom.desktop
7649
 
     DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
7650
7631
@@ -85,6 +85,7 @@
7651
7632
     maketransparent_config.cpp
7652
7633
     maketransparent_config.ui