[nautilus-actions] Rename NA_IOPTIONS_LIST_TYPE GType macro to NA_TYPE_IOPTIONS_LIST

[Pierre Wieser <pwieser src gnome org>]

commit 09629d8cf94aac2cf8d36aa081f05f6fb7fc41cc
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 13 00:47:59 2012 +0100

    Rename NA_IOPTIONS_LIST_TYPE GType macro to NA_TYPE_IOPTIONS_LIST

 ChangeLog                          |    8 ++++++++
 src/core/na-importer-ask.c         |    2 +-
 src/core/na-ioptions-list.h        |    8 ++++----
 src/nact/nact-assistant-export.c   |    2 +-
 src/nact/nact-assistant-import.c   |    2 +-
 src/nact/nact-preferences-editor.c |    2 +-
 6 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 140f63f..3f596c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-01-12 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-ioptions-list.h:
+	Rename NA_IOPTIONS_LIST_TYPE GType macro to NA_TYPE_IOPTIONS_LIST.
+
+	* src/core/na-importer-ask.c (register_type):
+	* src/nact/nact-assistant-export.c (register_type):
+	* src/nact/nact-assistant-import.c (register_type):
+	* src/nact/nact-preferences-editor.c (register_type): Updated accordingly.
+
 	* src/nact/nact-preferences-editor.c:
 	* src/nact/nact-preferences-editor.h:
 	* src/nact/nact-preferences.ui:
diff --git a/src/core/na-importer-ask.c b/src/core/na-importer-ask.c
index 00638ae..a43d9b6 100644
--- a/src/core/na-importer-ask.c
+++ b/src/core/na-importer-ask.c
@@ -120,7 +120,7 @@ register_type( void )
 
 	type = g_type_register_static( G_TYPE_OBJECT, "NAImporterAsk", &info, 0 );
 
-	g_type_add_interface_static( type, NA_IOPTIONS_LIST_TYPE, &ioptions_list_iface_info );
+	g_type_add_interface_static( type, NA_TYPE_IOPTIONS_LIST, &ioptions_list_iface_info );
 
 	return( type );
 }
diff --git a/src/core/na-ioptions-list.h b/src/core/na-ioptions-list.h
index 474c77e..66e757c 100644
--- a/src/core/na-ioptions-list.h
+++ b/src/core/na-ioptions-list.h
@@ -120,10 +120,10 @@
 
 G_BEGIN_DECLS
 
-#define NA_IOPTIONS_LIST_TYPE               ( na_ioptions_list_get_type())
-#define NA_IOPTIONS_LIST( i )               ( G_TYPE_CHECK_INSTANCE_CAST( i, NA_IOPTIONS_LIST_TYPE, NAIOptionsList ))
-#define NA_IS_IOPTIONS_LIST( i )            ( G_TYPE_CHECK_INSTANCE_TYPE( i, NA_IOPTIONS_LIST_TYPE ))
-#define NA_IOPTIONS_LIST_GET_INTERFACE( i ) ( G_TYPE_INSTANCE_GET_INTERFACE(( i ), NA_IOPTIONS_LIST_TYPE, NAIOptionsListInterface ))
+#define NA_TYPE_IOPTIONS_LIST                      ( na_ioptions_list_get_type())
+#define NA_IOPTIONS_LIST( instance )               ( G_TYPE_CHECK_INSTANCE_CAST( i, NA_TYPE_IOPTIONS_LIST, NAIOptionsList ))
+#define NA_IS_IOPTIONS_LIST( instance )            ( G_TYPE_CHECK_INSTANCE_TYPE( i, NA_TYPE_IOPTIONS_LIST ))
+#define NA_IOPTIONS_LIST_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_TYPE_IOPTIONS_LIST, NAIOptionsListInterface ))
 
 typedef struct _NAIOptionsList                      NAIOptionsList;
 typedef struct _NAIOptionsListInterfacePrivate      NAIOptionsListInterfacePrivate;
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index 3a1c592..7dacff2 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -165,7 +165,7 @@ register_type( void )
 
 	type = g_type_register_static( BASE_TYPE_ASSISTANT, "NactAssistantExport", &info, 0 );
 
-	g_type_add_interface_static( type, NA_IOPTIONS_LIST_TYPE, &ioptions_list_iface_info );
+	g_type_add_interface_static( type, NA_TYPE_IOPTIONS_LIST, &ioptions_list_iface_info );
 
 	return( type );
 }
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index f7fba9f..797c01b 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -172,7 +172,7 @@ register_type( void )
 
 	type = g_type_register_static( BASE_TYPE_ASSISTANT, "NactAssistantImport", &info, 0 );
 
-	g_type_add_interface_static( type, NA_IOPTIONS_LIST_TYPE, &ioptions_list_iface_info );
+	g_type_add_interface_static( type, NA_TYPE_IOPTIONS_LIST, &ioptions_list_iface_info );
 
 	return( type );
 }
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index a4b3773..9c5be63 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -208,7 +208,7 @@ register_type( void )
 
 	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 );
+	g_type_add_interface_static( type, NA_TYPE_IOPTIONS_LIST, &ioptions_list_iface_info );
 
 	return( type );
 }