dbus/glib dbus-gmain.c,1.30,1.31

[Olivier Andrieu]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv19204/glib

Modified Files:
	dbus-gmain.c 
Log Message:
* 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).


Index: dbus-gmain.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gmain.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- dbus-gmain.c	10 Aug 2004 03:07:00 -0000	1.30
+++ dbus-gmain.c	7 Oct 2004 09:56:01 -0000	1.31
@@ -610,12 +610,11 @@
     {
       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);
 }