[nautilus-actions] NACT: rename GType macros according to GObject usages

From: Pierre Wieser <pwieser src gnome org>
To: commits-list gnome org
Cc:
Subject: [nautilus-actions] NACT: rename GType macros according to GObject usages
Date: Sat, 14 Jan 2012 18:18:27 +0000 (UTC)
commit 0ac3ae60b8627a83a0f673d1b332ee4ec23eaba6
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Jan 14 19:17:58 2012 +0100

    NACT: rename GType macros according to GObject usages

 ChangeLog                             |   55 +++++++++++++++++++++++++++++++++
 src/nact/nact-add-capability-dialog.c |    2 +-
 src/nact/nact-add-capability-dialog.h |   12 +++---
 src/nact/nact-add-scheme-dialog.c     |    2 +-
 src/nact/nact-add-scheme-dialog.h     |   12 +++---
 src/nact/nact-application.c           |    2 +-
 src/nact/nact-application.h           |   12 +++---
 src/nact/nact-assistant-export.c      |    2 +-
 src/nact/nact-assistant-export.h      |   12 +++---
 src/nact/nact-assistant-import.c      |    2 +-
 src/nact/nact-assistant-import.h      |   12 +++---
 src/nact/nact-clipboard.c             |    2 +-
 src/nact/nact-clipboard.h             |   12 +++---
 src/nact/nact-confirm-logout.c        |    2 +-
 src/nact/nact-confirm-logout.h        |   12 +++---
 src/nact/nact-icon-chooser.c          |    2 +-
 src/nact/nact-icon-chooser.h          |   12 +++---
 src/nact/nact-menubar.c               |    4 +-
 src/nact/nact-menubar.h               |   12 +++---
 src/nact/nact-sort-buttons.c          |    2 +-
 src/nact/nact-sort-buttons.h          |   12 +++---
 src/nact/nact-tree-ieditable.c        |    2 +-
 src/nact/nact-tree-model.c            |    2 +-
 src/nact/nact-tree-model.h            |   12 +++---
 src/nact/nact-tree-view.c             |    2 +-
 src/nact/nact-tree-view.h             |   12 +++---
 26 files changed, 141 insertions(+), 86 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b888e04..b95ebd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+2012-01-14 Pierre Wieser <pwieser trychlos org>
+
+	* src/nact/nact-add-capability-dialog.c:
+	* src/nact/nact-add-capability-dialog.h:
+	NACT_ADD_CAPABILITY_DIALOG_TYPE GType macro renamed as
+	NACT_TYPE_ADD_CAPABILITY_DIALOG.
+
+	* src/nact/nact-add-scheme-dialog.c:
+	* src/nact/nact-add-scheme-dialog.h:
+	NACT_ADD_SCHEME_DIALOG_TYPE GType macro renamed as
+	NACT_TYPE_ADD_SCHEME_DIALOG.
+
+	* src/nact/nact-application.c:
+	* src/nact/nact-application.h:
+	NACT_APPLICATION_TYPE GType macro renamed as NACT_TYPE_APPLICATION.
+
+	* src/nact/nact-assistant-export.c:
+	* src/nact/nact-assistant-export.h:
+	NACT_ASSISTANT_EXPORT_TYPE GType macro renamed as
+	NACT_TYPE_ASSISTANT_EXPORT.
+
+	* src/nact/nact-assistant-import.c:
+	* src/nact/nact-assistant-import.h:
+	NACT_ASSISTANT_IMPORT_TYPE GType macro renamed as
+	NACT_TYPE_ASSISTANT_IMPORT.
+
+	* src/nact/nact-clipboard.c:
+	* src/nact/nact-clipboard.h:
+	NACT_CLIPBOARD_TYPE GType macro renamed as NACT_TYPE_CLIPBOARD.
+
+	* src/nact/nact-confirm-logout.c:
+	* src/nact/nact-confirm-logout.h:
+	NACT_CONFIRM_LOGOUT_TYPE GType macro renamed as NACT_TYPE_CONFIRM_LOGOUT.
+
+	* src/nact/nact-icon-chooser.c:
+	* src/nact/nact-icon-chooser.h:
+	NACT_ICON_CHOOSER_TYPE GType macro renamed as NACT_TYPE_ICON_CHOOSER.
+
+	* src/nact/nact-menubar.c:
+	* src/nact/nact-menubar.h:
+	NACT_MENUBAR_TYPE GType macro renamed as NACT_TYPE_MENUBAR.
+
+	* src/nact/nact-sort-buttons.c:
+	* src/nact/nact-sort-buttons.h:
+	NACT_SORT_BUTTONS_TYPE GType macro renamed as NACT_TYPE_SORT_BUTTONS.
+
+	* src/nact/nact-tree-model.c:
+	* src/nact/nact-tree-model.h:
+	* src/nact/nact-tree-ieditable.c:
+	NACT_TREE_MODEL_TYPE GType macro renamed as NACT_TYPE_TREE_MODEL.
+
+	* src/nact/nact-tree-view.c:
+	* src/nact/nact-tree-view.h:
+	NACT_TREE_VIEW_TYPE GType macro renamed as NACT_TYPE_TREE_VIEW.
+
 2012-01-13 Pierre Wieser <pwieser trychlos org>
 
 	* src/io-xml/naxml-provider.h:
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index e9e290e..6c9ece2 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -268,7 +268,7 @@ nact_add_capability_dialog_run( BaseWindow *parent, GSList *capabilities )
 
 	g_return_val_if_fail( BASE_IS_WINDOW( parent ), NULL );
 
-	dialog = g_object_new( NACT_ADD_CAPABILITY_DIALOG_TYPE,
+	dialog = g_object_new( NACT_TYPE_ADD_CAPABILITY_DIALOG,
 					BASE_PROP_PARENT,         parent,
 					BASE_PROP_XMLUI_FILENAME, st_xmlui_filename,
 					BASE_PROP_TOPLEVEL_NAME,  st_toplevel_name,
diff --git a/src/nact/nact-add-capability-dialog.h b/src/nact/nact-add-capability-dialog.h
index acb80ca..880fecf 100644
--- a/src/nact/nact-add-capability-dialog.h
+++ b/src/nact/nact-add-capability-dialog.h
@@ -44,12 +44,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_ADD_CAPABILITY_DIALOG_TYPE                ( nact_add_capability_dialog_get_type())
-#define NACT_ADD_CAPABILITY_DIALOG( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ADD_CAPABILITY_DIALOG_TYPE, NactAddCapabilityDialog ))
-#define NACT_ADD_CAPABILITY_DIALOG_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_ADD_CAPABILITY_DIALOG_TYPE, NactAddCapabilityDialogClass ))
-#define NACT_IS_ADD_CAPABILITY_DIALOG( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ADD_CAPABILITY_DIALOG_TYPE ))
-#define NACT_IS_ADD_CAPABILITY_DIALOG_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_ADD_CAPABILITY_DIALOG_TYPE ))
-#define NACT_ADD_CAPABILITY_DIALOG_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_ADD_CAPABILITY_DIALOG_TYPE, NactAddCapabilityDialogClass ))
+#define NACT_TYPE_ADD_CAPABILITY_DIALOG                ( nact_add_capability_dialog_get_type())
+#define NACT_ADD_CAPABILITY_DIALOG( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialog ))
+#define NACT_ADD_CAPABILITY_DIALOG_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialogClass ))
+#define NACT_IS_ADD_CAPABILITY_DIALOG( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_ADD_CAPABILITY_DIALOG ))
+#define NACT_IS_ADD_CAPABILITY_DIALOG_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_ADD_CAPABILITY_DIALOG ))
+#define NACT_ADD_CAPABILITY_DIALOG_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_ADD_CAPABILITY_DIALOG, NactAddCapabilityDialogClass ))
 
 typedef struct _NactAddCapabilityDialogPrivate         NactAddCapabilityDialogPrivate;
 
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index 77e09ca..ffd87e8 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -240,7 +240,7 @@ nact_add_scheme_dialog_run( BaseWindow *parent, GSList *schemes )
 
 	g_return_val_if_fail( BASE_IS_WINDOW( parent ), NULL );
 
-	dialog = g_object_new( NACT_ADD_SCHEME_DIALOG_TYPE,
+	dialog = g_object_new( NACT_TYPE_ADD_SCHEME_DIALOG,
 			BASE_PROP_PARENT,         parent,
 			BASE_PROP_XMLUI_FILENAME, st_xmlui_filename,
 			BASE_PROP_TOPLEVEL_NAME,  st_toplevel_name,
diff --git a/src/nact/nact-add-scheme-dialog.h b/src/nact/nact-add-scheme-dialog.h
index 8352fd0..7f43ccd 100644
--- a/src/nact/nact-add-scheme-dialog.h
+++ b/src/nact/nact-add-scheme-dialog.h
@@ -44,12 +44,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_ADD_SCHEME_DIALOG_TYPE                ( nact_add_scheme_dialog_get_type())
-#define NACT_ADD_SCHEME_DIALOG( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ADD_SCHEME_DIALOG_TYPE, NactAddSchemeDialog ))
-#define NACT_ADD_SCHEME_DIALOG_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_ADD_SCHEME_DIALOG_TYPE, NactAddSchemeDialogClass ))
-#define NACT_IS_ADD_SCHEME_DIALOG( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ADD_SCHEME_DIALOG_TYPE ))
-#define NACT_IS_ADD_SCHEME_DIALOG_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_ADD_SCHEME_DIALOG_TYPE ))
-#define NACT_ADD_SCHEME_DIALOG_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_ADD_SCHEME_DIALOG_TYPE, NactAddSchemeDialogClass ))
+#define NACT_TYPE_ADD_SCHEME_DIALOG                ( nact_add_scheme_dialog_get_type())
+#define NACT_ADD_SCHEME_DIALOG( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_ADD_SCHEME_DIALOG, NactAddSchemeDialog ))
+#define NACT_ADD_SCHEME_DIALOG_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_ADD_SCHEME_DIALOG, NactAddSchemeDialogClass ))
+#define NACT_IS_ADD_SCHEME_DIALOG( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_ADD_SCHEME_DIALOG ))
+#define NACT_IS_ADD_SCHEME_DIALOG_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_ADD_SCHEME_DIALOG ))
+#define NACT_ADD_SCHEME_DIALOG_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_ADD_SCHEME_DIALOG, NactAddSchemeDialogClass ))
 
 typedef struct _NactAddSchemeDialogPrivate         NactAddSchemeDialogPrivate;
 
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index 60bd784..70e9e00 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -217,7 +217,7 @@ nact_application_new( void )
 {
 	NactApplication *application;
 
-	application = g_object_new( NACT_APPLICATION_TYPE, NULL );
+	application = g_object_new( NACT_TYPE_APPLICATION, NULL );
 
 	g_object_set( G_OBJECT( application ),
 			BASE_PROP_OPTIONS,          st_option_entries,
diff --git a/src/nact/nact-application.h b/src/nact/nact-application.h
index 50b15e4..aa5f231 100644
--- a/src/nact/nact-application.h
+++ b/src/nact/nact-application.h
@@ -53,12 +53,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_APPLICATION_TYPE                ( nact_application_get_type())
-#define NACT_APPLICATION( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_APPLICATION_TYPE, NactApplication ))
-#define NACT_APPLICATION_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_APPLICATION_TYPE, NactApplicationClass ))
-#define NACT_IS_APPLICATION( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_APPLICATION_TYPE ))
-#define NACT_IS_APPLICATION_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_APPLICATION_TYPE ))
-#define NACT_APPLICATION_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_APPLICATION_TYPE, NactApplicationClass ))
+#define NACT_TYPE_APPLICATION                ( nact_application_get_type())
+#define NACT_APPLICATION( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_APPLICATION, NactApplication ))
+#define NACT_APPLICATION_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_APPLICATION, NactApplicationClass ))
+#define NACT_IS_APPLICATION( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_APPLICATION ))
+#define NACT_IS_APPLICATION_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_APPLICATION ))
+#define NACT_APPLICATION_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_APPLICATION, NactApplicationClass ))
 
 typedef struct _NactApplicationPrivate       NactApplicationPrivate;
 
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index bc03cee..b618d8b 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -368,7 +368,7 @@ nact_assistant_export_run( BaseWindow *main_window )
 	esc_quit = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_QUIT, NULL, NULL );
 	esc_confirm = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_CONFIRM, NULL, NULL );
 
-	assistant = g_object_new( NACT_ASSISTANT_EXPORT_TYPE,
+	assistant = g_object_new( NACT_TYPE_ASSISTANT_EXPORT,
 			BASE_PROP_PARENT,          main_window,
 			BASE_PROP_HAS_OWN_BUILDER, TRUE,
 			BASE_PROP_XMLUI_FILENAME,  st_xmlui_filename,
diff --git a/src/nact/nact-assistant-export.h b/src/nact/nact-assistant-export.h
index 8204511..bc0ba23 100644
--- a/src/nact/nact-assistant-export.h
+++ b/src/nact/nact-assistant-export.h
@@ -66,12 +66,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_ASSISTANT_EXPORT_TYPE                ( nact_assistant_export_get_type())
-#define NACT_ASSISTANT_EXPORT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ASSISTANT_EXPORT_TYPE, NactAssistantExport ))
-#define NACT_ASSISTANT_EXPORT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_ASSISTANT_EXPORT_TYPE, NactAssistantExportClass ))
-#define NACT_IS_ASSISTANT_EXPORT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ASSISTANT_EXPORT_TYPE ))
-#define NACT_IS_ASSISTANT_EXPORT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_ASSISTANT_EXPORT_TYPE ))
-#define NACT_ASSISTANT_EXPORT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_ASSISTANT_EXPORT_TYPE, NactAssistantExportClass ))
+#define NACT_TYPE_ASSISTANT_EXPORT                ( nact_assistant_export_get_type())
+#define NACT_ASSISTANT_EXPORT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_ASSISTANT_EXPORT, NactAssistantExport ))
+#define NACT_ASSISTANT_EXPORT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_ASSISTANT_EXPORT, NactAssistantExportClass ))
+#define NACT_IS_ASSISTANT_EXPORT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_ASSISTANT_EXPORT ))
+#define NACT_IS_ASSISTANT_EXPORT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_ASSISTANT_EXPORT ))
+#define NACT_ASSISTANT_EXPORT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_ASSISTANT_EXPORT, NactAssistantExportClass ))
 
 typedef struct _NactAssistantExportPrivate        NactAssistantExportPrivate;
 
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 797c01b..59888ae 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -328,7 +328,7 @@ nact_assistant_import_run( BaseWindow *main_window )
 	esc_quit = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_QUIT, NULL, NULL );
 	esc_confirm = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_CONFIRM, NULL, NULL );
 
-	assistant = g_object_new( NACT_ASSISTANT_IMPORT_TYPE,
+	assistant = g_object_new( NACT_TYPE_ASSISTANT_IMPORT,
 			BASE_PROP_PARENT,          main_window,
 			BASE_PROP_HAS_OWN_BUILDER, TRUE,
 			BASE_PROP_XMLUI_FILENAME,  st_xmlui_filename,
diff --git a/src/nact/nact-assistant-import.h b/src/nact/nact-assistant-import.h
index dde15c2..f556067 100644
--- a/src/nact/nact-assistant-import.h
+++ b/src/nact/nact-assistant-import.h
@@ -41,12 +41,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_ASSISTANT_IMPORT_TYPE                ( nact_assistant_import_get_type())
-#define NACT_ASSISTANT_IMPORT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ASSISTANT_IMPORT_TYPE, NactAssistantImport ))
-#define NACT_ASSISTANT_IMPORT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_ASSISTANT_IMPORT_TYPE, NactAssistantImportClass ))
-#define NACT_IS_ASSISTANT_IMPORT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ASSISTANT_IMPORT_TYPE ))
-#define NACT_IS_ASSISTANT_IMPORT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_ASSISTANT_IMPORT_TYPE ))
-#define NACT_ASSISTANT_IMPORT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_ASSISTANT_IMPORT_TYPE, NactAssistantImportClass ))
+#define NACT_TYPE_ASSISTANT_IMPORT                ( nact_assistant_import_get_type())
+#define NACT_ASSISTANT_IMPORT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_ASSISTANT_IMPORT, NactAssistantImport ))
+#define NACT_ASSISTANT_IMPORT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_ASSISTANT_IMPORT, NactAssistantImportClass ))
+#define NACT_IS_ASSISTANT_IMPORT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_ASSISTANT_IMPORT ))
+#define NACT_IS_ASSISTANT_IMPORT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_ASSISTANT_IMPORT ))
+#define NACT_ASSISTANT_IMPORT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_ASSISTANT_IMPORT, NactAssistantImportClass ))
 
 typedef struct _NactAssistantImportPrivate        NactAssistantImportPrivate;
 
diff --git a/src/nact/nact-clipboard.c b/src/nact/nact-clipboard.c
index 1c3af38..5316226 100644
--- a/src/nact/nact-clipboard.c
+++ b/src/nact/nact-clipboard.c
@@ -264,7 +264,7 @@ nact_clipboard_new( BaseWindow *window )
 
 	g_return_val_if_fail( BASE_IS_WINDOW( window ), NULL );
 
-	clipboard = g_object_new( NACT_CLIPBOARD_TYPE, NULL );
+	clipboard = g_object_new( NACT_TYPE_CLIPBOARD, NULL );
 
 	clipboard->private->window = window;
 
diff --git a/src/nact/nact-clipboard.h b/src/nact/nact-clipboard.h
index 9ff6ed2..00434e8 100644
--- a/src/nact/nact-clipboard.h
+++ b/src/nact/nact-clipboard.h
@@ -47,12 +47,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_CLIPBOARD_TYPE                ( nact_clipboard_get_type())
-#define NACT_CLIPBOARD( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_CLIPBOARD_TYPE, NactClipboard ))
-#define NACT_CLIPBOARD_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_CLIPBOARD_TYPE, NactClipboardClass ))
-#define NACT_IS_CLIPBOARD( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_CLIPBOARD_TYPE ))
-#define NACT_IS_CLIPBOARD_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_CLIPBOARD_TYPE ))
-#define NACT_CLIPBOARD_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_CLIPBOARD_TYPE, NactClipboardClass ))
+#define NACT_TYPE_CLIPBOARD                ( nact_clipboard_get_type())
+#define NACT_CLIPBOARD( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_CLIPBOARD, NactClipboard ))
+#define NACT_CLIPBOARD_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_CLIPBOARD, NactClipboardClass ))
+#define NACT_IS_CLIPBOARD( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_CLIPBOARD ))
+#define NACT_IS_CLIPBOARD_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_CLIPBOARD ))
+#define NACT_CLIPBOARD_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_CLIPBOARD, NactClipboardClass ))
 
 typedef struct _NactClipboardPrivate       NactClipboardPrivate;
 
diff --git a/src/nact/nact-confirm-logout.c b/src/nact/nact-confirm-logout.c
index cab785e..ee31801 100644
--- a/src/nact/nact-confirm-logout.c
+++ b/src/nact/nact-confirm-logout.c
@@ -201,7 +201,7 @@ nact_confirm_logout_run( NactMainWindow *parent )
 
 	g_debug( "%s: parent=%p", thisfn, ( void * ) parent );
 
-	dialog = g_object_new( NACT_CONFIRM_LOGOUT_TYPE,
+	dialog = g_object_new( NACT_TYPE_CONFIRM_LOGOUT,
 			BASE_PROP_PARENT,        parent,
 			BASE_PROP_TOPLEVEL_NAME, st_toplevel_name,
 			BASE_PROP_WSP_NAME,      st_wsp_name,
diff --git a/src/nact/nact-confirm-logout.h b/src/nact/nact-confirm-logout.h
index 8eb983e..ebb3e14 100644
--- a/src/nact/nact-confirm-logout.h
+++ b/src/nact/nact-confirm-logout.h
@@ -45,12 +45,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_CONFIRM_LOGOUT_TYPE                ( nact_confirm_logout_get_type())
-#define NACT_CONFIRM_LOGOUT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_CONFIRM_LOGOUT_TYPE, NactConfirmLogout ))
-#define NACT_CONFIRM_LOGOUT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_CONFIRM_LOGOUT_TYPE, NactConfirmLogoutClass ))
-#define NACT_IS_CONFIRM_LOGOUT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_CONFIRM_LOGOUT_TYPE ))
-#define NACT_IS_CONFIRM_LOGOUT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_CONFIRM_LOGOUT_TYPE ))
-#define NACT_CONFIRM_LOGOUT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_CONFIRM_LOGOUT_TYPE, NactConfirmLogoutClass ))
+#define NACT_TYPE_CONFIRM_LOGOUT                ( nact_confirm_logout_get_type())
+#define NACT_CONFIRM_LOGOUT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_CONFIRM_LOGOUT, NactConfirmLogout ))
+#define NACT_CONFIRM_LOGOUT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_CONFIRM_LOGOUT, NactConfirmLogoutClass ))
+#define NACT_IS_CONFIRM_LOGOUT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_CONFIRM_LOGOUT ))
+#define NACT_IS_CONFIRM_LOGOUT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_CONFIRM_LOGOUT ))
+#define NACT_CONFIRM_LOGOUT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_CONFIRM_LOGOUT, NactConfirmLogoutClass ))
 
 typedef struct _NactConfirmLogoutPrivate        NactConfirmLogoutPrivate;
 
diff --git a/src/nact/nact-icon-chooser.c b/src/nact/nact-icon-chooser.c
index ed632df..3c786c8 100644
--- a/src/nact/nact-icon-chooser.c
+++ b/src/nact/nact-icon-chooser.c
@@ -286,7 +286,7 @@ nact_icon_chooser_choose_icon( BaseWindow *parent, const gchar *icon_name )
 
 	g_debug( "%s: parent=%p, icon_name=%s", thisfn, ( void * ) parent, icon_name );
 
-	editor = g_object_new( NACT_ICON_CHOOSER_TYPE,
+	editor = g_object_new( NACT_TYPE_ICON_CHOOSER,
 			BASE_PROP_PARENT,         parent,
 			BASE_PROP_XMLUI_FILENAME, st_xmlui_filename,
 			BASE_PROP_TOPLEVEL_NAME,  st_toplevel_name,
diff --git a/src/nact/nact-icon-chooser.h b/src/nact/nact-icon-chooser.h
index 43d8ba7..90d0090 100644
--- a/src/nact/nact-icon-chooser.h
+++ b/src/nact/nact-icon-chooser.h
@@ -43,12 +43,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_ICON_CHOOSER_TYPE                ( nact_icon_chooser_get_type())
-#define NACT_ICON_CHOOSER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ICON_CHOOSER_TYPE, NactIconChooser ))
-#define NACT_ICON_CHOOSER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_ICON_CHOOSER_TYPE, NactIconChooserClass ))
-#define NACT_IS_ICON_CHOOSER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ICON_CHOOSER_TYPE ))
-#define NACT_IS_ICON_CHOOSER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_ICON_CHOOSER_TYPE ))
-#define NACT_ICON_CHOOSER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_ICON_CHOOSER_TYPE, NactIconChooserClass ))
+#define NACT_TYPE_ICON_CHOOSER                ( nact_icon_chooser_get_type())
+#define NACT_ICON_CHOOSER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_ICON_CHOOSER, NactIconChooser ))
+#define NACT_ICON_CHOOSER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_ICON_CHOOSER, NactIconChooserClass ))
+#define NACT_IS_ICON_CHOOSER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_ICON_CHOOSER ))
+#define NACT_IS_ICON_CHOOSER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_ICON_CHOOSER ))
+#define NACT_ICON_CHOOSER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_ICON_CHOOSER, NactIconChooserClass ))
 
 typedef struct _NactIconChooserPrivate        NactIconChooserPrivate;
 
diff --git a/src/nact/nact-menubar.c b/src/nact/nact-menubar.c
index 822e7cb..c6ea610 100644
--- a/src/nact/nact-menubar.c
+++ b/src/nact/nact-menubar.c
@@ -285,7 +285,7 @@ class_init( NactMenubarClass *klass )
 	 */
 	st_signals[ UPDATE_SENSITIVITIES ] = g_signal_new(
 			MENUBAR_SIGNAL_UPDATE_SENSITIVITIES,
-			NACT_MENUBAR_TYPE,
+			NACT_TYPE_MENUBAR,
 			G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 			0,					/* no default handler */
 			NULL,
@@ -385,7 +385,7 @@ nact_menubar_new( BaseWindow *window )
 
 	g_return_val_if_fail( BASE_IS_WINDOW( window ), NULL );
 
-	bar = g_object_new( NACT_MENUBAR_TYPE, NULL );
+	bar = g_object_new( NACT_TYPE_MENUBAR, NULL );
 
 	bar->private->window = window;
 	bar->private->sort_buttons = nact_sort_buttons_new( window );
diff --git a/src/nact/nact-menubar.h b/src/nact/nact-menubar.h
index 271414b..e08c658 100644
--- a/src/nact/nact-menubar.h
+++ b/src/nact/nact-menubar.h
@@ -63,12 +63,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_MENUBAR_TYPE                ( nact_menubar_get_type())
-#define NACT_MENUBAR( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_MENUBAR_TYPE, NactMenubar ))
-#define NACT_MENUBAR_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_MENUBAR_TYPE, NactMenubarClass ))
-#define NACT_IS_MENUBAR( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_MENUBAR_TYPE ))
-#define NACT_IS_MENUBAR_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_MENUBAR_TYPE ))
-#define NACT_MENUBAR_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_MENUBAR_TYPE, NactMenubarClass ))
+#define NACT_TYPE_MENUBAR                ( nact_menubar_get_type())
+#define NACT_MENUBAR( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_MENUBAR, NactMenubar ))
+#define NACT_MENUBAR_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_MENUBAR, NactMenubarClass ))
+#define NACT_IS_MENUBAR( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_MENUBAR ))
+#define NACT_IS_MENUBAR_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_MENUBAR ))
+#define NACT_MENUBAR_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_MENUBAR, NactMenubarClass ))
 
 typedef struct _NactMenubarPrivate       NactMenubarPrivate;
 
diff --git a/src/nact/nact-sort-buttons.c b/src/nact/nact-sort-buttons.c
index 499257a..1f82384 100644
--- a/src/nact/nact-sort-buttons.c
+++ b/src/nact/nact-sort-buttons.c
@@ -218,7 +218,7 @@ nact_sort_buttons_new( BaseWindow *window )
 
 	g_return_val_if_fail( BASE_IS_WINDOW( window ), NULL );
 
-	obj = g_object_new( NACT_SORT_BUTTONS_TYPE, NULL );
+	obj = g_object_new( NACT_TYPE_SORT_BUTTONS, NULL );
 
 	base_window_signal_connect( window,
 			G_OBJECT( window ), BASE_SIGNAL_INITIALIZE_WINDOW, G_CALLBACK( on_base_initialize_buttons ));
diff --git a/src/nact/nact-sort-buttons.h b/src/nact/nact-sort-buttons.h
index 9c1e92f..6fd163f 100644
--- a/src/nact/nact-sort-buttons.h
+++ b/src/nact/nact-sort-buttons.h
@@ -53,12 +53,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_SORT_BUTTONS_TYPE                ( nact_sort_buttons_get_type())
-#define NACT_SORT_BUTTONS( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_SORT_BUTTONS_TYPE, NactSortButtons ))
-#define NACT_SORT_BUTTONS_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_SORT_BUTTONS_TYPE, NactSortButtonsClass ))
-#define NACT_IS_SORT_BUTTONS( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_SORT_BUTTONS_TYPE ))
-#define NACT_IS_SORT_BUTTONS_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_SORT_BUTTONS_TYPE ))
-#define NACT_SORT_BUTTONS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_SORT_BUTTONS_TYPE, NactSortButtonsClass ))
+#define NACT_TYPE_SORT_BUTTONS                ( nact_sort_buttons_get_type())
+#define NACT_SORT_BUTTONS( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_SORT_BUTTONS, NactSortButtons ))
+#define NACT_SORT_BUTTONS_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_SORT_BUTTONS, NactSortButtonsClass ))
+#define NACT_IS_SORT_BUTTONS( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_SORT_BUTTONS ))
+#define NACT_IS_SORT_BUTTONS_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_SORT_BUTTONS ))
+#define NACT_SORT_BUTTONS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_SORT_BUTTONS, NactSortButtonsClass ))
 
 typedef struct _NactSortButtonsPrivate        NactSortButtonsPrivate;
 
diff --git a/src/nact/nact-tree-ieditable.c b/src/nact/nact-tree-ieditable.c
index 46e0c06..aca60c8 100644
--- a/src/nact/nact-tree-ieditable.c
+++ b/src/nact/nact-tree-ieditable.c
@@ -128,7 +128,7 @@ register_type( void )
 
 	type = g_type_register_static( G_TYPE_INTERFACE, "NactTreeIEditable", &info, 0 );
 
-	g_type_interface_add_prerequisite( type, NACT_TREE_VIEW_TYPE );
+	g_type_interface_add_prerequisite( type, NACT_TYPE_TREE_VIEW );
 
 	return( type );
 }
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index 2f84f51..8184156 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -319,7 +319,7 @@ nact_tree_model_new( BaseWindow *window, GtkTreeView *treeview, NactTreeMode mod
 
 	/* create the filter model
 	 */
-	model = g_object_new( NACT_TREE_MODEL_TYPE, "child-model", ts_model, NULL );
+	model = g_object_new( NACT_TYPE_TREE_MODEL, "child-model", ts_model, NULL );
 
 	gtk_tree_model_filter_set_visible_func(
 			GTK_TREE_MODEL_FILTER( model ), ( GtkTreeModelFilterVisibleFunc ) filter_visible, model, NULL );
diff --git a/src/nact/nact-tree-model.h b/src/nact/nact-tree-model.h
index 4a773db..3d97872 100644
--- a/src/nact/nact-tree-model.h
+++ b/src/nact/nact-tree-model.h
@@ -51,12 +51,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TREE_MODEL_TYPE                ( nact_tree_model_get_type())
-#define NACT_TREE_MODEL( object )           ( G_TYPE_CHECK_INSTANCE_CAST(( object ), NACT_TREE_MODEL_TYPE, NactTreeModel ))
-#define NACT_TREE_MODEL_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST(( klass ), NACT_TREE_MODEL_TYPE, NactTreeModelClass ))
-#define NACT_IS_TREE_MODEL( object )        ( G_TYPE_CHECK_INSTANCE_TYPE(( object ), NACT_TREE_MODEL_TYPE ))
-#define NACT_IS_TREE_MODEL_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TREE_MODEL_TYPE ))
-#define NACT_TREE_MODEL_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TREE_MODEL_TYPE, NactTreeModelClass ))
+#define NACT_TYPE_TREE_MODEL                ( nact_tree_model_get_type())
+#define NACT_TREE_MODEL( object )           ( G_TYPE_CHECK_INSTANCE_CAST(( object ), NACT_TYPE_TREE_MODEL, NactTreeModel ))
+#define NACT_TREE_MODEL_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST(( klass ), NACT_TYPE_TREE_MODEL, NactTreeModelClass ))
+#define NACT_IS_TREE_MODEL( object )        ( G_TYPE_CHECK_INSTANCE_TYPE(( object ), NACT_TYPE_TREE_MODEL ))
+#define NACT_IS_TREE_MODEL_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_TREE_MODEL ))
+#define NACT_TREE_MODEL_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_TREE_MODEL, NactTreeModelClass ))
 
 typedef struct _NactTreeModelPrivate        NactTreeModelPrivate;
 
diff --git a/src/nact/nact-tree-view.c b/src/nact/nact-tree-view.c
index 9b7be77..1aaa7cf 100644
--- a/src/nact/nact-tree-view.c
+++ b/src/nact/nact-tree-view.c
@@ -673,7 +673,7 @@ nact_tree_view_new( BaseWindow *window, GtkContainer *parent, const gchar *treev
 {
 	NactTreeView *view;
 
-	view = g_object_new( NACT_TREE_VIEW_TYPE,
+	view = g_object_new( NACT_TYPE_TREE_VIEW,
 			TREE_PROP_WINDOW,      window,
 			TREE_PROP_PARENT,      parent,
 			TREE_PROP_WIDGET_NAME, treeview_name,
diff --git a/src/nact/nact-tree-view.h b/src/nact/nact-tree-view.h
index 21e3ebf..88a9955 100644
--- a/src/nact/nact-tree-view.h
+++ b/src/nact/nact-tree-view.h
@@ -46,12 +46,12 @@
 
 G_BEGIN_DECLS
 
-#define NACT_TREE_VIEW_TYPE                ( nact_tree_view_get_type())
-#define NACT_TREE_VIEW( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TREE_VIEW_TYPE, NactTreeView ))
-#define NACT_TREE_VIEW_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TREE_VIEW_TYPE, NactTreeViewClass ))
-#define NACT_IS_TREE_VIEW( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TREE_VIEW_TYPE ))
-#define NACT_IS_TREE_VIEW_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TREE_VIEW_TYPE ))
-#define NACT_TREE_VIEW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TREE_VIEW_TYPE, NactTreeViewClass ))
+#define NACT_TYPE_TREE_VIEW                ( nact_tree_view_get_type())
+#define NACT_TREE_VIEW( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_TYPE_TREE_VIEW, NactTreeView ))
+#define NACT_TREE_VIEW_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_TYPE_TREE_VIEW, NactTreeViewClass ))
+#define NACT_IS_TREE_VIEW( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_TYPE_TREE_VIEW ))
+#define NACT_IS_TREE_VIEW_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_TYPE_TREE_VIEW ))
+#define NACT_TREE_VIEW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_TYPE_TREE_VIEW, NactTreeViewClass ))
 
 typedef struct _NactTreeViewPrivate        NactTreeViewPrivate;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]