[nautilus-actions] BaseDialog: rename GType macro to BASE_TYPE_DIALOG

[Pierre Wieser <pwieser src gnome org>]

commit c48a60a9ae985af2ac01c8e3caedbf486739a1ce
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jan 11 22:54:36 2012 +0100

    BaseDialog: rename GType macro to BASE_TYPE_DIALOG

 ChangeLog                             |   11 +++++++++++
 src/nact/base-dialog.c                |    3 +++
 src/nact/base-dialog.h                |   12 ++++++------
 src/nact/nact-add-capability-dialog.c |    2 +-
 src/nact/nact-add-scheme-dialog.c     |    2 +-
 src/nact/nact-confirm-logout.c        |    2 +-
 src/nact/nact-export-ask.c            |    2 +-
 src/nact/nact-icon-chooser.c          |    2 +-
 src/nact/nact-preferences-editor.c    |    2 +-
 9 files changed, 26 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 87324c6..c7bb60d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2012-01-11 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/base-dialog.c:
+	* src/nact/base-dialog.h:
+	BASE_DIALOG_TYPE GType macro is renamed as BASE_TYPE_DIALOG.
+
+	* src/nact/nact-add-capability-dialog.c (register_type):
+	* src/nact/nact-add-scheme-dialog.c (register_type):
+	* src/nact/nact-confirm-logout.c (register_type):
+	* src/nact/nact-export-ask.c (register_type):
+	* src/nact/nact-icon-chooser.c (register_type):
+	* src/nact/nact-preferences-editor.c (register_type): Updated accordingly.
+
 	* src/nact/base-assistant.c:
 	* src/nact/base-assistant.h:
 	BASE_ASSISTANT_TYPE GType macro is renamed as BASE_TYPE_ASSISTANT.
diff --git a/src/nact/base-dialog.c b/src/nact/base-dialog.c
index 490c057..d3ccf2d 100644
--- a/src/nact/base-dialog.c
+++ b/src/nact/base-dialog.c
@@ -193,10 +193,13 @@ do_run( BaseWindow *window )
 	code = BASE_EXIT_CODE_INIT_WINDOW;
 
 	if( !BASE_DIALOG( window )->private->dispose_has_run ){
+
 		g_debug( "%s: window=%p (%s), starting gtk_dialog_run",
 				thisfn,
 				( void * ) window, G_OBJECT_TYPE_NAME( window ));
+
 		toplevel = base_window_get_gtk_toplevel( window );
+
 		do {
 			code = gtk_dialog_run( GTK_DIALOG( toplevel ));
 		}
diff --git a/src/nact/base-dialog.h b/src/nact/base-dialog.h
index 327b536..73cce0e 100644
--- a/src/nact/base-dialog.h
+++ b/src/nact/base-dialog.h
@@ -45,12 +45,12 @@
 
 G_BEGIN_DECLS
 
-#define BASE_DIALOG_TYPE                ( base_dialog_get_type())
-#define BASE_DIALOG( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_DIALOG_TYPE, BaseDialog ))
-#define BASE_DIALOG_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_DIALOG_TYPE, BaseDialogClass ))
-#define BASE_IS_DIALOG( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_DIALOG_TYPE ))
-#define BASE_IS_DIALOG_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_DIALOG_TYPE ))
-#define BASE_DIALOG_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_DIALOG_TYPE, BaseDialogClass ))
+#define BASE_TYPE_DIALOG                ( base_dialog_get_type())
+#define BASE_DIALOG( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_TYPE_DIALOG, BaseDialog ))
+#define BASE_DIALOG_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_TYPE_DIALOG, BaseDialogClass ))
+#define BASE_IS_DIALOG( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_TYPE_DIALOG ))
+#define BASE_IS_DIALOG_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_TYPE_DIALOG ))
+#define BASE_DIALOG_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_TYPE_DIALOG, BaseDialogClass ))
 
 typedef struct _BaseDialogPrivate       BaseDialogPrivate;
 
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index 1332c30..e9e290e 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -139,7 +139,7 @@ register_type( void )
 
 	g_debug( "%s", thisfn );
 
-	type = g_type_register_static( BASE_DIALOG_TYPE, "NactAddCapabilityDialog", &info, 0 );
+	type = g_type_register_static( BASE_TYPE_DIALOG, "NactAddCapabilityDialog", &info, 0 );
 
 	return( type );
 }
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index d6f99ad..77e09ca 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -110,7 +110,7 @@ register_type( void )
 
 	g_debug( "%s", thisfn );
 
-	type = g_type_register_static( BASE_DIALOG_TYPE, "NactAddSchemeDialog", &info, 0 );
+	type = g_type_register_static( BASE_TYPE_DIALOG, "NactAddSchemeDialog", &info, 0 );
 
 	return( type );
 }
diff --git a/src/nact/nact-confirm-logout.c b/src/nact/nact-confirm-logout.c
index 26caa58..cab785e 100644
--- a/src/nact/nact-confirm-logout.c
+++ b/src/nact/nact-confirm-logout.c
@@ -103,7 +103,7 @@ register_type( void )
 
 	g_debug( "%s", thisfn );
 
-	type = g_type_register_static( BASE_DIALOG_TYPE, "NactConfirmLogout", &info, 0 );
+	type = g_type_register_static( BASE_TYPE_DIALOG, "NactConfirmLogout", &info, 0 );
 
 	return( type );
 }
diff --git a/src/nact/nact-export-ask.c b/src/nact/nact-export-ask.c
index 9a299b4..c7332fa 100644
--- a/src/nact/nact-export-ask.c
+++ b/src/nact/nact-export-ask.c
@@ -124,7 +124,7 @@ register_type( void )
 
 	g_debug( "%s", thisfn );
 
-	type = g_type_register_static( BASE_DIALOG_TYPE, "NactExportAsk", &info, 0 );
+	type = g_type_register_static( BASE_TYPE_DIALOG, "NactExportAsk", &info, 0 );
 
 	g_type_add_interface_static( type, NA_IOPTIONS_LIST_TYPE, &ioptions_list_iface_info );
 
diff --git a/src/nact/nact-icon-chooser.c b/src/nact/nact-icon-chooser.c
index c4dce60..ed632df 100644
--- a/src/nact/nact-icon-chooser.c
+++ b/src/nact/nact-icon-chooser.c
@@ -159,7 +159,7 @@ register_type( void )
 
 	g_debug( "%s", thisfn );
 
-	type = g_type_register_static( BASE_DIALOG_TYPE, "NactIconChooser", &info, 0 );
+	type = g_type_register_static( BASE_TYPE_DIALOG, "NactIconChooser", &info, 0 );
 
 	return( type );
 }
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index 8994093..da029b9 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -206,7 +206,7 @@ register_type( void )
 
 	g_debug( "%s", thisfn );
 
-	type = g_type_register_static( BASE_DIALOG_TYPE, "NactPreferencesEditor", &info, 0 );
+	type = g_type_register_static( BASE_TYPE_DIALOG, "NactPreferencesEditor", &info, 0 );
 
 	g_type_add_interface_static( type, NA_IOPTIONS_LIST_TYPE, &ioptions_list_iface_info );