GNOME.org
 

[nautilus-actions] Fix headers for single inclusion

commit d53f0bf1ab4489c2dce2bad78a19647f8e7544e2
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Aug 21 23:49:06 2010 +0200

    Fix headers for single inclusion

 ChangeLog                               |   14 ++++++++++++++
 src/api/na-dbus.h                       |    2 ++
 src/api/na-ifactory-provider-provider.h |    2 ++
 src/core/na-importer-ask.h              |    4 ++--
 src/io-desktop/nadp-formats.h           |    2 ++
 src/io-desktop/nadp-reader.h            |    1 +
 src/io-desktop/nadp-utils.h             |    2 ++
 src/io-desktop/nadp-writer.h            |    1 +
 src/io-gconf/nagp-reader.h              |    1 +
 src/io-gconf/nagp-writer.h              |    1 +
 src/io-xml/naxml-formats.h              |    2 ++
 src/io-xml/naxml-reader.h               |    1 +
 src/io-xml/naxml-writer.h               |    1 +
 src/nact/nact-tree-model-priv.h         |    3 +++
 src/test/test-include.c                 |    2 +-
 15 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9f21821..0529f13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2010-08-21 Pierre Wieser <pwieser trychlos org>
 
+	* src/api/na-dbus.h
+	* src/api/na-ifactory-provider-provider.h
+	* src/core/na-importer-ask.h
+	* src/io-desktop/nadp-formats.h
+	* src/io-desktop/nadp-reader.h
+	* src/io-desktop/nadp-utils.h
+	* src/io-desktop/nadp-writer.h
+	* src/io-gconf/nagp-reader.h
+	* src/io-gconf/nagp-writer.h
+	* src/io-xml/naxml-formats.h
+	* src/io-xml/naxml-reader.h
+	* src/io-xml/naxml-writer.h
+	* src/nact/nact-tree-model-priv.h: Fix single inclusion.
+
 	* src/core/na-icontext.c
 	(is_candidate_for_schemes, is_candidate_for_folders):
 	Address each ocurrence of file instead of just the first one.
diff --git a/src/api/na-dbus.h b/src/api/na-dbus.h
index a3a8614..d6a1dcb 100644
--- a/src/api/na-dbus.h
+++ b/src/api/na-dbus.h
@@ -37,6 +37,8 @@
  * @include: nautilus-actions/na-dbus.h
  */
 
+#include <glib.h>
+
 G_BEGIN_DECLS
 
 #define NAUTILUS_ACTIONS_DBUS_SERVICE	"org.nautilus-actions.DBus"
diff --git a/src/api/na-ifactory-provider-provider.h b/src/api/na-ifactory-provider-provider.h
index 603cbb5..7946b39 100644
--- a/src/api/na-ifactory-provider-provider.h
+++ b/src/api/na-ifactory-provider-provider.h
@@ -37,6 +37,8 @@
  * @include: nautilus-actions/na-ifactory_provider-fn.h
  */
 
+#include <glib.h>
+
 G_BEGIN_DECLS
 
 typedef struct NAIFactoryProvider                 NAIFactoryProvider;
diff --git a/src/core/na-importer-ask.h b/src/core/na-importer-ask.h
index e8bc8dd..15f2362 100644
--- a/src/core/na-importer-ask.h
+++ b/src/core/na-importer-ask.h
@@ -41,12 +41,12 @@
  * want to be ask to known what to do with it.
  */
 
-G_BEGIN_DECLS
-
 #include <gtk/gtk.h>
 
 #include <api/na-object-item.h>
 
+G_BEGIN_DECLS
+
 #define NA_IMPORTER_ASK_TYPE				( na_importer_ask_get_type())
 #define NA_IMPORTER_ASK( object )			( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IMPORTER_ASK_TYPE, NAImporterAsk ))
 #define NA_IMPORTER_ASK_CLASS( klass )		( G_TYPE_CHECK_CLASS_CAST( klass, NA_IMPORTER_ASK_TYPE, NAImporterAskClass ))
diff --git a/src/io-desktop/nadp-formats.h b/src/io-desktop/nadp-formats.h
index c791348..c4c51d8 100644
--- a/src/io-desktop/nadp-formats.h
+++ b/src/io-desktop/nadp-formats.h
@@ -31,6 +31,8 @@
 #ifndef __NADP_FORMATS_H__
 #define __NADP_FORMATS_H__
 
+#include <glib.h>
+
 G_BEGIN_DECLS
 
 #define NADP_FORMAT_DESKTOP_V1			"Desktop1"
diff --git a/src/io-desktop/nadp-reader.h b/src/io-desktop/nadp-reader.h
index 673cd4f..4209df8 100644
--- a/src/io-desktop/nadp-reader.h
+++ b/src/io-desktop/nadp-reader.h
@@ -33,6 +33,7 @@
 
 #include <api/na-iio-provider.h>
 #include <api/na-iimporter.h>
+#include <api/na-ifactory-provider.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/io-desktop/nadp-utils.h b/src/io-desktop/nadp-utils.h
index 2a06c7b..a9c2521 100644
--- a/src/io-desktop/nadp-utils.h
+++ b/src/io-desktop/nadp-utils.h
@@ -31,6 +31,8 @@
 #ifndef __NADP_UTILS_H__
 #define __NADP_UTILS_H__
 
+#include <glib.h>
+
 G_BEGIN_DECLS
 
 GSList  *nadp_utils_gslist_remove_from( GSList *list, const gchar *string );
diff --git a/src/io-desktop/nadp-writer.h b/src/io-desktop/nadp-writer.h
index af96b13..6768436 100644
--- a/src/io-desktop/nadp-writer.h
+++ b/src/io-desktop/nadp-writer.h
@@ -33,6 +33,7 @@
 
 #include <api/na-iio-provider.h>
 #include <api/na-iexporter.h>
+#include <api/na-ifactory-provider.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/io-gconf/nagp-reader.h b/src/io-gconf/nagp-reader.h
index 33d629d..f7bc2cd 100644
--- a/src/io-gconf/nagp-reader.h
+++ b/src/io-gconf/nagp-reader.h
@@ -32,6 +32,7 @@
 #define __NAGP_READER_H__
 
 #include <api/na-iio-provider.h>
+#include <api/na-ifactory-provider.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/io-gconf/nagp-writer.h b/src/io-gconf/nagp-writer.h
index efef1c9..9afa3f0 100644
--- a/src/io-gconf/nagp-writer.h
+++ b/src/io-gconf/nagp-writer.h
@@ -33,6 +33,7 @@
 
 #include <api/na-data-boxed.h>
 #include <api/na-iio-provider.h>
+#include <api/na-ifactory-provider.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/io-xml/naxml-formats.h b/src/io-xml/naxml-formats.h
index 1bb1342..3f8f3e2 100644
--- a/src/io-xml/naxml-formats.h
+++ b/src/io-xml/naxml-formats.h
@@ -31,6 +31,8 @@
 #ifndef __NAXML_FORMATS_H__
 #define __NAXML_FORMATS_H__
 
+#include <glib.h>
+
 G_BEGIN_DECLS
 
 #define NAXML_FORMAT_GCONF_SCHEMA_V1			"GConfSchemaV1"
diff --git a/src/io-xml/naxml-reader.h b/src/io-xml/naxml-reader.h
index cb996f9..2d9c1d4 100644
--- a/src/io-xml/naxml-reader.h
+++ b/src/io-xml/naxml-reader.h
@@ -47,6 +47,7 @@
 
 #include <api/na-data-boxed.h>
 #include <api/na-iimporter.h>
+#include <api/na-ifactory-provider.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/io-xml/naxml-writer.h b/src/io-xml/naxml-writer.h
index c157c0b..572a2cc 100644
--- a/src/io-xml/naxml-writer.h
+++ b/src/io-xml/naxml-writer.h
@@ -41,6 +41,7 @@
 
 #include <api/na-data-boxed.h>
 #include <api/na-iexporter.h>
+#include <api/na-ifactory-provider.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/nact/nact-tree-model-priv.h b/src/nact/nact-tree-model-priv.h
index 9cac4d8..de194e8 100644
--- a/src/nact/nact-tree-model-priv.h
+++ b/src/nact/nact-tree-model-priv.h
@@ -37,6 +37,9 @@
 #ifndef __NACT_TREE_MODEL_PRIV_H__
 #define __NACT_TREE_MODEL_PRIV_H__
 
+#include "base-window.h"
+#include "nact-clipboard.h"
+
 G_BEGIN_DECLS
 
 /* private instance data
diff --git a/src/test/test-include.c b/src/test/test-include.c
index 1831a55..458f492 100644
--- a/src/test/test-include.c
+++ b/src/test/test-include.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include <api/na-iimporter.h>
+#include <utils/console-utils.h>
 
 int
 main()
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]