Commit dbb4ee01 authored by Olivier Andrieu's avatar Olivier Andrieu

* 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).
parent 0c168e3e
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> 2004-09-28 Jon Trowbridge <trow@ximian.com>
* mono/BusDriver.cs: Changed BusDriver struct to remove * mono/BusDriver.cs: Changed BusDriver struct to remove
......
...@@ -2122,7 +2122,7 @@ _dbus_file_get_contents (DBusString *str, ...@@ -2122,7 +2122,7 @@ _dbus_file_get_contents (DBusString *str,
{ {
dbus_set_error (error, DBUS_ERROR_FAILED, dbus_set_error (error, DBUS_ERROR_FAILED,
"File size %lu of \"%s\" is too large.", "File size %lu of \"%s\" is too large.",
filename_c, (unsigned long) sb.st_size); (unsigned long) sb.st_size, filename_c);
close (fd); close (fd);
return FALSE; return FALSE;
} }
......
...@@ -610,12 +610,11 @@ dbus_g_bus_get (DBusBusType type, ...@@ -610,12 +610,11 @@ dbus_g_bus_get (DBusBusType type,
{ {
dbus_set_g_error (error, &derror); dbus_set_g_error (error, &derror);
dbus_error_free (&derror); dbus_error_free (&derror);
return NULL;
} }
else
{ /* does nothing if it's already been done */
/* does nothing if it's already been done */ dbus_connection_setup_with_g_main (connection, NULL);
dbus_connection_setup_with_g_main (connection, NULL);
}
return DBUS_G_CONNECTION_FROM_CONNECTION (connection); return DBUS_G_CONNECTION_FROM_CONNECTION (connection);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment