[recipes] Move GrImages to its own files

[Matthias Clasen <matthiasc src gnome org>]

commit f2cd1e2c7efc096bef734b9a49ed3ddfd6f19af7
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 16 20:37:09 2016 -0500

    Move GrImages to its own files

 src/Makefile.am                        |    4 +-
 src/gr-details-page.c                  |    2 +-
 src/gr-edit-page.c                     |    2 +-
 src/gr-image-editor.c                  |  400 --------------------------------
 src/gr-image-viewer.c                  |    2 +-
 src/{gr-image-editor.h => gr-images.c} |   40 ++--
 src/{gr-image-editor.h => gr-images.h} |   13 +-
 src/gr-recipe-exporter.c               |    2 +-
 src/gr-recipe-importer.c               |    2 +-
 src/gr-recipe-printer.c                |    2 +-
 src/gr-recipe-store.c                  |    2 +-
 src/gr-recipe-tile.c                   |    2 +-
 src/gr-recipe.c                        |    2 +-
 src/gr-shell-search-provider.c         |    2 +-
 src/main.c                             |    2 -
 15 files changed, 32 insertions(+), 447 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 081395b..9c459aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,8 +44,8 @@ recipes_SOURCES = \
        gr-diet-row.c           \
        gr-edit-page.h          \
        gr-edit-page.c          \
-       gr-image-editor.h       \
-       gr-image-editor.c       \
+       gr-images.h             \
+       gr-images.c             \
        gr-image-viewer.h       \
        gr-image-viewer.c       \
        gr-ingredient.h         \
diff --git a/src/gr-details-page.c b/src/gr-details-page.c
index 5f8d328..2f905e2 100644
--- a/src/gr-details-page.c
+++ b/src/gr-details-page.c
@@ -30,7 +30,7 @@
 #include "gr-app.h"
 #include "gr-window.h"
 #include "gr-utils.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 #include "gr-image-viewer.h"
 #include "gr-ingredients-list.h"
 #include "gr-timer.h"
diff --git a/src/gr-edit-page.c b/src/gr-edit-page.c
index 9414a19..12d4080 100644
--- a/src/gr-edit-page.c
+++ b/src/gr-edit-page.c
@@ -32,7 +32,7 @@
 #include "gr-cuisine.h"
 #include "gr-meal.h"
 #include "gr-season.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
diff --git a/src/gr-image-viewer.c b/src/gr-image-viewer.c
index cb4a372..ad32567 100644
--- a/src/gr-image-viewer.c
+++ b/src/gr-image-viewer.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n.h>
 
 #include "gr-image-viewer.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 #include "gr-utils.h"
 
 
diff --git a/src/gr-image-editor.h b/src/gr-images.c
similarity index 52%
copy from src/gr-image-editor.h
copy to src/gr-images.c
index c1601f8..d414eec 100644
--- a/src/gr-image-editor.h
+++ b/src/gr-images.c
@@ -1,4 +1,4 @@
-/* gr-image-editor.h:
+/* gr-images.c:
  *
  * Copyright (C) 2016 Matthias Clasen <mclasen redhat com>
  *
@@ -18,29 +18,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#include "config.h"
 
-#include <gtk/gtk.h>
+#include "gr-images.h"
 
-G_BEGIN_DECLS
+static void
+gr_rotated_image_clear (gpointer data)
+{
+        GrRotatedImage *image = data;
 
-typedef struct {
-        char *path;
-        int angle;
-        gboolean dark_text;
-} GrRotatedImage;
+        g_clear_pointer (&image->path, g_free);
+        image->angle = 0;
+        image->dark_text = FALSE;
+}
 
-GArray *gr_rotated_image_array_new (void);
+GArray *
+gr_rotated_image_array_new (void)
+{
+        GArray *a;
 
-#define GR_TYPE_IMAGE_EDITOR (gr_image_editor_get_type())
+        a = g_array_new (TRUE, TRUE, sizeof (GrRotatedImage));
+        g_array_set_clear_func (a, gr_rotated_image_clear);
 
-G_DECLARE_FINAL_TYPE (GrImageEditor, gr_image_editor, GR, IMAGE_EDITOR, GtkBox)
-
-GrImageEditor  *gr_image_editor_new          (void);
-
-void            gr_image_editor_add_image    (GrImageEditor *editor);
-void            gr_image_editor_remove_image (GrImageEditor *editor);
-void            gr_image_editor_rotate_image (GrImageEditor *editor,
-                                              gint           angle);
-
-G_END_DECLS
+        return a;
+}
diff --git a/src/gr-image-editor.h b/src/gr-images.h
similarity index 66%
rename from src/gr-image-editor.h
rename to src/gr-images.h
index c1601f8..d6a1492 100644
--- a/src/gr-image-editor.h
+++ b/src/gr-images.h
@@ -1,4 +1,4 @@
-/* gr-image-editor.h:
+/* gr-images.h:
  *
  * Copyright (C) 2016 Matthias Clasen <mclasen redhat com>
  *
@@ -32,15 +32,4 @@ typedef struct {
 
 GArray *gr_rotated_image_array_new (void);
 
-#define GR_TYPE_IMAGE_EDITOR (gr_image_editor_get_type())
-
-G_DECLARE_FINAL_TYPE (GrImageEditor, gr_image_editor, GR, IMAGE_EDITOR, GtkBox)
-
-GrImageEditor  *gr_image_editor_new          (void);
-
-void            gr_image_editor_add_image    (GrImageEditor *editor);
-void            gr_image_editor_remove_image (GrImageEditor *editor);
-void            gr_image_editor_rotate_image (GrImageEditor *editor,
-                                              gint           angle);
-
 G_END_DECLS
diff --git a/src/gr-recipe-exporter.c b/src/gr-recipe-exporter.c
index 44de9ba..f584ced 100644
--- a/src/gr-recipe-exporter.c
+++ b/src/gr-recipe-exporter.c
@@ -26,7 +26,7 @@
 #include "glnx-shutil.h"
 
 #include "gr-recipe-exporter.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 #include "gr-chef.h"
 #include "gr-recipe.h"
 #include "gr-recipe-store.h"
diff --git a/src/gr-recipe-importer.c b/src/gr-recipe-importer.c
index e2c7e53..cd4b359 100644
--- a/src/gr-recipe-importer.c
+++ b/src/gr-recipe-importer.c
@@ -26,7 +26,7 @@
 #include "glnx-shutil.h"
 
 #include "gr-recipe-importer.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 #include "gr-chef.h"
 #include "gr-recipe.h"
 #include "gr-recipe-store.h"
diff --git a/src/gr-recipe-printer.c b/src/gr-recipe-printer.c
index ccd45be..9be32c7 100644
--- a/src/gr-recipe-printer.c
+++ b/src/gr-recipe-printer.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n.h>
 
 #include "gr-recipe-printer.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 #include "gr-utils.h"
 
 
diff --git a/src/gr-recipe-store.c b/src/gr-recipe-store.c
index 1f1cb4c..4e32a49 100644
--- a/src/gr-recipe-store.c
+++ b/src/gr-recipe-store.c
@@ -30,7 +30,7 @@
 #include "gr-recipe.h"
 #include "gr-utils.h"
 #include "gr-ingredients-list.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 #include "gr-app.h"
 
 
diff --git a/src/gr-recipe-tile.c b/src/gr-recipe-tile.c
index 1c07829..a91cd79 100644
--- a/src/gr-recipe-tile.c
+++ b/src/gr-recipe-tile.c
@@ -27,7 +27,7 @@
 #include "gr-recipe-tile.h"
 #include "gr-window.h"
 #include "gr-utils.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 
 
 struct _GrRecipeTile
diff --git a/src/gr-recipe.c b/src/gr-recipe.c
index 27df0b4..33dcd65 100644
--- a/src/gr-recipe.c
+++ b/src/gr-recipe.c
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 
 #include "gr-recipe.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 #include "types.h"
 
 struct _GrRecipe
diff --git a/src/gr-shell-search-provider.c b/src/gr-shell-search-provider.c
index dc945b5..16c32a7 100644
--- a/src/gr-shell-search-provider.c
+++ b/src/gr-shell-search-provider.c
@@ -27,7 +27,7 @@
 
 #include "gr-shell-search-provider-dbus.h"
 #include "gr-shell-search-provider.h"
-#include "gr-image-editor.h"
+#include "gr-images.h"
 #include "gr-utils.h"
 
 
diff --git a/src/main.c b/src/main.c
index ecb39f9..1ad2b92 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,7 +35,6 @@
 #include "gr-search-page.h"
 #include "gr-timer-widget.h"
 #include "gr-toggle-button.h"
-#include "gr-image-editor.h"
 #include "gr-image-viewer.h"
 
 
@@ -49,7 +48,6 @@ main (int argc, char *argv[])
         g_type_ensure (GR_TYPE_CUISINES_PAGE);
         g_type_ensure (GR_TYPE_DETAILS_PAGE);
         g_type_ensure (GR_TYPE_EDIT_PAGE);
-        g_type_ensure (GR_TYPE_IMAGE_EDITOR);
         g_type_ensure (GR_TYPE_IMAGE_VIEWER);
         g_type_ensure (GR_TYPE_INGREDIENTS_PAGE);
         g_type_ensure (GR_TYPE_LIST_PAGE);