[maemo-commits] [maemo-commits] r14523 - in projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-19 14:32:56 +0300 (Fri, 19 Oct 2007)
New Revision: 14523

Modified:
   projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian/changelog
   projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian/patches/09-replace-invalid-assert.patch
Log:
fix to the 09 patch


Modified: projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian/changelog
===================================================================
--- projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian/changelog	2007-10-19 11:30:54 UTC (rev 14522)
+++ projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian/changelog	2007-10-19 11:32:56 UTC (rev 14523)
@@ -1,3 +1,9 @@
+dbus-glib (0.74-0osso2fix2) experimental; urgency=low
+
+  * Use g_debug instead of g_error in the fix. Fixes: NB#66881
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 19 Oct 2007 14:32:02 +0300
+
 dbus-glib (0.74-0osso2fix) experimental; urgency=low
 
   * Replace invalid assert in dbus_g_proxy_begin_call_internal.

Modified: projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian/patches/09-replace-invalid-assert.patch
===================================================================
--- projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian/patches/09-replace-invalid-assert.patch	2007-10-19 11:30:54 UTC (rev 14522)
+++ projects/haf/tags/dbus-glib/0.74-0osso2fix2/debian/patches/09-replace-invalid-assert.patch	2007-10-19 11:32:56 UTC (rev 14523)
@@ -1,6 +1,6 @@
 diff -pur dbus-glib-0.74/dbus/dbus-gproxy.c dbus-glib-0.74.new/dbus/dbus-gproxy.c
 --- dbus-glib-0.74/dbus/dbus-gproxy.c	2007-04-20 19:36:09.000000000 +0300
-+++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2007-10-04 15:24:56.088323208 +0300
++++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2007-10-19 14:29:37.148438896 +0300
 @@ -2167,7 +2167,11 @@ dbus_g_proxy_begin_call_internal (DBusGP
                                          timeout))
      goto oom;
@@ -8,7 +8,7 @@
 -  g_assert (pending != NULL);
 +  if (pending == NULL)
 +    {
-+      g_error ("Disconnected");
++      g_debug ("Disconnected");
 +      return 0;
 +    }