[maemo-commits] [maemo-commits] r8576 - in projects/haf/branches/dbus/0.x/trunk/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2006-12-04 14:00:26 +0200 (Mon, 04 Dec 2006)
New Revision: 8576

Added:
   projects/haf/branches/dbus/0.x/trunk/debian/patches/34-fix-match-rule-equal.patch
Modified:
   projects/haf/branches/dbus/0.x/trunk/debian/changelog
Log:
added missing patch from a branched version


Modified: projects/haf/branches/dbus/0.x/trunk/debian/changelog
===================================================================
--- projects/haf/branches/dbus/0.x/trunk/debian/changelog	2006-12-04 10:56:07 UTC (rev 8575)
+++ projects/haf/branches/dbus/0.x/trunk/debian/changelog	2006-12-04 12:00:26 UTC (rev 8576)
@@ -1,3 +1,10 @@
+dbus (0.61-osso25) experimental; urgency=low
+
+  * Added match_rule_equal() fix from branched 0.61-osso23fix.
+    Still Fixes: NB#46383, NB#47812
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 04 Dec 2006 13:59:58 +0200
+
 dbus (0.61-osso24) experimental; urgency=low
 
   * Activated process now creates its own process group. Fixes: NB#46383

Added: projects/haf/branches/dbus/0.x/trunk/debian/patches/34-fix-match-rule-equal.patch
===================================================================
--- projects/haf/branches/dbus/0.x/trunk/debian/patches/34-fix-match-rule-equal.patch	2006-12-04 10:56:07 UTC (rev 8575)
+++ projects/haf/branches/dbus/0.x/trunk/debian/patches/34-fix-match-rule-equal.patch	2006-12-04 12:00:26 UTC (rev 8576)
@@ -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;