[gthumb] do not include gth-image-utils.h in gtk-utils.h

[Paolo Bacchilega <paobac src gnome org>]

commit 8c0c192429b9ae8a3414f77e6373c1933f0d8035
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Dec 16 09:27:01 2019 +0100

    do not include gth-image-utils.h in gtk-utils.h
    
    This will allow to make a gtk-utils test without including
    many other files.

 gthumb/gth-image-utils.c | 14 --------------
 gthumb/gth-image-utils.h | 24 ------------------------
 gthumb/gtk-utils.c       | 16 +++++++++++++++-
 gthumb/gtk-utils.h       | 25 +++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 39 deletions(-)
---
diff --git a/gthumb/gth-image-utils.c b/gthumb/gth-image-utils.c
index 045030d1..207b45b1 100644
--- a/gthumb/gth-image-utils.c
+++ b/gthumb/gth-image-utils.c
@@ -30,20 +30,6 @@
 #include "gth-main.h"
 
 
-SizeValue
-ImageSizeValues[IMAGE_SIZE_N] = {
-               { 320, 200 },
-               { 320, 320 },
-               { 640, 480 },
-               { 640, 640 },
-               { 800, 600 },
-               { 800, 800 },
-               { 1024, 768 },
-               { 1024, 1024 },
-               { 1280, 960 },
-               { 1280, 1280 } };
-
-
 gboolean
 scale_keeping_ratio_min (int      *width,
                         int      *height,
diff --git a/gthumb/gth-image-utils.h b/gthumb/gth-image-utils.h
index 8407d525..ee53a4ba 100644
--- a/gthumb/gth-image-utils.h
+++ b/gthumb/gth-image-utils.h
@@ -27,30 +27,6 @@
 
 G_BEGIN_DECLS
 
-typedef enum /*< skip >*/ {
-       IMAGE_SIZE_320x200,
-       IMAGE_SIZE_320x320,
-       IMAGE_SIZE_640x480,
-       IMAGE_SIZE_640x640,
-       IMAGE_SIZE_800x600,
-       IMAGE_SIZE_800x800,
-       IMAGE_SIZE_1024x768,
-       IMAGE_SIZE_1024x1024,
-       IMAGE_SIZE_1280x960,
-       IMAGE_SIZE_1280x1280,
-       IMAGE_SIZE_N
-} ImageSize;
-
-
-typedef struct {
-       int width;
-       int height;
-} SizeValue;
-
-
-extern SizeValue ImageSizeValues[IMAGE_SIZE_N];
-
-
 gboolean    scale_keeping_ratio_min              (int             *width,
                                                  int             *height,
                                                  int              min_width,
diff --git a/gthumb/gtk-utils.c b/gthumb/gtk-utils.c
index 92356d78..13e628e3 100644
--- a/gthumb/gtk-utils.c
+++ b/gthumb/gtk-utils.c
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <string.h>
 #include "color-utils.h"
-#include "gth-image-utils.h"
 #include "gtk-utils.h"
 
 
@@ -30,6 +29,21 @@
 #define GTHUMB_RESOURCE_BASE_PATH "/org/gnome/gThumb/resources/"
 
 
+SizeValue
+ImageSizeValues[IMAGE_SIZE_N] = {
+       { 320, 200 },
+       { 320, 320 },
+       { 640, 480 },
+       { 640, 640 },
+       { 800, 600 },
+       { 800, 800 },
+       { 1024, 768 },
+       { 1024, 1024 },
+       { 1280, 960 },
+       { 1280, 1280 }
+};
+
+
 GtkWidget*
 _gtk_message_dialog_new (GtkWindow        *parent,
                         GtkDialogFlags    flags,
diff --git a/gthumb/gtk-utils.h b/gthumb/gtk-utils.h
index 71fd2668..9482aa69 100644
--- a/gthumb/gtk-utils.h
+++ b/gthumb/gtk-utils.h
@@ -51,6 +51,31 @@ typedef struct {
        const char *accelerator;
 } GthAccelerator;
 
+
+typedef enum /*< skip >*/ {
+       IMAGE_SIZE_320x200,
+       IMAGE_SIZE_320x320,
+       IMAGE_SIZE_640x480,
+       IMAGE_SIZE_640x640,
+       IMAGE_SIZE_800x600,
+       IMAGE_SIZE_800x800,
+       IMAGE_SIZE_1024x768,
+       IMAGE_SIZE_1024x1024,
+       IMAGE_SIZE_1280x960,
+       IMAGE_SIZE_1280x1280,
+       IMAGE_SIZE_N
+} ImageSize;
+
+
+typedef struct {
+       int width;
+       int height;
+} SizeValue;
+
+
+extern SizeValue ImageSizeValues[IMAGE_SIZE_N];
+
+
 GtkWidget *     _gtk_message_dialog_new                    (GtkWindow        *parent,
                                                            GtkDialogFlags    flags,
                                                            const char       *icon_name,