* dbus/dbus-sysdeps.c (_dbus_file_get_contents): fix an incorrect format string.

* glib/dbus-dbus-gmain.c (dbus_g_bus_get): do not mangle NULL pointer
(bug #1540, Leonardo Boiko).

diff --git a/ChangeLog b/ChangeLog
index 75b4dfc8ab5325585d757e7965a009ec273a7e7e..9f05ea4e9c5faf176ca586d8d39453553797e5ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-07  Olivier Andrieu  <oliv__a@users.sourceforge.net>
+
+       * dbus/dbus-sysdeps.c (_dbus_file_get_contents): fix an incorrect
+       format string.
+
+       * glib/dbus-dbus-gmain.c (dbus_g_bus_get): do not mangle NULL
+       pointer (bug #1540, Leonardo Boiko).
+
 2004-09-28  Jon Trowbridge  <trow@ximian.com>
 
        * mono/BusDriver.cs: Changed BusDriver struct to remove

diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 2b3ec51c9836fb80d073a68c9dd6a16ee9ef4224..80188e48fa12de21a0a90011e5bae8114bda1f85 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -2122,7 +2122,7 @@ _dbus_file_get_contents (DBusString       *str,
     {
       dbus_set_error (error, DBUS_ERROR_FAILED,
                       "File size %lu of \"%s\" is too large.",
-                      filename_c, (unsigned long) sb.st_size);
+                      (unsigned long) sb.st_size, filename_c);
       close (fd);
       return FALSE;
     }

diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c
index 23c5a78c6fea37aec3f8e9ee2fe881ee69332979..30b1c4e099bc4a533ab6843f9bb11882d4448744 100644 (file)
--- a/glib/dbus-gmain.c
+++ b/glib/dbus-gmain.c
@@ -610,12 +610,11 @@ dbus_g_bus_get (DBusBusType     type,
     {
       dbus_set_g_error (error, &derror);
       dbus_error_free (&derror);
+      return NULL;
     }
-  else
-    {
-      /* does nothing if it's already been done */
-      dbus_connection_setup_with_g_main (connection, NULL);
-    }
+
+  /* does nothing if it's already been done */
+  dbus_connection_setup_with_g_main (connection, NULL);
 
   return DBUS_G_CONNECTION_FROM_CONNECTION (connection);
 }