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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-09-21 13:47:32 +0300 (Fri, 21 Sep 2007)
New Revision: 13979

Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch
Log:
made the warning non-fatal


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-09-21 10:10:50 UTC (rev 13978)
+++ projects/haf/trunk/dbus/debian/changelog	2007-09-21 10:47:32 UTC (rev 13979)
@@ -1,3 +1,9 @@
+dbus (1.0.2-0osso12) experimental; urgency=low
+
+  * Made the warning in dbus_connection_filter_remove non-fatal.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 21 Sep 2007 13:43:46 +0300
+
 dbus (1.0.2-0osso11) experimental; urgency=low
 
   * Fix bug in dbus_connection_filter_remove when removing a non-existing

Modified: projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch	2007-09-21 10:10:50 UTC (rev 13978)
+++ projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch	2007-09-21 10:47:32 UTC (rev 13979)
@@ -1,6 +1,6 @@
 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-09-18 16:08:19.647124064 +0300
++++ dbus-1.0.2.new/dbus/dbus-connection.c	2007-09-21 13:47:05.284698776 +0300
 @@ -5025,19 +5025,18 @@ dbus_connection_remove_filter (DBusConne
          }
          
@@ -13,8 +13,10 @@
 -#ifndef DBUS_DISABLE_CHECKS
    if (filter == NULL)
      {
-       _dbus_warn_check_failed ("Attempt to remove filter function %p user data %p, but no such filter has been added\n",
-                                function, user_data);
+-      _dbus_warn_check_failed ("Attempt to remove filter function %p user data %p, but no such filter has been added\n",
+-                               function, user_data);
++      _dbus_warn ("Attempt to remove filter function %p user data %p, but no such filter has been added\n",
++                  function, user_data);
        return;
      }
 -#endif