dbus/dbus dbus-internals.h,1.40,1.41 dbus-errors.c,1.25,1.26

[Olivier Andrieu]

Update of /cvs/dbus/dbus/dbus
In directory pdx:/tmp/cvs-serv17410/dbus

Modified Files:
	dbus-internals.h dbus-errors.c 
Log Message:
* dbus/dbus-internals.h (_DBUS_SET_OOM): 
* bus/utils.h (BUS_SET_OOM): use dbus_error_set_const instead of
dbus_error_set.

* bus/dispatch.c (check_send_exit_to_service): fix the test case,
broken by the change in the _SET_OOM macros.


Index: dbus-internals.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-internals.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dbus-internals.h	2 Dec 2003 10:44:21 -0000	1.40
+++ dbus-internals.h	31 Jul 2004 09:15:24 -0000	1.41
@@ -215,7 +215,7 @@
 const char* _dbus_header_field_to_string (int header_field);
 
 extern const char _dbus_no_memory_message[];
-#define _DBUS_SET_OOM(error) dbus_set_error ((error), DBUS_ERROR_NO_MEMORY, _dbus_no_memory_message)
+#define _DBUS_SET_OOM(error) dbus_set_error_const ((error), DBUS_ERROR_NO_MEMORY, _dbus_no_memory_message)
 
 #ifdef DBUS_BUILD_TESTS
 /* Memory debugging */

Index: dbus-errors.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-errors.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dbus-errors.c	20 Jun 2004 15:28:15 -0000	1.25
+++ dbus-errors.c	31 Jul 2004 09:15:24 -0000	1.26
@@ -368,7 +368,7 @@
   return;
   
  nomem:
-  dbus_set_error_const (error, DBUS_ERROR_NO_MEMORY, NULL);      
+  _DBUS_SET_OOM (error);
 }
 
 /** @} */ /* End public API */