[gnome-commander] noop: code cleanup (gnome_cmd_string_dialog_get_type() -> GNOME_CMD_TYPE_STRING_DIALOG)

[Piotr Eljasiak <epiotr src gnome org>]

commit 03f89c3c9ffb9be1899fff894607a2470bc6f9f5
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Thu Jan 27 19:02:31 2011 +0100

    noop: code cleanup (gnome_cmd_string_dialog_get_type() -> GNOME_CMD_TYPE_STRING_DIALOG)

 libgcmd/gnome-cmd-string-dialog.cc |    2 +-
 libgcmd/gnome-cmd-string-dialog.h  |   12 ++++++------
 src/gnome-cmd-make-copy-dialog.cc  |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/libgcmd/gnome-cmd-string-dialog.cc b/libgcmd/gnome-cmd-string-dialog.cc
index e7d7063..bdcf2e6 100644
--- a/libgcmd/gnome-cmd-string-dialog.cc
+++ b/libgcmd/gnome-cmd-string-dialog.cc
@@ -177,7 +177,7 @@ GtkType gnome_cmd_string_dialog_get_type ()
 
 GtkWidget *gnome_cmd_string_dialog_new_with_cancel (const gchar *title, const gchar **labels, gint rows, GnomeCmdStringDialogCallback ok_cb, GtkSignalFunc cancel_cb, gpointer user_data)
 {
-    GnomeCmdStringDialog *dialog = (GnomeCmdStringDialog *) gtk_type_new (gnome_cmd_string_dialog_get_type ());
+    GnomeCmdStringDialog *dialog = (GnomeCmdStringDialog *) gtk_type_new (GNOME_CMD_TYPE_STRING_DIALOG);
 
     gnome_cmd_string_dialog_setup_with_cancel (dialog, title, labels, rows, ok_cb, cancel_cb, user_data);
 
diff --git a/libgcmd/gnome-cmd-string-dialog.h b/libgcmd/gnome-cmd-string-dialog.h
index 125cc3b..a19f26e 100644
--- a/libgcmd/gnome-cmd-string-dialog.h
+++ b/libgcmd/gnome-cmd-string-dialog.h
@@ -21,12 +21,12 @@
 #ifndef __GNOME_CMD_STRING_DIALOG_H__
 #define __GNOME_CMD_STRING_DIALOG_H__
 
-#define GNOME_CMD_STRING_DIALOG(obj) \
-    GTK_CHECK_CAST (obj, gnome_cmd_string_dialog_get_type (), GnomeCmdStringDialog)
-#define GNOME_CMD_STRING_DIALOG_CLASS(klass) \
-    GTK_CHECK_CLASS_CAST (klass, gnome_cmd_string_dialog_get_type (), GnomeCmdStringDialogClass)
-#define GNOME_CMD_IS_STRING_DIALOG(obj) \
-    GTK_CHECK_TYPE (obj, gnome_cmd_string_dialog_get_type ())
+#define GNOME_CMD_TYPE_STRING_DIALOG              (gnome_cmd_string_dialog_get_type ())
+#define GNOME_CMD_STRING_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_CMD_TYPE_STRING_DIALOG, GnomeCmdStringDialog))
+#define GNOME_CMD_STRING_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), GNOME_CMD_TYPE_STRING_DIALOG, GnomeCmdStringDialogClass))
+#define GNOME_CMD_IS_STRING_DIALOG(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNOME_CMD_TYPE_STRING_DIALOG))
+#define GNOME_CMD_IS_STRING_DIALOG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_CMD_TYPE_STRING_DIALOG))
+#define GNOME_CMD_STRING_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), GNOME_CMD_TYPE_STRING_DIALOG, GnomeCmdStringDialogClass))
 
 
 typedef struct _GnomeCmdStringDialog GnomeCmdStringDialog;
diff --git a/src/gnome-cmd-make-copy-dialog.cc b/src/gnome-cmd-make-copy-dialog.cc
index 54142dc..c48a82c 100644
--- a/src/gnome-cmd-make-copy-dialog.cc
+++ b/src/gnome-cmd-make-copy-dialog.cc
@@ -107,7 +107,7 @@ static void class_init (GnomeCmdMakeCopyDialogClass *klass)
     GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdStringDialogClass *) gtk_type_class (gnome_cmd_string_dialog_get_type ());
+    parent_class = (GnomeCmdStringDialogClass *) gtk_type_class (GNOME_CMD_TYPE_STRING_DIALOG);
     object_class->destroy = destroy;
     widget_class->map = ::map;
 }
@@ -174,7 +174,7 @@ GtkType gnome_cmd_make_copy_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_string_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_STRING_DIALOG, &dlg_info);
     }
     return dlg_type;
 }