rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-rh#443610.patch, 1.1, 1.2 kdebase-workspace.spec, 1.74, 1.75

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28039/devel

Modified Files:
	kdebase-workspace-4.0.3-rh#443610.patch kdebase-workspace.spec 
Log Message:
Make patch apply to 4.0.3.

kdebase-workspace-4.0.3-rh#443610.patch:

Index: kdebase-workspace-4.0.3-rh#443610.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.3-rh#443610.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.0.3-rh#443610.patch	27 Apr 2008 02:13:37 -0000	1.1
+++ kdebase-workspace-4.0.3-rh#443610.patch	27 Apr 2008 03:52:28 -0000	1.2
@@ -1,12 +1,11 @@
-Index: libs/plasma/containment.cpp
-===================================================================
---- libs/plasma/containment.cpp	(revision 794495)
-+++ libs/plasma/containment.cpp	(revision 794496)
-@@ -220,6 +220,7 @@
+diff -ur kdebase-workspace-4.0.3/libs/plasma/containment.cpp kdebase-workspace-4.0.3-rh#443610/libs/plasma/containment.cpp
+--- kdebase-workspace-4.0.3/libs/plasma/containment.cpp	2008-03-27 21:34:44.000000000 +0100
++++ kdebase-workspace-4.0.3-rh#443610/libs/plasma/containment.cpp	2008-04-27 05:50:08.000000000 +0200
+@@ -187,6 +187,7 @@
  
              Plasma::Widget *zoomOutTool = addToolBoxTool("zoomOut", "zoom-out", i18n("Zoom Out"));
              connect(zoomOutTool, SIGNAL(clicked()), this, SIGNAL(zoomOut()));
 +            enableToolBoxTool("zoomOut", false);
- 
-             if (!isKioskImmutable()) {
-                 Plasma::Widget *lockTool = addToolBoxTool("lockWidgets", "object-locked",
+         }
+     } else {
+         delete d->toolbox;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kdebase-workspace.spec	27 Apr 2008 02:13:37 -0000	1.74
+++ kdebase-workspace.spec	27 Apr 2008 03:52:28 -0000	1.75
@@ -150,7 +150,7 @@
 # plasma-4.0-openSUSE patches:
 %patch200 -p0 -b .plasma-default-wallpaper
 %patch201 -p1 -b .kde#158301
-%patch202 -p0 -b .rh#443610
+%patch202 -p1 -b .rh#443610
 
 %build