rev 12403 - in branches/kde4/packages/kdelibs/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Sun Oct 12 18:49:59 UTC 2008
Author: ana
Date: 2008-10-12 18:49:59 +0000 (Sun, 12 Oct 2008)
New Revision: 12403
Added:
branches/kde4/packages/kdelibs/debian/patches/02_r866736_kdedglobalaccel_crashes.diff
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/patches/series
Log:
Fix kdedglobalaccel crashes. Add patch 02.
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-10-11 16:29:51 UTC (rev 12402)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-10-12 18:49:59 UTC (rev 12403)
@@ -1,3 +1,9 @@
+kde4libs (4:4.1.2-2) experimental; urgency=low
+
+ * Fix kdedglobalaccel crashes. Patch 02.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Sun, 12 Oct 2008 20:00:14 +0200
+
kde4libs (4:4.1.2-1) experimental; urgency=low
* New upstream release.
Added: branches/kde4/packages/kdelibs/debian/patches/02_r866736_kdedglobalaccel_crashes.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/02_r866736_kdedglobalaccel_crashes.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/02_r866736_kdedglobalaccel_crashes.diff 2008-10-12 18:49:59 UTC (rev 12403)
@@ -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);
++ }
+ }
+ }
+ }
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-10-11 16:29:51 UTC (rev 12402)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-10-12 18:49:59 UTC (rev 12403)
@@ -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
More information about the pkg-kde-commits
mailing list