[nautilus-actions] Cosmetic changes in src/nact headers
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Cosmetic changes in src/nact headers
- Date: Fri, 21 Jan 2011 18:37:09 +0000 (UTC)
commit 1f0a7a46ac5fd5d19c2bb7be7ccde7e263bf9ef7
Author: Pierre Wieser <pwieser trychlos org>
Date: Thu Jan 20 20:11:21 2011 +0100
Cosmetic changes in src/nact headers
+ src/nact/base-application.c
+ src/nact/base-application-class.h
+ src/nact/base-assistant.c
+ src/nact/base-assistant.h
+ src/nact/base-builder.c
+ src/nact/base-builder.h
+ src/nact/base-dialog.c
+ src/nact/base-dialog.h
+ src/nact/base-iprefs.c
+ src/nact/base-iprefs.h
+ src/nact/base-window.c
+ src/nact/base-window-class.h
+ src/nact/egg-tree-multi-dnd.h
+ src/nact/nact-add-capability-dialog.c
+ src/nact/nact-add-capability-dialog.h
+ src/nact/nact-add-scheme-dialog.c
+ src/nact/nact-add-scheme-dialog.h
+ src/nact/nact-application.c
+ src/nact/nact-application.h
+ src/nact/nact-assistant-export.c
+ src/nact/nact-assistant-export.h
+ src/nact/nact-assistant-import.c
+ src/nact/nact-assistant-import.h
+ src/nact/nact-clipboard.c
+ src/nact/nact-clipboard.h
+ src/nact/nact-confirm-logout.c
+ src/nact/nact-confirm-logout.h
+ src/nact/nact-export-ask.c
+ src/nact/nact-export-ask.h
+ src/nact/nact-iactions-list.c
+ src/nact/nact-iactions-list.h
+ src/nact/nact-iaction-tab.c
+ src/nact/nact-iaction-tab.h
+ src/nact/nact-ibasenames-tab.c
+ src/nact/nact-ibasenames-tab.h
+ src/nact/nact-icapabilities-tab.c
+ src/nact/nact-icapabilities-tab.h
+ src/nact/nact-icommand-tab.c
+ src/nact/nact-icommand-tab.h
+ src/nact/nact-icon-chooser.h
+ src/nact/nact-ienvironment-tab.c
+ src/nact/nact-ienvironment-tab.h
+ src/nact/nact-iexecution-tab.c
+ src/nact/nact-iexecution-tab.h
+ src/nact/nact-ifolders-tab.c
+ src/nact/nact-ifolders-tab.h
+ src/nact/nact-imimetypes-tab.c
+ src/nact/nact-imimetypes-tab.h
+ src/nact/nact-iproperties-tab.c
+ src/nact/nact-iproperties-tab.h
+ src/nact/nact-ischemes-tab.c
+ src/nact/nact-ischemes-tab.h
+ src/nact/nact-main-window.c
+ src/nact/nact-main-window.h
+ src/nact/nact-preferences-editor.c
+ src/nact/nact-preferences-editor.h
+ src/nact/nact-tree-model.c
+ src/nact/nact-tree-model.h
+ src/nact/nact-tree-model-priv.h
+ src/nact/nact-window.c
+ src/nact/nact-window.h
ChangeLog | 62 +++++++++++++++++++++++++++++++++
src/nact/base-application-class.h | 19 ++++++----
src/nact/base-application.c | 4 +-
src/nact/base-assistant.c | 4 +-
src/nact/base-assistant.h | 19 ++++++----
src/nact/base-builder.c | 4 +-
src/nact/base-builder.h | 18 +++++----
src/nact/base-dialog.c | 4 +-
src/nact/base-dialog.h | 18 +++++----
src/nact/base-iprefs.c | 2 +-
src/nact/base-iprefs.h | 15 ++++----
src/nact/base-window-class.h | 19 ++++++----
src/nact/base-window.c | 4 +-
src/nact/egg-tree-multi-dnd.h | 30 ----------------
src/nact/nact-add-capability-dialog.c | 4 +-
src/nact/nact-add-capability-dialog.h | 18 +++++----
src/nact/nact-add-scheme-dialog.c | 4 +-
src/nact/nact-add-scheme-dialog.h | 18 +++++----
src/nact/nact-application.c | 4 +-
src/nact/nact-application.h | 18 +++++----
src/nact/nact-assistant-export.c | 4 +-
src/nact/nact-assistant-export.h | 18 +++++----
src/nact/nact-assistant-import.c | 4 +-
src/nact/nact-assistant-import.h | 18 +++++----
src/nact/nact-clipboard.c | 4 +-
src/nact/nact-clipboard.h | 18 +++++----
src/nact/nact-confirm-logout.c | 4 +-
src/nact/nact-confirm-logout.h | 18 +++++----
src/nact/nact-export-ask.c | 4 +-
src/nact/nact-export-ask.h | 18 +++++----
src/nact/nact-iaction-tab.c | 2 +-
src/nact/nact-iaction-tab.h | 14 ++++----
src/nact/nact-iactions-list.c | 2 +-
src/nact/nact-iactions-list.h | 15 ++++----
src/nact/nact-ibasenames-tab.c | 2 +-
src/nact/nact-ibasenames-tab.h | 14 ++++----
src/nact/nact-icapabilities-tab.c | 2 +-
src/nact/nact-icapabilities-tab.h | 14 ++++----
src/nact/nact-icommand-tab.c | 2 +-
src/nact/nact-icommand-tab.h | 14 ++++----
src/nact/nact-icon-chooser.h | 5 ++-
src/nact/nact-ienvironment-tab.c | 2 +-
src/nact/nact-ienvironment-tab.h | 14 ++++----
src/nact/nact-iexecution-tab.c | 2 +-
src/nact/nact-iexecution-tab.h | 14 ++++----
src/nact/nact-ifolders-tab.c | 2 +-
src/nact/nact-ifolders-tab.h | 14 ++++----
src/nact/nact-imimetypes-tab.c | 2 +-
src/nact/nact-imimetypes-tab.h | 14 ++++----
src/nact/nact-iproperties-tab.c | 2 +-
src/nact/nact-iproperties-tab.h | 14 ++++----
src/nact/nact-ischemes-tab.c | 2 +-
src/nact/nact-ischemes-tab.h | 14 ++++----
src/nact/nact-main-window.c | 4 +-
src/nact/nact-main-window.h | 18 +++++----
src/nact/nact-preferences-editor.c | 4 +-
src/nact/nact-preferences-editor.h | 18 +++++----
src/nact/nact-tree-model-priv.h | 2 +-
src/nact/nact-tree-model.c | 2 +-
src/nact/nact-tree-model.h | 18 +++++----
src/nact/nact-window.c | 4 +-
src/nact/nact-window.h | 18 +++++----
62 files changed, 371 insertions(+), 297 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e6ce74d..4f0186f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,67 @@
2011-01-20 Pierre Wieser <pwieser trychlos org>
+ * src/nact/base-application.c:
+ * src/nact/base-application-class.h:
+ * src/nact/base-assistant.c:
+ * src/nact/base-assistant.h:
+ * src/nact/base-builder.c:
+ * src/nact/base-builder.h:
+ * src/nact/base-dialog.c:
+ * src/nact/base-dialog.h:
+ * src/nact/base-iprefs.c:
+ * src/nact/base-iprefs.h:
+ * src/nact/base-window.c:
+ * src/nact/base-window-class.h:
+ * src/nact/egg-tree-multi-dnd.h:
+ * src/nact/nact-add-capability-dialog.c:
+ * src/nact/nact-add-capability-dialog.h:
+ * src/nact/nact-add-scheme-dialog.c:
+ * src/nact/nact-add-scheme-dialog.h:
+ * src/nact/nact-application.c:
+ * src/nact/nact-application.h:
+ * src/nact/nact-assistant-export.c:
+ * src/nact/nact-assistant-export.h:
+ * src/nact/nact-assistant-import.c:
+ * src/nact/nact-assistant-import.h:
+ * src/nact/nact-clipboard.c:
+ * src/nact/nact-clipboard.h:
+ * src/nact/nact-confirm-logout.c:
+ * src/nact/nact-confirm-logout.h:
+ * src/nact/nact-export-ask.c:
+ * src/nact/nact-export-ask.h:
+ * src/nact/nact-iactions-list.c:
+ * src/nact/nact-iactions-list.h:
+ * src/nact/nact-iaction-tab.c:
+ * src/nact/nact-iaction-tab.h:
+ * src/nact/nact-ibasenames-tab.c:
+ * src/nact/nact-ibasenames-tab.h:
+ * src/nact/nact-icapabilities-tab.c:
+ * src/nact/nact-icapabilities-tab.h:
+ * src/nact/nact-icommand-tab.c:
+ * src/nact/nact-icommand-tab.h:
+ * src/nact/nact-icon-chooser.h:
+ * src/nact/nact-ienvironment-tab.c:
+ * src/nact/nact-ienvironment-tab.h:
+ * src/nact/nact-iexecution-tab.c:
+ * src/nact/nact-iexecution-tab.h:
+ * src/nact/nact-ifolders-tab.c:
+ * src/nact/nact-ifolders-tab.h:
+ * src/nact/nact-imimetypes-tab.c:
+ * src/nact/nact-imimetypes-tab.h:
+ * src/nact/nact-iproperties-tab.c:
+ * src/nact/nact-iproperties-tab.h:
+ * src/nact/nact-ischemes-tab.c:
+ * src/nact/nact-ischemes-tab.h:
+ * src/nact/nact-main-window.c:
+ * src/nact/nact-main-window.h:
+ * src/nact/nact-preferences-editor.c:
+ * src/nact/nact-preferences-editor.h:
+ * src/nact/nact-tree-model.c:
+ * src/nact/nact-tree-model.h:
+ * src/nact/nact-tree-model-priv.h:
+ * src/nact/nact-window.c:
+ * src/nact/nact-window.h: Cosmetic changes in src/nact headers.
+
* src/io-xml/naxml-provider.c:
* src/io-xml/naxml-provider.h:
* src/io-xml/naxml-reader.c:
diff --git a/src/nact/base-application-class.h b/src/nact/base-application-class.h
index 784afb0..165723d 100644
--- a/src/nact/base-application-class.h
+++ b/src/nact/base-application-class.h
@@ -43,27 +43,30 @@
G_BEGIN_DECLS
-#define BASE_APPLICATION_TYPE ( base_application_get_type())
-#define BASE_APPLICATION( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_APPLICATION_TYPE, BaseApplication ))
-#define BASE_APPLICATION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_APPLICATION_TYPE, BaseApplicationClass ))
-#define BASE_IS_APPLICATION( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_APPLICATION_TYPE ))
-#define BASE_IS_APPLICATION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_APPLICATION_TYPE ))
-#define BASE_APPLICATION_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_APPLICATION_TYPE, BaseApplicationClass ))
+#define BASE_APPLICATION_TYPE ( base_application_get_type())
+#define BASE_APPLICATION( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_APPLICATION_TYPE, BaseApplication ))
+#define BASE_APPLICATION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_APPLICATION_TYPE, BaseApplicationClass ))
+#define BASE_IS_APPLICATION( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_APPLICATION_TYPE ))
+#define BASE_IS_APPLICATION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_APPLICATION_TYPE ))
+#define BASE_APPLICATION_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_APPLICATION_TYPE, BaseApplicationClass ))
-typedef struct BaseApplicationPrivate BaseApplicationPrivate;
+typedef struct _BaseApplicationPrivate BaseApplicationPrivate;
typedef struct {
+ /*< private >*/
GObject parent;
BaseApplicationPrivate *private;
}
BaseApplication;
-typedef struct BaseApplicationClassPrivate BaseApplicationClassPrivate;
+typedef struct _BaseApplicationClassPrivate BaseApplicationClassPrivate;
typedef struct {
+ /*< private >*/
GObjectClass parent;
BaseApplicationClassPrivate *private;
+ /*< public >*/
/**
* run:
* @appli: this #BaseApplication instance.
diff --git a/src/nact/base-application.c b/src/nact/base-application.c
index 3c771ba..00f2f33 100644
--- a/src/nact/base-application.c
+++ b/src/nact/base-application.c
@@ -43,13 +43,13 @@
/* private class data
*/
-struct BaseApplicationClassPrivate {
+struct _BaseApplicationClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct BaseApplicationPrivate {
+struct _BaseApplicationPrivate {
gboolean dispose_has_run;
int argc;
gpointer argv;
diff --git a/src/nact/base-assistant.c b/src/nact/base-assistant.c
index f9523d6..60a21fd 100644
--- a/src/nact/base-assistant.c
+++ b/src/nact/base-assistant.c
@@ -41,13 +41,13 @@
/* private class data
*/
-struct BaseAssistantClassPrivate {
+struct _BaseAssistantClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct BaseAssistantPrivate {
+struct _BaseAssistantPrivate {
gboolean dispose_has_run;
gboolean cancel_on_escape;
gboolean warn_on_escape;
diff --git a/src/nact/base-assistant.h b/src/nact/base-assistant.h
index e59c2de..f39ef5e 100644
--- a/src/nact/base-assistant.h
+++ b/src/nact/base-assistant.h
@@ -51,27 +51,30 @@
G_BEGIN_DECLS
-#define BASE_ASSISTANT_TYPE ( base_assistant_get_type())
-#define BASE_ASSISTANT( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_ASSISTANT_TYPE, BaseAssistant ))
-#define BASE_ASSISTANT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_ASSISTANT_TYPE, BaseAssistantClass ))
-#define BASE_IS_ASSISTANT( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_ASSISTANT_TYPE ))
-#define BASE_IS_ASSISTANT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_ASSISTANT_TYPE ))
-#define BASE_ASSISTANT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_ASSISTANT_TYPE, BaseAssistantClass ))
+#define BASE_ASSISTANT_TYPE ( base_assistant_get_type())
+#define BASE_ASSISTANT( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_ASSISTANT_TYPE, BaseAssistant ))
+#define BASE_ASSISTANT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_ASSISTANT_TYPE, BaseAssistantClass ))
+#define BASE_IS_ASSISTANT( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_ASSISTANT_TYPE ))
+#define BASE_IS_ASSISTANT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_ASSISTANT_TYPE ))
+#define BASE_ASSISTANT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_ASSISTANT_TYPE, BaseAssistantClass ))
-typedef struct BaseAssistantPrivate BaseAssistantPrivate;
+typedef struct _BaseAssistantPrivate BaseAssistantPrivate;
typedef struct {
+ /*< private >*/
BaseWindow parent;
BaseAssistantPrivate *private;
}
BaseAssistant;
-typedef struct BaseAssistantClassPrivate BaseAssistantClassPrivate;
+typedef struct _BaseAssistantClassPrivate BaseAssistantClassPrivate;
typedef struct {
+ /*< private >*/
BaseWindowClass parent;
BaseAssistantClassPrivate *private;
+ /*< public >*/
/**
* apply:
* @window: this #BaseAssistance instance.
diff --git a/src/nact/base-builder.c b/src/nact/base-builder.c
index f1dcdae..aec4964 100644
--- a/src/nact/base-builder.c
+++ b/src/nact/base-builder.c
@@ -38,13 +38,13 @@
/* private class data
*/
-struct BaseBuilderClassPrivate {
+struct _BaseBuilderClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct BaseBuilderPrivate {
+struct _BaseBuilderPrivate {
gboolean dispose_has_run;
GSList *fnames;
};
diff --git a/src/nact/base-builder.h b/src/nact/base-builder.h
index 17b8172..4f44ce6 100644
--- a/src/nact/base-builder.h
+++ b/src/nact/base-builder.h
@@ -47,24 +47,26 @@
G_BEGIN_DECLS
-#define BASE_BUILDER_TYPE ( base_builder_get_type())
-#define BASE_BUILDER( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_BUILDER_TYPE, BaseBuilder ))
-#define BASE_BUILDER_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_BUILDER_TYPE, BaseBuilderClass ))
-#define BASE_IS_BUILDER( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_BUILDER_TYPE ))
-#define BASE_IS_BUILDER_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_BUILDER_TYPE ))
-#define BASE_BUILDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_BUILDER_TYPE, BaseBuilderClass ))
+#define BASE_BUILDER_TYPE ( base_builder_get_type())
+#define BASE_BUILDER( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_BUILDER_TYPE, BaseBuilder ))
+#define BASE_BUILDER_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_BUILDER_TYPE, BaseBuilderClass ))
+#define BASE_IS_BUILDER( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_BUILDER_TYPE ))
+#define BASE_IS_BUILDER_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_BUILDER_TYPE ))
+#define BASE_BUILDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_BUILDER_TYPE, BaseBuilderClass ))
-typedef struct BaseBuilderPrivate BaseBuilderPrivate;
+typedef struct _BaseBuilderPrivate BaseBuilderPrivate;
typedef struct {
+ /*< private >*/
GtkBuilder parent;
BaseBuilderPrivate *private;
}
BaseBuilder;
-typedef struct BaseBuilderClassPrivate BaseBuilderClassPrivate;
+typedef struct _BaseBuilderClassPrivate BaseBuilderClassPrivate;
typedef struct {
+ /*< private >*/
GtkBuilderClass parent;
BaseBuilderClassPrivate *private;
}
diff --git a/src/nact/base-dialog.c b/src/nact/base-dialog.c
index 79c7844..d31c90c 100644
--- a/src/nact/base-dialog.c
+++ b/src/nact/base-dialog.c
@@ -36,13 +36,13 @@
/* private class data
*/
-struct BaseDialogClassPrivate {
+struct _BaseDialogClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct BaseDialogPrivate {
+struct _BaseDialogPrivate {
gboolean dispose_has_run;
};
diff --git a/src/nact/base-dialog.h b/src/nact/base-dialog.h
index 6e8578d..15c5372 100644
--- a/src/nact/base-dialog.h
+++ b/src/nact/base-dialog.h
@@ -44,24 +44,26 @@
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_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 ))
-typedef struct BaseDialogPrivate BaseDialogPrivate;
+typedef struct _BaseDialogPrivate BaseDialogPrivate;
typedef struct {
+ /*< private >*/
BaseWindow parent;
BaseDialogPrivate *private;
}
BaseDialog;
-typedef struct BaseDialogClassPrivate BaseDialogClassPrivate;
+typedef struct _BaseDialogClassPrivate BaseDialogClassPrivate;
typedef struct {
+ /*< private >*/
BaseWindowClass parent;
BaseDialogClassPrivate *private;
}
diff --git a/src/nact/base-iprefs.c b/src/nact/base-iprefs.c
index 7ea64b0..668d070 100644
--- a/src/nact/base-iprefs.c
+++ b/src/nact/base-iprefs.c
@@ -41,7 +41,7 @@
/* private interface data
*/
-struct BaseIPrefsInterfacePrivate {
+struct _BaseIPrefsInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/base-iprefs.h b/src/nact/base-iprefs.h
index 99682ee..66ace82 100644
--- a/src/nact/base-iprefs.h
+++ b/src/nact/base-iprefs.h
@@ -48,19 +48,20 @@
G_BEGIN_DECLS
-#define BASE_IPREFS_TYPE ( base_iprefs_get_type())
-#define BASE_IPREFS( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_IPREFS_TYPE, BaseIPrefs ))
-#define BASE_IS_IPREFS( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_IPREFS_TYPE ))
-#define BASE_IPREFS_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), BASE_IPREFS_TYPE, BaseIPrefsInterface ))
+#define BASE_IPREFS_TYPE ( base_iprefs_get_type())
+#define BASE_IPREFS( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_IPREFS_TYPE, BaseIPrefs ))
+#define BASE_IS_IPREFS( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_IPREFS_TYPE ))
+#define BASE_IPREFS_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), BASE_IPREFS_TYPE, BaseIPrefsInterface ))
-typedef struct BaseIPrefs BaseIPrefs;
-
-typedef struct BaseIPrefsInterfacePrivate BaseIPrefsInterfacePrivate;
+typedef struct _BaseIPrefs BaseIPrefs;
+typedef struct _BaseIPrefsInterfacePrivate BaseIPrefsInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
BaseIPrefsInterfacePrivate *private;
+ /*< public >*/
/* api
*/
gchar * ( *iprefs_get_window_id )( const BaseWindow *window );
diff --git a/src/nact/base-window-class.h b/src/nact/base-window-class.h
index 1b8a45c..c5e8fa7 100644
--- a/src/nact/base-window-class.h
+++ b/src/nact/base-window-class.h
@@ -75,27 +75,30 @@
G_BEGIN_DECLS
-#define BASE_WINDOW_TYPE ( base_window_get_type())
-#define BASE_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_WINDOW_TYPE, BaseWindow ))
-#define BASE_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_WINDOW_TYPE, BaseWindowClass ))
-#define BASE_IS_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_WINDOW_TYPE ))
-#define BASE_IS_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_WINDOW_TYPE ))
-#define BASE_WINDOW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_WINDOW_TYPE, BaseWindowClass ))
+#define BASE_WINDOW_TYPE ( base_window_get_type())
+#define BASE_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, BASE_WINDOW_TYPE, BaseWindow ))
+#define BASE_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, BASE_WINDOW_TYPE, BaseWindowClass ))
+#define BASE_IS_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, BASE_WINDOW_TYPE ))
+#define BASE_IS_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), BASE_WINDOW_TYPE ))
+#define BASE_WINDOW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), BASE_WINDOW_TYPE, BaseWindowClass ))
-typedef struct BaseWindowPrivate BaseWindowPrivate;
+typedef struct _BaseWindowPrivate BaseWindowPrivate;
typedef struct {
+ /*< private >*/
GObject parent;
BaseWindowPrivate *private;
}
BaseWindow;
-typedef struct BaseWindowClassPrivate BaseWindowClassPrivate;
+typedef struct _BaseWindowClassPrivate BaseWindowClassPrivate;
typedef struct {
+ /*< private >*/
GObjectClass parent;
BaseWindowClassPrivate *private;
+ /*< public >*/
/**
* initial_load_toplevel:
* @window: this #BaseWindow instance.
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index e5a4283..6a14ff2 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -43,13 +43,13 @@
/* private class data
*/
-struct BaseWindowClassPrivate {
+struct _BaseWindowClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct BaseWindowPrivate {
+struct _BaseWindowPrivate {
gboolean dispose_has_run;
BaseWindow *parent;
BaseApplication *application;
diff --git a/src/nact/egg-tree-multi-dnd.h b/src/nact/egg-tree-multi-dnd.h
index d9366b3..bc2c4dd 100644
--- a/src/nact/egg-tree-multi-dnd.h
+++ b/src/nact/egg-tree-multi-dnd.h
@@ -1,33 +1,3 @@
-/*
- * Nautilus-Actions
- * A Nautilus extension which offers configurable context menu actions.
- *
- * Copyright (C) 2005 The GNOME Foundation
- * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
- * Copyright (C) 2009, 2010, 2011 Pierre Wieser and others (see AUTHORS)
- *
- * This Program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors:
- * Frederic Ruaudel <grumz grumz net>
- * Rodrigo Moya <rodrigo gnome-db org>
- * Pierre Wieser <pwieser trychlos org>
- * ... and many others (see AUTHORS)
- */
-
/* eggtreednd.h
* Copyright (C) 2001 Red Hat, Inc.
*
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index 78cc010..e72f546 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -44,13 +44,13 @@
/* private class data
*/
-struct NactAddCapabilityDialogClassPrivate {
+struct _NactAddCapabilityDialogClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactAddCapabilityDialogPrivate {
+struct _NactAddCapabilityDialogPrivate {
gboolean dispose_has_run;
GSList *already_used;
gchar *capability;
diff --git a/src/nact/nact-add-capability-dialog.h b/src/nact/nact-add-capability-dialog.h
index e38edf1..f8b6acd 100644
--- a/src/nact/nact-add-capability-dialog.h
+++ b/src/nact/nact-add-capability-dialog.h
@@ -44,24 +44,26 @@
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_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 ))
-typedef struct NactAddCapabilityDialogPrivate NactAddCapabilityDialogPrivate;
+typedef struct _NactAddCapabilityDialogPrivate NactAddCapabilityDialogPrivate;
typedef struct {
+ /*< private >*/
BaseDialog parent;
NactAddCapabilityDialogPrivate *private;
}
NactAddCapabilityDialog;
-typedef struct NactAddCapabilityDialogClassPrivate NactAddCapabilityDialogClassPrivate;
+typedef struct _NactAddCapabilityDialogClassPrivate NactAddCapabilityDialogClassPrivate;
typedef struct {
+ /*< private >*/
BaseDialogClass parent;
NactAddCapabilityDialogClassPrivate *private;
}
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index 1db83ff..1ea45ce 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -43,13 +43,13 @@
/* private class data
*/
-struct NactAddSchemeDialogClassPrivate {
+struct _NactAddSchemeDialogClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactAddSchemeDialogPrivate {
+struct _NactAddSchemeDialogPrivate {
gboolean dispose_has_run;
GSList *already_used;
gchar *scheme;
diff --git a/src/nact/nact-add-scheme-dialog.h b/src/nact/nact-add-scheme-dialog.h
index a19d77f..f7727e9 100644
--- a/src/nact/nact-add-scheme-dialog.h
+++ b/src/nact/nact-add-scheme-dialog.h
@@ -44,24 +44,26 @@
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_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 ))
-typedef struct NactAddSchemeDialogPrivate NactAddSchemeDialogPrivate;
+typedef struct _NactAddSchemeDialogPrivate NactAddSchemeDialogPrivate;
typedef struct {
+ /*< private >*/
BaseDialog parent;
NactAddSchemeDialogPrivate *private;
}
NactAddSchemeDialog;
-typedef struct NactAddSchemeDialogClassPrivate NactAddSchemeDialogClassPrivate;
+typedef struct _NactAddSchemeDialogClassPrivate NactAddSchemeDialogClassPrivate;
typedef struct {
+ /*< private >*/
BaseDialogClass parent;
NactAddSchemeDialogClassPrivate *private;
}
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index e530152..6af122d 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -45,13 +45,13 @@
/* private class data
*/
-struct NactApplicationClassPrivate {
+struct _NactApplicationClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactApplicationPrivate {
+struct _NactApplicationPrivate {
gboolean dispose_has_run;
NAUpdater *updater;
};
diff --git a/src/nact/nact-application.h b/src/nact/nact-application.h
index b42c43f..fb36ef9 100644
--- a/src/nact/nact-application.h
+++ b/src/nact/nact-application.h
@@ -45,24 +45,26 @@
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_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 ))
-typedef struct NactApplicationPrivate NactApplicationPrivate;
+typedef struct _NactApplicationPrivate NactApplicationPrivate;
typedef struct {
+ /*< private >*/
BaseApplication parent;
NactApplicationPrivate *private;
}
NactApplication;
-typedef struct NactApplicationClassPrivate NactApplicationClassPrivate;
+typedef struct _NactApplicationClassPrivate NactApplicationClassPrivate;
typedef struct {
+ /*< private >*/
BaseApplicationClass parent;
NactApplicationClassPrivate *private;
}
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index d3318ad..8fa6671 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -73,13 +73,13 @@ enum {
/* private class data
*/
-struct NactAssistantExportClassPrivate {
+struct _NactAssistantExportClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactAssistantExportPrivate {
+struct _NactAssistantExportPrivate {
gboolean dispose_has_run;
gboolean preferences_locked;
gchar *uri;
diff --git a/src/nact/nact-assistant-export.h b/src/nact/nact-assistant-export.h
index 9cd10a2..40a4348 100644
--- a/src/nact/nact-assistant-export.h
+++ b/src/nact/nact-assistant-export.h
@@ -66,24 +66,26 @@
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_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 ))
-typedef struct NactAssistantExportPrivate NactAssistantExportPrivate;
+typedef struct _NactAssistantExportPrivate NactAssistantExportPrivate;
typedef struct {
+ /*< private >*/
BaseAssistant parent;
NactAssistantExportPrivate *private;
}
NactAssistantExport;
-typedef struct NactAssistantExportClassPrivate NactAssistantExportClassPrivate;
+typedef struct _NactAssistantExportClassPrivate NactAssistantExportClassPrivate;
typedef struct {
+ /*< private >*/
BaseAssistantClass parent;
NactAssistantExportClassPrivate *private;
}
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 697350a..aa2c773 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -67,13 +67,13 @@ enum {
/* private class data
*/
-struct NactAssistantImportClassPrivate {
+struct _NactAssistantImportClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactAssistantImportPrivate {
+struct _NactAssistantImportPrivate {
gboolean dispose_has_run;
GList *results;
};
diff --git a/src/nact/nact-assistant-import.h b/src/nact/nact-assistant-import.h
index 1ca4466..d5854e0 100644
--- a/src/nact/nact-assistant-import.h
+++ b/src/nact/nact-assistant-import.h
@@ -41,24 +41,26 @@
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_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 ))
-typedef struct NactAssistantImportPrivate NactAssistantImportPrivate;
+typedef struct _NactAssistantImportPrivate NactAssistantImportPrivate;
typedef struct {
+ /*< private >*/
BaseAssistant parent;
NactAssistantImportPrivate *private;
}
NactAssistantImport;
-typedef struct NactAssistantImportClassPrivate NactAssistantImportClassPrivate;
+typedef struct _NactAssistantImportClassPrivate NactAssistantImportClassPrivate;
typedef struct {
+ /*< private >*/
BaseAssistantClass parent;
NactAssistantImportClassPrivate *private;
}
diff --git a/src/nact/nact-clipboard.c b/src/nact/nact-clipboard.c
index 613fe9d..2324db5 100644
--- a/src/nact/nact-clipboard.c
+++ b/src/nact/nact-clipboard.c
@@ -48,7 +48,7 @@
/* private class data
*/
-struct NactClipboardClassPrivate {
+struct _NactClipboardClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
@@ -71,7 +71,7 @@ typedef struct {
}
PrimaryData;
-struct NactClipboardPrivate {
+struct _NactClipboardPrivate {
gboolean dispose_has_run;
BaseWindow *window;
GtkClipboard *dnd;
diff --git a/src/nact/nact-clipboard.h b/src/nact/nact-clipboard.h
index acf7476..7d1c029 100644
--- a/src/nact/nact-clipboard.h
+++ b/src/nact/nact-clipboard.h
@@ -47,24 +47,26 @@
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_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 ))
-typedef struct NactClipboardPrivate NactClipboardPrivate;
+typedef struct _NactClipboardPrivate NactClipboardPrivate;
typedef struct {
+ /*< private >*/
GObject parent;
NactClipboardPrivate *private;
}
NactClipboard;
-typedef struct NactClipboardClassPrivate NactClipboardClassPrivate;
+typedef struct _NactClipboardClassPrivate NactClipboardClassPrivate;
typedef struct {
+ /*< private >*/
GObjectClass parent;
NactClipboardClassPrivate *private;
}
diff --git a/src/nact/nact-confirm-logout.c b/src/nact/nact-confirm-logout.c
index c3453ec..5338fc2 100644
--- a/src/nact/nact-confirm-logout.c
+++ b/src/nact/nact-confirm-logout.c
@@ -37,13 +37,13 @@
/* private class data
*/
-struct NactConfirmLogoutClassPrivate {
+struct _NactConfirmLogoutClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactConfirmLogoutPrivate {
+struct _NactConfirmLogoutPrivate {
gboolean dispose_has_run;
gboolean willing_to_quit;
};
diff --git a/src/nact/nact-confirm-logout.h b/src/nact/nact-confirm-logout.h
index df9d1d0..3d48c59 100644
--- a/src/nact/nact-confirm-logout.h
+++ b/src/nact/nact-confirm-logout.h
@@ -45,24 +45,26 @@
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_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 ))
-typedef struct NactConfirmLogoutPrivate NactConfirmLogoutPrivate;
+typedef struct _NactConfirmLogoutPrivate NactConfirmLogoutPrivate;
typedef struct {
+ /*< private >*/
BaseDialog parent;
NactConfirmLogoutPrivate *private;
}
NactConfirmLogout;
-typedef struct NactConfirmLogoutClassPrivate NactConfirmLogoutClassPrivate;
+typedef struct _NactConfirmLogoutClassPrivate NactConfirmLogoutClassPrivate;
typedef struct {
+ /*< private >*/
BaseDialogClass parent;
NactConfirmLogoutClassPrivate *private;
}
diff --git a/src/nact/nact-export-ask.c b/src/nact/nact-export-ask.c
index 2824d04..ce88ab8 100644
--- a/src/nact/nact-export-ask.c
+++ b/src/nact/nact-export-ask.c
@@ -46,13 +46,13 @@
/* private class data
*/
-struct NactExportAskClassPrivate {
+struct _NactExportAskClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactExportAskPrivate {
+struct _NactExportAskPrivate {
gboolean dispose_has_run;
BaseWindow *parent;
gboolean preferences_locked;
diff --git a/src/nact/nact-export-ask.h b/src/nact/nact-export-ask.h
index defe161..34d6b65 100644
--- a/src/nact/nact-export-ask.h
+++ b/src/nact/nact-export-ask.h
@@ -47,24 +47,26 @@
G_BEGIN_DECLS
-#define NACT_EXPORT_ASK_TYPE ( nact_export_ask_get_type())
-#define NACT_EXPORT_ASK( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_EXPORT_ASK_TYPE, NactExportAsk ))
-#define NACT_EXPORT_ASK_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_EXPORT_ASK_TYPE, NactExportAskClass ))
-#define NACT_IS_EXPORT_ASK( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_EXPORT_ASK_TYPE ))
-#define NACT_IS_EXPORT_ASK_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_EXPORT_ASK_TYPE ))
-#define NACT_EXPORT_ASK_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_EXPORT_ASK_TYPE, NactExportAskClass ))
+#define NACT_EXPORT_ASK_TYPE ( nact_export_ask_get_type())
+#define NACT_EXPORT_ASK( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_EXPORT_ASK_TYPE, NactExportAsk ))
+#define NACT_EXPORT_ASK_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_EXPORT_ASK_TYPE, NactExportAskClass ))
+#define NACT_IS_EXPORT_ASK( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_EXPORT_ASK_TYPE ))
+#define NACT_IS_EXPORT_ASK_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_EXPORT_ASK_TYPE ))
+#define NACT_EXPORT_ASK_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_EXPORT_ASK_TYPE, NactExportAskClass ))
-typedef struct NactExportAskPrivate NactExportAskPrivate;
+typedef struct _NactExportAskPrivate NactExportAskPrivate;
typedef struct {
+ /*< private >*/
BaseDialog parent;
NactExportAskPrivate *private;
}
NactExportAsk;
-typedef struct NactExportAskClassPrivate NactExportAskClassPrivate;
+typedef struct _NactExportAskClassPrivate NactExportAskClassPrivate;
typedef struct {
+ /*< private >*/
BaseDialogClass parent;
NactExportAskClassPrivate *private;
}
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 2e7bfc1..485b14c 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -52,7 +52,7 @@
/* private interface data
*/
-struct NactIActionTabInterfacePrivate {
+struct _NactIActionTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-iaction-tab.h b/src/nact/nact-iaction-tab.h
index ebeca88..007673b 100644
--- a/src/nact/nact-iaction-tab.h
+++ b/src/nact/nact-iaction-tab.h
@@ -47,16 +47,16 @@
G_BEGIN_DECLS
-#define NACT_IACTION_TAB_TYPE ( nact_iaction_tab_get_type())
-#define NACT_IACTION_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IACTION_TAB_TYPE, NactIActionTab ))
-#define NACT_IS_IACTION_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IACTION_TAB_TYPE ))
-#define NACT_IACTION_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IACTION_TAB_TYPE, NactIActionTabInterface ))
+#define NACT_IACTION_TAB_TYPE ( nact_iaction_tab_get_type())
+#define NACT_IACTION_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IACTION_TAB_TYPE, NactIActionTab ))
+#define NACT_IS_IACTION_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IACTION_TAB_TYPE ))
+#define NACT_IACTION_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IACTION_TAB_TYPE, NactIActionTabInterface ))
-typedef struct NactIActionTab NactIActionTab;
-
-typedef struct NactIActionTabInterfacePrivate NactIActionTabInterfacePrivate;
+typedef struct _NactIActionTab NactIActionTab;
+typedef struct _NactIActionTabInterfacePrivate NactIActionTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactIActionTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-iactions-list.c b/src/nact/nact-iactions-list.c
index 9834877..f276ab6 100644
--- a/src/nact/nact-iactions-list.c
+++ b/src/nact/nact-iactions-list.c
@@ -46,7 +46,7 @@
/* private interface data
*/
-struct NactIActionsListInterfacePrivate {
+struct _NactIActionsListInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-iactions-list.h b/src/nact/nact-iactions-list.h
index 831393b..4ba4385 100644
--- a/src/nact/nact-iactions-list.h
+++ b/src/nact/nact-iactions-list.h
@@ -56,19 +56,20 @@
G_BEGIN_DECLS
-#define NACT_IACTIONS_LIST_TYPE ( nact_iactions_list_get_type())
-#define NACT_IACTIONS_LIST( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IACTIONS_LIST_TYPE, NactIActionsList ))
-#define NACT_IS_IACTIONS_LIST( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IACTIONS_LIST_TYPE ))
-#define NACT_IACTIONS_LIST_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IACTIONS_LIST_TYPE, NactIActionsListInterface ))
+#define NACT_IACTIONS_LIST_TYPE ( nact_iactions_list_get_type())
+#define NACT_IACTIONS_LIST( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IACTIONS_LIST_TYPE, NactIActionsList ))
+#define NACT_IS_IACTIONS_LIST( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IACTIONS_LIST_TYPE ))
+#define NACT_IACTIONS_LIST_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IACTIONS_LIST_TYPE, NactIActionsListInterface ))
-typedef struct NactIActionsList NactIActionsList;
-
-typedef struct NactIActionsListInterfacePrivate NactIActionsListInterfacePrivate;
+typedef struct _NactIActionsList NactIActionsList;
+typedef struct _NactIActionsListInterfacePrivate NactIActionsListInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactIActionsListInterfacePrivate *private;
+ /*< public >*/
/**
* get_treeview_name:
* @instance: this #NactIActionsList implementor.
diff --git a/src/nact/nact-ibasenames-tab.c b/src/nact/nact-ibasenames-tab.c
index 157de18..7da8b1c 100644
--- a/src/nact/nact-ibasenames-tab.c
+++ b/src/nact/nact-ibasenames-tab.c
@@ -43,7 +43,7 @@
/* private interface data
*/
-struct NactIBasenamesTabInterfacePrivate {
+struct _NactIBasenamesTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-ibasenames-tab.h b/src/nact/nact-ibasenames-tab.h
index 7ccfea0..5a1fa6d 100644
--- a/src/nact/nact-ibasenames-tab.h
+++ b/src/nact/nact-ibasenames-tab.h
@@ -44,16 +44,16 @@
G_BEGIN_DECLS
-#define NACT_IBASENAMES_TAB_TYPE ( nact_ibasenames_tab_get_type())
-#define NACT_IBASENAMES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IBASENAMES_TAB_TYPE, NactIBasenamesTab ))
-#define NACT_IS_IBASENAMES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IBASENAMES_TAB_TYPE ))
-#define NACT_IBASENAMES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IBASENAMES_TAB_TYPE, NactIBasenamesTabInterface ))
+#define NACT_IBASENAMES_TAB_TYPE ( nact_ibasenames_tab_get_type())
+#define NACT_IBASENAMES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IBASENAMES_TAB_TYPE, NactIBasenamesTab ))
+#define NACT_IS_IBASENAMES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IBASENAMES_TAB_TYPE ))
+#define NACT_IBASENAMES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IBASENAMES_TAB_TYPE, NactIBasenamesTabInterface ))
-typedef struct NactIBasenamesTab NactIBasenamesTab;
-
-typedef struct NactIBasenamesTabInterfacePrivate NactIBasenamesTabInterfacePrivate;
+typedef struct _NactIBasenamesTab NactIBasenamesTab;
+typedef struct _NactIBasenamesTabInterfacePrivate NactIBasenamesTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactIBasenamesTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-icapabilities-tab.c b/src/nact/nact-icapabilities-tab.c
index c72b02e..5126004 100644
--- a/src/nact/nact-icapabilities-tab.c
+++ b/src/nact/nact-icapabilities-tab.c
@@ -44,7 +44,7 @@
/* private interface data
*/
-struct NactICapabilitiesTabInterfacePrivate {
+struct _NactICapabilitiesTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-icapabilities-tab.h b/src/nact/nact-icapabilities-tab.h
index f553893..a0a903c 100644
--- a/src/nact/nact-icapabilities-tab.h
+++ b/src/nact/nact-icapabilities-tab.h
@@ -44,16 +44,16 @@
G_BEGIN_DECLS
-#define NACT_ICAPABILITIES_TAB_TYPE ( nact_icapabilities_tab_get_type())
-#define NACT_ICAPABILITIES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ICAPABILITIES_TAB_TYPE, NactICapabilitiesTab ))
-#define NACT_IS_ICAPABILITIES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ICAPABILITIES_TAB_TYPE ))
-#define NACT_ICAPABILITIES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_ICAPABILITIES_TAB_TYPE, NactICapabilitiesTabInterface ))
+#define NACT_ICAPABILITIES_TAB_TYPE ( nact_icapabilities_tab_get_type())
+#define NACT_ICAPABILITIES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ICAPABILITIES_TAB_TYPE, NactICapabilitiesTab ))
+#define NACT_IS_ICAPABILITIES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ICAPABILITIES_TAB_TYPE ))
+#define NACT_ICAPABILITIES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_ICAPABILITIES_TAB_TYPE, NactICapabilitiesTabInterface ))
-typedef struct NactICapabilitiesTab NactICapabilitiesTab;
-
-typedef struct NactICapabilitiesTabInterfacePrivate NactICapabilitiesTabInterfacePrivate;
+typedef struct _NactICapabilitiesTab NactICapabilitiesTab;
+typedef struct _NactICapabilitiesTabInterfacePrivate NactICapabilitiesTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactICapabilitiesTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index b05d9ee..a4798ba 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -54,7 +54,7 @@
/* private interface data
*/
-struct NactICommandTabInterfacePrivate {
+struct _NactICommandTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-icommand-tab.h b/src/nact/nact-icommand-tab.h
index 1ae0d2e..11e27f6 100644
--- a/src/nact/nact-icommand-tab.h
+++ b/src/nact/nact-icommand-tab.h
@@ -44,16 +44,16 @@
G_BEGIN_DECLS
-#define NACT_ICOMMAND_TAB_TYPE ( nact_icommand_tab_get_type())
-#define NACT_ICOMMAND_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ICOMMAND_TAB_TYPE, NactICommandTab ))
-#define NACT_IS_ICOMMAND_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ICOMMAND_TAB_TYPE ))
-#define NACT_ICOMMAND_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_ICOMMAND_TAB_TYPE, NactICommandTabInterface ))
+#define NACT_ICOMMAND_TAB_TYPE ( nact_icommand_tab_get_type())
+#define NACT_ICOMMAND_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ICOMMAND_TAB_TYPE, NactICommandTab ))
+#define NACT_IS_ICOMMAND_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ICOMMAND_TAB_TYPE ))
+#define NACT_ICOMMAND_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_ICOMMAND_TAB_TYPE, NactICommandTabInterface ))
-typedef struct NactICommandTab NactICommandTab;
-
-typedef struct NactICommandTabInterfacePrivate NactICommandTabInterfacePrivate;
+typedef struct _NactICommandTab NactICommandTab;
+typedef struct _NactICommandTabInterfacePrivate NactICommandTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactICommandTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-icon-chooser.h b/src/nact/nact-icon-chooser.h
index 8b0160d..b85df25 100644
--- a/src/nact/nact-icon-chooser.h
+++ b/src/nact/nact-icon-chooser.h
@@ -51,15 +51,18 @@ G_BEGIN_DECLS
#define NACT_ICON_CHOOSER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_ICON_CHOOSER_TYPE, NactIconChooserClass ))
typedef struct _NactIconChooserPrivate NactIconChooserPrivate;
-typedef struct _NactIconChooserClassPrivate NactIconChooserClassPrivate;
typedef struct {
+ /*< private >*/
BaseDialog parent;
NactIconChooserPrivate *private;
}
NactIconChooser;
+typedef struct _NactIconChooserClassPrivate NactIconChooserClassPrivate;
+
typedef struct {
+ /*< private >*/
BaseDialogClass parent;
NactIconChooserClassPrivate *private;
}
diff --git a/src/nact/nact-ienvironment-tab.c b/src/nact/nact-ienvironment-tab.c
index 23f5ed6..f177574 100644
--- a/src/nact/nact-ienvironment-tab.c
+++ b/src/nact/nact-ienvironment-tab.c
@@ -48,7 +48,7 @@
/* private interface data
*/
-struct NactIEnvironmentTabInterfacePrivate {
+struct _NactIEnvironmentTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-ienvironment-tab.h b/src/nact/nact-ienvironment-tab.h
index be5657d..9244b21 100644
--- a/src/nact/nact-ienvironment-tab.h
+++ b/src/nact/nact-ienvironment-tab.h
@@ -48,16 +48,16 @@
G_BEGIN_DECLS
-#define NACT_IENVIRONMENT_TAB_TYPE ( nact_ienvironment_tab_get_type())
-#define NACT_IENVIRONMENT_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IENVIRONMENT_TAB_TYPE, NactIEnvironmentTab ))
-#define NACT_IS_IENVIRONMENT_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IENVIRONMENT_TAB_TYPE ))
-#define NACT_IENVIRONMENT_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IENVIRONMENT_TAB_TYPE, NactIEnvironmentTabInterface ))
+#define NACT_IENVIRONMENT_TAB_TYPE ( nact_ienvironment_tab_get_type())
+#define NACT_IENVIRONMENT_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IENVIRONMENT_TAB_TYPE, NactIEnvironmentTab ))
+#define NACT_IS_IENVIRONMENT_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IENVIRONMENT_TAB_TYPE ))
+#define NACT_IENVIRONMENT_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IENVIRONMENT_TAB_TYPE, NactIEnvironmentTabInterface ))
-typedef struct NactIEnvironmentTab NactIEnvironmentTab;
-
-typedef struct NactIEnvironmentTabInterfacePrivate NactIEnvironmentTabInterfacePrivate;
+typedef struct _NactIEnvironmentTab NactIEnvironmentTab;
+typedef struct _NactIEnvironmentTabInterfacePrivate NactIEnvironmentTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactIEnvironmentTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-iexecution-tab.c b/src/nact/nact-iexecution-tab.c
index 880df96..536e1ec 100644
--- a/src/nact/nact-iexecution-tab.c
+++ b/src/nact/nact-iexecution-tab.c
@@ -42,7 +42,7 @@
/* private interface data
*/
-struct NactIExecutionTabInterfacePrivate {
+struct _NactIExecutionTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-iexecution-tab.h b/src/nact/nact-iexecution-tab.h
index 4bfe1b6..8230085 100644
--- a/src/nact/nact-iexecution-tab.h
+++ b/src/nact/nact-iexecution-tab.h
@@ -44,16 +44,16 @@
G_BEGIN_DECLS
-#define NACT_IEXECUTION_TAB_TYPE ( nact_iexecution_tab_get_type())
-#define NACT_IEXECUTION_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IEXECUTION_TAB_TYPE, NactIExecutionTab ))
-#define NACT_IS_IEXECUTION_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IEXECUTION_TAB_TYPE ))
-#define NACT_IEXECUTION_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IEXECUTION_TAB_TYPE, NactIExecutionTabInterface ))
+#define NACT_IEXECUTION_TAB_TYPE ( nact_iexecution_tab_get_type())
+#define NACT_IEXECUTION_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IEXECUTION_TAB_TYPE, NactIExecutionTab ))
+#define NACT_IS_IEXECUTION_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IEXECUTION_TAB_TYPE ))
+#define NACT_IEXECUTION_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IEXECUTION_TAB_TYPE, NactIExecutionTabInterface ))
-typedef struct NactIExecutionTab NactIExecutionTab;
-
-typedef struct NactIExecutionTabInterfacePrivate NactIExecutionTabInterfacePrivate;
+typedef struct _NactIExecutionTab NactIExecutionTab;
+typedef struct _NactIExecutionTabInterfacePrivate NactIExecutionTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactIExecutionTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index 7cd0eeb..eb66f66 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -50,7 +50,7 @@
/* private interface data
*/
-struct NactIFoldersTabInterfacePrivate {
+struct _NactIFoldersTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-ifolders-tab.h b/src/nact/nact-ifolders-tab.h
index 63d453d..09cc286 100644
--- a/src/nact/nact-ifolders-tab.h
+++ b/src/nact/nact-ifolders-tab.h
@@ -44,16 +44,16 @@
G_BEGIN_DECLS
-#define NACT_IFOLDERS_TAB_TYPE ( nact_ifolders_tab_get_type())
-#define NACT_IFOLDERS_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IFOLDERS_TAB_TYPE, NactIFoldersTab ))
-#define NACT_IS_IFOLDERS_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IFOLDERS_TAB_TYPE ))
-#define NACT_IFOLDERS_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IFOLDERS_TAB_TYPE, NactIFoldersTabInterface ))
+#define NACT_IFOLDERS_TAB_TYPE ( nact_ifolders_tab_get_type())
+#define NACT_IFOLDERS_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IFOLDERS_TAB_TYPE, NactIFoldersTab ))
+#define NACT_IS_IFOLDERS_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IFOLDERS_TAB_TYPE ))
+#define NACT_IFOLDERS_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IFOLDERS_TAB_TYPE, NactIFoldersTabInterface ))
-typedef struct NactIFoldersTab NactIFoldersTab;
-
-typedef struct NactIFoldersTabInterfacePrivate NactIFoldersTabInterfacePrivate;
+typedef struct _NactIFoldersTab NactIFoldersTab;
+typedef struct _NactIFoldersTabInterfacePrivate NactIFoldersTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactIFoldersTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-imimetypes-tab.c b/src/nact/nact-imimetypes-tab.c
index cd314e9..aa0bbba 100644
--- a/src/nact/nact-imimetypes-tab.c
+++ b/src/nact/nact-imimetypes-tab.c
@@ -42,7 +42,7 @@
/* private interface data
*/
-struct NactIMimetypesTabInterfacePrivate {
+struct _NactIMimetypesTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-imimetypes-tab.h b/src/nact/nact-imimetypes-tab.h
index 9c5b25d..ef3c426 100644
--- a/src/nact/nact-imimetypes-tab.h
+++ b/src/nact/nact-imimetypes-tab.h
@@ -44,16 +44,16 @@
G_BEGIN_DECLS
-#define NACT_IMIMETYPES_TAB_TYPE ( nact_imimetypes_tab_get_type())
-#define NACT_IMIMETYPES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IMIMETYPES_TAB_TYPE, NactIMimetypesTab ))
-#define NACT_IS_IMIMETYPES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IMIMETYPES_TAB_TYPE ))
-#define NACT_IMIMETYPES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IMIMETYPES_TAB_TYPE, NactIMimetypesTabInterface ))
+#define NACT_IMIMETYPES_TAB_TYPE ( nact_imimetypes_tab_get_type())
+#define NACT_IMIMETYPES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IMIMETYPES_TAB_TYPE, NactIMimetypesTab ))
+#define NACT_IS_IMIMETYPES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IMIMETYPES_TAB_TYPE ))
+#define NACT_IMIMETYPES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IMIMETYPES_TAB_TYPE, NactIMimetypesTabInterface ))
-typedef struct NactIMimetypesTab NactIMimetypesTab;
-
-typedef struct NactIMimetypesTabInterfacePrivate NactIMimetypesTabInterfacePrivate;
+typedef struct _NactIMimetypesTab NactIMimetypesTab;
+typedef struct _NactIMimetypesTabInterfacePrivate NactIMimetypesTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactIMimetypesTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-iproperties-tab.c b/src/nact/nact-iproperties-tab.c
index 51a0b34..546835e 100644
--- a/src/nact/nact-iproperties-tab.c
+++ b/src/nact/nact-iproperties-tab.c
@@ -46,7 +46,7 @@
/* private interface data
*/
-struct NactIPropertiesTabInterfacePrivate {
+struct _NactIPropertiesTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-iproperties-tab.h b/src/nact/nact-iproperties-tab.h
index ca4932d..a5ab568 100644
--- a/src/nact/nact-iproperties-tab.h
+++ b/src/nact/nact-iproperties-tab.h
@@ -46,16 +46,16 @@
G_BEGIN_DECLS
-#define NACT_IPROPERTIES_TAB_TYPE ( nact_iproperties_tab_get_type())
-#define NACT_IPROPERTIES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IPROPERTIES_TAB_TYPE, NactIPropertiesTab ))
-#define NACT_IS_IPROPERTIES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IPROPERTIES_TAB_TYPE ))
-#define NACT_IPROPERTIES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IPROPERTIES_TAB_TYPE, NactIPropertiesTabInterface ))
+#define NACT_IPROPERTIES_TAB_TYPE ( nact_iproperties_tab_get_type())
+#define NACT_IPROPERTIES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IPROPERTIES_TAB_TYPE, NactIPropertiesTab ))
+#define NACT_IS_IPROPERTIES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IPROPERTIES_TAB_TYPE ))
+#define NACT_IPROPERTIES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IPROPERTIES_TAB_TYPE, NactIPropertiesTabInterface ))
-typedef struct NactIPropertiesTab NactIPropertiesTab;
-
-typedef struct NactIPropertiesTabInterfacePrivate NactIPropertiesTabInterfacePrivate;
+typedef struct _NactIPropertiesTab NactIPropertiesTab;
+typedef struct _NactIPropertiesTabInterfacePrivate NactIPropertiesTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactIPropertiesTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-ischemes-tab.c b/src/nact/nact-ischemes-tab.c
index fbac6c1..9c2ce5f 100644
--- a/src/nact/nact-ischemes-tab.c
+++ b/src/nact/nact-ischemes-tab.c
@@ -45,7 +45,7 @@
/* private interface data
*/
-struct NactISchemesTabInterfacePrivate {
+struct _NactISchemesTabInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-ischemes-tab.h b/src/nact/nact-ischemes-tab.h
index b3a59c5..7bdb941 100644
--- a/src/nact/nact-ischemes-tab.h
+++ b/src/nact/nact-ischemes-tab.h
@@ -44,16 +44,16 @@
G_BEGIN_DECLS
-#define NACT_ISCHEMES_TAB_TYPE ( nact_ischemes_tab_get_type())
-#define NACT_ISCHEMES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ISCHEMES_TAB_TYPE, NactISchemesTab ))
-#define NACT_IS_ISCHEMES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ISCHEMES_TAB_TYPE ))
-#define NACT_ISCHEMES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_ISCHEMES_TAB_TYPE, NactISchemesTabInterface ))
+#define NACT_ISCHEMES_TAB_TYPE ( nact_ischemes_tab_get_type())
+#define NACT_ISCHEMES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_ISCHEMES_TAB_TYPE, NactISchemesTab ))
+#define NACT_IS_ISCHEMES_TAB( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_ISCHEMES_TAB_TYPE ))
+#define NACT_ISCHEMES_TAB_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_ISCHEMES_TAB_TYPE, NactISchemesTabInterface ))
-typedef struct NactISchemesTab NactISchemesTab;
-
-typedef struct NactISchemesTabInterfacePrivate NactISchemesTabInterfacePrivate;
+typedef struct _NactISchemesTab NactISchemesTab;
+typedef struct _NactISchemesTabInterfacePrivate NactISchemesTabInterfacePrivate;
typedef struct {
+ /*< private >*/
GTypeInterface parent;
NactISchemesTabInterfacePrivate *private;
}
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 81f4fcc..99b30e7 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -68,13 +68,13 @@
/* private class data
*/
-struct NactMainWindowClassPrivate {
+struct _NactMainWindowClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactMainWindowPrivate {
+struct _NactMainWindowPrivate {
gboolean dispose_has_run;
/* TODO: this will have to be replaced with undo-manager */
diff --git a/src/nact/nact-main-window.h b/src/nact/nact-main-window.h
index 9b1c124..09f212b 100644
--- a/src/nact/nact-main-window.h
+++ b/src/nact/nact-main-window.h
@@ -46,24 +46,26 @@
G_BEGIN_DECLS
-#define NACT_MAIN_WINDOW_TYPE ( nact_main_window_get_type())
-#define NACT_MAIN_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_MAIN_WINDOW_TYPE, NactMainWindow ))
-#define NACT_MAIN_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_MAIN_WINDOW_TYPE, NactMainWindowClass ))
-#define NACT_IS_MAIN_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_MAIN_WINDOW_TYPE ))
-#define NACT_IS_MAIN_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_MAIN_WINDOW_TYPE ))
-#define NACT_MAIN_WINDOW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_MAIN_WINDOW_TYPE, NactMainWindowClass ))
+#define NACT_MAIN_WINDOW_TYPE ( nact_main_window_get_type())
+#define NACT_MAIN_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_MAIN_WINDOW_TYPE, NactMainWindow ))
+#define NACT_MAIN_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_MAIN_WINDOW_TYPE, NactMainWindowClass ))
+#define NACT_IS_MAIN_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_MAIN_WINDOW_TYPE ))
+#define NACT_IS_MAIN_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_MAIN_WINDOW_TYPE ))
+#define NACT_MAIN_WINDOW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_MAIN_WINDOW_TYPE, NactMainWindowClass ))
-typedef struct NactMainWindowPrivate NactMainWindowPrivate;
+typedef struct _NactMainWindowPrivate NactMainWindowPrivate;
typedef struct {
+ /*< private >*/
NactWindow parent;
NactMainWindowPrivate *private;
}
NactMainWindow;
-typedef struct NactMainWindowClassPrivate NactMainWindowClassPrivate;
+typedef struct _NactMainWindowClassPrivate NactMainWindowClassPrivate;
typedef struct {
+ /*< private >*/
NactWindowClass parent;
NactMainWindowClassPrivate *private;
}
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index 79646e7..14680bb 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -45,13 +45,13 @@
/* private class data
*/
-struct NactPreferencesEditorClassPrivate {
+struct _NactPreferencesEditorClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactPreferencesEditorPrivate {
+struct _NactPreferencesEditorPrivate {
gboolean dispose_has_run;
gboolean preferences_locked;
diff --git a/src/nact/nact-preferences-editor.h b/src/nact/nact-preferences-editor.h
index 73b31b5..5e887d0 100644
--- a/src/nact/nact-preferences-editor.h
+++ b/src/nact/nact-preferences-editor.h
@@ -44,24 +44,26 @@
G_BEGIN_DECLS
-#define NACT_PREFERENCES_EDITOR_TYPE ( nact_preferences_editor_get_type())
-#define NACT_PREFERENCES_EDITOR( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_PREFERENCES_EDITOR_TYPE, NactPreferencesEditor ))
-#define NACT_PREFERENCES_EDITOR_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_PREFERENCES_EDITOR_TYPE, NactPreferencesEditorClass ))
-#define NACT_IS_PREFERENCES_EDITOR( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_PREFERENCES_EDITOR_TYPE ))
-#define NACT_IS_PREFERENCES_EDITOR_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_PREFERENCES_EDITOR_TYPE ))
-#define NACT_PREFERENCES_EDITOR_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_PREFERENCES_EDITOR_TYPE, NactPreferencesEditorClass ))
+#define NACT_PREFERENCES_EDITOR_TYPE ( nact_preferences_editor_get_type())
+#define NACT_PREFERENCES_EDITOR( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_PREFERENCES_EDITOR_TYPE, NactPreferencesEditor ))
+#define NACT_PREFERENCES_EDITOR_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_PREFERENCES_EDITOR_TYPE, NactPreferencesEditorClass ))
+#define NACT_IS_PREFERENCES_EDITOR( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_PREFERENCES_EDITOR_TYPE ))
+#define NACT_IS_PREFERENCES_EDITOR_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_PREFERENCES_EDITOR_TYPE ))
+#define NACT_PREFERENCES_EDITOR_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_PREFERENCES_EDITOR_TYPE, NactPreferencesEditorClass ))
-typedef struct NactPreferencesEditorPrivate NactPreferencesEditorPrivate;
+typedef struct _NactPreferencesEditorPrivate NactPreferencesEditorPrivate;
typedef struct {
+ /*< private >*/
BaseDialog parent;
NactPreferencesEditorPrivate *private;
}
NactPreferencesEditor;
-typedef struct NactPreferencesEditorClassPrivate NactPreferencesEditorClassPrivate;
+typedef struct _NactPreferencesEditorClassPrivate NactPreferencesEditorClassPrivate;
typedef struct {
+ /*< private >*/
BaseDialogClass parent;
NactPreferencesEditorClassPrivate *private;
}
diff --git a/src/nact/nact-tree-model-priv.h b/src/nact/nact-tree-model-priv.h
index 1960b49..a66223d 100644
--- a/src/nact/nact-tree-model-priv.h
+++ b/src/nact/nact-tree-model-priv.h
@@ -44,7 +44,7 @@ G_BEGIN_DECLS
/* private instance data
*/
-struct NactTreeModelPrivate {
+struct _NactTreeModelPrivate {
gboolean dispose_has_run;
BaseWindow *window;
GtkTreeView *treeview;
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index 06e6592..4265e4a 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -48,7 +48,7 @@
/* private class data
*/
-struct NactTreeModelClassPrivate {
+struct _NactTreeModelClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
diff --git a/src/nact/nact-tree-model.h b/src/nact/nact-tree-model.h
index 4ab35b4..b2b9b76 100644
--- a/src/nact/nact-tree-model.h
+++ b/src/nact/nact-tree-model.h
@@ -53,24 +53,26 @@
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_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 ))
-typedef struct NactTreeModelPrivate NactTreeModelPrivate;
+typedef struct _NactTreeModelPrivate NactTreeModelPrivate;
typedef struct {
+ /*< private >*/
GtkTreeModelFilter parent;
NactTreeModelPrivate *private;
}
NactTreeModel;
-typedef struct NactTreeModelClassPrivate NactTreeModelClassPrivate;
+typedef struct _NactTreeModelClassPrivate NactTreeModelClassPrivate;
typedef struct {
+ /*< private >*/
GtkTreeModelFilterClass parent;
NactTreeModelClassPrivate *private;
}
diff --git a/src/nact/nact-window.c b/src/nact/nact-window.c
index 503b419..2db951c 100644
--- a/src/nact/nact-window.c
+++ b/src/nact/nact-window.c
@@ -47,13 +47,13 @@
/* private class data
*/
-struct NactWindowClassPrivate {
+struct _NactWindowClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
-struct NactWindowPrivate {
+struct _NactWindowPrivate {
gboolean dispose_has_run;
};
diff --git a/src/nact/nact-window.h b/src/nact/nact-window.h
index 3484900..769a87d 100644
--- a/src/nact/nact-window.h
+++ b/src/nact/nact-window.h
@@ -46,24 +46,26 @@
G_BEGIN_DECLS
-#define NACT_WINDOW_TYPE ( nact_window_get_type())
-#define NACT_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_WINDOW_TYPE, NactWindow ))
-#define NACT_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_WINDOW_TYPE, NactWindowClass ))
-#define NACT_IS_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_WINDOW_TYPE ))
-#define NACT_IS_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_WINDOW_TYPE ))
-#define NACT_WINDOW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_WINDOW_TYPE, NactWindowClass ))
+#define NACT_WINDOW_TYPE ( nact_window_get_type())
+#define NACT_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_WINDOW_TYPE, NactWindow ))
+#define NACT_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_WINDOW_TYPE, NactWindowClass ))
+#define NACT_IS_WINDOW( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_WINDOW_TYPE ))
+#define NACT_IS_WINDOW_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_WINDOW_TYPE ))
+#define NACT_WINDOW_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_WINDOW_TYPE, NactWindowClass ))
-typedef struct NactWindowPrivate NactWindowPrivate;
+typedef struct _NactWindowPrivate NactWindowPrivate;
typedef struct {
+ /*< private >*/
BaseWindow parent;
NactWindowPrivate *private;
}
NactWindow;
-typedef struct NactWindowClassPrivate NactWindowClassPrivate;
+typedef struct _NactWindowClassPrivate NactWindowClassPrivate;
typedef struct {
+ /*< private >*/
BaseWindowClass parent;
NactWindowClassPrivate *private;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
