rpms/kdebase-workspace/F-9 kdebase-workspace-4.0.3-rh#443610.patch, NONE, 1.1 kdebase-workspace.spec, 1.73, 1.74

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.3-rh#443610.patch 
Log Message:
* Sun Apr 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-18
- don't show "Zoom Out" toolbox action (#443610, patch from openSUSE branch)

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

--- NEW FILE kdebase-workspace-4.0.3-rh#443610.patch ---
Index: libs/plasma/containment.cpp
===================================================================
--- libs/plasma/containment.cpp	(revision 794495)
+++ libs/plasma/containment.cpp	(revision 794496)
@@ -220,6 +220,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",


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdebase-workspace.spec	19 Apr 2008 14:59:40 -0000	1.73
+++ kdebase-workspace.spec	27 Apr 2008 02:13:36 -0000	1.74
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.3
 
-Release: 17%{?dist}
+Release: 18%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -45,6 +45,9 @@
 # from Plasma review board: http://mattr.info/r/261/
 # allows moving plasmoids on panels (#439587, kde#158301)
 Patch201: kdebase-workspace-4.0.3-kde#158301.patch
+# http://websvn.kde.org/?view=rev&revision=794496
+# don't show "Zoom Out" toolbox action (not working in 4.0)
+Patch202: kdebase-workspace-4.0.3-rh#443610.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -147,6 +150,7 @@
 # plasma-4.0-openSUSE patches:
 %patch200 -p0 -b .plasma-default-wallpaper
 %patch201 -p1 -b .kde#158301
+%patch202 -p0 -b .rh#443610
 
 %build
 
@@ -265,6 +269,9 @@
 
 
 %changelog
+* Sun Apr 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-18
+- don't show "Zoom Out" toolbox action (#443610, patch from openSUSE branch)
+
 * Sat Apr 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-17
 - allow moving plasmoids on panels (#439587, kde#158301) (upstream patch)