rpms/kdelibs/F-10 kdelibs-4.1.2-kde#171870-kded-crash.patch, NONE, 1.1 kdelibs.spec, 1.383, 1.384

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16057

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.2-kde#171870-kded-crash.patch 
Log Message:
backport patch to fix crash kded startup crash


kdelibs-4.1.2-kde#171870-kded-crash.patch:

--- NEW FILE kdelibs-4.1.2-kde#171870-kded-crash.patch ---
Index: kdeui/shortcuts/kdedglobalaccel.cpp
===================================================================
--- kdeui/shortcuts/kdedglobalaccel.cpp	(Revision 870758)
+++ kdeui/shortcuts/kdedglobalaccel.cpp	(Revision 870759)
@@ -361,8 +361,9 @@
 
 void KdedGlobalAccel::unRegister(const QStringList &actionId)
 {
+    kDebug(125) << actionId;
+
     Q_ASSERT(actionId.size()==4);
-
     if (actionId.size() < 4) {
         return;
     }
@@ -586,7 +587,14 @@
     
             foreach (int key, ad->keys) {
                 if (key != 0) {
-                    d->keyToAction.insert(key, ad);
+                    if (d->keyToAction.contains(key)) {
+                        // The shortcut is already used. The config file is
+                        // broken. Ignore the request.
+                        ad->keys.removeAll(key);
+                        kWarning() << "Shortcut found twice in kglobalshortcutsrc.";
+                    } else {
+                        d->keyToAction.insert(key, ad);
+                    }
                 }
             }
         }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- kdelibs.spec	8 Oct 2008 20:33:15 -0000	1.383
+++ kdelibs.spec	13 Oct 2008 09:33:00 -0000	1.384
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -79,6 +79,7 @@
 
 ## upstream patches
 Patch100: kdelibs-4.1.2-googlemaps.patch
+Patch101: kdelibs-4.1.2-kde#171870-kded-crash.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -205,6 +206,7 @@
 
 ## upstream patches
 %patch100 -p0 -b .googlemaps
+%patch101 -p0 -b .kde#171870-kded-crash
 
 %build
 
@@ -365,6 +367,9 @@
 
 
 %changelog
+* Mon Oct 13 2008 Than Ngo <than at redhat.com> 4.1.2-4
+- backport patch to fix crash kded startup crash
+
 * Wed Oct 08 2008 Than Ngo <than at redhat.com> 4.1.2-3
 - backport fix for google maps