[gimp/metadata-browser] app: remove gimpdisplay-utils.[ch], move its only function to gimpdisplay.[ch]

[Roman Joost <romanofski src gnome org>]

commit ac8c69cd9b345e8f11558c28bf0810e95e327bdb
Author: Michael Natterer <mitch gimp org>
Date:   Sat Feb 11 17:57:27 2012 +0100

    app: remove gimpdisplay-utils.[ch], move its only function to gimpdisplay.[ch]

 app/actions/windows-actions.c   |    1 -
 app/display/Makefile.am         |    2 -
 app/display/gimpdisplay-utils.c |   48 ----------------------
 app/display/gimpdisplay-utils.h |   28 -------------
 app/display/gimpdisplay.c       |   16 +++++++
 app/display/gimpdisplay.h       |   84 ++++++++++++++++++++-------------------
 app/menus/windows-menu.c        |    1 -
 7 files changed, 59 insertions(+), 121 deletions(-)
---
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
index 7adf621..80b0c17 100644
--- a/app/actions/windows-actions.c
+++ b/app/actions/windows-actions.c
@@ -42,7 +42,6 @@
 #include "widgets/gimphelp-ids.h"
 
 #include "display/gimpdisplay.h"
-#include "display/gimpdisplay-utils.h"
 
 #include "dialogs/dialogs.h"
 
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index ab4111b..d0b5413 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -75,8 +75,6 @@ libappdisplay_a_sources = \
 	gimpdisplay-foreach.h			\
 	gimpdisplay-handlers.c			\
 	gimpdisplay-handlers.h			\
-	gimpdisplay-utils.c			\
-	gimpdisplay-utils.h			\
 	gimpdisplayshell.c			\
 	gimpdisplayshell.h			\
 	gimpdisplayshell-appearance.c		\
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
index 75fd5bd..016425f 100644
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@@ -586,6 +586,22 @@ gimp_display_get_by_ID (Gimp *gimp,
   return NULL;
 }
 
+/**
+ * gimp_display_get_action_name:
+ * @display:
+ *
+ * Returns: The action name for the given display. The action name
+ * depends on the display ID. The result must be freed with g_free().
+ **/
+gchar *
+gimp_display_get_action_name (GimpDisplay *display)
+{
+  g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
+
+  return g_strdup_printf ("windows-display-%04d",
+                          gimp_display_get_ID (display));
+}
+
 Gimp *
 gimp_display_get_gimp (GimpDisplay *display)
 {
diff --git a/app/display/gimpdisplay.h b/app/display/gimpdisplay.h
index 7bc13e3..7296867 100644
--- a/app/display/gimpdisplay.h
+++ b/app/display/gimpdisplay.h
@@ -47,47 +47,49 @@ struct _GimpDisplayClass
 };
 
 
-GType              gimp_display_get_type     (void) G_GNUC_CONST;
-
-GimpDisplay      * gimp_display_new          (Gimp              *gimp,
-                                              GimpImage         *image,
-                                              GimpUnit           unit,
-                                              gdouble            scale,
-                                              GimpMenuFactory   *menu_factory,
-                                              GimpUIManager     *popup_manager,
-                                              GimpDialogFactory *dialog_factory);
-void               gimp_display_delete       (GimpDisplay       *display);
-void               gimp_display_close        (GimpDisplay       *display);
-
-gint               gimp_display_get_ID       (GimpDisplay       *display);
-GimpDisplay      * gimp_display_get_by_ID    (Gimp              *gimp,
-                                              gint               ID);
-
-Gimp             * gimp_display_get_gimp     (GimpDisplay       *display);
-
-GimpImage        * gimp_display_get_image    (GimpDisplay       *display);
-void               gimp_display_set_image    (GimpDisplay       *display,
-                                              GimpImage         *image);
-
-gint               gimp_display_get_instance (GimpDisplay       *display);
-
-GimpDisplayShell * gimp_display_get_shell    (GimpDisplay       *display);
-
-void               gimp_display_empty        (GimpDisplay       *display);
-void               gimp_display_fill         (GimpDisplay       *display,
-                                              GimpImage         *image,
-                                              GimpUnit           unit,
-                                              gdouble            scale);
-
-void               gimp_display_update_area  (GimpDisplay       *display,
-                                              gboolean           now,
-                                              gint               x,
-                                              gint               y,
-                                              gint               w,
-                                              gint               h);
-
-void               gimp_display_flush        (GimpDisplay       *display);
-void               gimp_display_flush_now    (GimpDisplay       *display);
+GType              gimp_display_get_type        (void) G_GNUC_CONST;
+
+GimpDisplay      * gimp_display_new             (Gimp              *gimp,
+                                                 GimpImage         *image,
+                                                 GimpUnit           unit,
+                                                 gdouble            scale,
+                                                 GimpMenuFactory   *menu_factory,
+                                                 GimpUIManager     *popup_manager,
+                                                 GimpDialogFactory *dialog_factory);
+void               gimp_display_delete          (GimpDisplay       *display);
+void               gimp_display_close           (GimpDisplay       *display);
+
+gint               gimp_display_get_ID          (GimpDisplay       *display);
+GimpDisplay      * gimp_display_get_by_ID       (Gimp              *gimp,
+                                                 gint               ID);
+
+gchar            * gimp_display_get_action_name (GimpDisplay       *display);
+
+Gimp             * gimp_display_get_gimp        (GimpDisplay       *display);
+
+GimpImage        * gimp_display_get_image       (GimpDisplay       *display);
+void               gimp_display_set_image       (GimpDisplay       *display,
+                                                 GimpImage         *image);
+
+gint               gimp_display_get_instance    (GimpDisplay       *display);
+
+GimpDisplayShell * gimp_display_get_shell       (GimpDisplay       *display);
+
+void               gimp_display_empty           (GimpDisplay       *display);
+void               gimp_display_fill            (GimpDisplay       *display,
+                                                 GimpImage         *image,
+                                                 GimpUnit           unit,
+                                                 gdouble            scale);
+
+void               gimp_display_update_area     (GimpDisplay       *display,
+                                                 gboolean           now,
+                                                 gint               x,
+                                                 gint               y,
+                                                 gint               w,
+                                                 gint               h);
+
+void               gimp_display_flush           (GimpDisplay       *display);
+void               gimp_display_flush_now       (GimpDisplay       *display);
 
 
 #endif /*  __GIMP_DISPLAY_H__  */
diff --git a/app/menus/windows-menu.c b/app/menus/windows-menu.c
index 91264af..f111c8d 100644
--- a/app/menus/windows-menu.c
+++ b/app/menus/windows-menu.c
@@ -40,7 +40,6 @@
 #include "widgets/gimpuimanager.h"
 
 #include "display/gimpdisplay.h"
-#include "display/gimpdisplay-utils.h"
 
 #include "dialogs/dialogs.h"