dbus/dbus dbus-auth.c, 1.46, 1.47 dbus-connection.c, 1.113, 1.114 dbus-keyring.c, 1.30, 1.31 dbus-server-debug-pipe.c, 1.18, 1.19

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv31793/dbus

Modified Files:
	dbus-auth.c dbus-connection.c dbus-keyring.c 
	dbus-server-debug-pipe.c 
Log Message:
* dbus/dbus-auth.c, dbus/dbus-connection.c, dbus/dbus-keyring.c,
  dbus/dbus-server-debug-pipe.c, glib/dbus-binding-tool-glib.c
  glib/dbus-glib-tool.c, glib/dbus-gparser.c, glib/dbus-gproxy.c
  test/test-segfault.c, test/test-utils.c,
  test/glib/test-dbus-glib.c, tools/dbus-cleanup-sockets.c
  tools/dbus-launch.c, tools/dbus-tree-view.c, tools/dbus-viewer.c:
  Various cleanup of dead code and compiler warnings (patch from
  Kjartan Maraas <kmaraas at gnome.org>) 


Index: dbus-auth.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-auth.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- dbus-auth.c	25 Oct 2005 15:57:13 -0000	1.46
+++ dbus-auth.c	30 Nov 2005 19:32:26 -0000	1.47
@@ -543,8 +543,6 @@
   
   if (auth->keyring == NULL)
     {
-      DBusError error;
-
       dbus_error_init (&error);
       auth->keyring = _dbus_keyring_new_homedir (data,
                                                  &auth->context,

Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- dbus-connection.c	12 Oct 2005 22:15:37 -0000	1.113
+++ dbus-connection.c	30 Nov 2005 19:32:26 -0000	1.114
@@ -2762,7 +2762,7 @@
   
   _dbus_return_val_if_fail (connection != NULL, NULL);
   _dbus_return_val_if_fail (message != NULL, NULL);
-  _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE);  
+  _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, NULL);
   _dbus_return_val_if_error_is_set (error, NULL);
   
   if (!dbus_connection_send_with_reply (connection, message,

Index: dbus-keyring.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-keyring.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- dbus-keyring.c	11 Sep 2005 10:02:47 -0000	1.30
+++ dbus-keyring.c	30 Nov 2005 19:32:26 -0000	1.31
@@ -730,7 +730,7 @@
   if (!_dbus_string_init (&homedir))
     {
       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-      return FALSE;
+      return NULL;
     }
 
   _dbus_string_init_const (&dotdir, ".dbus-keyrings");
@@ -855,7 +855,7 @@
   if (keyring)
     _dbus_keyring_unref (keyring);
   _dbus_string_free (&homedir);
-  return FALSE;
+  return NULL;
 
 }
 

Index: dbus-server-debug-pipe.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-server-debug-pipe.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dbus-server-debug-pipe.c	26 Feb 2005 06:37:46 -0000	1.18
+++ dbus-server-debug-pipe.c	30 Nov 2005 19:32:26 -0000	1.19
@@ -289,7 +289,7 @@
       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
       _dbus_transport_unref (server_transport);
       _dbus_transport_unref (client_transport);
-      return FALSE;
+      return NULL;
     }
   
   connection = _dbus_connection_new_for_transport (server_transport);