[nautilus-actions] Cosmetic changes in src/io-desktop headers



commit c2a90b85bc10306d502d739ba621436a8a3eed7e
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Jan 20 19:30:42 2011 +0100

    Cosmetic changes in src/io-desktop headers
    
    + src/io-desktop/nadp-desktop-file.c
    + src/io-desktop/nadp-desktop-file.h
    + src/io-desktop/nadp-desktop-provider.c
    + src/io-desktop/nadp-desktop-provider.h
    + src/io-desktop/nadp-monitor.c
    + src/io-desktop/nadp-monitor.h

 ChangeLog                              |    7 +++++++
 src/io-desktop/nadp-desktop-file.c     |    4 ++--
 src/io-desktop/nadp-desktop-file.h     |   18 ++++++++++--------
 src/io-desktop/nadp-desktop-provider.c |    2 +-
 src/io-desktop/nadp-desktop-provider.h |   24 +++++++++++++-----------
 src/io-desktop/nadp-monitor.c          |    4 ++--
 src/io-desktop/nadp-monitor.h          |   18 ++++++++++--------
 7 files changed, 45 insertions(+), 32 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b2c49c8..faab349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-20 Pierre Wieser <pwieser trychlos org>
 
+	* src/io-desktop/nadp-desktop-file.c:
+	* src/io-desktop/nadp-desktop-file.h:
+	* src/io-desktop/nadp-desktop-provider.c:
+	* src/io-desktop/nadp-desktop-provider.h:
+	* src/io-desktop/nadp-monitor.c:
+	* src/io-desktop/nadp-monitor.h: Cosmetic changes in src/io-desktop headers.
+
 	* src/core/na-export-format.h:
 	* src/core/na-iabout.h:
 	* src/core/na-importer-ask.h:
diff --git a/src/io-desktop/nadp-desktop-file.c b/src/io-desktop/nadp-desktop-file.c
index 51e658b..023e6ad 100644
--- a/src/io-desktop/nadp-desktop-file.c
+++ b/src/io-desktop/nadp-desktop-file.c
@@ -43,13 +43,13 @@
 
 /* private class data
  */
-struct NadpDesktopFileClassPrivate {
+struct _NadpDesktopFileClassPrivate {
 	void *empty;						/* so that gcc -pedantic is happy */
 };
 
 /* private instance data
  */
-struct NadpDesktopFilePrivate {
+struct _NadpDesktopFilePrivate {
 	gboolean   dispose_has_run;
 	gchar     *id;
 	gchar     *uri;
diff --git a/src/io-desktop/nadp-desktop-file.h b/src/io-desktop/nadp-desktop-file.h
index 1fdda01..437d2e8 100644
--- a/src/io-desktop/nadp-desktop-file.h
+++ b/src/io-desktop/nadp-desktop-file.h
@@ -45,24 +45,26 @@
 
 G_BEGIN_DECLS
 
-#define NADP_DESKTOP_FILE_TYPE					( nadp_desktop_file_get_type())
-#define NADP_DESKTOP_FILE( object )				( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_DESKTOP_FILE_TYPE, NadpDesktopFile ))
-#define NADP_DESKTOP_FILE_CLASS( klass )		( G_TYPE_CHECK_CLASS_CAST( klass, NADP_DESKTOP_FILE_TYPE, NadpDesktopFileClass ))
-#define NADP_IS_DESKTOP_FILE( object )			( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_DESKTOP_FILE_TYPE ))
-#define NADP_IS_DESKTOP_FILE_CLASS( klass )		( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_DESKTOP_FILE_TYPE ))
-#define NADP_DESKTOP_FILE_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_DESKTOP_FILE_TYPE, NadpDesktopFileClass ))
+#define NADP_DESKTOP_FILE_TYPE                ( nadp_desktop_file_get_type())
+#define NADP_DESKTOP_FILE( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_DESKTOP_FILE_TYPE, NadpDesktopFile ))
+#define NADP_DESKTOP_FILE_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_DESKTOP_FILE_TYPE, NadpDesktopFileClass ))
+#define NADP_IS_DESKTOP_FILE( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_DESKTOP_FILE_TYPE ))
+#define NADP_IS_DESKTOP_FILE_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_DESKTOP_FILE_TYPE ))
+#define NADP_DESKTOP_FILE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_DESKTOP_FILE_TYPE, NadpDesktopFileClass ))
 
-typedef struct NadpDesktopFilePrivate NadpDesktopFilePrivate;
+typedef struct _NadpDesktopFilePrivate        NadpDesktopFilePrivate;
 
 typedef struct {
+	/*< private >*/
 	GObject                 parent;
 	NadpDesktopFilePrivate *private;
 }
 	NadpDesktopFile;
 
-typedef struct NadpDesktopFileClassPrivate NadpDesktopFileClassPrivate;
+typedef struct _NadpDesktopFileClassPrivate   NadpDesktopFileClassPrivate;
 
 typedef struct {
+	/*< private >*/
 	GObjectClass                 parent;
 	NadpDesktopFileClassPrivate *private;
 }
diff --git a/src/io-desktop/nadp-desktop-provider.c b/src/io-desktop/nadp-desktop-provider.c
index f5444ad..9209d18 100644
--- a/src/io-desktop/nadp-desktop-provider.c
+++ b/src/io-desktop/nadp-desktop-provider.c
@@ -46,7 +46,7 @@
 
 /* private class data
  */
-struct NadpDesktopProviderClassPrivate {
+struct _NadpDesktopProviderClassPrivate {
 	void *empty;						/* so that gcc -pedantic is happy */
 };
 
diff --git a/src/io-desktop/nadp-desktop-provider.h b/src/io-desktop/nadp-desktop-provider.h
index ffaff35..2ac5e31 100644
--- a/src/io-desktop/nadp-desktop-provider.h
+++ b/src/io-desktop/nadp-desktop-provider.h
@@ -47,33 +47,35 @@
 
 G_BEGIN_DECLS
 
-#define NADP_DESKTOP_PROVIDER_TYPE					( nadp_desktop_provider_get_type())
-#define NADP_DESKTOP_PROVIDER( object )				( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProvider ))
-#define NADP_DESKTOP_PROVIDER_CLASS( klass )		( G_TYPE_CHECK_CLASS_CAST( klass, NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProviderClass ))
-#define NADP_IS_DESKTOP_PROVIDER( object )			( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_DESKTOP_PROVIDER_TYPE ))
-#define NADP_IS_DESKTOP_PROVIDER_CLASS( klass )		( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_DESKTOP_PROVIDER_TYPE ))
-#define NADP_DESKTOP_PROVIDER_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProviderClass ))
-
-typedef struct NadpDesktopProviderPrivate      NadpDesktopProviderPrivate;
+#define NADP_DESKTOP_PROVIDER_TYPE                ( nadp_desktop_provider_get_type())
+#define NADP_DESKTOP_PROVIDER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProvider ))
+#define NADP_DESKTOP_PROVIDER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProviderClass ))
+#define NADP_IS_DESKTOP_PROVIDER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_DESKTOP_PROVIDER_TYPE ))
+#define NADP_IS_DESKTOP_PROVIDER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_DESKTOP_PROVIDER_TYPE ))
+#define NADP_DESKTOP_PROVIDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProviderClass ))
 
 /* private instance data
  */
-struct NadpDesktopProviderPrivate {
+typedef struct _NadpDesktopProviderPrivate {
+	/*< private >*/
 	gboolean dispose_has_run;
 	GList   *monitors;
 	GTimeVal last_event;
 	guint    event_source_id;
-};
+}
+	NadpDesktopProviderPrivate;
 
 typedef struct {
+	/*< private >*/
 	GObject                     parent;
 	NadpDesktopProviderPrivate *private;
 }
 	NadpDesktopProvider;
 
-typedef struct NadpDesktopProviderClassPrivate NadpDesktopProviderClassPrivate;
+typedef struct _NadpDesktopProviderClassPrivate   NadpDesktopProviderClassPrivate;
 
 typedef struct {
+	/*< private >*/
 	GObjectClass                     parent;
 	NadpDesktopProviderClassPrivate *private;
 }
diff --git a/src/io-desktop/nadp-monitor.c b/src/io-desktop/nadp-monitor.c
index 4924426..e5e8e79 100644
--- a/src/io-desktop/nadp-monitor.c
+++ b/src/io-desktop/nadp-monitor.c
@@ -38,13 +38,13 @@
 
 /* private class data
  */
-struct NadpMonitorClassPrivate {
+struct _NadpMonitorClassPrivate {
 	void *empty;						/* so that gcc -pedantic is happy */
 };
 
 /* private instance data
  */
-struct NadpMonitorPrivate {
+struct _NadpMonitorPrivate {
 	gboolean             dispose_has_run;
 	NadpDesktopProvider *provider;
 	gchar               *name;
diff --git a/src/io-desktop/nadp-monitor.h b/src/io-desktop/nadp-monitor.h
index 3aca044..83d4c32 100644
--- a/src/io-desktop/nadp-monitor.h
+++ b/src/io-desktop/nadp-monitor.h
@@ -51,24 +51,26 @@
 
 G_BEGIN_DECLS
 
-#define NADP_MONITOR_TYPE					( nadp_monitor_get_type())
-#define NADP_MONITOR( object )				( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_MONITOR_TYPE, NadpMonitor ))
-#define NADP_MONITOR_CLASS( klass )			( G_TYPE_CHECK_CLASS_CAST( klass, NADP_MONITOR_TYPE, NadpMonitorClass ))
-#define NADP_IS_MONITOR( object )			( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_MONITOR_TYPE ))
-#define NADP_IS_MONITOR_CLASS( klass )		( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_MONITOR_TYPE ))
-#define NADP_MONITOR_GET_CLASS( object )	( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_MONITOR_TYPE, NadpMonitorClass ))
+#define NADP_MONITOR_TYPE                ( nadp_monitor_get_type())
+#define NADP_MONITOR( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_MONITOR_TYPE, NadpMonitor ))
+#define NADP_MONITOR_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_MONITOR_TYPE, NadpMonitorClass ))
+#define NADP_IS_MONITOR( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_MONITOR_TYPE ))
+#define NADP_IS_MONITOR_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_MONITOR_TYPE ))
+#define NADP_MONITOR_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_MONITOR_TYPE, NadpMonitorClass ))
 
-typedef struct NadpMonitorPrivate      NadpMonitorPrivate;
+typedef struct _NadpMonitorPrivate       NadpMonitorPrivate;
 
 typedef struct {
+	/*< private >*/
 	GObject             parent;
 	NadpMonitorPrivate *private;
 }
 	NadpMonitor;
 
-typedef struct NadpMonitorClassPrivate NadpMonitorClassPrivate;
+typedef struct _NadpMonitorClassPrivate  NadpMonitorClassPrivate;
 
 typedef struct {
+	/*< private >*/
 	GObjectClass             parent;
 	NadpMonitorClassPrivate *private;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]