diff options
| author | Olivier Andrieu <oliv__a@users.sourceforge.net> | 2004-10-07 09:56:02 +0000 |
|---|---|---|
| committer | Olivier Andrieu <oliv__a@users.sourceforge.net> | 2004-10-07 09:56:02 +0000 |
| commit | dbb4ee01e029908787dbf38fa2543ac35e36b5dd (patch) | |
| tree | 19c0b2c6de2d911b17065811ca1b8d2c019a76c3 /glib/dbus-gmain.c | |
| parent | 0c168e3e1506c9cf5d4cb13189fa284ec0706904 (diff) | |
* 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).
Diffstat (limited to 'glib/dbus-gmain.c')
| -rw-r--r-- | glib/dbus-gmain.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index 23c5a78c..30b1c4e0 100644 --- 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); } |