ported to gstdio, removed unnecessary includes.

2005-03-04  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/*: ported to gstdio, removed unnecessary includes.

ChangeLog

@@ -1,3 +1,7 @@
+2005-03-04  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/common/*: ported to gstdio, removed unnecessary includes.
+
 2005-03-04  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/FractalExplorer

plug-ins/bmp/bmp.c

@@ -53,8 +53,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/bmp/bmpread.c

@@ -28,14 +28,13 @@
 
 #include <glib/gstdio.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 
 #include "bmp.h"
 
 #include "libgimp/stdplugins-intl.h"
 
+
 #if !defined(WIN32) || defined(__MINGW32__)
 #define BI_RGB 		0
 #define BI_RLE8  	1

plug-ins/bmp/bmpwrite.c

@@ -34,8 +34,6 @@
 
 #include <glib/gstdio.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -43,6 +41,7 @@
 
 #include "libgimp/stdplugins-intl.h"
 
+
 static gint cur_progress = 0;
 static gint max_progress = 0;
 static gint encoded      = 0;

plug-ins/common/AlienMap2.c

@@ -27,11 +27,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/CEL.c

@@ -22,17 +22,13 @@
  * Possible future additions:
  *  +   Save (perhaps optionally?) the palette in a KCF
  */
+
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -298,7 +294,7 @@ load_image (const gchar *file,
 
 
   /* Open the file for reading */
-  fp = fopen (file, "r");
+  fp = g_fopen (file, "r");
 
   if (fp == NULL)
     {
@@ -570,7 +566,7 @@ save_image (const gchar *file,
   drawable = gimp_drawable_get (layer);
 
   /* Open the file for writing */
-  fp = fopen (file, "w");
+  fp = g_fopen (file, "w");
 
   if (fp == NULL)
     {

plug-ins/common/CML_explorer.c

@@ -72,11 +72,10 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -1999,7 +1998,7 @@ CML_save_to_file_response (GtkWidget *dialog,
       ! force_overwrite (filename, dialog))
     return;
 
-  file = fopen (filename, "w");
+  file = g_fopen (filename, "w");
 
   if (! file)
     {
@@ -2214,7 +2213,7 @@ CML_load_parameter_file (const gchar *filename,
   gint       seed = 0;
   gint       old2new_function_id[] = { 3, 4, 5, 6, 7, 9, 10, 11, 1, 2 };
 
-  file = fopen (filename, "r");
+  file = g_fopen (filename, "r");
 
   if (!file)
     {

plug-ins/common/aa.c

@@ -29,9 +29,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <aalib.h>
 
-#include <gtk/gtk.h>
+#include <aalib.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/align_layers.c

@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/animationplay.c

@@ -46,12 +46,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -604,7 +600,7 @@ render_frame (gint32 whichframe)
     {
       printf( "playback: Asked for frame number %d in a %d-frame animation!\n",
              (int) (whichframe+1), (int) total_frames);
-      exit(-1);
+      gimp_quit ();
     }
 
   drawable = gimp_drawable_get (layers[total_frames-(whichframe+1)]);

plug-ins/common/animoptimize.c

@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 #include <libgimp/gimp.h>

plug-ins/common/apply_lens.c

@@ -39,8 +39,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/blinds.c

@@ -34,8 +34,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/borderaverage.c

@@ -17,9 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include "config.h"
 
-#include <gtk/gtk.h>
+#include "config.h"
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/bumpmap.c

@@ -102,14 +102,7 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/ccanalyze.c

@@ -26,15 +26,15 @@
 #include "config.h"
 
 #include <string.h>
-#include <sys/stat.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
+
 /* lets prototype */
 static void query (void);
 static void run   (const gchar      *name,
@@ -394,7 +394,7 @@ doDialog (void)
   doLabel (vbox, _("Uncompressed size: %s"), memsize);
   g_free (memsize);
 
-  if (filename && !stat (filename, &st) && !gimp_image_is_dirty (imageID))
+  if (filename && !g_stat (filename, &st) && !gimp_image_is_dirty (imageID))
     {
       gchar *memsize = gimp_memsize_to_string (st.st_size);
 

plug-ins/common/channel_mixer.c

@@ -27,18 +27,10 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
-#ifdef G_OS_WIN32
-#include <libgimpbase/gimpwin32-io.h>
-#endif
-
-#include <libgimpmath/gimpmath.h>
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -920,7 +912,7 @@ cm_load_file_response_callback (GtkWidget    *dialog,
 
       filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 
-      fp = fopen (filename, "r");
+      fp = g_fopen (filename, "r");
 
       if (fp)
         {
@@ -1054,7 +1046,7 @@ cm_save_file_response_callback (GtkWidget    *dialog,
       return;
     }
 
-  file = fopen (filename, "w");
+  file = g_fopen (filename, "w");
 
   if (! file)
     {

plug-ins/common/checkerboard.c

@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/colortoalpha.c

@@ -23,9 +23,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/compose.c

@@ -29,15 +29,10 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
-#include <libgimpmath/gimpmath.h>
 
 #include "libgimp/stdplugins-intl.h"
 

plug-ins/common/compressor.c

@@ -59,21 +59,26 @@
 
 #include "config.h"
 
-#include <stdlib.h>
+#include <string.h>
-#include <stdio.h>
+#include <errno.h>
+
 #include <sys/types.h>
+
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
+
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
+
 #include <sys/stat.h>
-#include <string.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <errno.h>
+
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 
@@ -378,7 +383,7 @@ save_image (const Compressor *compressor,
                          tmpname,
                          tmpname) && valid_file (tmpname)))
     {
-      unlink (tmpname);
+      g_unlink (tmpname);
       g_free (tmpname);
       return GIMP_PDB_EXECUTION_ERROR;
     }
@@ -399,7 +404,7 @@ save_image (const Compressor *compressor,
       {
         FILE *f;
 
-        if (!(f = fopen (filename, "w")))
+        if (!(f = g_fopen (filename, "w")))
           {
             g_message (_("Could not open '%s' for writing: %s"),
                        gimp_filename_to_utf8 (filename), g_strerror (errno));
@@ -450,8 +455,8 @@ save_image (const Compressor *compressor,
     STARTUPINFO          startupinfo;
     PROCESS_INFORMATION  processinfo;
 
-    in  = fopen (tmpname, "rb");
+    in  = g_fopen (tmpname, "rb");
-    out = fopen (filename, "wb");
+    out = g_fopen (filename, "wb");
 
     startupinfo.cb          = sizeof (STARTUPINFO);
     startupinfo.lpReserved  = NULL;
@@ -485,7 +490,7 @@ save_image (const Compressor *compressor,
   }
 #endif /* G_OS_WIN32 */
 
-  unlink (tmpname);
+  g_unlink (tmpname);
   g_free (tmpname);
 
   return GIMP_PDB_SUCCESS;
@@ -530,7 +535,7 @@ load_image (const Compressor  *compressor,
       {
         FILE *f;
 
-        if (! (f = fopen (tmpname, "w")))
+        if (! (f = g_fopen (tmpname, "w")))
           {
             g_message (_("Could not open '%s' for writing: %s"),
                        gimp_filename_to_utf8 (tmpname), g_strerror (errno));
@@ -586,8 +591,8 @@ load_image (const Compressor  *compressor,
     STARTUPINFO          startupinfo;
     PROCESS_INFORMATION  processinfo;
 
-    in  = fopen (filename, "rb");
+    in  = g_fopen (filename, "rb");
-    out = fopen (tmpname, "wb");
+    out = g_fopen (tmpname, "wb");
 
     startupinfo.cb          = sizeof (STARTUPINFO);
     startupinfo.lpReserved  = NULL;
@@ -626,7 +631,7 @@ load_image (const Compressor  *compressor,
 
   image_ID = gimp_file_load (run_mode, tmpname, tmpname);
 
-  unlink (tmpname);
+  g_unlink (tmpname);
   g_free (tmpname);
 
   if (image_ID != -1)

plug-ins/common/convmatrix.c

@@ -54,15 +54,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
 #include <string.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/csource.c

@@ -21,11 +21,9 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -382,7 +380,7 @@ save_image (Config *config,
   guint8 *img_buffer, *img_buffer_end;
   gchar *basename;
 
-  fp = fopen (config->file_name, "w");
+  fp = g_fopen (config->file_name, "w");
   if (!fp)
     return FALSE;
 

plug-ins/common/cubism.c

@@ -22,11 +22,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/curve_bend.c

@@ -36,12 +36,11 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -855,7 +854,7 @@ p_save_pointfile (BenderDialog *cd,
   gint j;
   FILE *l_fp;
 
-  l_fp = fopen(filename, "w+");
+  l_fp = g_fopen(filename, "w+");
   if (!l_fp)
     {
       g_message (_("Could not open '%s' for writing: %s"),
@@ -907,7 +906,7 @@ p_load_pointfile (BenderDialog *cd,
   float l_fux, l_fuy, l_flx, l_fly;
   gint  l_iuy, l_ily ;
 
-  l_fp = fopen(filename, "r");
+  l_fp = g_fopen(filename, "r");
   if (!l_fp)
     {
       g_message (_("Could not open '%s' for reading: %s"),

plug-ins/common/decompose.c

@@ -30,13 +30,10 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
-#include <libgimpmath/gimpmath.h>
 
 #include "libgimp/stdplugins-intl.h"
 

plug-ins/common/deinterlace.c

@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/depthmerge.c

@@ -24,11 +24,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/despeckle.c

@@ -23,11 +23,7 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/destripe.c

@@ -23,12 +23,8 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/dicom.c

@@ -25,9 +25,10 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
 
+#include <glib/gstdio.h>
+
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -283,7 +284,7 @@ load_image (const gchar *filename)
   gboolean        toggle_endian     = FALSE;
 
   /* open the file */
-  DICOM = fopen (filename, "rb");
+  DICOM = g_fopen (filename, "rb");
 
   if (!DICOM)
     {
@@ -640,7 +641,7 @@ save_image (const gchar  *filename,
   g_date_free (date);
 
   /* Open the output file. */
-  DICOM = fopen (filename, "wb");
+  DICOM = g_fopen (filename, "wb");
 
   if (!DICOM)
     {

plug-ins/common/diffraction.c

@@ -23,15 +23,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <sys/types.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/displace.c

@@ -42,23 +42,8 @@
 
 /* Version 1.12. */
 
-typedef enum
-{
-  CARTESIAN_MODE = 0,
-  POLAR_MODE = 1
-} DisplaceMode;
-
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <signal.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -70,6 +55,13 @@ typedef enum
 #define ENTRY_WIDTH     75
 #define TILE_CACHE_SIZE 48
 
+
+typedef enum
+{
+  CARTESIAN_MODE = 0,
+  POLAR_MODE = 1
+} DisplaceMode;
+
 typedef struct
 {
   gdouble      amount_x;

plug-ins/common/dog.c

@@ -29,8 +29,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/edge.c

@@ -50,12 +50,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/emboss.c

@@ -28,12 +28,7 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/engrave.c

@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/exchange.c

@@ -37,12 +37,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/film.c

@@ -22,16 +22,10 @@
  * This plug-in generates a film roll with several images
  */
 
-static char ident[] = "@(#) GIMP Film plug-in v1.04 1999-10-08";
-
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -686,7 +680,7 @@ scale_layer (gint32  src_layer,
 	     gint    dst_height)
 {
   gint tile_height, i, scan_lines, numpix;
-  guchar *src, *tmp = (guchar *) ident; /* Just to satisfy gcc */
+  guchar *src, *tmp;
   gint32 tmp_image, tmp_layer;
   GimpDrawable *tmp_drawable, *src_drawable, *dst_drawable;
   GimpPixelRgn tmp_pixel_rgn, src_pixel_rgn, dst_pixel_rgn;

plug-ins/common/flarefx.c

@@ -47,8 +47,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/fp.c

@@ -25,8 +25,6 @@
 
 #include <stdlib.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/fractaltrace.c

@@ -29,11 +29,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -335,7 +330,6 @@ pixels_get (gint     x,
     }
 }
 
-#include <stdio.h>
 static void
 pixels_get_biliner (gdouble  x,
                     gdouble  y,

plug-ins/common/gauss.c

@@ -18,12 +18,8 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/gbr.c

@@ -17,19 +17,20 @@
 
 #include "config.h"
 
-#include <glib.h>		/* Include early for G_OS_WIN32 */
-
 #include <errno.h>
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdio.h>
+
-#include <stdlib.h>
+#include <glib/gstdio.h>
-#include <string.h>
+
-#include <math.h>
+#include <glib.h>
 
 #ifdef G_OS_WIN32
 #include <io.h>
@@ -39,8 +40,6 @@
 #define _O_BINARY 0
 #endif
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -319,7 +318,7 @@ load_image (const gchar *filename)
   GimpImageType      image_type;
   gssize             size;
 
-  fd = open (filename, O_RDONLY | _O_BINARY);
+  fd = g_open (filename, O_RDONLY | _O_BINARY);
 
   if (fd == -1)
     {
@@ -576,7 +575,7 @@ save_image (const gchar *filename,
       return FALSE;
     }
 
-  fd = open (filename, O_CREAT | O_TRUNC | O_WRONLY | _O_BINARY, 0644);
+  fd = g_open (filename, O_CREAT | O_TRUNC | O_WRONLY | _O_BINARY, 0644);
 
   if (fd == -1)
     {

plug-ins/common/gee.c

@@ -12,8 +12,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/gee_zoom.c

@@ -32,8 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/gif.c

@@ -275,10 +275,10 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
+#include <glib/gstdio.h>
+
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -988,7 +988,7 @@ save_image (const gchar *filename,
 
 
   /* open the destination file for writing */
-  outfile = fopen (filename, "wb");
+  outfile = g_fopen (filename, "wb");
   if (!outfile)
     {
       g_message (_("Could not open '%s' for writing: %s"),

plug-ins/common/gifload.c

@@ -66,11 +66,9 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 
@@ -290,7 +288,7 @@ load_image (const gchar *filename)
   char version[4];
   gint32 image_ID = -1;
 
-  fd = fopen (filename, "rb");
+  fd = g_fopen (filename, "rb");
   if (!fd)
     {
       g_message (_("Could not open '%s' for reading: %s"),

plug-ins/common/gih.c

@@ -43,17 +43,19 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#include <glib/gstdio.h>
+
 #include <glib.h>
 
 #ifdef G_OS_WIN32
@@ -64,8 +66,6 @@
 #define _O_BINARY 0
 #endif
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 #include <libgimpbase/gimpparasiteio.h>
@@ -640,7 +640,7 @@ gih_load_image (const gchar *filename)
   gchar   *paramstring;
   GimpParasite *pipe_parasite;
 
-  fd = open (filename, O_RDONLY | _O_BINARY);
+  fd = g_open (filename, O_RDONLY | _O_BINARY);
 
   if (fd == -1)
     {
@@ -1250,7 +1250,7 @@ gih_save_image (const gchar *filename,
   imageh = gimp_image_height (image_ID);
   gimp_tile_cache_size (gimp_tile_height () * imagew * 4);
 
-  fd = open (filename, O_CREAT | O_TRUNC | O_WRONLY | _O_BINARY, 0644);
+  fd = g_open (filename, O_CREAT | O_TRUNC | O_WRONLY | _O_BINARY, 0644);
 
   if (fd == -1)
     {

plug-ins/common/glasstile.c

@@ -42,8 +42,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/gqbist.c

@@ -27,16 +27,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/grid.c

@@ -39,12 +39,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/gtm.c

@@ -51,11 +51,9 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -217,7 +215,7 @@ save_image (const gchar  *filename,
 
   palloc = g_new (int, drawable->width * drawable->height);
 
-  fp = fopen (filename, "w");
+  fp = g_fopen (filename, "w");
 
   if (! fp)
     {

plug-ins/common/header.c

@@ -18,11 +18,9 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -164,7 +162,7 @@ save_image (const gchar *filename,
   guchar *cmap;
   gint colors;
 
-  if ((fp = fopen (filename, "w")) == NULL)
+  if ((fp = g_fopen (filename, "w")) == NULL)
     return FALSE;
 
   drawable = gimp_drawable_get (drawable_ID);

plug-ins/common/hot.c

@@ -1,9 +1,3 @@
-/*
- * file: hot/hot.c
- *
- * $Id$
- */
-
 /*
  * hot.c - Scan an image for pixels with RGB values that will give
  *	"unsafe" values of chrominance signal or composite signal
@@ -66,17 +60,14 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
+
 typedef struct
 {
   gint32 image;

plug-ins/common/illusion.c

@@ -26,17 +26,14 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
+
 #define PLUG_IN_NAME    "plug_in_illusion"
 #define PLUG_IN_VERSION "v0.8 (May 14 2000)"
 #define HELP_ID         "plug-in-illusion"

plug-ins/common/iwarp.c

@@ -40,11 +40,7 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/jigsaw.c

@@ -35,17 +35,14 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
+
 typedef enum
 {
   BEZIER_1,
@@ -607,7 +604,7 @@ draw_jigsaw (guchar   *buffer,
   else
     {
       printf("draw_jigsaw: bad style\n");
-      exit(1);
+      gimp_quit ();
     }
 
   g_free (globals.gridx);

plug-ins/common/laplace.c

@@ -30,13 +30,10 @@
    don't use rint;
    if gamma-channel: set to white if at least one colour channel is >15 */
 
-/* update 03/10/97
-   #ifdef MAX and MIN */
 
 #include "config.h"
 
 #include <stdlib.h>
-#include <stdio.h>
 
 #include <libgimp/gimp.h>
 

plug-ins/common/lic.c

@@ -36,11 +36,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/mail.c

@@ -80,17 +80,19 @@
 
 #include "config.h"
 
-#include <stdlib.h>
+#include <string.h>
-#include <stdio.h>
+#include <errno.h>
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
 
-#include <gtk/gtk.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -435,7 +437,7 @@ save_image (const gchar *filename,
   else
     {
       /* This must be MIME stuff. Base64 away... */
-      infile = fopen (tmpname, "r");
+      infile = g_fopen (tmpname, "r");
       to64 (infile, mailpipe);
 
       /* close off mime */
@@ -456,7 +458,7 @@ cleanup:
   waitpid (mailpid, NULL, 0);
 
   /* delete the tmpfile that was generated */
-  unlink (tmpname);
+  g_unlink (tmpname);
   g_free (tmpname);
 
   return status;

plug-ins/common/mapcolor.c

@@ -35,12 +35,7 @@ static char dversio[] =                          "v1.03  22-May-00";
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/max_rgb.c

@@ -27,11 +27,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/mblur.c

@@ -48,13 +48,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/mng.c

@@ -45,11 +45,12 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include <glib/gstdio.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -553,7 +554,7 @@ mng_save_image (const gchar *filename,
 
   userdata = g_new0 (struct mnglib_userdata_t, 1);
 
-  if ((userdata->fp = fopen (filename, "wb")) == NULL)
+  if ((userdata->fp = g_fopen (filename, "wb")) == NULL)
     {
       g_message (_("Could not open '%s' for writing: %s"),
                  gimp_filename_to_utf8 (filename), g_strerror (errno));
@@ -941,12 +942,12 @@ mng_save_image (const gchar *filename,
           return 0;
         }
 
-      if ((outfile = fopen (temp_file_name, "wb")) == NULL)
+      if ((outfile = g_fopen (temp_file_name, "wb")) == NULL)
         {
           g_message (_("Could not open '%s' for writing: %s"),
                      gimp_filename_to_utf8 (temp_file_name),
                      g_strerror (errno));
-          unlink (temp_file_name);
+          g_unlink (temp_file_name);
           mng_cleanup (&handle);
           fclose (userdata->fp);
           g_free (userdata);
@@ -961,7 +962,7 @@ mng_save_image (const gchar *filename,
           g_warning
             ("Unable to png_create_write_struct() in mng_save_image()");
           fclose (outfile);
-          unlink (temp_file_name);
+          g_unlink (temp_file_name);
           mng_cleanup (&handle);
           fclose (userdata->fp);
           g_free (userdata);
@@ -974,7 +975,7 @@ mng_save_image (const gchar *filename,
             ("Unable to png_create_info_struct() in mng_save_image()");
           png_destroy_write_struct (&png_ptr, (png_infopp) NULL);
           fclose (outfile);
-          unlink (temp_file_name);
+          g_unlink (temp_file_name);
           mng_cleanup (&handle);
           fclose (userdata->fp);
           g_free (userdata);
@@ -986,7 +987,7 @@ mng_save_image (const gchar *filename,
           g_warning ("HRM saving PNG in mng_save_image()");
           png_destroy_write_struct (&png_ptr, (png_infopp) NULL);
           fclose (outfile);
-          unlink (temp_file_name);
+          g_unlink (temp_file_name);
           mng_cleanup (&handle);
           fclose (userdata->fp);
           g_free (userdata);
@@ -1112,12 +1113,12 @@ mng_save_image (const gchar *filename,
 
       fclose (outfile);
 
-      if ((infile = fopen (temp_file_name, "rb")) == NULL)
+      if ((infile = g_fopen (temp_file_name, "rb")) == NULL)
         {
           g_message (_("Could not open '%s' for reading: %s"),
                      gimp_filename_to_utf8 (temp_file_name),
                      g_strerror (errno));
-          unlink (temp_file_name);
+          g_unlink (temp_file_name);
           mng_cleanup (&handle);
           fclose (userdata->fp);
           g_free (userdata);
@@ -1260,7 +1261,7 @@ mng_save_image (const gchar *filename,
         }
 
       fclose (infile);
-      unlink (temp_file_name);
+      g_unlink (temp_file_name);
     }
 
   if ((ret = mng_putchunk_mend (handle)) != MNG_NOERROR)

plug-ins/common/mosaic.c

@@ -25,16 +25,14 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
+
 #define  SCALE_WIDTH     150
 
 #define  HORIZONTAL        0

plug-ins/common/newsprint.c

@@ -49,22 +49,14 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
-
-#ifdef RCSID
-static char rcsid[] = "$Id$";
-#endif
-
 #define VERSION "v0.60"
 
 /* Some useful macros */

plug-ins/common/nlfilt.c

@@ -22,8 +22,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
 
 /*
@@ -33,9 +31,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/noisify.c

@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /*
@@ -34,12 +32,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/normalize.c

@@ -30,7 +30,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <stdio.h>
 
 #include <libgimp/gimp.h>
 
@@ -161,7 +160,7 @@ indexed_normalize (gint32 image_ID)  /* a.d.m. */
 
   if (cmap==NULL)
     {
-      printf ("normalize: cmap was NULL!  Quitting...\n");
+      g_printerr ("normalize: cmap was NULL!  Quitting...\n");
       return;
     }
 

plug-ins/common/nova.c

@@ -61,11 +61,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/oilify.c

@@ -17,18 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/papertile.c

@@ -24,13 +24,12 @@
 
 #include <stdlib.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
+
 /*===========================================================================*/
 /* DEFINES                                                                   */
 /*===========================================================================*/

plug-ins/common/pat.c

@@ -8,16 +8,14 @@
 
 #include "config.h"
 
+#include <string.h>
 #include <errno.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_UNISTD_H
+
-#include <unistd.h>
+#include <glib/gstdio.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -293,7 +291,7 @@ load_image (const gchar *filename)
   GimpImageBaseType base_type;
   GimpImageType     image_type;
 
-  fd = open (filename, O_RDONLY | _O_BINARY);
+  fd = g_open (filename, O_RDONLY | _O_BINARY);
 
   if (fd == -1)
     {
@@ -424,7 +422,7 @@ save_image (const gchar *filename,
   gint          line;
   GimpPixelRgn  pixel_rgn;
 
-  fd = open (filename, O_CREAT | O_TRUNC | O_WRONLY | _O_BINARY, 0644);
+  fd = g_open (filename, O_CREAT | O_TRUNC | O_WRONLY | _O_BINARY, 0644);
 
   if (fd == -1)
     {

plug-ins/common/pcx.c

@@ -17,11 +17,9 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -295,7 +293,7 @@ load_image (const gchar *filename)
   gint32 image, layer;
   guchar *dest, cmap[768];
 
-  fd = fopen (filename, "rb");
+  fd = g_fopen (filename, "rb");
   if (!fd)
     {
       g_message (_("Could not open '%s' for reading: %s"),
@@ -576,7 +574,7 @@ save_image (const gchar *filename,
       return FALSE;
   }
 
-  if ((fp = fopen (filename, "wb")) == NULL)
+  if ((fp = g_fopen (filename, "wb")) == NULL)
     {
       g_message (_("Could not open '%s' for writing: %s"),
                  gimp_filename_to_utf8 (filename), g_strerror (errno));

plug-ins/common/pix.c

@@ -40,18 +40,12 @@
  *       colour, so neither does this plug-in
  */
 
-static char ident[] = "@(#) GIMP Alias|Wavefront pix image file-plugin v1.0  24-jun-97";
-
 #include "config.h"
 
 #include <errno.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -325,7 +319,7 @@ load_image (const gchar *filename)
   PIX_DEBUG_PRINT ("Opening file: %s\n", filename);
 
   /* Open the file */
-  file = fopen (filename, "rb");
+  file = g_fopen (filename, "rb");
   if (NULL == file)
     {
       g_message (_("Could not open '%s' for reading: %s"),
@@ -505,7 +499,7 @@ save_image (const gchar *filename,
   depth = gimp_drawable_bpp (drawable_ID);
 
   /* Open the output file. */
-  file = fopen (filename, "wb");
+  file = g_fopen (filename, "wb");
   if (!file)
     {
       g_message (_("Could not open '%s' for writing: %s"),

plug-ins/common/pixelize.c

@@ -58,23 +58,14 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
 
-#ifdef RCSID
-static char rcsid[] = "$Id$";
-#endif
-
-
 /* Some useful macros */
 
 #define TILE_CACHE_SIZE  16

plug-ins/common/plasma.c

@@ -57,17 +57,14 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
+
 /* Some useful macros */
 
 #define SCALE_WIDTH      48

plug-ins/common/png.c

@@ -41,12 +41,10 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
+#include <errno.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -666,7 +664,7 @@ load_image (const gchar *filename,
    * Open the file and initialize the PNG read "engine"...
    */
 
-  fp = fopen (filename, "rb");
+  fp = g_fopen (filename, "rb");
 
   if (fp == NULL)
     {
@@ -1169,7 +1167,7 @@ save_image (const gchar *filename,
    * Open the file and initialize the PNG write "engine"...
    */
 
-  fp = fopen (filename, "wb");
+  fp = g_fopen (filename, "wb");
   if (fp == NULL)
     {
       g_message (_("Could not open '%s' for writing: %s"),

plug-ins/common/pnm.c

@@ -28,16 +28,18 @@
 #include "config.h"
 
 #include <errno.h>
+#include <string.h>
+
 #include <setjmp.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdio.h>
+
-#include <stdlib.h>
+#include <glib/gstdio.h>
-#include <string.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -424,7 +426,7 @@ load_image (const gchar *filename)
   int ctr;
 
   /* open the file */
-  fd = open (filename, O_RDONLY | _O_BINARY);
+  fd = g_open (filename, O_RDONLY | _O_BINARY);
 
   if (fd == -1)
     {
@@ -800,7 +802,7 @@ save_image (const gchar *filename,
     }
 
   /* open the file */
-  fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC | _O_BINARY, 0644);
+  fd = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC | _O_BINARY, 0644);
 
   if (fd == -1)
     {

plug-ins/common/polar.c

@@ -57,19 +57,12 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
 #include "libgimp/stdplugins-intl.h"
 
+
 #define WITHIN(a, b, c) ((((a) <= (b)) && ((b) <= (c))) ? 1 : 0)
 
 

plug-ins/common/postscript.c

@@ -70,13 +70,10 @@
  */
 #define VERSIO 1.17
 static char dversio[] = "v1.17  19-Sep-2004";
-static char ident[] = "@(#) GIMP PostScript/PDF file-plugin v1.17  19-Sep-2004";
 
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -86,6 +83,8 @@ static char ident[] = "@(#) GIMP PostScript/PDF file-plugin v1.17  19-Sep-2004";
 #include <unistd.h>
 #endif
 
+#include <glib/gstdio.h>
+
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -984,7 +983,7 @@ load_image (const gchar *filename)
 #endif
 
   /* Try to see if PostScript file is available */
-  ifp = fopen (filename, "r");
+  ifp = g_fopen (filename, "r");
   if (ifp == NULL)
     {
       g_message (_("Could not open '%s' for reading: %s"),
@@ -1115,7 +1114,7 @@ save_image (const gchar *filename,
     }
 
   /* Open the output file. */
-  ofp = fopen (filename, "wb");
+  ofp = g_fopen (filename, "wb");
   if (!ofp)
     {
       g_message (_("Could not open '%s' for writing: %s"),
@@ -1416,7 +1415,8 @@ ps_open (const gchar      *filename,
          gint             *is_epsf,
          gint             *ChildPidPtr)
 {
-  char *gs, *driver;
+  const gchar *gs;
+  gchar *driver;
   GPtrArray *cmdA;
   gchar **pcmdA;
   FILE *fd_popen = NULL;
@@ -1445,7 +1445,7 @@ ps_open (const gchar      *filename,
   /* Check if it is a EPS-file */
   *is_epsf = 0;
 
-  eps_file = fopen (filename, "rb");
+  eps_file = g_fopen (filename, "rb");
 
   if (eps_file != NULL)
     {
@@ -1530,7 +1530,7 @@ ps_open (const gchar      *filename,
   pnmfile = "-";
 #endif
 
-  gs = getenv ("GS_PROG");
+  gs = g_getenv ("GS_PROG");
   if (gs == NULL)
     gs = DEFAULT_GS_PROG;
 
@@ -1557,7 +1557,7 @@ ps_open (const gchar      *filename,
   g_ptr_array_add (cmdA, g_strdup ("-dNOPAUSE"));
 
   /* If no additional options specified, use at least -dSAFER */
-  if (getenv ("GS_OPTIONS") == NULL)
+  if (g_getenv ("GS_OPTIONS") == NULL)
     g_ptr_array_add (cmdA, g_strdup ("-dSAFER"));
 
   /* Output file name */
@@ -1649,7 +1649,7 @@ ps_open (const gchar      *filename,
       g_message (_("Error starting ghostscript: %s"), Gerr->message);
       g_error_free (Gerr);
 
-      unlink (pnmfile);
+      g_unlink (pnmfile);
 
       goto out;
     }
@@ -1657,7 +1657,7 @@ ps_open (const gchar      *filename,
   /* Don't care about exit status of ghostscript. */
   /* Just try to read what it wrote. */
 
-  fd_popen = fopen (pnmfile, "rb");
+  fd_popen = g_fopen (pnmfile, "rb");
 
 #endif
 
@@ -1716,7 +1716,7 @@ ps_close (FILE *ifp, gint ChildPid)
 #else  /*  USE_REAL_OUTPUTFILE  */
  /* If a real outputfile was used, close the file and remove it. */
   fclose (ifp);
-  unlink (pnmfile);
+  g_unlink (pnmfile);
 #endif
 }
 

plug-ins/common/psd.c

@@ -182,14 +182,10 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <string.h>
 
-#include <glib.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 
@@ -1776,7 +1772,7 @@ load_image (const gchar *name)
 
   IFDBG printf("------- %s ---------------------------------\n",name);
 
-  fd = fopen (name, "rb");
+  fd = g_fopen (name, "rb");
   if (! fd)
     {
       g_message (_("Could not open '%s' for reading: %s"),

plug-ins/common/psd_save.c

@@ -61,14 +61,9 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <string.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include "libgimp/gimp.h"
 #include "libgimp/gimpui.h"
@@ -1329,7 +1324,7 @@ save_image (const gchar *filename,
   g_free (layers);
 
 
-  fd = fopen (filename, "wb");
+  fd = g_fopen (filename, "wb");
   if (fd == NULL)
     {
       g_message (_("Could not open '%s' for writing: %s"),

plug-ins/common/psp.c

@@ -36,19 +36,11 @@
 
 #include "config.h"
 
-#include <glib.h>		/* We want glib.h first because of some
-				 * pretty obscure Win32 compilation issues.
-				 */
-
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <zlib.h>
 
-#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -1456,7 +1448,7 @@ load_image (const gchar *filename)
   if (stat (filename, &st) == -1)
     return -1;
 
-  f = fopen (filename, "rb");
+  f = g_fopen (filename, "rb");
   if (f == NULL)
     {
       g_message (_("Could not open '%s' for reading: %s"),

plug-ins/common/randomize.c

@@ -67,16 +67,9 @@
  *  - add a real melt function
  ****************************************************************************/
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/raw.c

@@ -25,12 +25,17 @@
 #include "config.h"
 
 #include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include <string.h>
+
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#include <glib/gstdio.h>
 
 #include "libgimp/gimp.h"
 #include "libgimp/gimpui.h"
@@ -223,7 +228,7 @@ run (const gchar      *name,
         {
           gimp_get_data ("file_raw_load", runtime);
 
-          preview_fd = open (param[1].data.d_string, O_RDONLY);
+          preview_fd = g_open (param[1].data.d_string, O_RDONLY);
 
           if (preview_fd < 0)
             {
@@ -426,7 +431,7 @@ raw_load_palette (RawGimpData *data,
 
   if (palette_file)
     {
-      fd = open (palette_file, O_RDONLY);
+      fd = g_open (palette_file, O_RDONLY);
 
       if (! fd)
         return FALSE;
@@ -510,7 +515,7 @@ save_image (gchar  *filename,
 
   gimp_pixel_rgn_get_rect (&pixel_rgn, buf, 0, 0, width, height);
 
-  fp = fopen (filename, "wb");
+  fp = g_fopen (filename, "wb");
 
   if (! fp)
     {
@@ -537,7 +542,7 @@ save_image (gchar  *filename,
           gchar *newfile = g_strconcat (filename, ".pal", NULL);
           gchar *temp;
 
-          fp = fopen (newfile, "wb");
+          fp = g_fopen (newfile, "wb");
 
           if (! fp)
             {
@@ -628,7 +633,7 @@ load_image (gchar *filename)
 
   data = g_new0 (RawGimpData, 1);
 
-  data->fp = fopen (filename, "rb");
+  data->fp = g_fopen (filename, "rb");
   if (! data->fp)
     {
       g_message (_("Could not open '%s' for reading: %s"),
@@ -822,7 +827,7 @@ preview_update (GimpPreviewArea *preview)
               {
                 gint fd;
 
-                fd = open (palfile, O_RDONLY);
+                fd = g_open (palfile, O_RDONLY);
                 lseek (fd, runtime->palette_offset, SEEK_SET);
                 read (fd, preview_cmap,
                       (runtime->palette_type == RAW_PALETTE_RGB) ? 768 : 1024);

plug-ins/common/retinex.c

@@ -20,8 +20,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "libgimp/gimp.h"
 #include "libgimp/gimpui.h"
 

plug-ins/common/ripple.c

@@ -20,13 +20,9 @@
  *
  * You can contact the original The Gimp authors at gimp@xcf.berkeley.edu
  */
+
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/sample_colorize.c

@@ -22,12 +22,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
@@ -2570,7 +2567,7 @@ p_init_gdrw (t_GDRW       *gdrw,
   if (non_empty && (l_sel_channel_id >= 0))
     {
       /* selection is TRUE */
-      l_sel_gdrw = (t_GDRW *) calloc(1, sizeof(t_GDRW));
+      l_sel_gdrw = g_new0 (t_GDRW, 1);
       l_sel_gdrw->drawable = gimp_drawable_get (l_sel_channel_id);
 
       l_sel_gdrw->tile = NULL;

plug-ins/common/scatter_hsv.c

@@ -22,11 +22,7 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>

plug-ins/common/screenshot.c

@@ -29,8 +29,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/sel_gauss.c

@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/semiflatten.c

@@ -22,9 +22,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include <libgimp/gimp.h>
 
 #include "libgimp/stdplugins-intl.h"

plug-ins/common/sharpen.c

@@ -25,8 +25,6 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/shift.c

@@ -24,11 +24,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/sinus.c

@@ -29,11 +29,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/smooth_palette.c

@@ -22,12 +22,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/snoise.c

@@ -65,11 +65,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 

plug-ins/common/sobel.c

@@ -24,8 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>