[maemo-commits] [maemo-commits] r8287 - in projects/haf/tags/dbus/0.61-osso23fix/debian: . patches

[From: www-data at stage.maemo.org]

Author: kihamala
Date: 2006-11-23 17:17:33 +0200 (Thu, 23 Nov 2006)
New Revision: 8287

Added:
   projects/haf/tags/dbus/0.61-osso23fix/debian/patches/34-fix-match-rule-equal.patch
Modified:
   projects/haf/tags/dbus/0.61-osso23fix/debian/changelog
Log:
fixed match_rule_equal()


Modified: projects/haf/tags/dbus/0.61-osso23fix/debian/changelog
===================================================================
--- projects/haf/tags/dbus/0.61-osso23fix/debian/changelog	2006-11-23 15:13:17 UTC (rev 8286)
+++ projects/haf/tags/dbus/0.61-osso23fix/debian/changelog	2006-11-23 15:17:33 UTC (rev 8287)
@@ -1,3 +1,10 @@
+dbus (0.61-osso23fix) experimental; urgency=low
+
+  * Fixed a bug in match_rule_equal(), which was removing other connections'
+    matches in some cases. Fixes: NB#48121
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 23 Nov 2006 17:19:37 +0200
+
 dbus (0.61-osso23) experimental; urgency=low
 
   * Fixed failing assert in dbus-gproxy.c. Fixes: NB#31796

Added: projects/haf/tags/dbus/0.61-osso23fix/debian/patches/34-fix-match-rule-equal.patch
===================================================================
--- projects/haf/tags/dbus/0.61-osso23fix/debian/patches/34-fix-match-rule-equal.patch	2006-11-23 15:13:17 UTC (rev 8286)
+++ projects/haf/tags/dbus/0.61-osso23fix/debian/patches/34-fix-match-rule-equal.patch	2006-11-23 15:17:33 UTC (rev 8287)
@@ -0,0 +1,13 @@
+diff -pur 0.61-osso23/bus/signals.c 0.61-osso23.new/bus/signals.c
+--- 0.61-osso23/bus/signals.c	2006-11-23 16:46:52.589602192 +0200
++++ 0.61-osso23.new/bus/signals.c	2006-11-23 16:49:28.873843376 +0200
+@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
+   if (a->flags != b->flags)
+     return FALSE;
+ 
++  if (a->matches_go_to != b->matches_go_to)
++    return FALSE;
++
+   if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
+       a->message_type != b->message_type)
+     return FALSE;