rev 11408 - in trunk/packages/qt4-x11/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-07-09 00:27:49 +0000 (Wed, 09 Jul 2008)
New Revision: 11408

Added:
   trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
+++ Changes by Sune Vuorela:
* Add 0235-qdbus-dispatch-async-timeout.diff from qt copy. Acked in qt-copy
by Thiago.

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-07-09 00:23:43 UTC (rev 11407)
+++ trunk/packages/qt4-x11/debian/changelog	2008-07-09 00:27:49 UTC (rev 11408)
@@ -1,6 +1,6 @@
 qt4-x11 (4.4.0-4~pre1) unstable; urgency=low
 
-  +++ Changes by Sune Vuolera:
+  +++ Changes by Sune Vuorela:
 
   * Get patch from 4.4.2 (yes!) to fix painting of scrollbars in webkit with
     some styles.
@@ -10,6 +10,8 @@
     See #487745 for details.
   * Don't make the std:: symbols in webkit public. Solution based on the work
     of Mike Hommey in the gtk webkit package.
+  * Add 0235-qdbus-dispatch-async-timeout.diff from qt copy. Acked in qt-copy
+    by Thiago.
 
   +++ Changes by Modestas Vainius:
 

Added: trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff	2008-07-09 00:27:49 UTC (rev 11408)
@@ -0,0 +1,20 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: Michael Leupold <lemma at confuego.org>
+
+This patch dispatches synthesized timeout messages directly
+after handling them. This is neccessary in order to receive timeout
+errors to asynchroneous messages.
+
+--- src/dbus/qdbusintegrator.cpp	(Revision 827848)
++++ src/dbus/qdbusintegrator.cpp	(Arbeitskopie)
+@@ -988,6 +988,7 @@
+ {
+     DBusTimeout *timeout = timeouts.value(e->timerId(), 0);
+     q_dbus_timeout_handle(timeout);
++    doDispatch();
+ }
+ 
+ void QDBusConnectionPrivate::customEvent(QEvent *e)

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:23:43 UTC (rev 11407)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:27:49 UTC (rev 11408)
@@ -21,6 +21,7 @@
 0233-fix-q3textbrowser-image.diff
 
 # debian patches
+0235-qdbus-dispatch-async-timeout.diff
 01_qmake_for_debian.diff
 02_launch_assistant-qt4.diff
 03_launch_moc-qt4.diff