dbus ChangeLog,1.1241,1.1242 dbus-win.patch,1.5,1.6

[Ralf Habacker]

Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv18782

Modified Files:
	ChangeLog dbus-win.patch 
Log Message:
* dbus-win.patch: dbus-connection.c (dbus_connection_get_unix_user,
dbus_connection_get_unix_process_id): Let return them valid user id's, 
otherwise bus-test fails. How to replace on win32 ?.
* dbus/dbus-sysdeps-win.c (fill_win_user_info_homedir): fix memory leak.

Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1241
retrieving revision 1.1242
diff -u -d -r1.1241 -r1.1242
--- ChangeLog	8 Mar 2007 13:04:18 -0000	1.1241
+++ ChangeLog	8 Mar 2007 13:40:16 -0000	1.1242
@@ -1,5 +1,14 @@
 2007-03-08  Ralf Habacker  <ralf.habacker at freenet.de>
 
+	* dbus-win.patch: dbus-connection.c (dbus_connection_get_unix_user,
+	dbus_connection_get_unix_process_id): Let return them valid user id's, 
+	otherwise bus-test fails. How to replace on win32 ?.
+	
+	* dbus/dbus-sysdeps-win.c (fill_win_user_info_homedir):
+	fix memory leak.
+
+2007-03-08  Ralf Habacker  <ralf.habacker at freenet.de>
+
 	* dbus/dbus-sysdeps-win.c (_dbus_win_set_error_from_win_error):
 	use dbus friendly error name.
 	(fill_win_user_info_homedir): print user name in error case too.

Index: dbus-win.patch
===================================================================
RCS file: /cvs/dbus/dbus/dbus-win.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dbus-win.patch	7 Mar 2007 19:09:57 -0000	1.5
+++ dbus-win.patch	8 Mar 2007 13:40:16 -0000	1.6
@@ -1,3 +1,35 @@
+--- dbus/dbus-connection.c Wed Nov 15 04:07:59 2006
++++ dbus/dbus-connection.c Thu Mar 08 14:22:09 2007
+@@ -4790,14 +4790,6 @@
+   _dbus_return_val_if_fail (connection != NULL, FALSE);
+   _dbus_return_val_if_fail (uid != NULL, FALSE);
+ 
+-#ifdef DBUS_WIN
+-  /* FIXME this should be done at a lower level, but it's kind of hard,
+-   * just want to be sure we don't ship with this API returning
+-   * some weird internal fake uid for 1.0
+-   */
+-  return FALSE;
+-#endif
+-  
+   CONNECTION_LOCK (connection);
+ 
+   if (!_dbus_transport_get_is_authenticated (connection->transport))
+@@ -4829,14 +4821,6 @@
+   _dbus_return_val_if_fail (connection != NULL, FALSE);
+   _dbus_return_val_if_fail (pid != NULL, FALSE);
+ 
+-#ifdef DBUS_WIN
+-  /* FIXME this should be done at a lower level, but it's kind of hard,
+-   * just want to be sure we don't ship with this API returning
+-   * some weird internal fake uid for 1.0
+-   */
+-  return FALSE;
+-#endif
+-  
+   CONNECTION_LOCK (connection);
+ 
+   if (!_dbus_transport_get_is_authenticated (connection->transport))
 Index: bus/bus.c
 ===================================================================
 RCS file: /cvs/dbus/dbus/bus/bus.c,v