diff -crN ./libwnck/libwnck/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libwnck/libwnck/Makefile.am
*** ./libwnck/libwnck/Makefile.am	Thu Oct 31 06:43:44 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libwnck/libwnck/Makefile.am	Thu Jul  3 16:01:09 2003
***************
*** 55,61 ****
  	$(wnck_built_cfiles)	\
  	$(wnck_accessibility_files)
  
! $(libwnck_1_la_OBJECTS): inlinepixbufs.h
  
  test_wnck_SOURCES=		\
  	test-wnck.c
--- 55,61 ----
  	$(wnck_built_cfiles)	\
  	$(wnck_accessibility_files)
  
! $(libwnck_1_la_OBJECTS): inlinepixbufs.h $(wnck_built_headers) $(wnck_built_cfiles)
  
  test_wnck_SOURCES=		\
  	test-wnck.c
***************
*** 76,82 ****
          -export-symbols-regex "^[^_].*"
  
  libwnck_1_la_LIBADD=   \
! 	@LIBWNCK_LIBS@
  
  test_wnck_LDADD=@LIBWNCK_LIBS@ libwnck-1.la
  test_tasklist_LDADD=@LIBWNCK_LIBS@ libwnck-1.la
--- 76,82 ----
          -export-symbols-regex "^[^_].*"
  
  libwnck_1_la_LIBADD=   \
! 	@LIBWNCK_LIBS@ -lX11
  
  test_wnck_LDADD=@LIBWNCK_LIBS@ libwnck-1.la
  test_tasklist_LDADD=@LIBWNCK_LIBS@ libwnck-1.la
***************
*** 85,100 ****
  ## we just punt on built sources, and check them into cvs, manually updating 
  ## when required.
  
! regenerate-built-sources:
! 	echo "Building wnck-enum-types.h" \
! 	&& glib-mkenums --fhead "#ifndef __WNCK_ENUM_TYPES_H__\n#define __WNCK_ENUM_TYPES_H__\n" --fprod "/* enumerations from \"@filename@\" */\n" --vhead "GType @enum_name@_get_type (void);\n#define WNCK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" --ftail "#endif /* __WNCK_ENUM_TYPES_H__ */" $(wnck_headers) > wnck-enum-types.h \
! 	&& echo "Building wnck-enum-types.c"	\
! 	&& glib-mkenums --fhead "#include <libwnck/libwnck.h>" --fprod "\n/* enumerations from \"@filename@\" */" --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" $(wnck_headers) > wnck-enum-types.c \
! 	&& echo "Building wnck-marshal.h" \
! 	&& @GLIB_GENMARSHAL@ --prefix=_wnck_marshal wnck-marshal.list --header > wnck-marshal.h \
! 	&& echo "Building wnck-marshal.c" \
! 	&& echo "#include <libwnck/libwnck.h>" > wnck-marshal.c \
!         && @GLIB_GENMARSHAL@ --prefix=_wnck_marshal wnck-marshal.list --body >> wnck-marshal.c
  
  IMAGES=default_icon.png stock_delete.png stock_maximize.png stock_minimize.png
  VARIABLES=default_icon_data $(srcdir)/default_icon.png 		\
--- 85,108 ----
  ## we just punt on built sources, and check them into cvs, manually updating 
  ## when required.
  
! $(srcdir)/wnck-enum-types.h: $(wnck_headers)
! 	echo "Building wnck-enum-types.h"
! 	cd $(srcdir) && glib-mkenums --fhead "#ifndef __WNCK_ENUM_TYPES_H__\n#define __WNCK_ENUM_TYPES_H__\n" --fprod "/* enumerations from \"@filename@\" */\n" --vhead "GType @enum_name@_get_type (void);\n#define WNCK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" --ftail "#endif /* __WNCK_ENUM_TYPES_H__ */" $(wnck_headers) > wnck-enum-types.h
! 
! $(srcdir)/wnck-enum-types.c: $(wnck_headers)
! 	echo "Building wnck-enum-types.c"
! 	cd $(srcdir) && glib-mkenums --fhead "#include <libwnck/libwnck.h>" --fprod "\n/* enumerations from \"@filename@\" */" --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" $(wnck_headers) > wnck-enum-types.c
! 	
! $(srcdir)/wnck-marshal.h: wnck-marshal.list
! 	echo "Building wnck-marshal.h"
! 	cd $(srcdir) && @GLIB_GENMARSHAL@ --prefix=_wnck_marshal wnck-marshal.list --header > wnck-marshal.h
! 
! $(srcdir)/wnck-marshal.c: wnck-marshal.list
! 	echo "Building wnck-marshal.c" \
! 	cd $(srcdir) && echo "#include <libwnck/libwnck.h>" > wnck-marshal.c && \
!         @GLIB_GENMARSHAL@ --prefix=_wnck_marshal wnck-marshal.list --body >> wnck-marshal.c
! 
! regenerate-built-sources: $(wnck_built_headers) $(wnck_built_cfiles)
  
  IMAGES=default_icon.png stock_delete.png stock_maximize.png stock_minimize.png
  VARIABLES=default_icon_data $(srcdir)/default_icon.png 		\
***************
*** 108,114 ****
  inlinepixbufs.h: $(IMAGES)
  	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
  
! $(OBJECTS): inlinepixbufs.h
  
  EXTRA_DIST= 			\
  	wnck-marshal.list	\
--- 116,122 ----
  inlinepixbufs.h: $(IMAGES)
  	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
  
! $(OBJECTS): inlinepixbufs.h $(wnck_built_headers) $(wnck_built_cfiles)
  
  EXTRA_DIST= 			\
  	wnck-marshal.list	\
diff -crN ./libwnck/libwnck/pager.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libwnck/libwnck/pager.c
*** ./libwnck/libwnck/pager.c	Sun Nov 24 18:34:11 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libwnck/libwnck/pager.c	Thu Jul  3 16:01:36 2003
***************
*** 935,941 ****
  	    {
  	      if (event->button == 1)
  		{
! 		  // wnck_window_activate (win);
  		  pager->priv->drag_window = win;
  		  pager->priv->drag_start_x = event->x;
  		  pager->priv->drag_start_y = event->y;
--- 935,941 ----
  	    {
  	      if (event->button == 1)
  		{
! 		  /* wnck_window_activate (win); */
  		  pager->priv->drag_window = win;
  		  pager->priv->drag_start_x = event->x;
  		  pager->priv->drag_start_y = event->y;
diff -crN ./libwnck/libwnck/tasklist.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libwnck/libwnck/tasklist.h
*** ./libwnck/libwnck/tasklist.h	Sun Dec  1 04:55:43 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libwnck/libwnck/tasklist.h	Thu Jul  3 16:02:08 2003
***************
*** 53,59 ****
  typedef enum {
    WNCK_TASKLIST_NEVER_GROUP,
    WNCK_TASKLIST_AUTO_GROUP,
!   WNCK_TASKLIST_ALWAYS_GROUP,
  } WnckTasklistGroupingType;
  
  GType wnck_tasklist_get_type (void) G_GNUC_CONST;
--- 53,59 ----
  typedef enum {
    WNCK_TASKLIST_NEVER_GROUP,
    WNCK_TASKLIST_AUTO_GROUP,
!   WNCK_TASKLIST_ALWAYS_GROUP
  } WnckTasklistGroupingType;
  
  GType wnck_tasklist_get_type (void) G_GNUC_CONST;