Index: libgimp/Makefile.am
===================================================================
RCS file: /cvs/gnome/gimp/libgimp/Makefile.am,v
retrieving revision 1.141
diff -u -r1.141 Makefile.am
--- libgimp/Makefile.am	30 May 2004 22:04:15 -0000	1.141
+++ libgimp/Makefile.am	25 Jul 2004 11:34:15 -0000
@@ -216,6 +216,10 @@
 	gimpimagecombobox.h	\
 	gimppixbuf.c		\
 	gimppixbuf.h		\
+	gimppreviewarea.c	\
+	gimppreviewarea.h	\
 	gimpexport.c		\
 	gimpexport.h
 
Index: libgimp/gimpui.h
===================================================================
RCS file: /cvs/gnome/gimp/libgimp/gimpui.h,v
retrieving revision 1.25
diff -u -r1.25 gimpui.h
--- libgimp/gimpui.h	20 Apr 2004 22:14:49 -0000	1.25
+++ libgimp/gimpui.h	25 Jul 2004 11:34:15 -0000
@@ -35,6 +35,7 @@
 #include <libgimp/gimppixbuf.h>
 #include <libgimp/gimpdrawablecombobox.h>
 #include <libgimp/gimpimagecombobox.h>
+#include <libgimp/gimppreviewarea.h>
 
 
 G_BEGIN_DECLS
Index: libgimp/gimpuitypes.h
===================================================================
RCS file: /cvs/gnome/gimp/libgimp/gimpuitypes.h,v
retrieving revision 1.5
diff -u -r1.5 gimpuitypes.h
--- libgimp/gimpuitypes.h	5 Dec 2003 15:55:04 -0000	1.5
+++ libgimp/gimpuitypes.h	25 Jul 2004 11:34:15 -0000
@@ -31,6 +31,8 @@
  *
  * left here because it will contain stuff again  --Mitch
  */
+typedef struct _GimpPreviewArea GimpPreviewArea;
 
 G_END_DECLS
 
Index: plug-ins/common/sharpen.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/sharpen.c,v
retrieving revision 1.46
diff -u -r1.46 sharpen.c
--- plug-ins/common/sharpen.c	19 May 2004 23:54:40 -0000	1.46
+++ plug-ins/common/sharpen.c	25 Jul 2004 11:34:16 -0000
@@ -27,11 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef __GNUC__
-#warning GTK_DISABLE_DEPRECATED
-#endif
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
@@ -39,7 +34,6 @@
 
 #include "libgimp/stdplugins-intl.h"
 
-
 /*
  * Constants...
  */
@@ -533,14 +527,14 @@
   preview_width  = MIN (sel_width, PREVIEW_SIZE);
   preview_height = MIN (sel_height, PREVIEW_SIZE);
 
-  preview = gtk_preview_new (GTK_PREVIEW_COLOR);
-  gtk_preview_size (GTK_PREVIEW (preview), preview_width, preview_height);
+  preview = gimp_preview_area_new ();
+  gtk_widget_set_size_request (preview, preview_width, preview_height);
   gtk_container_add (GTK_CONTAINER (frame), preview);
   gtk_widget_show (preview);
 
@@ -790,11 +784,10 @@
    * Draw the preview image on the screen...
    */
 
-  for (y = 0, image_ptr = preview_image;
-       y < preview_height;
-       y ++, image_ptr += preview_width * 3)
-    gtk_preview_draw_row (GTK_PREVIEW (preview), image_ptr, 0, y,
-			  preview_width);
+  gimp_preview_area_draw_buf (GIMP_PREVIEW_AREA (preview),
+                              preview_image, 0,0,
+                              preview_width, preview_height,
+                              gimp_drawable_type (drawable));
 
   gtk_widget_queue_draw (preview);
 }
