* dbus/dbus-sysdeps.c: moved global lock system_users from dbus-userdb.c

diff --git a/ChangeLog b/ChangeLog
index 5f5c73cfe5a9e6910d7cb23ff3c1975249f33cd3..b22d6204c95815cc5ae28af9fa78cb04e62d2c8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
+    
+       * dbus/dbus-sysdeps.c: moved global lock system_users from dbus-userdb.c
+
 2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
     
        * global rename of function dbus_username_from_current_process

diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index cf689bc04d2b397ccae36ed4c7ce3b275cf929d3..7f779600590fd5c440b816a6a27515dd0be1c605 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -49,6 +49,7 @@
 
 _DBUS_DEFINE_GLOBAL_LOCK (win_fds);
 _DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
+_DBUS_DEFINE_GLOBAL_LOCK (system_users);
 
 /**
  * @defgroup DBusSysdeps Internal system-dependent API

diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 5a5d9098e72f1d28d167aebdab422cae41a7c606..6ef205538f1424da90c58c53ab4f5f342b572b0c 100644 (file)
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -218,7 +218,6 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
     }
 }
 
-_DBUS_DEFINE_GLOBAL_LOCK(system_users);
 static dbus_bool_t database_locked = FALSE;
 static DBusUserDatabase *system_db = NULL;
 static DBusString process_username;