[gimp] app: rename convert-dialog.[ch] to convert-type-dialog.[ch]

[Michael Natterer <mitch src gnome org>]

commit 88571276e9c808a3bf52abb2397288713072ffd9
Author: Michael Natterer <mitch gimp org>
Date:   Tue Jun 26 13:41:58 2012 +0200

    app: rename convert-dialog.[ch] to convert-type-dialog.[ch]

 app/actions/image-commands.c                       |   20 ++++++++++++--------
 app/dialogs/Makefile.am                            |    4 ++--
 .../{convert-dialog.c => convert-type-dialog.c}    |   10 +++++-----
 .../{convert-dialog.h => convert-type-dialog.h}    |   14 +++++++-------
 po/POTFILES.in                                     |    2 +-
 5 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c
index 520a1b7..486647f 100644
--- a/app/actions/image-commands.c
+++ b/app/actions/image-commands.c
@@ -50,7 +50,7 @@
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplayshell.h"
 
-#include "dialogs/convert-dialog.h"
+#include "dialogs/convert-type-dialog.h"
 #include "dialogs/grid-dialog.h"
 #include "dialogs/image-merge-layers-dialog.h"
 #include "dialogs/image-new-dialog.h"
@@ -65,6 +65,9 @@
 #include "gimp-intl.h"
 
 
+#define IMAGE_CONVERT_TYPE_DIALOG_KEY "image-convert-type-dialog"
+
+
 typedef struct
 {
   GimpContext *context;
@@ -146,7 +149,7 @@ image_new_cmd_callback (GtkAction *action,
 static void
 image_convert_dialog_unset (GtkWidget *widget)
 {
-  g_object_set_data (G_OBJECT (widget), "image-convert-dialog", NULL);
+  g_object_set_data (G_OBJECT (widget), IMAGE_CONVERT_TYPE_DIALOG_KEY, NULL);
 }
 
 void
@@ -187,17 +190,18 @@ image_convert_base_type_cmd_callback (GtkAction *action,
       {
         GtkWidget *dialog;
 
-        dialog = g_object_get_data (G_OBJECT (widget), "image-convert-dialog");
+        dialog = g_object_get_data (G_OBJECT (widget),
+                                    IMAGE_CONVERT_TYPE_DIALOG_KEY);
 
         if (! dialog)
           {
-            dialog = convert_dialog_new (image,
-                                         action_data_get_context (data),
-                                         widget,
-                                         GIMP_PROGRESS (display));
+            dialog = convert_type_dialog_new (image,
+                                              action_data_get_context (data),
+                                              widget,
+                                              GIMP_PROGRESS (display));
 
             g_object_set_data (G_OBJECT (widget),
-                               "image-convert-dialog", dialog);
+                               IMAGE_CONVERT_TYPE_DIALOG_KEY, dialog);
 
             g_signal_connect_object (dialog, "destroy",
                                      G_CALLBACK (image_convert_dialog_unset),
diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am
index f7080ec..c6ae168 100644
--- a/app/dialogs/Makefile.am
+++ b/app/dialogs/Makefile.am
@@ -25,8 +25,8 @@ libappdialogs_a_sources = \
 	about-dialog.h			\
 	channel-options-dialog.c	\
 	channel-options-dialog.h	\
-	convert-dialog.c		\
-	convert-dialog.h		\
+	convert-type-dialog.c		\
+	convert-type-dialog.h		\
 	data-delete-dialog.c		\
 	data-delete-dialog.h		\
 	fade-dialog.c			\
diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-type-dialog.c
similarity index 98%
rename from app/dialogs/convert-dialog.c
rename to app/dialogs/convert-type-dialog.c
index 913b019..beb7544 100644
--- a/app/dialogs/convert-dialog.c
+++ b/app/dialogs/convert-type-dialog.c
@@ -39,7 +39,7 @@
 #include "widgets/gimpviewabledialog.h"
 #include "widgets/gimpwidgets-utils.h"
 
-#include "convert-dialog.h"
+#include "convert-type-dialog.h"
 
 #include "gimp-intl.h"
 
@@ -87,10 +87,10 @@ static GimpPalette            *saved_palette      = NULL;
 /*  public functions  */
 
 GtkWidget *
-convert_dialog_new (GimpImage    *image,
-                    GimpContext  *context,
-                    GtkWidget    *parent,
-                    GimpProgress *progress)
+convert_type_dialog_new (GimpImage    *image,
+                         GimpContext  *context,
+                         GtkWidget    *parent,
+                         GimpProgress *progress)
 {
   IndexedDialog *dialog;
   GtkWidget     *button;
diff --git a/app/dialogs/convert-dialog.h b/app/dialogs/convert-type-dialog.h
similarity index 68%
rename from app/dialogs/convert-dialog.h
rename to app/dialogs/convert-type-dialog.h
index 084f41e..509dccc 100644
--- a/app/dialogs/convert-dialog.h
+++ b/app/dialogs/convert-type-dialog.h
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CONVERT_DIALOG_H__
-#define __CONVERT_DIALOG_H__
+#ifndef __CONVERT_TYPE_DIALOG_H__
+#define __CONVERT_TYPE_DIALOG_H__
 
 
-GtkWidget * convert_dialog_new (GimpImage    *image,
-                                GimpContext  *context,
-                                GtkWidget    *parent,
-                                GimpProgress *progress);
+GtkWidget * convert_type_dialog_new (GimpImage    *image,
+                                     GimpContext  *context,
+                                     GtkWidget    *parent,
+                                     GimpProgress *progress);
 
 
-#endif  /*  __CONVERT_DIALOG_H__  */
+#endif  /*  __CONVERT_TYPE_DIALOG_H__  */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b3b9b97..ba2e8f5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -168,7 +168,7 @@ app/core/gimp-user-install.c
 
 app/dialogs/about-dialog.c
 app/dialogs/channel-options-dialog.c
-app/dialogs/convert-dialog.c
+app/dialogs/convert-type-dialog.c
 app/dialogs/data-delete-dialog.c
 app/dialogs/dialogs.c
 app/dialogs/dialogs-constructors.c