From f0814dcf33c5b7d97981c5d15d1f0f37617c3c3f Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Fri, 25 Sep 2015 00:40:57 +0200
Subject: [PATCH] libgimp: rename gimpmetadata.[ch] to gimpimagemetadata.[ch]

so the filenames match the contained namespace. Sort includes in
gimpui.h alphabetically.
---
 libgimp/Makefile.am                           |  6 ++---
 .../{gimpmetadata.c => gimpimagemetadata.c}   |  4 ++--
 .../{gimpmetadata.h => gimpimagemetadata.h}   | 10 ++++-----
 libgimp/gimpui.h                              | 22 +++++++++----------
 po-libgimp/POTFILES.in                        |  2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)
 rename libgimp/{gimpmetadata.c => gimpimagemetadata.c} (99%)
 rename libgimp/{gimpmetadata.h => gimpimagemetadata.h} (93%)

diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index a4cd0fa215..f857e595f6 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -284,12 +284,12 @@ libgimpui_sources = \
 	gimpgradientselectbutton.h	\
 	gimpimagecombobox.c		\
 	gimpimagecombobox.h		\
+	gimpimagemetadata.c		\
+	gimpimagemetadata.h		\
 	gimpitemcombobox.c		\
 	gimpitemcombobox.h		\
 	gimpmenu.c			\
 	gimpmenu.h			\
-	gimpmetadata.c			\
-	gimpmetadata.h			\
 	gimppalettemenu.c		\
 	gimppalettemenu.h		\
 	gimppaletteselectbutton.c	\
@@ -362,9 +362,9 @@ gimpinclude_HEADERS = \
 	gimpgradientmenu.h		\
 	gimpgradientselectbutton.h	\
 	gimpimagecombobox.h		\
+	gimpimagemetadata.h		\
 	gimpitemcombobox.h		\
 	gimpmenu.h			\
-	gimpmetadata.h			\
 	gimppalettemenu.h		\
 	gimppaletteselectbutton.h	\
 	gimppatternmenu.h		\
diff --git a/libgimp/gimpmetadata.c b/libgimp/gimpimagemetadata.c
similarity index 99%
rename from libgimp/gimpmetadata.c
rename to libgimp/gimpimagemetadata.c
index 402d83c12d..2b109ce3a1 100644
--- a/libgimp/gimpmetadata.c
+++ b/libgimp/gimpimagemetadata.c
@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library
  * Copyright (C) 1995-2000 Peter Mattis and Spencer Kimball
  *
- * gimpmetadata.c
+ * gimpimagemetadata.c
  *
  * This library is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 
 #include "gimp.h"
 #include "gimpui.h"
-#include "gimpmetadata.h"
+#include "gimpimagemetadata.h"
 
 #include "libgimp-intl.h"
 
diff --git a/libgimp/gimpmetadata.h b/libgimp/gimpimagemetadata.h
similarity index 93%
rename from libgimp/gimpmetadata.h
rename to libgimp/gimpimagemetadata.h
index 7cd4674c3e..26d0b71aa1 100644
--- a/libgimp/gimpmetadata.h
+++ b/libgimp/gimpimagemetadata.h
@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library
  * Copyright (C) 1995-2000 Peter Mattis and Spencer Kimball
  *
- * gimpmetadata.h
+ * gimpimagemetadata.h
  *
  * This library is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,8 +22,8 @@
 #error "Only <libgimp/gimpui.h> can be included directly."
 #endif
 
-#ifndef __LIBGIMP_GIMP_METADATA_H__
-#define __LIBGIMP_GIMP_METADATA_H__
+#ifndef __GIMP_IMAGE_METADATA_H__
+#define __GIMP_IMAGE_METADATA_H__
 
 G_BEGIN_DECLS
 
@@ -51,11 +51,11 @@ gboolean       gimp_image_metadata_save_finish  (gint32                 image_ID
                                                  GError               **error);
 
 
-/* this is experimental API, so be finished for 2.10 */
+/* this is experimental API, to be finished for 2.10 */
 
 gint32       gimp_image_metadata_load_thumbnail (GFile                 *file,
                                                  GError               **error);
 
 G_END_DECLS
 
-#endif /* ___LIBGIMP_GIMP_METADATA_H__ */
+#endif /* __GIMP_IMAGE_METADATA_H__ */
diff --git a/libgimp/gimpui.h b/libgimp/gimpui.h
index 85c5ea5766..cdf89a653c 100644
--- a/libgimp/gimpui.h
+++ b/libgimp/gimpui.h
@@ -27,27 +27,27 @@
 
 #include <libgimp/gimpuitypes.h>
 
-#include <libgimp/gimpexport.h>
-#include <libgimp/gimpmenu.h>
-#include <libgimp/gimpmetadata.h>
 #include <libgimp/gimpaspectpreview.h>
-#include <libgimp/gimpdrawablepreview.h>
 #include <libgimp/gimpbrushmenu.h>
+#include <libgimp/gimpbrushselectbutton.h>
+#include <libgimp/gimpdrawablepreview.h>
+#include <libgimp/gimpexport.h>
 #include <libgimp/gimpfontmenu.h>
+#include <libgimp/gimpfontselectbutton.h>
 #include <libgimp/gimpgradientmenu.h>
+#include <libgimp/gimpgradientselectbutton.h>
+#include <libgimp/gimpimagecombobox.h>
+#include <libgimp/gimpimagemetadata.h>
+#include <libgimp/gimpitemcombobox.h>
+#include <libgimp/gimpmenu.h>
 #include <libgimp/gimppalettemenu.h>
+#include <libgimp/gimppaletteselectbutton.h>
 #include <libgimp/gimppatternmenu.h>
+#include <libgimp/gimppatternselectbutton.h>
 #include <libgimp/gimpprocbrowserdialog.h>
 #include <libgimp/gimpprocview.h>
 #include <libgimp/gimpprogressbar.h>
-#include <libgimp/gimpitemcombobox.h>
-#include <libgimp/gimpimagecombobox.h>
 #include <libgimp/gimpselectbutton.h>
-#include <libgimp/gimpbrushselectbutton.h>
-#include <libgimp/gimpfontselectbutton.h>
-#include <libgimp/gimpgradientselectbutton.h>
-#include <libgimp/gimppaletteselectbutton.h>
-#include <libgimp/gimppatternselectbutton.h>
 #include <libgimp/gimpzoompreview.h>
 
 #undef __GIMP_UI_H_INSIDE__
diff --git a/po-libgimp/POTFILES.in b/po-libgimp/POTFILES.in
index ac3d2ecf68..4957b42aa6 100644
--- a/po-libgimp/POTFILES.in
+++ b/po-libgimp/POTFILES.in
@@ -10,8 +10,8 @@ libgimp/gimpexport.c
 libgimp/gimpfontselectbutton.c
 libgimp/gimpgradientmenu.c
 libgimp/gimpgradientselectbutton.c
+libgimp/gimpimagemetadata.c
 libgimp/gimpmenu.c
-libgimp/gimpmetadata.c
 libgimp/gimppalettemenu.c
 libgimp/gimppaletteselectbutton.c
 libgimp/gimppatternmenu.c