Fix kdedglobalaccel crashes. Add patch 02.debian/4.1.2-2

3 files changed, 53 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 24144f2..26f9af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kde4libs (4:4.1.2-2) experimental; urgency=low
+
+  * Fix kdedglobalaccel crashes. Patch 02. 
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 12 Oct 2008 20:00:14 +0200
+
 kde4libs (4:4.1.2-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/02_r866736_kdedglobalaccel_crashes.diff b/debian/patches/02_r866736_kdedglobalaccel_crashes.diff
new file mode 100644
index 0000000..35e4b5c
--- /dev/null
+++ b/debian/patches/02_r866736_kdedglobalaccel_crashes.diff
@@ -0,0 +1,46 @@
+SVN commit 866736 by mjansen:
+
+Fix those kdedglobalaccel crashes. It's not safe to assume the config file
+has a correct content. Somehow it get's messed up sometimes and contains
+something like this:
+
+  next=Meta+B,Meta+B,
+  nextTrack=Meta+B,Meta+B,
+
+BUG:171870
+CCBUG:171206
+
+ M  +10 -2     kdedglobalaccel.cpp  
+
+
+Index: kde4libs-4.1.2/kdeui/shortcuts/kdedglobalaccel.cpp
+===================================================================
+--- kde4libs-4.1.2.orig/kdeui/shortcuts/kdedglobalaccel.cpp	2008-07-03 07:06:28.000000000 +0200
++++ kde4libs-4.1.2/kdeui/shortcuts/kdedglobalaccel.cpp	2008-10-12 20:36:21.000000000 +0200
+@@ -361,8 +361,9 @@
+ 
+ void KdedGlobalAccel::unRegister(const QStringList &actionId)
+ {
+-    Q_ASSERT(actionId.size()==4);
++    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);
++                    }
+                 }
+             }
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 90f06a2..820ca9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 01_kross_version_11_r838337.diff
+02_r866736_kdedglobalaccel_crashes.diff
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
 11_kde4_applications_menu.diff