Small patch

[Julian King <jpk28 cus cam ac uk>]

> > One last question, if we do actually come up with a patch, where should
> > we send it, here to this list or somewhere else?
> 
> Yes, here is good.

Ok, I attatch 2 patches then.  They are essentially the same, but apply
to different files.

I believe that I am correct in saying that:

lockdir = gconf_concat_dir_and_key(root_dir, "%gconf-xml-backend.lock");

is wrong, and that it should use gconf_get_lock_dir() rather than
using 'root_dir'

Assuming that is correct the attatched patches should make the change we
want simpler (followed your advice in using a different filesystem 
rather than the home dir for locking, since it makes lots of things
simpler, and we are doing that with Xauth and ICE anyway)

Still need another patch (which I have a local kludged one for the 
moment) to make gconf_get_lock_dir() return something appropriate of
course.

> Havoc

Cheers,


Julian

*** GConf-1.2.0/backends/dir-utils.c	Mon Feb  5 21:17:52 2001
--- /tmp/foom.c	Mon Aug 12 11:03:25 2002
***************
*** 169,175 ****
        {
  	gchar *lockdir;
  
! 	lockdir = gconf_concat_dir_and_key (root_dir, "%gconf-backend.lock");
  
  	lock = gconf_get_lock (lockdir, err);
  
--- 169,175 ----
        {
  	gchar *lockdir;
  
! 	lockdir = gconf_concat_dir_and_key (gconf_get_lock_dir(), "%gconf-backend.lock");
  
  	lock = gconf_get_lock (lockdir, err);
  

*** GConf-1.2.0/backends/xml-backend.c	2002-03-21 23:55:06.000000000 +0000
--- /tmp/foom2.c	2002-08-12 15:53:42.000000000 +0100
***************
*** 374,380 ****
        {
          gchar* lockdir;
  
!         lockdir = gconf_concat_dir_and_key(root_dir, "%gconf-xml-backend.lock");
          
          lock = gconf_get_lock(lockdir, err);
  
--- 374,380 ----
        {
          gchar* lockdir;
  
!         lockdir = gconf_concat_dir_and_key (gconf_get_lock_dir(), "%gconf-backend.lock");
          
          lock = gconf_get_lock(lockdir, err);