[maemo-commits] [maemo-commits] r14620 - in projects/haf/trunk/dbus/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-25 17:01:35 +0300 (Thu, 25 Oct 2007)
New Revision: 14620

Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/patches/27-dead-code-and-reply-serial.patch
Log:
transform dead code into working code


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-10-25 13:37:35 UTC (rev 14619)
+++ projects/haf/trunk/dbus/debian/changelog	2007-10-25 14:01:35 UTC (rev 14620)
@@ -12,6 +12,8 @@
   * Added a check for failing allocation to bus.c:setup_server.
   * Use DBUS_UID_UNSET and DBUS_GID_UNSET instead of checking if an unsigned
     variable is smaller than zero.
+  * Transform dead code into working code in
+    _dbus_connection_get_next_client_serial.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 18 Oct 2007 11:21:11 +0300
 

Modified: projects/haf/trunk/dbus/debian/patches/27-dead-code-and-reply-serial.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/27-dead-code-and-reply-serial.patch	2007-10-25 13:37:35 UTC (rev 14619)
+++ projects/haf/trunk/dbus/debian/patches/27-dead-code-and-reply-serial.patch	2007-10-25 14:01:35 UTC (rev 14620)
@@ -1,21 +1,20 @@
 diff -pur dbus-1.0.2/dbus/dbus-connection.c dbus-1.0.2.new/dbus/dbus-connection.c
 --- dbus-1.0.2/dbus/dbus-connection.c	2006-12-11 21:21:08.000000000 +0200
-+++ dbus-1.0.2.new/dbus/dbus-connection.c	2007-10-25 16:36:35.916915136 +0300
-@@ -1374,13 +1374,12 @@ _dbus_connection_unref_unlocked (DBusCon
++++ dbus-1.0.2.new/dbus/dbus-connection.c	2007-10-25 16:59:56.912931368 +0300
+@@ -1374,13 +1374,13 @@ _dbus_connection_unref_unlocked (DBusCon
  static dbus_uint32_t
  _dbus_connection_get_next_client_serial (DBusConnection *connection)
  {
 -  int serial;
 +  dbus_uint32_t serial;
  
--  serial = connection->client_serial++;
-+  serial = ++(connection->client_serial);
-+  if (serial == 0)
-+    serial = 1;
+   serial = connection->client_serial++;
  
 -  if (connection->client_serial < 0)
--    connection->client_serial = 1;
++  if (connection->client_serial == 0)
+     connection->client_serial = 1;
 -  
++
    return serial;
  }