diff -crN ./metacity/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/configure.in
*** ./metacity/configure.in	Wed Sep 10 20:37:47 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/configure.in	Wed Nov 12 13:02:54 2003
***************
*** 128,138 ****
     PKG_CHECK_MODULES(METACITY_PROPS, gtk+-2.0 >= 2.2.0 gconf-2.0 >= 1.1.9 libglade-2.0)
  fi
  
! if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
!    echo "pangoxft found"
! else
!    AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
! fi
  
  STARTUP_NOTIFICATION_VERSION=0.4
  AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
--- 128,138 ----
     PKG_CHECK_MODULES(METACITY_PROPS, gtk+-2.0 >= 2.2.0 gconf-2.0 >= 1.1.9 libglade-2.0)
  fi
  
! dnl if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
! dnl    echo "pangoxft found"
! dnl else
! dnl    AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
! dnl fi
  
  STARTUP_NOTIFICATION_VERSION=0.4
  AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
diff -crN ./metacity/src/prefs.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/prefs.h
*** ./metacity/src/prefs.h	Mon Jul 21 21:12:27 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/prefs.h	Thu Oct 16 14:25:38 2003
***************
*** 222,228 ****
    META_KEYBINDING_ACTION_COMMAND_9,
    META_KEYBINDING_ACTION_COMMAND_10,
    META_KEYBINDING_ACTION_COMMAND_11,
!   META_KEYBINDING_ACTION_COMMAND_12,
  } MetaKeyBindingAction;
  
  typedef struct
--- 222,228 ----
    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 21:12:24 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./metacity/src/session.c	Wed Sep  3 17: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 */