rpms/kdelibs4/F-8 kdelibs-4.1.2-kde#171870-kded-crash.patch, NONE, 1.1

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15588/F-8

Added Files:
	kdelibs-4.1.2-kde#171870-kded-crash.patch 
Log Message:
Sync from kdelibs/F-9:

* Mon Oct 13 2008 Than Ngo <than at redhat.com> 4.1.2-4
- 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);
+                    }
                 }
             }
         }