rpms/kdebase-workspace/F-10 kdebase-workspace-4.1.2-klipper-crash.patch, NONE, 1.1 kdebase-workspace.spec, 1.125, 1.126

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20587/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.2-klipper-crash.patch 
Log Message:
Sync from F9:

* Wed Oct  8 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.2-3
- fix crash when invoking a klipper command for a second time

kdebase-workspace-4.1.2-klipper-crash.patch:

--- NEW FILE kdebase-workspace-4.1.2-klipper-crash.patch ---
Index: klipper/urlgrabber.cpp
===================================================================
--- klipper/urlgrabber.cpp	(revision 868725)
+++ klipper/urlgrabber.cpp	(revision 868726)
@@ -226,7 +226,8 @@
 
 void URLGrabber::slotItemSelected(QAction *action)
 {
-    myMenu->hide(); // deleted by the timer or the next action
+    if (myMenu)
+        myMenu->hide(); // deleted by the timer or the next action
 
     QString id = action->data().toString();
 
@@ -402,8 +403,10 @@
         }
     }
 
-    myMenu->deleteLater();
-    myMenu = 0;
+    if ( myMenu ) {
+        myMenu->deleteLater();
+        myMenu = 0;
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kdebase-workspace.spec	29 Sep 2008 02:41:29 -0000	1.125
+++ kdebase-workspace.spec	9 Oct 2008 04:26:04 -0000	1.126
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.2
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -36,6 +36,7 @@
 # reenable KWin taskbarthumbnail effect (already done upstream in 4.2, was
 # disabled in 4.1 due to no tooltip support - see also Patch100)
 Patch102: kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch
+Patch103: kdebase-workspace-4.1.2-klipper-crash.patch
 
 # plasma-4.0-openSUSE patches:
 Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch
@@ -169,6 +170,7 @@
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
 %patch102 -p0 -b .kwin-taskbarthumbnail
+%patch103 -p0 -b .klipper-crash
 
 # plasma-4.0-openSUSE patches:
 %patch204 -p1 -b .kickoff-suspend
@@ -309,6 +311,9 @@
 
 
 %changelog
+* Wed Oct  8 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.2-3
+- fix crash when invoking a klipper command for a second time
+
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
 - respin against new(er) kde-filesystem