* global rename of function dbus_username_from_current_process to _dbus_append_desired_identity

7 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index c64c100e..5f5c73cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
+    
+	* global rename of function dbus_username_from_current_process
+	to _dbus_append_desired_identity. 
+	Approved by Havoc Pennington
+
+2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
 
 	* dbus/dbus-sysdeps-win.c: disabled DBusUserInfo related code
 		(_dbus_append_desired_identity,	_dbus_windows_user_is_process_owner):
diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index eb145e49..225569fc 100644
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -522,7 +522,7 @@ _dbus_auth_script_run (const DBusString *filename)
                     goto out;
                   }
 
-                if (!_dbus_username_from_current_process (&u) ||
+                if (!_dbus_append_desired_identity (&u) ||
                     !_dbus_string_copy (u, 0, &username,
                                         _dbus_string_get_length (&username)))
                   {
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index e47f6e36..7fe9671a 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -785,7 +785,7 @@ handle_client_initial_response_cookie_sha1_mech (DBusAuth   *auth,
 
   retval = FALSE;
 
-  if (!_dbus_username_from_current_process (&username))
+  if (!_dbus_append_desired_identity (&username))
     goto out_0;
 
   if (!_dbus_string_hex_encode (username, 0,
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index 17c6b179..af8ef080 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -738,7 +738,7 @@ _dbus_keyring_new_homedir (const DBusString *username,
     {
       const DBusString *const_homedir;
 
-      if (!_dbus_username_from_current_process (&username) ||
+      if (!_dbus_append_desired_identity (&username) ||
           !_dbus_homedir_from_current_process (&const_homedir))
         goto failed;
 
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 0cb92c61..154619a5 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -168,7 +168,7 @@ dbus_bool_t _dbus_credentials_add_from_current_process (DBusCredentials  *creden
 dbus_bool_t _dbus_credentials_parse_and_add_desired    (DBusCredentials  *credentials,
                                                         const DBusString *desired_identity);
 
-dbus_bool_t _dbus_username_from_current_process (const DBusString **username);
+dbus_bool_t _dbus_append_desired_identity (const DBusString **username);
 dbus_bool_t _dbus_append_desired_identity       (DBusString *str);
 
 dbus_bool_t _dbus_homedir_from_current_process  (const DBusString **homedir);
diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index 6e1653e6..5f0ec56d 100644
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -414,7 +414,7 @@ _dbus_userdb_test (const char *test_data_dir)
   unsigned long *group_ids;
   int n_group_ids, i;
 
-  if (!_dbus_username_from_current_process (&username))
+  if (!_dbus_append_desired_identity (&username))
     _dbus_assert_not_reached ("didn't get username");
 
   if (!_dbus_homedir_from_current_process (&homedir))
diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index c3ae8ef4..5a5d9098 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -361,7 +361,7 @@ _dbus_user_database_flush_system (void)
  * @returns #FALSE if no memory
  */
 dbus_bool_t
-_dbus_username_from_current_process (const DBusString **username)
+_dbus_append_desired_identity (const DBusString **username)
 {
   _dbus_user_database_lock_system ();
   if (!init_system_db ())