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

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

Author: kihamala
Date: 2006-11-24 10:41:07 +0200 (Fri, 24 Nov 2006)
New Revision: 8298

Added:
   projects/haf/tags/dbus/0.61-osso13fix3/debian/patches/40-fix-match-rule-equal.patch
Modified:
   projects/haf/tags/dbus/0.61-osso13fix3/debian/changelog
Log:
added fix for match_rule_equal()


Modified: projects/haf/tags/dbus/0.61-osso13fix3/debian/changelog
===================================================================
--- projects/haf/tags/dbus/0.61-osso13fix3/debian/changelog	2006-11-24 08:35:32 UTC (rev 8297)
+++ projects/haf/tags/dbus/0.61-osso13fix3/debian/changelog	2006-11-24 08:41:07 UTC (rev 8298)
@@ -1,6 +1,13 @@
+dbus (0.61-osso13fix3) experimental; urgency=low
+
+  * UNRELEASED
+  * Fixed bug in match_rule_equal(). Fixes: NB#48333
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 24 Nov 2006 10:36:55 +0200
+
 dbus (0.61-osso13fix2) experimental; urgency=low
 
-  * Added fix for inheriting the oom_adj value.
+  * Added fix for inheriting the oom_adj value. Fixes: NB#48266
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 22 Nov 2006 10:58:20 +0200
 

Added: projects/haf/tags/dbus/0.61-osso13fix3/debian/patches/40-fix-match-rule-equal.patch
===================================================================
--- projects/haf/tags/dbus/0.61-osso13fix3/debian/patches/40-fix-match-rule-equal.patch	2006-11-24 08:35:32 UTC (rev 8297)
+++ projects/haf/tags/dbus/0.61-osso13fix3/debian/patches/40-fix-match-rule-equal.patch	2006-11-24 08:41:07 UTC (rev 8298)
@@ -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;