diff -crN ./eel/eel/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/Makefile.am
*** ./eel/eel/Makefile.am	Tue Mar  4 16:19:55 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/Makefile.am	Fri Jul  4 15:33:19 2003
***************
*** 24,29 ****
--- 24,30 ----
  	-version-info @EEL_VERSION_INFO@	\
  	$(EEL_LIBS)				\
  	$(RENDER_LIBS)				\
+ 	-lX11					\
  	$(NULL)
  
  EGGFILES =                      \
diff -crN ./eel/eel/eel-background.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-background.c
*** ./eel/eel/eel-background.c	Tue Feb 11 08:30:15 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-background.c	Fri Jul  4 15:33:28 2003
***************
*** 23,28 ****
--- 23,31 ----
  */
  
  #include <config.h>
+ 
+ #include <math.h>
+ 
  #include "eel-background.h"
  #include "eel-gdk-extensions.h"
  #include "eel-gdk-pixbuf-extensions.h"
***************
*** 41,47 ****
  #include <eel/eel-canvas.h>
  #include <eel/eel-canvas-util.h>
  #include <libgnomevfs/gnome-vfs-async-ops.h>
- #include <math.h>
  #include <stdio.h>
  
  /* FIXME: This could really be eliminated now */
--- 44,49 ----
diff -crN ./eel/eel/eel-canvas.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-canvas.h
*** ./eel/eel/eel-canvas.h	Tue Mar  4 14:19:46 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-canvas.h	Fri Jul  4 15:33:58 2003
***************
*** 92,104 ****
  	EEL_CANVAS_ITEM_ALWAYS_REDRAW    = 1 << 6,
  	EEL_CANVAS_ITEM_VISIBLE          = 1 << 7,
  	EEL_CANVAS_ITEM_NEED_UPDATE      = 1 << 8,
! 	EEL_CANVAS_ITEM_NEED_DEEP_UPDATE = 1 << 9,
  };
  
  /* Update flags for items */
  enum {
  	EEL_CANVAS_UPDATE_REQUESTED  = 1 << 0,
! 	EEL_CANVAS_UPDATE_DEEP       = 1 << 1,
  };
  
  #define EEL_TYPE_CANVAS_ITEM            (eel_canvas_item_get_type ())
--- 92,104 ----
  	EEL_CANVAS_ITEM_ALWAYS_REDRAW    = 1 << 6,
  	EEL_CANVAS_ITEM_VISIBLE          = 1 << 7,
  	EEL_CANVAS_ITEM_NEED_UPDATE      = 1 << 8,
! 	EEL_CANVAS_ITEM_NEED_DEEP_UPDATE = 1 << 9
  };
  
  /* Update flags for items */
  enum {
  	EEL_CANVAS_UPDATE_REQUESTED  = 1 << 0,
! 	EEL_CANVAS_UPDATE_DEEP       = 1 << 1
  };
  
  #define EEL_TYPE_CANVAS_ITEM            (eel_canvas_item_get_type ())
diff -crN ./eel/eel/eel-cell-renderer-pixbuf-list.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-cell-renderer-pixbuf-list.c
*** ./eel/eel/eel-cell-renderer-pixbuf-list.c	Tue Feb 11 08:30:15 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-cell-renderer-pixbuf-list.c	Fri Jul  4 15:34:08 2003
***************
*** 60,66 ****
  
  enum {
  	PROP_ZERO,
! 	PROP_PIXBUFS,
  };
  
  EEL_CLASS_BOILERPLATE (EelCellRendererPixbufList, eel_cell_renderer_pixbuf_list, GTK_TYPE_CELL_RENDERER)
--- 60,66 ----
  
  enum {
  	PROP_ZERO,
! 	PROP_PIXBUFS
  };
  
  EEL_CLASS_BOILERPLATE (EelCellRendererPixbufList, eel_cell_renderer_pixbuf_list, GTK_TYPE_CELL_RENDERER)
diff -crN ./eel/eel/eel-editable-label.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-editable-label.c
*** ./eel/eel/eel-editable-label.c	Fri Feb 28 18:09:49 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-editable-label.c	Fri Jul  4 15:35:02 2003
***************
*** 2144,2150 ****
  
    if (gtk_im_context_filter_keypress (label->im_context, event))
      {
!       //TODO eel_editable_label_obscure_mouse_cursor (label);
        label->need_im_reset = TRUE;
        return TRUE;
      }
--- 2144,2150 ----
  
    if (gtk_im_context_filter_keypress (label->im_context, event))
      {
!       /*TODO eel_editable_label_obscure_mouse_cursor (label);*/
        label->need_im_reset = TRUE;
        return TRUE;
      }
***************
*** 3006,3012 ****
  
    gdk_window_get_origin (widget->window, x, y);      
  
!   //gtk_widget_size_request (label->popup_menu, &req);
    req = widget->requisition;
    
    *x += widget->allocation.width / 2;
--- 3006,3012 ----
  
    gdk_window_get_origin (widget->window, x, y);      
  
!   /*gtk_widget_size_request (label->popup_menu, &req);*/
    req = widget->requisition;
    
    *x += widget->allocation.width / 2;
diff -crN ./eel/eel/eel-gdk-extensions.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-gdk-extensions.h
*** ./eel/eel/eel-gdk-extensions.h	Thu Oct  3 12:03:12 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-gdk-extensions.h	Fri Jul  4 15:35:09 2003
***************
*** 67,73 ****
  	EEL_GDK_HEIGHT_VALUE = 0x08,
  	EEL_GDK_ALL_VALUES   = 0x0f,
  	EEL_GDK_X_NEGATIVE   = 0x10,
! 	EEL_GDK_Y_NEGATIVE   = 0x20,
  } EelGdkGeometryFlags;
  
  /* A gradient spec. is a string that contains a specifier for either a
--- 67,73 ----
  	EEL_GDK_HEIGHT_VALUE = 0x08,
  	EEL_GDK_ALL_VALUES   = 0x0f,
  	EEL_GDK_X_NEGATIVE   = 0x10,
! 	EEL_GDK_Y_NEGATIVE   = 0x20
  } EelGdkGeometryFlags;
  
  /* A gradient spec. is a string that contains a specifier for either a
diff -crN ./eel/eel/eel-gtk-extensions.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-gtk-extensions.c
*** ./eel/eel/eel-gtk-extensions.c	Thu Oct  3 12:03:14 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-gtk-extensions.c	Fri Jul  4 15:37:26 2003
***************
*** 27,32 ****
--- 27,33 ----
  */
  
  #include <config.h>
+ #include <math.h>
  #include "eel-gtk-extensions.h"
  
  #include "eel-gdk-pixbuf-extensions.h"
***************
*** 51,57 ****
  #include <gtk/gtkseparatormenuitem.h>
  #include <gtk/gtksignal.h>
  #include <pango/pangoft2.h>
- #include <math.h>
  
  #include "eel-marshal.h"
  #include "eel-marshal.c"
--- 52,57 ----
diff -crN ./eel/eel/eel-labeled-image.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-labeled-image.c
*** ./eel/eel/eel-labeled-image.c	Mon Jul 15 10:54:38 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-labeled-image.c	Fri Jul  4 15:37:34 2003
***************
*** 69,75 ****
  	PROP_X_ALIGNMENT,
  	PROP_X_PADDING,
  	PROP_Y_ALIGNMENT,
! 	PROP_Y_PADDING,
  };
  
  /* Detail member struct */
--- 69,75 ----
  	PROP_X_ALIGNMENT,
  	PROP_X_PADDING,
  	PROP_Y_ALIGNMENT,
! 	PROP_Y_PADDING
  };
  
  /* Detail member struct */
diff -crN ./eel/eel/eel-wrap-table.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-wrap-table.c
*** ./eel/eel/eel-wrap-table.c	Mon Nov  4 17:34:32 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-wrap-table.c	Fri Jul  4 15:39:00 2003
***************
*** 42,48 ****
  	PROP_Y_SPACING,
  	PROP_X_JUSTIFICATION,
  	PROP_Y_JUSTIFICATION,
! 	PROP_HOMOGENEOUS,
  };
  
  /* Detail member struct */
--- 42,48 ----
  	PROP_Y_SPACING,
  	PROP_X_JUSTIFICATION,
  	PROP_Y_JUSTIFICATION,
! 	PROP_HOMOGENEOUS
  };
  
  /* Detail member struct */
diff -crN ./eel/eel/eel-wrap-table.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-wrap-table.h
*** ./eel/eel/eel-wrap-table.h	Fri Mar 22 21:09:37 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/eel/eel-wrap-table.h	Fri Jul  4 15:39:06 2003
***************
*** 73,80 ****
  GtkWidget *      eel_wrap_table_find_child_at_event_point (const EelWrapTable *wrap_table,
  							   int                 x,
  							   int                 y);
! void             eel_wrap_table_set_x_justification       (EelWrapTable       *wrap_table,
  							   GtkJustification    justification);
  EelJustification eel_wrap_table_get_x_justification       (const EelWrapTable *wrap_table);
  void             eel_wrap_table_set_y_justification       (EelWrapTable       *wrap_table,
  							   EelJustification    justification);
--- 73,87 ----
  GtkWidget *      eel_wrap_table_find_child_at_event_point (const EelWrapTable *wrap_table,
  							   int                 x,
  							   int                 y);
! 
! /* ?? : BV : Changed 2nd parameter type of the function eel_wrap_table_set_x_justification
! */
! void		 eel_wrap_table_set_x_justification	  (EelWrapTable *wrap_table,
! 					 		   EelJustification x_justification);
! /*void             eel_wrap_table_set_x_justification       (EelWrapTable       *wrap_table,
  							   GtkJustification    justification);
+ */
+ 
  EelJustification eel_wrap_table_get_x_justification       (const EelWrapTable *wrap_table);
  void             eel_wrap_table_set_y_justification       (EelWrapTable       *wrap_table,
  							   EelJustification    justification);
diff -crN ./eel/test/test-eel-image-chooser.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/test/test-eel-image-chooser.c
*** ./eel/test/test-eel-image-chooser.c	Thu Mar 28 22:34:21 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/test/test-eel-image-chooser.c	Fri Jul  4 15:40:18 2003
***************
*** 219,227 ****
  
  	gtk_widget_show_all (window);
  
! // 	gtk_widget_hide (button_group);
! // 	gtk_widget_hide (clear_button);
! // 	gtk_widget_hide (populate_button);
  
  	gtk_main ();
  
--- 219,228 ----
  
  	gtk_widget_show_all (window);
  
! /*	gtk_widget_hide (button_group);
!  *	gtk_widget_hide (clear_button);
!  *	gtk_widget_hide (populate_button);
!  */
  
  	gtk_main ();
  
diff -crN ./eel/test/test-eel-image-table.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/test/test-eel-image-table.c
*** ./eel/test/test-eel-image-table.c	Tue Feb 11 08:30:17 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/test/test-eel-image-table.c	Fri Jul  4 15:44:03 2003
***************
*** 89,95 ****
  
  	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
  
! //	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
  }
  
  static void
--- 89,95 ----
  
  	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
  
! /*	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text); */
  }
  
  static void
***************
*** 104,110 ****
  
  	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
  
! //	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
  }
  
  static void
--- 104,110 ----
  
  	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
  
! /*	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text); */
  }
  
  static void
***************
*** 183,189 ****
  
  	if (0) g_timeout_add (0, foo_timeout, callback_data);
  
! 	//gtk_widget_queue_resize (GTK_WIDGET (callback_data));
  
  	if (0) gtk_widget_size_allocate (GTK_WIDGET (image_table),
  					 &GTK_WIDGET (image_table)->allocation);
--- 183,189 ----
  
  	if (0) g_timeout_add (0, foo_timeout, callback_data);
  
! 	/*gtk_widget_queue_resize (GTK_WIDGET (callback_data)); */
  
  	if (0) gtk_widget_size_allocate (GTK_WIDGET (image_table),
  					 &GTK_WIDGET (image_table)->allocation);
diff -crN ./eel/test/test.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/test/test.c
*** ./eel/test/test.c	Wed Nov  6 11:43:01 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/test/test.c	Fri Jul  4 15:44:17 2003
***************
*** 28,34 ****
  int
  test_quit (int exit_code)
  {
! 	//gnome_vfs_shutdown ();
  
  	if (gtk_main_level () > 0) {
  		gtk_main_quit ();
--- 28,34 ----
  int
  test_quit (int exit_code)
  {
! 	/*gnome_vfs_shutdown ();*/
  
  	if (gtk_main_level () > 0) {
  		gtk_main_quit ();
***************
*** 140,215 ****
  	return pixbuf;
  }
  
! // /* Preferences hacks */
! // void
! // test_text_caption_set_text_for_int_preferences (EelTextCaption *text_caption,
! // 					 const char *name)
! // {
! // 	int int_value;
! // 	char *text;
  
! // 	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
! // 	g_return_if_fail (name != NULL);
  	
! // 	int_value = eel_preferences_get_integer (name);
  
! // 	text = g_strdup_printf ("%d", int_value);
  
! // 	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
  
! // 	g_free (text);
! // }
  
! // void
! // test_text_caption_set_text_for_string_preferences (EelTextCaption *text_caption,
! // 						   const char *name)
! // {
! // 	char *text;
  
! // 	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
! // 	g_return_if_fail (name != NULL);
  	
! // 	text = eel_preferences_get (name);
  	
! // 	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
  
! // 	g_free (text);
! // }
  
! // void
! // test_text_caption_set_text_for_default_int_preferences (EelTextCaption *text_caption,
! // 							const char *name)
! // {
! // 	int int_value;
! // 	char *text;
  	
! // 	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
! // 	g_return_if_fail (name != NULL);
  	
! // 	int_value = 0;
  
! // 	text = g_strdup_printf ("%d", int_value);
  
! // 	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
  
! // 	g_free (text);
! // }
  
! // void
! // test_text_caption_set_text_for_default_string_preferences (EelTextCaption *text_caption,
! // 							   const char *name)
! // {
! // 	char *text;
  	
! // 	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
! // 	g_return_if_fail (name != NULL);
  	
! // 	text = g_strdup ("");
  
! // 	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
  
! // 	g_free (text);
! // }
  
  #if 0
  int
--- 140,217 ----
  	return pixbuf;
  }
  
! #if 0
! /* Preferences hacks */
! void
! test_text_caption_set_text_for_int_preferences (EelTextCaption *text_caption,
! 					 const char *name)
! {
! 	int int_value;
! 	char *text;
  
! 	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
! 	g_return_if_fail (name != NULL);
  	
! 	int_value = eel_preferences_get_integer (name);
  
! 	text = g_strdup_printf ("%d", int_value);
  
! 	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
  
! 	g_free (text);
! }
  
! void
! test_text_caption_set_text_for_string_preferences (EelTextCaption *text_caption,
! 						   const char *name)
! {
! 	char *text;
  
! 	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
! 	g_return_if_fail (name != NULL);
  	
! 	text = eel_preferences_get (name);
  	
! 	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
  
! 	g_free (text);
! }
  
! void
! test_text_caption_set_text_for_default_int_preferences (EelTextCaption *text_caption,
! 							const char *name)
! {
! 	int int_value;
! 	char *text;
  	
! 	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
! 	g_return_if_fail (name != NULL);
  	
! 	int_value = 0;
  
! 	text = g_strdup_printf ("%d", int_value);
  
! 	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
  
! 	g_free (text);
! }
  
! void
! test_text_caption_set_text_for_default_string_preferences (EelTextCaption *text_caption,
! 							   const char *name)
! {
! 	char *text;
  	
! 	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
! 	g_return_if_fail (name != NULL);
  	
! 	text = g_strdup ("");
  
! 	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
  
! 	g_free (text);
! }
! #endif /* 0 */
  
  #if 0
  int
diff -crN ./eel/test/test.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/test/test.h
*** ./eel/test/test.h	Wed Nov  6 11:43:01 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eel/test/test.h	Fri Jul  4 15:44:25 2003
***************
*** 34,48 ****
  						 const char             *title);
  char *     eel_pixmap_file                      (const char             *partial_path);
  
! // /* Preferences hacks */
! // void test_text_caption_set_text_for_int_preferences            (EelTextCaption       *text_caption,
! // 								const char                *name);
! // void test_text_caption_set_text_for_string_preferences         (EelTextCaption       *text_caption,
! // 								const char                *name);
! // void test_text_caption_set_text_for_default_int_preferences    (EelTextCaption       *text_caption,
! // 								const char                *name);
! // void test_text_caption_set_text_for_default_string_preferences (EelTextCaption       *text_caption,
! // 								const char                *name);
  
  #include <eel/eel-debug.h>
  #include <eel/eel.h>
--- 34,50 ----
  						 const char             *title);
  char *     eel_pixmap_file                      (const char             *partial_path);
  
! #if 0
! /* Preferences hacks */
! void test_text_caption_set_text_for_int_preferences            (EelTextCaption       *text_caption,
! 								const char                *name);
! void test_text_caption_set_text_for_string_preferences         (EelTextCaption       *text_caption,
! 								const char                *name);
! void test_text_caption_set_text_for_default_int_preferences    (EelTextCaption       *text_caption,
! 								const char                *name);
! void test_text_caption_set_text_for_default_string_preferences (EelTextCaption       *text_caption,
! 								const char                *name);
! #endif /* 0 */
  
  #include <eel/eel-debug.h>
  #include <eel/eel.h>