diff -crN ./metacity/src/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/Makefile.am
*** ./metacity/src/Makefile.am	Wed Feb  5 04:46:06 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/Makefile.am	Wed May 14 15:54:50 2003
***************
*** 97,102 ****
--- 97,105 ----
  	util.h			\
  	common.h
  
+ libmetacity_private_la_LIBADD=	\
+ 	@METACITY_LIBS@
+ 
  libmetacityincludedir = $(includedir)/metacity-1/metacity-private
  
  libmetacityinclude_HEADERS =	\
***************
*** 142,148 ****
  @INTLTOOL_SCHEMAS_RULE@
  
  install-data-local:
! 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
  
  IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
  VARIABLES=default_icon_data $(srcdir)/default_icon.png \
--- 145,151 ----
  @INTLTOOL_SCHEMAS_RULE@
  
  install-data-local:
! 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
  
  IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
  VARIABLES=default_icon_data $(srcdir)/default_icon.png \
diff -crN ./metacity/src/prefs.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/prefs.h
*** ./metacity/src/prefs.h	Wed Feb  5 04:46:06 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/prefs.h	Tue Mar  4 11:38:47 2003
***************
*** 212,218 ****
    META_KEYBINDING_ACTION_COMMAND_9,
    META_KEYBINDING_ACTION_COMMAND_10,
    META_KEYBINDING_ACTION_COMMAND_11,
!   META_KEYBINDING_ACTION_COMMAND_12,
  } MetaKeyBindingAction;
  
  typedef struct
--- 212,218 ----
    META_KEYBINDING_ACTION_COMMAND_9,
    META_KEYBINDING_ACTION_COMMAND_10,
    META_KEYBINDING_ACTION_COMMAND_11,
!   META_KEYBINDING_ACTION_COMMAND_12
  } MetaKeyBindingAction;
  
  typedef struct
diff -crN ./metacity/src/session.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/session.c
*** ./metacity/src/session.c	Wed Oct 16 22:12:24 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/session.c	Wed Sep  3 18:31:10 2003
***************
*** 1815,1820 ****
--- 1815,1832 ----
        /* Remove the callback, freeing data */
        return FALSE; 
      }
+   else if (condition & G_IO_IN)
+     {
+       char buffer[128];
+       int ret;
+ 
+       ret = read(d->child_pipe, buffer, 128);
+       if (ret == 0)
+ 	{
+ 	  finish_interact (d->shutdown);
+ 	  return FALSE;
+ 	}
+     }
  
    /* Keep callback installed */
    return TRUE;
diff -crN ./metacity/src/util.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/util.h
*** ./metacity/src/util.h	Sun Jan  5 08:51:02 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/util.h	Tue Mar  4 11:39:58 2003
***************
*** 106,112 ****
  #    define meta_verbose(format...)
  #    define meta_topic(format...)
  #  else
! #    error "This compiler does not support varargs macros and thus verbose mode can't be disabled meaningfully"
  #  endif
  
  #endif /* !WITH_VERBOSE_MODE */
--- 106,114 ----
  #    define meta_verbose(format...)
  #    define meta_topic(format...)
  #  else
! inline void meta_debug_spew(const char* format,...) { return; }
! inline void meta_verbose(const char* format, ...) { return; }
! inline void meta_topic(const char* format, ...) { return; }
  #  endif
  
  #endif /* !WITH_VERBOSE_MODE */