rev 4790 - in trunk/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2006-10-26 07:49:54 +0000 (Thu, 26 Oct 2006)
New Revision: 4790

Added:
   trunk/packages/kdelibs/debian/patches/41_x_kde_getactionmenu_no_timeout.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
A patch for #348411

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-10-25 23:17:10 UTC (rev 4789)
+++ trunk/packages/kdelibs/debian/changelog	2006-10-26 07:49:54 UTC (rev 4790)
@@ -1,3 +1,18 @@
+kdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
+
+  * Patch: 41_x_kde_getactionmenu_no_timeout.diff
+      Do not time out when waiting for the reply for the X-KDE-GetActionMenu
+      DCOP call. DCOP protocol is synchronouos by design and a reply for the
+      timed out call (i.e. garbage) still arrives and might be falsely returned
+      as a valid reply for the subsequent DCOP call on the same connection. The
+      application currently known to be badly hurt by this is kdesvn and its
+      konqueror service menu integration. Its X-KDE-GetActionMenu might take
+      longer than current 100 milisecond timeout to complete. As a result
+      then, a late reply will "pollute" a main DCOP connection of the client
+      application (e.g. konqueror) causing further DCOP failures. Closes: #348411
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Oct 2006 10:44:35 +0300
+
 kdelibs (4:3.5.5a.dfsg.1-2) unstable; urgency=high
 
   * Rebuild against qt-x11-free 3.3.7. There exists a strange KDE build system

Added: trunk/packages/kdelibs/debian/patches/41_x_kde_getactionmenu_no_timeout.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/41_x_kde_getactionmenu_no_timeout.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/41_x_kde_getactionmenu_no_timeout.diff	2006-10-26 07:49:54 UTC (rev 4790)
@@ -0,0 +1,11 @@
+--- kdelibs-3.5.5a.dfsg.1/kio/kio/kmimetype.cpp	2006-10-26 01:58:40.000000000 +0300
++++ kdelibs-3.5.5a.dfsg.1/kio/kio/kmimetype.cpp	2006-10-26 02:01:04.000000000 +0300
+@@ -1013,7 +1013,7 @@
+     } else {
+       if(kapp->dcopClient()->call( app, object,
+                    function.utf8(),
+-                   dataToSend, replyType, replyData, true, 100)
++                   dataToSend, replyType, replyData, true, -1)
+ 	    && replyType == "QStringList" ) {
+ 
+         QDataStream dataStreamIn(replyData, IO_ReadOnly);