cairo_io: renamed some files to more meaningful names

extensions/cairo_io/Makefile.am

@@ -29,30 +29,30 @@ enum-types.c: $(HEADER_FILES)
 		$^> xgen-$(@F) \
 	&& mv -f xgen-$(@F) enum-types.c )
 
-libcairo_io_la_SOURCES = 	\
-	cairo-io-png.c		\
-	cairo-io-png.h		\
-	gth-png-saver.c         \
-        gth-png-saver.h         \
-        gth-tga-saver.c         \
-        gth-tga-saver.h         \
-        gth-tiff-saver.c        \
-        gth-tiff-saver.h        \
-        preferences.c		\
+libcairo_io_la_SOURCES = 		\
+	cairo-image-surface-png.c	\
+	cairo-image-surface-png.h	\
+	gth-png-saver.c         	\
+        gth-png-saver.h         	\
+        gth-tga-saver.c         	\
+        gth-tga-saver.h         	\
+        gth-tiff-saver.c        	\
+        gth-tiff-saver.h        	\
+        preferences.c			\
 	main.c
 
 if ENABLE_JPEG_TOOLS
-libcairo_io_la_SOURCES +=	\
-	cairo-io-jpeg.c		\
-	cairo-io-jpeg.h		\
-        gth-jpeg-saver.c        \
+libcairo_io_la_SOURCES +=		\
+	cairo-image-surface-jpeg.c	\
+	cairo-image-surface-jpeg.h	\
+        gth-jpeg-saver.c        	\
         gth-jpeg-saver.h
 endif
 
 if ENABLE_LIBRSVG
-libcairo_io_la_SOURCES +=	\
-	cairo-io-svg.c		\
-	cairo-io-svg.h
+libcairo_io_la_SOURCES +=		\
+	cairo-image-surface-svg.c	\
+	cairo-image-surface-svg.h
 endif
 
 libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) $(LIBRSVG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb

extensions/cairo_io/cairo-io-jpeg.c → extensions/cairo_io/cairo-image-surface-jpeg.c

@@ -28,7 +28,7 @@
 #include <gthumb.h>
 #include <extensions/jpeg_utils/jmemorysrc.h>
 #include <extensions/jpeg_utils/jpeg-info.h>
-#include "cairo-io-jpeg.h"
+#include "cairo-image-surface-jpeg.h"
 
 
 /* error handler data */

extensions/cairo_io/cairo-io-jpeg.h → extensions/cairo_io/cairo-image-surface-jpeg.h

@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CAIRO_IO_JPEG_H
-#define CAIRO_IO_JPEG_H
+#ifndef CAIRO_IMAGE_SURFACE_JPEG_H
+#define CAIRO_IMAGE_SURFACE_JPEG_H
 
 #include <gtk/gtk.h>
 #include <gthumb.h>
@@ -37,4 +37,4 @@ GthImage *  _cairo_image_surface_create_from_jpeg (GthFileData   *file_data,
 
 G_END_DECLS
 
-#endif /* CAIRO_IO_JPEG_H */
+#endif /* CAIRO_IMAGE_SURFACE_JPEG_H */

extensions/cairo_io/cairo-io-png.c → extensions/cairo_io/cairo-image-surface-png.c

@@ -22,7 +22,7 @@
 #include <config.h>
 #include <png.h>
 #include <gthumb.h>
-#include "cairo-io-png.h"
+#include "cairo-image-surface-png.h"
 
 /* starting from libpng version 1.5 it is not possible
  * to access inside the PNG struct directly

extensions/cairo_io/cairo-io-png.h → extensions/cairo_io/cairo-image-surface-png.h

@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CAIRO_IO_PNG_H
-#define CAIRO_IO_PNG_H
+#ifndef CAIRO_IMAGE_SURFACE_PNG_H
+#define CAIRO_IMAGE_SURFACE_PNG_H
 
 #include <gtk/gtk.h>
 #include <gthumb.h>
@@ -37,4 +37,4 @@ GthImage *  _cairo_image_surface_create_from_png (GthFileData   *file_data,
 
 G_END_DECLS
 
-#endif /* CAIRO_IO_PNG_H */
+#endif /* CAIRO_IMAGE_SURFACE_PNG_H */

extensions/cairo_io/cairo-io-svg.c → extensions/cairo_io/cairo-image-surface-svg.c

@@ -23,7 +23,7 @@
 #include <gthumb.h>
 #include <librsvg/rsvg.h>
 #include <librsvg/rsvg-cairo.h>
-#include "cairo-io-svg.h"
+#include "cairo-image-surface-svg.h"
 
 
 /* GthImageSvg (private class) */

extensions/cairo_io/cairo-io-svg.h → extensions/cairo_io/cairo-image-surface-svg.h

@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CAIRO_IO_SVG_H
-#define CAIRO_IO_SVG_H
+#ifndef CAIRO_IMAGE_SURFACE_SVG_H
+#define CAIRO_IMAGE_SURFACE_SVG_H
 
 #include <gtk/gtk.h>
 #include <gthumb.h>
@@ -37,4 +37,4 @@ GthImage *  _cairo_image_surface_create_from_svg (GthFileData   *file_data,
 
 G_END_DECLS
 
-#endif /* CAIRO_IO_SVG_H */
+#endif /* CAIRO_IMAGE_SURFACE_SVG_H */

extensions/cairo_io/main.c

@@ -22,9 +22,9 @@
 
 #include <config.h>
 #include <gthumb.h>
-#include "cairo-io-jpeg.h"
-#include "cairo-io-png.h"
-#include "cairo-io-svg.h"
+#include "cairo-image-surface-jpeg.h"
+#include "cairo-image-surface-png.h"
+#include "cairo-image-surface-svg.h"
 #include "gth-jpeg-saver.h"
 #include "gth-png-saver.h"
 #include "gth-tga-saver.h"