* dbus/dbus-message.c: Message counter fix, patch by Christian Hammond <chipx86@gnupdate.org>

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a34367c7..789a5364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-19  Olivier Andrieu  <oliv__a@users.sourceforge.net>
+
+	* dbus/dbus-message.c: Message counter fix, patch by Christian
+	Hammond <chipx86@gnupdate.org>
+
 2004-07-18  Seth Nickell  <seth@gnome.org>
 
 	* python/dbus.py:
@@ -572,7 +577,6 @@
 	* mono/DBusType/Array.cs: Handle empty arrays
 	* mono/Arguments.cs: Handle empty arguments
 
->>>>>>> 1.496
 2004-04-30  Owen Fraser-Green  <owen@discobabe.net>
 
 	* dbus-sharp.pc.in: Modified to include include Libs and Requires
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index c9cefb9f..2e4c9b35 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -1039,7 +1039,7 @@ _dbus_message_remove_size_counter (DBusMessage  *message,
   else
     _dbus_list_free_link (link);
 
-  _dbus_counter_adjust (counter, message->size_counter_delta);
+  _dbus_counter_adjust (counter, - message->size_counter_delta);
 
   _dbus_counter_unref (counter);
 }