GNOME.org
 

[nautilus-actions: 7/30] Move runtime/na-object stuff to private/ directory

commit cb440f61ce3acc493181bd5415e5d26a0bc39465
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Nov 18 21:42:45 2009 +0100

    Move runtime/na-object stuff to private/ directory

 ChangeLog                                          |   70 ++++++++++++++++++++
 nautilus-actions/api/na-iio-provider.h             |    2 +-
 nautilus-actions/common/na-object-action-fn.h      |    4 +-
 nautilus-actions/common/na-object-action.c         |    3 +-
 nautilus-actions/common/na-object-api.h            |    2 +-
 nautilus-actions/common/na-object-fn.h             |    2 +-
 nautilus-actions/common/na-object-id-fn.h          |    3 +-
 nautilus-actions/common/na-object-id.c             |    4 +-
 nautilus-actions/common/na-object-item-fn.h        |    2 +-
 nautilus-actions/common/na-object-item.c           |    3 +-
 nautilus-actions/common/na-object-menu-fn.h        |    2 +-
 nautilus-actions/common/na-object-menu.c           |    3 +-
 nautilus-actions/common/na-object-profile-fn.h     |    2 +-
 nautilus-actions/common/na-object-profile.c        |    3 +-
 nautilus-actions/common/na-object.c                |    4 +-
 nautilus-actions/common/na-xml-writer.h            |    2 +-
 nautilus-actions/nact/Makefile.am                  |    1 +
 nautilus-actions/nact/nact-application.c           |    3 +-
 nautilus-actions/nact/nact-assistant-export-ask.h  |    2 +-
 nautilus-actions/nact/nact-assistant-export.c      |    2 +
 nautilus-actions/nact/nact-assistant-import-ask.h  |    2 +-
 nautilus-actions/nact/nact-iactions-list.c         |    2 +
 nautilus-actions/nact/nact-iactions-list.h         |    2 +-
 nautilus-actions/nact/nact-main-window.h           |    2 +-
 nautilus-actions/nact/nact-window.h                |    3 +-
 nautilus-actions/nact/nact-xml-reader.h            |    2 +-
 nautilus-actions/plugin/Makefile.am                |    3 +-
 nautilus-actions/plugin/nautilus-actions.c         |    3 +-
 nautilus-actions/private/Makefile.am               |   30 ++++++++
 .../{runtime => private}/na-gnome-vfs-uri.c        |    0
 .../{runtime => private}/na-gnome-vfs-uri.h        |    6 +-
 .../{runtime => private}/na-iduplicable.c          |    0
 .../{runtime => private}/na-iduplicable.h          |    8 +-
 .../{runtime => private}/na-object-action-class.h  |    8 +-
 .../{runtime => private}/na-object-action-fn.h     |    8 +-
 .../{runtime => private}/na-object-action-priv.h   |    6 +-
 .../{runtime => private}/na-object-action.c        |    3 +-
 .../{runtime => private}/na-object-api.h           |   10 +--
 .../{runtime => private}/na-object-class.h         |    8 +-
 .../{runtime => private}/na-object-fn.h            |    8 +-
 .../{runtime => private}/na-object-id-class.h      |    8 +-
 .../{runtime => private}/na-object-id-fn.h         |    8 +-
 .../{runtime => private}/na-object-id-priv.h       |    6 +-
 .../{runtime => private}/na-object-id.c            |    0
 .../{runtime => private}/na-object-item-class.h    |    8 +-
 .../{runtime => private}/na-object-item-fn.h       |    8 +-
 .../{runtime => private}/na-object-item-priv.h     |    8 ++-
 .../{runtime => private}/na-object-item.c          |    3 +-
 .../{runtime => private}/na-object-menu-class.h    |    8 +-
 .../{runtime => private}/na-object-menu-fn.h       |    8 +-
 .../{runtime => private}/na-object-menu-priv.h     |    6 +-
 .../{runtime => private}/na-object-menu.c          |    4 +-
 .../{runtime => private}/na-object-priv.h          |    6 +-
 .../{runtime => private}/na-object-profile-class.h |    8 +-
 .../{runtime => private}/na-object-profile-fn.h    |    8 +-
 .../{runtime => private}/na-object-profile-priv.h  |    6 +-
 .../{runtime => private}/na-object-profile.c       |    3 +-
 nautilus-actions/{runtime => private}/na-object.c  |    0
 nautilus-actions/runtime/Makefile.am               |   30 +--------
 nautilus-actions/runtime/na-gconf-provider.c       |    3 +-
 nautilus-actions/runtime/na-io-provider.c          |    5 +-
 nautilus-actions/runtime/na-pivot.c                |    3 +-
 nautilus-actions/runtime/na-pivot.h                |    7 +-
 nautilus-actions/test/Makefile.am                  |    1 +
 nautilus-actions/test/test-parse-uris.c            |    2 +-
 nautilus-actions/utils/Makefile.am                 |    2 +
 po/POTFILES.in                                     |    6 +-
 67 files changed, 244 insertions(+), 154 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f020ae9..3e11669 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,75 @@
 2009-11-18 Pierre Wieser <pwieser trychlos org>
 
+	Move runtime/na-object-* stuff to private/ subdirectory.
+
+	* nautilus-actions/runtime/na-gnome-vfs-uri.c:
+	* nautilus-actions/runtime/na-gnome-vfs-uri.h:
+	* nautilus-actions/runtime/na-iduplicable.c:
+	* nautilus-actions/runtime/na-iduplicable.h:
+	* nautilus-actions/runtime/na-object-action-class.h:
+	* nautilus-actions/runtime/na-object-action-fn.h:
+	* nautilus-actions/runtime/na-object-action-priv.h:
+	* nautilus-actions/runtime/na-object-action.c:
+	* nautilus-actions/runtime/na-object-api.h:
+	* nautilus-actions/runtime/na-object-class.h:
+	* nautilus-actions/runtime/na-object-fn.h:
+	* nautilus-actions/runtime/na-object-id-class.h:
+	* nautilus-actions/runtime/na-object-id-fn.h:
+	* nautilus-actions/runtime/na-object-id-priv.h:
+	* nautilus-actions/runtime/na-object-id.c:
+	* nautilus-actions/runtime/na-object-item-class.h:
+	* nautilus-actions/runtime/na-object-item-fn.h:
+	* nautilus-actions/runtime/na-object-item-priv.h:
+	* nautilus-actions/runtime/na-object-item.c:
+	* nautilus-actions/runtime/na-object-menu-class.h:
+	* nautilus-actions/runtime/na-object-menu-fn.h:
+	* nautilus-actions/runtime/na-object-menu-priv.h:
+	* nautilus-actions/runtime/na-object-menu.c:
+	* nautilus-actions/runtime/na-object-priv.h:
+	* nautilus-actions/runtime/na-object-profile-class.h:
+	* nautilus-actions/runtime/na-object-profile-fn.h:
+	* nautilus-actions/runtime/na-object-profile-priv.h:
+	* nautilus-actions/runtime/na-object-profile.c:
+	* nautilus-actions/runtime/na-object.c: Moved to private/
+
+	* nautilus-actions/api/na-iio-provider.h:
+	* nautilus-actions/common/na-object-action-fn.h:
+	* nautilus-actions/common/na-object-action.c:
+	* nautilus-actions/common/na-object-api.h:
+	* nautilus-actions/common/na-object-fn.h:
+	* nautilus-actions/common/na-object-id-fn.h:
+	* nautilus-actions/common/na-object-id.c:
+	* nautilus-actions/common/na-object-item-fn.h:
+	* nautilus-actions/common/na-object-item.c:
+	* nautilus-actions/common/na-object-menu-fn.h:
+	* nautilus-actions/common/na-object-menu.c:
+	* nautilus-actions/common/na-object-profile-fn.h:
+	* nautilus-actions/common/na-object-profile.c:
+	* nautilus-actions/common/na-object.c:
+	* nautilus-actions/common/na-xml-writer.h:
+	* nautilus-actions/nact/Makefile.am:
+	* nautilus-actions/nact/nact-application.c:
+	* nautilus-actions/nact/nact-assistant-export-ask.h:
+	* nautilus-actions/nact/nact-assistant-export.c:
+	* nautilus-actions/nact/nact-assistant-import-ask.h:
+	* nautilus-actions/nact/nact-iactions-list.c:
+	* nautilus-actions/nact/nact-iactions-list.h:
+	* nautilus-actions/nact/nact-main-window.h:
+	* nautilus-actions/nact/nact-window.h:
+	* nautilus-actions/nact/nact-xml-reader.h:
+	* nautilus-actions/plugin/Makefile.am:
+	* nautilus-actions/plugin/nautilus-actions.c:
+	* nautilus-actions/private/Makefile.am:
+	* nautilus-actions/runtime/Makefile.am:
+	* nautilus-actions/runtime/na-gconf-provider.c:
+	* nautilus-actions/runtime/na-io-provider.c:
+	* nautilus-actions/runtime/na-pivot.c:
+	* nautilus-actions/runtime/na-pivot.h:
+	* nautilus-actions/test/Makefile.am:
+	* nautilus-actions/test/test-parse-uris.c:
+	* nautilus-actions/utils/Makefile.am:
+	* po/POTFILES.in: Updated accordingly.
+
 	Create private/ directory to host installed though private headers.
 
 	* configure.ac:
diff --git a/nautilus-actions/api/na-iio-provider.h b/nautilus-actions/api/na-iio-provider.h
index 7ebf11a..0970a4e 100644
--- a/nautilus-actions/api/na-iio-provider.h
+++ b/nautilus-actions/api/na-iio-provider.h
@@ -40,7 +40,7 @@
  * provide I/O storage resources to Nautilus-Actions.
  */
 
-#include <nautilus-actions/runtime/na-object-item-class.h>
+#include <nautilus-actions/private/na-object-item-class.h>
 
 G_BEGIN_DECLS
 
diff --git a/nautilus-actions/common/na-object-action-fn.h b/nautilus-actions/common/na-object-action-fn.h
index e0a5a26..61b6894 100644
--- a/nautilus-actions/common/na-object-action-fn.h
+++ b/nautilus-actions/common/na-object-action-fn.h
@@ -40,8 +40,8 @@
  * not shared by the Nautilus Actions plugin.
  */
 
-#include <runtime/na-object-action-class.h>
-#include <runtime/na-object-profile-class.h>
+#include <private/na-object-action-class.h>
+#include <private/na-object-profile-class.h>
 
 G_BEGIN_DECLS
 
diff --git a/nautilus-actions/common/na-object-action.c b/nautilus-actions/common/na-object-action.c
index 4511287..8efe8ca 100644
--- a/nautilus-actions/common/na-object-action.c
+++ b/nautilus-actions/common/na-object-action.c
@@ -34,8 +34,7 @@
 
 #include <string.h>
 
-#include <runtime/na-object-api.h>
-#include <runtime/na-object-action-priv.h>
+#include <private/na-object-action-priv.h>
 
 #include "na-object-api.h"
 
diff --git a/nautilus-actions/common/na-object-api.h b/nautilus-actions/common/na-object-api.h
index 9421102..dce1702 100644
--- a/nautilus-actions/common/na-object-api.h
+++ b/nautilus-actions/common/na-object-api.h
@@ -41,7 +41,7 @@
  * Nautilus Actions plugin.
  */
 
-#include <runtime/na-object-api.h>
+#include <private/na-object-api.h>
 
 #include "na-object-fn.h"
 #include "na-object-id-fn.h"
diff --git a/nautilus-actions/common/na-object-fn.h b/nautilus-actions/common/na-object-fn.h
index 38f0581..e739950 100644
--- a/nautilus-actions/common/na-object-fn.h
+++ b/nautilus-actions/common/na-object-fn.h
@@ -43,7 +43,7 @@
  * in common/na-object-api.h, which itself includes runtime/na-object-api.h.
  */
 
-#include <runtime/na-object-class.h>
+#include <private/na-object-class.h>
 
 G_BEGIN_DECLS
 
diff --git a/nautilus-actions/common/na-object-id-fn.h b/nautilus-actions/common/na-object-id-fn.h
index 3d50be8..fc5c77b 100644
--- a/nautilus-actions/common/na-object-id-fn.h
+++ b/nautilus-actions/common/na-object-id-fn.h
@@ -43,7 +43,8 @@
  * in na-object-api.h
  */
 
-#include <runtime/na-object-action-class.h>
+#include <private/na-object-action-class.h>
+
 #include <runtime/na-pivot.h>
 
 G_BEGIN_DECLS
diff --git a/nautilus-actions/common/na-object-id.c b/nautilus-actions/common/na-object-id.c
index 400ba6d..d265b64 100644
--- a/nautilus-actions/common/na-object-id.c
+++ b/nautilus-actions/common/na-object-id.c
@@ -35,8 +35,8 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <runtime/na-object-api.h>
-#include <runtime/na-object-id-priv.h>
+#include <private/na-object-id-priv.h>
+#include <private/na-iduplicable.h>
 
 #include "na-object-api.h"
 #include "na-iprefs.h"
diff --git a/nautilus-actions/common/na-object-item-fn.h b/nautilus-actions/common/na-object-item-fn.h
index 8eb0a02..98e30f3 100644
--- a/nautilus-actions/common/na-object-item-fn.h
+++ b/nautilus-actions/common/na-object-item-fn.h
@@ -45,7 +45,7 @@
 
 #include <gtk/gtk.h>
 
-#include <runtime/na-object-item-class.h>
+#include <private/na-object-item-class.h>
 
 G_BEGIN_DECLS
 
diff --git a/nautilus-actions/common/na-object-item.c b/nautilus-actions/common/na-object-item.c
index 84ddeca..d1f7f24 100644
--- a/nautilus-actions/common/na-object-item.c
+++ b/nautilus-actions/common/na-object-item.c
@@ -35,8 +35,7 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
-#include <runtime/na-object-api.h>
-#include <runtime/na-object-item-priv.h>
+#include <private/na-object-item-priv.h>
 
 #include "na-object-api.h"
 
diff --git a/nautilus-actions/common/na-object-menu-fn.h b/nautilus-actions/common/na-object-menu-fn.h
index e29909c..ca5aac1 100644
--- a/nautilus-actions/common/na-object-menu-fn.h
+++ b/nautilus-actions/common/na-object-menu-fn.h
@@ -42,7 +42,7 @@
  * are not shared by the Nautilus Actions plugin.
  */
 
-#include <runtime/na-object-menu-class.h>
+#include <private/na-object-menu-class.h>
 
 G_BEGIN_DECLS
 
diff --git a/nautilus-actions/common/na-object-menu.c b/nautilus-actions/common/na-object-menu.c
index 135530b..0c2a78f 100644
--- a/nautilus-actions/common/na-object-menu.c
+++ b/nautilus-actions/common/na-object-menu.c
@@ -32,7 +32,6 @@
 #include <config.h>
 #endif
 
-#include <runtime/na-object-api.h>
-#include <runtime/na-object-menu-priv.h>
+#include <private/na-object-menu-priv.h>
 
 #include "na-object-api.h"
diff --git a/nautilus-actions/common/na-object-profile-fn.h b/nautilus-actions/common/na-object-profile-fn.h
index e0249ae..3dccfb5 100644
--- a/nautilus-actions/common/na-object-profile-fn.h
+++ b/nautilus-actions/common/na-object-profile-fn.h
@@ -40,7 +40,7 @@
  * are not shared by the Nautilus Actions plugin.
  */
 
-#include <runtime/na-object-profile-class.h>
+#include <private/na-object-profile-class.h>
 
 G_BEGIN_DECLS
 
diff --git a/nautilus-actions/common/na-object-profile.c b/nautilus-actions/common/na-object-profile.c
index 88c2692..494d81a 100644
--- a/nautilus-actions/common/na-object-profile.c
+++ b/nautilus-actions/common/na-object-profile.c
@@ -36,8 +36,7 @@
 
 #include <libnautilus-extension/nautilus-file-info.h>
 
-#include <runtime/na-object-api.h>
-#include <runtime/na-object-profile-priv.h>
+#include <private/na-object-profile-priv.h>
 
 #include "na-object-api.h"
 #include "na-utils.h"
diff --git a/nautilus-actions/common/na-object.c b/nautilus-actions/common/na-object.c
index ffa4481..4d20e01 100644
--- a/nautilus-actions/common/na-object.c
+++ b/nautilus-actions/common/na-object.c
@@ -34,8 +34,8 @@
 
 #include <string.h>
 
-#include <runtime/na-object-api.h>
-#include <runtime/na-object-priv.h>
+#include <private/na-object-priv.h>
+#include <private/na-iduplicable.h>
 
 #include "na-object-api.h"
 
diff --git a/nautilus-actions/common/na-xml-writer.h b/nautilus-actions/common/na-xml-writer.h
index d392f94..d43c1b6 100644
--- a/nautilus-actions/common/na-xml-writer.h
+++ b/nautilus-actions/common/na-xml-writer.h
@@ -42,7 +42,7 @@
  * nautilus-actions-new utility.
  */
 
-#include <runtime/na-object-action-class.h>
+#include <private/na-object-action-class.h>
 
 G_BEGIN_DECLS
 
diff --git a/nautilus-actions/nact/Makefile.am b/nautilus-actions/nact/Makefile.am
index 21cb09f..843940d 100644
--- a/nautilus-actions/nact/Makefile.am
+++ b/nautilus-actions/nact/Makefile.am
@@ -115,6 +115,7 @@ nact-marshal.c: nact-marshal.list $(GLIB_GENMARSHAL)
 nautilus_actions_config_tool_LDADD = \
 	$(top_builddir)/nautilus-actions/common/libna-common.la		\
 	-L$(top_builddir)/nautilus-actions/api		-lna-api		\
+	-L$(top_builddir)/nautilus-actions/private	-lna-private	\
 	-L$(top_builddir)/nautilus-actions/runtime	-lna-runtime	\
 	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
diff --git a/nautilus-actions/nact/nact-application.c b/nautilus-actions/nact/nact-application.c
index bcc1984..8c0790f 100644
--- a/nautilus-actions/nact/nact-application.c
+++ b/nautilus-actions/nact/nact-application.c
@@ -35,9 +35,10 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+#include <private/na-object-action-fn.h>
+
 #include <runtime/na-iabout.h>
 #include <runtime/na-ipivot-consumer.h>
-#include <runtime/na-object-action-fn.h>
 
 #include "nact-application.h"
 #include "nact-main-window.h"
diff --git a/nautilus-actions/nact/nact-assistant-export-ask.h b/nautilus-actions/nact/nact-assistant-export-ask.h
index 6458d09..7e6c1da 100644
--- a/nautilus-actions/nact/nact-assistant-export-ask.h
+++ b/nautilus-actions/nact/nact-assistant-export-ask.h
@@ -41,7 +41,7 @@
  * to be ask to choose the export format.
  */
 
-#include <runtime/na-object-action-class.h>
+#include <private/na-object-action-class.h>
 
 #include "base-dialog.h"
 
diff --git a/nautilus-actions/nact/nact-assistant-export.c b/nautilus-actions/nact/nact-assistant-export.c
index c46bcf3..b70a5ef 100644
--- a/nautilus-actions/nact/nact-assistant-export.c
+++ b/nautilus-actions/nact/nact-assistant-export.c
@@ -42,6 +42,8 @@
 #include <common/na-xml-names.h>
 #include <common/na-xml-writer.h>
 
+#include <private/na-iduplicable.h>
+
 #include <runtime/na-pivot.h>
 
 #include "base-iprefs.h"
diff --git a/nautilus-actions/nact/nact-assistant-import-ask.h b/nautilus-actions/nact/nact-assistant-import-ask.h
index 70d3152..bb0cb9b 100644
--- a/nautilus-actions/nact/nact-assistant-import-ask.h
+++ b/nautilus-actions/nact/nact-assistant-import-ask.h
@@ -42,7 +42,7 @@
  * with it.
  */
 
-#include <runtime/na-object-action-class.h>
+#include <private/na-object-action-class.h>
 
 #include "base-dialog.h"
 #include "nact-main-window.h"
diff --git a/nautilus-actions/nact/nact-iactions-list.c b/nautilus-actions/nact/nact-iactions-list.c
index 9509a29..67d04a7 100644
--- a/nautilus-actions/nact/nact-iactions-list.c
+++ b/nautilus-actions/nact/nact-iactions-list.c
@@ -38,6 +38,8 @@
 #include <common/na-object-api.h>
 #include <common/na-iprefs.h>
 
+#include <private/na-iduplicable.h>
+
 #include "nact-application.h"
 #include "nact-marshal.h"
 #include "nact-main-tab.h"
diff --git a/nautilus-actions/nact/nact-iactions-list.h b/nautilus-actions/nact/nact-iactions-list.h
index f84d5f5..6be774d 100644
--- a/nautilus-actions/nact/nact-iactions-list.h
+++ b/nautilus-actions/nact/nact-iactions-list.h
@@ -52,7 +52,7 @@
 
 #include <gtk/gtk.h>
 
-#include <runtime/na-object-class.h>
+#include <private/na-object-class.h>
 
 G_BEGIN_DECLS
 
diff --git a/nautilus-actions/nact/nact-main-window.h b/nautilus-actions/nact/nact-main-window.h
index 687e9e0..a2eebda 100644
--- a/nautilus-actions/nact/nact-main-window.h
+++ b/nautilus-actions/nact/nact-main-window.h
@@ -39,7 +39,7 @@
  * This class is derived from BaseWindow and manages the main window.
  */
 
-#include <runtime/na-object-action-class.h>
+#include <private/na-object-action-class.h>
 
 #include "nact-clipboard.h"
 #include "nact-window.h"
diff --git a/nautilus-actions/nact/nact-window.h b/nautilus-actions/nact/nact-window.h
index 067ef8a..ae55376 100644
--- a/nautilus-actions/nact/nact-window.h
+++ b/nautilus-actions/nact/nact-window.h
@@ -40,7 +40,8 @@
  * It is a common base class for all Nautilus Actions window documents.
  */
 
-#include <runtime/na-object-item-class.h>
+#include <private/na-object-item-class.h>
+
 #include <runtime/na-pivot.h>
 
 #include "base-window.h"
diff --git a/nautilus-actions/nact/nact-xml-reader.h b/nautilus-actions/nact/nact-xml-reader.h
index a51fe1c..dc4646b 100644
--- a/nautilus-actions/nact/nact-xml-reader.h
+++ b/nautilus-actions/nact/nact-xml-reader.h
@@ -39,7 +39,7 @@
  * This is the base class for importing actions from XML files.
  */
 
-#include <runtime/na-object-action-class.h>
+#include <private/na-object-action-class.h>
 
 #include "base-assistant.h"
 
diff --git a/nautilus-actions/plugin/Makefile.am b/nautilus-actions/plugin/Makefile.am
index 0253fa0..0c32c35 100644
--- a/nautilus-actions/plugin/Makefile.am
+++ b/nautilus-actions/plugin/Makefile.am
@@ -46,6 +46,7 @@ libnautilus_actions_la_SOURCES = \
 libnautilus_actions_la_LDFLAGS = -module -avoid-version
 
 libnautilus_actions_la_LIBADD = \
-	-L$(top_builddir)/nautilus-actions/runtime -lna-runtime		\
+	-L$(top_builddir)/nautilus-actions/private	-lna-private	\
+	-L$(top_builddir)/nautilus-actions/runtime	-lna-runtime	\
 	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
diff --git a/nautilus-actions/plugin/nautilus-actions.c b/nautilus-actions/plugin/nautilus-actions.c
index fd16dfb..8080b6a 100644
--- a/nautilus-actions/plugin/nautilus-actions.c
+++ b/nautilus-actions/plugin/nautilus-actions.c
@@ -38,7 +38,8 @@
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 
-#include <runtime/na-object-api.h>
+#include <private/na-object-api.h>
+
 #include <runtime/na-pivot.h>
 #include <runtime/na-iabout.h>
 #include <runtime/na-iprefs.h>
diff --git a/nautilus-actions/private/Makefile.am b/nautilus-actions/private/Makefile.am
index 919c070..a9c5bb8 100644
--- a/nautilus-actions/private/Makefile.am
+++ b/nautilus-actions/private/Makefile.am
@@ -30,6 +30,7 @@ pkglib_LTLIBRARIES = libna-private.la
 
 AM_CPPFLAGS += \
 	-I $(top_srcdir)							\
+	-I $(top_srcdir)/nautilus-actions			\
 	-DPKGLIBDIR=\""$(pkglibdir)"\"				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_PRIVATE}\"	\
@@ -39,9 +40,38 @@ AM_CPPFLAGS += \
 libna_private_includedir = $(pkgincludedir)/private
 
 libna_private_include_HEADERS = \
+	na-object-api.h								\
+	na-object-class.h							\
+	na-object-fn.h								\
+	na-object-id-class.h						\
+	na-object-id-fn.h							\
+	na-object-item-class.h						\
+	na-object-item-fn.h							\
+	na-object-action-class.h					\
+	na-object-action-fn.h						\
+	na-object-menu-class.h						\
+	na-object-menu-fn.h							\
+	na-object-profile-class.h					\
+	na-object-profile-fn.h						\
 	$(NULL)
 
 libna_private_la_SOURCES = \
+	na-gnome-vfs-uri.c							\
+	na-gnome-vfs-uri.h							\
+	na-iduplicable.c							\
+	na-iduplicable.h							\
+	na-object.c									\
+	na-object-priv.h							\
+	na-object-id.c								\
+	na-object-id-priv.h							\
+	na-object-item.c							\
+	na-object-item-priv.h						\
+	na-object-action.c							\
+	na-object-action-priv.h						\
+	na-object-menu.c							\
+	na-object-menu-priv.h						\
+	na-object-profile.c							\
+	na-object-profile-priv.h					\
 	$(NULL)
 
 libna_private_la_LIBADD = \
diff --git a/nautilus-actions/runtime/na-gnome-vfs-uri.c b/nautilus-actions/private/na-gnome-vfs-uri.c
similarity index 100%
rename from nautilus-actions/runtime/na-gnome-vfs-uri.c
rename to nautilus-actions/private/na-gnome-vfs-uri.c
diff --git a/nautilus-actions/runtime/na-gnome-vfs-uri.h b/nautilus-actions/private/na-gnome-vfs-uri.h
similarity index 94%
rename from nautilus-actions/runtime/na-gnome-vfs-uri.h
rename to nautilus-actions/private/na-gnome-vfs-uri.h
index 851f639..864d640 100644
--- a/nautilus-actions/runtime/na-gnome-vfs-uri.h
+++ b/nautilus-actions/private/na-gnome-vfs-uri.h
@@ -28,8 +28,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_GNOME_VFS_URI_H__
-#define __NA_RUNTIME_GNOME_VFS_URI_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_GNOME_VFS_URI_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_GNOME_VFS_URI_H__
 
 /*
  * pwi 2009-07-29
@@ -105,4 +105,4 @@ void na_gnome_vfs_uri_free( NAGnomeVFSURI *vfs );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_GNOME_VFS_URI_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_GNOME_VFS_URI_H__ */
diff --git a/nautilus-actions/runtime/na-iduplicable.c b/nautilus-actions/private/na-iduplicable.c
similarity index 100%
rename from nautilus-actions/runtime/na-iduplicable.c
rename to nautilus-actions/private/na-iduplicable.c
diff --git a/nautilus-actions/runtime/na-iduplicable.h b/nautilus-actions/private/na-iduplicable.h
similarity index 96%
rename from nautilus-actions/runtime/na-iduplicable.h
rename to nautilus-actions/private/na-iduplicable.h
index add8b87..ba48e72 100644
--- a/nautilus-actions/runtime/na-iduplicable.h
+++ b/nautilus-actions/private/na-iduplicable.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_IDUPLICABLE_H__
-#define __NA_RUNTIME_IDUPLICABLE_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_IDUPLICABLE_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_IDUPLICABLE_H__
 
 /**
  * SECTION: na_iduplicable
  * @short_description: #NAIDuplicable interface.
- * @include: runtime/na-iduplicable.h
+ * @include: nautilus-actions/private/na-iduplicable.h
  *
  * This interface is implemented by #NAObject in order to let
  * #NAObject-derived instance duplication be easily tracked. This works
@@ -164,4 +164,4 @@ void           na_iduplicable_register_consumer( GObject *consumer );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_IDUPLICABLE_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_IDUPLICABLE_H__ */
diff --git a/nautilus-actions/runtime/na-object-action-class.h b/nautilus-actions/private/na-object-action-class.h
similarity index 92%
rename from nautilus-actions/runtime/na-object-action-class.h
rename to nautilus-actions/private/na-object-action-class.h
index ea8603f..fd5e54f 100644
--- a/nautilus-actions/runtime/na-object-action-class.h
+++ b/nautilus-actions/private/na-object-action-class.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ACTION_CLASS_H__
-#define __NA_RUNTIME_OBJECT_ACTION_CLASS_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_CLASS_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_CLASS_H__
 
 /**
  * SECTION: na_object_action
  * @short_description: #NAObjectAction class definition.
- * @include: runtime/na-object-action-class.h
+ * @include: nautilus-actions/private/na-object-action-class.h
  *
  * This is the class which maintains data and properties of an Nautilus
  * action.
@@ -89,4 +89,4 @@ GType na_object_action_get_type( void );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ACTION_CLASS_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_CLASS_H__ */
diff --git a/nautilus-actions/runtime/na-object-action-fn.h b/nautilus-actions/private/na-object-action-fn.h
similarity index 94%
rename from nautilus-actions/runtime/na-object-action-fn.h
rename to nautilus-actions/private/na-object-action-fn.h
index 31fd59b..cc47bd5 100644
--- a/nautilus-actions/runtime/na-object-action-fn.h
+++ b/nautilus-actions/private/na-object-action-fn.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ACTION_FN_H__
-#define __NA_RUNTIME_OBJECT_ACTION_FN_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_FN_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_FN_H__
 
 /**
  * SECTION: na_object_action
  * @short_description: #NAObjectAction public function declaration.
- * @include: runtime/na-object-action.h
+ * @include: nautilus-actions/private/na-object-action.h
  */
 
 #include <glib/gi18n.h>
@@ -91,4 +91,4 @@ gboolean        na_object_action_is_candidate( const NAObjectAction *action, gin
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ACTION_FN_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_FN_H__ */
diff --git a/nautilus-actions/runtime/na-object-action-priv.h b/nautilus-actions/private/na-object-action-priv.h
similarity index 91%
rename from nautilus-actions/runtime/na-object-action-priv.h
rename to nautilus-actions/private/na-object-action-priv.h
index 5d0bd80..03285a7 100644
--- a/nautilus-actions/runtime/na-object-action-priv.h
+++ b/nautilus-actions/private/na-object-action-priv.h
@@ -28,8 +28,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ACTION_PRIV_H__
-#define __NA_RUNTIME_OBJECT_ACTION_PRIV_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_PRIV_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_PRIV_H__
 
 #include "na-object-action-class.h"
 
@@ -69,4 +69,4 @@ struct NAObjectActionPrivate {
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ACTION_PRIV_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ACTION_PRIV_H__ */
diff --git a/nautilus-actions/runtime/na-object-action.c b/nautilus-actions/private/na-object-action.c
similarity index 99%
rename from nautilus-actions/runtime/na-object-action.c
rename to nautilus-actions/private/na-object-action.c
index 3357795..9d9d0c2 100644
--- a/nautilus-actions/runtime/na-object-action.c
+++ b/nautilus-actions/private/na-object-action.c
@@ -34,10 +34,11 @@
 
 #include <string.h>
 
+#include <runtime/na-utils.h>
+
 #include "na-iduplicable.h"
 #include "na-object-api.h"
 #include "na-object-action-priv.h"
-#include "na-utils.h"
 
 /* private class data
  */
diff --git a/nautilus-actions/runtime/na-object-api.h b/nautilus-actions/private/na-object-api.h
similarity index 95%
rename from nautilus-actions/runtime/na-object-api.h
rename to nautilus-actions/private/na-object-api.h
index 1ea604f..f1c7513 100644
--- a/nautilus-actions/runtime/na-object-api.h
+++ b/nautilus-actions/private/na-object-api.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_API_H__
-#define __NA_RUNTIME_OBJECT_API_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_API_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_API_H__
 
 /**
  * SECTION: na_object
  * @short_description: #NAObject public API.
- * @include: runtime/na-object-api.h
+ * @include: nautilus-actions/private/na-object-api.h
  *
  * We define here a common API which makes easier to write (and read)
  * the code ; all object functions are named na_object ; all arguments
@@ -43,8 +43,6 @@
  * Only define here the API which is relevant in libna-runtime library.
  */
 
-#include "na-iduplicable.h"
-
 #include "na-object-fn.h"
 #include "na-object-id-fn.h"
 #include "na-object-item-fn.h"
@@ -104,4 +102,4 @@ G_BEGIN_DECLS
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_API_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_API_H__ */
diff --git a/nautilus-actions/runtime/na-object-class.h b/nautilus-actions/private/na-object-class.h
similarity index 96%
rename from nautilus-actions/runtime/na-object-class.h
rename to nautilus-actions/private/na-object-class.h
index a7fb83d..d09dc4f 100644
--- a/nautilus-actions/runtime/na-object-class.h
+++ b/nautilus-actions/private/na-object-class.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_CLASS_H__
-#define __NA_RUNTIME_OBJECT_CLASS_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_CLASS_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_CLASS_H__
 
 /**
  * SECTION: na_object
  * @short_description: #NAObject class definition.
- * @include: runtime/na-object-class.h
+ * @include: nautilus-actions/private/na-object-class.h
  *
  * This is the base class for managed objects.
  *
@@ -186,4 +186,4 @@ GType     na_object_get_type( void );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_CLASS_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_CLASS_H__ */
diff --git a/nautilus-actions/runtime/na-object-fn.h b/nautilus-actions/private/na-object-fn.h
similarity index 91%
rename from nautilus-actions/runtime/na-object-fn.h
rename to nautilus-actions/private/na-object-fn.h
index e5971b6..abd8540 100644
--- a/nautilus-actions/runtime/na-object-fn.h
+++ b/nautilus-actions/private/na-object-fn.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_FN_H__
-#define __NA_RUNTIME_OBJECT_FN_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_FN_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_FN_H__
 
 /**
  * SECTION: na_object
  * @short_description: #NAObject public functions declarations.
- * @include: runtime/na-object-fn.h
+ * @include: nautilus-actions/private/na-object-fn.h
  *
  * Define here the public functions of the #NAObject class.
  *
@@ -68,4 +68,4 @@ void      na_object_free_hierarchy( GList *hierarchy );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_FN_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_FN_H__ */
diff --git a/nautilus-actions/runtime/na-object-id-class.h b/nautilus-actions/private/na-object-id-class.h
similarity index 93%
rename from nautilus-actions/runtime/na-object-id-class.h
rename to nautilus-actions/private/na-object-id-class.h
index fa1f5b5..b48d32f 100644
--- a/nautilus-actions/runtime/na-object-id-class.h
+++ b/nautilus-actions/private/na-object-id-class.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ID_CLASS_H__
-#define __NA_RUNTIME_OBJECT_ID_CLASS_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_CLASS_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_CLASS_H__
 
 /**
  * SECTION: na_object_id
  * @short_description: #NAObjectId class definition.
- * @include: runtime/na-object-id-class.h
+ * @include: nautilus-actions/private/na-object-id-class.h
  *
  * A #NAObjectId object is characterized by :
  * - an internal identifiant (ASCII, case insensitive)
@@ -92,4 +92,4 @@ GType  na_object_id_get_type( void );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ID_CLASS_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_CLASS_H__ */
diff --git a/nautilus-actions/runtime/na-object-id-fn.h b/nautilus-actions/private/na-object-id-fn.h
similarity index 90%
rename from nautilus-actions/runtime/na-object-id-fn.h
rename to nautilus-actions/private/na-object-id-fn.h
index 45485d6..003c326 100644
--- a/nautilus-actions/runtime/na-object-id-fn.h
+++ b/nautilus-actions/private/na-object-id-fn.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ID_FN_H__
-#define __NA_RUNTIME_OBJECT_ID_FN_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_FN_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_FN_H__
 
 /**
  * SECTION: na_object_id
  * @short_description: #NAObjectId public function declarations.
- * @include: runtime/na-object-id-fn.h
+ * @include: nautilus-actions/private/na-object-id-fn.h
  *
  * Define here the public functions of the #NAObjectId class.
  *
@@ -57,4 +57,4 @@ void          na_object_id_set_parent( NAObjectId *object, NAObjectItem *parent
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ID_FN_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_FN_H__ */
diff --git a/nautilus-actions/runtime/na-object-id-priv.h b/nautilus-actions/private/na-object-id-priv.h
similarity index 89%
rename from nautilus-actions/runtime/na-object-id-priv.h
rename to nautilus-actions/private/na-object-id-priv.h
index 6ab8623..10f8e6a 100644
--- a/nautilus-actions/runtime/na-object-id-priv.h
+++ b/nautilus-actions/private/na-object-id-priv.h
@@ -28,8 +28,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ID_PRIV_H__
-#define __NA_RUNTIME_OBJECT_ID_PRIV_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_PRIV_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_PRIV_H__
 
 #include "na-object-id-class.h"
 #include "na-object-item-class.h"
@@ -47,4 +47,4 @@ struct NAObjectIdPrivate {
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ID_PRIV_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_PRIV_H__ */
diff --git a/nautilus-actions/runtime/na-object-id.c b/nautilus-actions/private/na-object-id.c
similarity index 100%
rename from nautilus-actions/runtime/na-object-id.c
rename to nautilus-actions/private/na-object-id.c
diff --git a/nautilus-actions/runtime/na-object-item-class.h b/nautilus-actions/private/na-object-item-class.h
similarity index 92%
rename from nautilus-actions/runtime/na-object-item-class.h
rename to nautilus-actions/private/na-object-item-class.h
index 2936149..77f02a1 100644
--- a/nautilus-actions/runtime/na-object-item-class.h
+++ b/nautilus-actions/private/na-object-item-class.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ITEM_CLASS_H__
-#define __NA_RUNTIME_OBJECT_ITEM_CLASS_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_CLASS_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_CLASS_H__
 
 /**
  * SECTION: na_object_item
  * @short_description: #NAObjectItem class definition.
- * @include: runtime/na-object-item-class.h
+ * @include: nautilus-actions/private/na-object-item-class.h
  *
  * Derived from #NAObjectId class, this class implements objects which
  * have :
@@ -86,4 +86,4 @@ GType na_object_item_get_type( void );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ITEM_CLASS_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_CLASS_H__ */
diff --git a/nautilus-actions/runtime/na-object-item-fn.h b/nautilus-actions/private/na-object-item-fn.h
similarity index 92%
rename from nautilus-actions/runtime/na-object-item-fn.h
rename to nautilus-actions/private/na-object-item-fn.h
index b10d58e..51fe6e1 100644
--- a/nautilus-actions/runtime/na-object-item-fn.h
+++ b/nautilus-actions/private/na-object-item-fn.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ITEM_FN_H__
-#define __NA_RUNTIME_OBJECT_ITEM_FN_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_FN_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_FN_H__
 
 /**
  * SECTION: na_object_item
  * @short_description: #NAObjectItem public function declarations.
- * @include: runtime/na-object-fn.h
+ * @include: nautilus-actions/private/na-object-fn.h
  *
  * Define here the public functions of the #NAObjectItem class.
  *
@@ -73,4 +73,4 @@ void           na_object_item_set_items_string_list( NAObjectItem *item, GSList
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ITEM_FN_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_FN_H__ */
diff --git a/nautilus-actions/runtime/na-object-item-priv.h b/nautilus-actions/private/na-object-item-priv.h
similarity index 88%
rename from nautilus-actions/runtime/na-object-item-priv.h
rename to nautilus-actions/private/na-object-item-priv.h
index 7a9e823..2c0a31e 100644
--- a/nautilus-actions/runtime/na-object-item-priv.h
+++ b/nautilus-actions/private/na-object-item-priv.h
@@ -28,8 +28,10 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_ITEM_PRIV_H__
-#define __NA_RUNTIME_OBJECT_ITEM_PRIV_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_PRIV_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_PRIV_H__
+
+#include <nautilus-actions/api/na-iio-provider.h>
 
 #include "na-object-item-class.h"
 
@@ -60,4 +62,4 @@ struct NAObjectItemPrivate {
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_ITEM_PRIV_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ITEM_PRIV_H__ */
diff --git a/nautilus-actions/runtime/na-object-item.c b/nautilus-actions/private/na-object-item.c
similarity index 99%
rename from nautilus-actions/runtime/na-object-item.c
rename to nautilus-actions/private/na-object-item.c
index ad08994..2e27a74 100644
--- a/nautilus-actions/runtime/na-object-item.c
+++ b/nautilus-actions/private/na-object-item.c
@@ -35,10 +35,11 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
+#include <runtime/na-utils.h>
+
 #include "na-iduplicable.h"
 #include "na-object-api.h"
 #include "na-object-item-priv.h"
-#include "na-utils.h"
 
 /* private class data
  */
diff --git a/nautilus-actions/runtime/na-object-menu-class.h b/nautilus-actions/private/na-object-menu-class.h
similarity index 90%
rename from nautilus-actions/runtime/na-object-menu-class.h
rename to nautilus-actions/private/na-object-menu-class.h
index 5485795..c842950 100644
--- a/nautilus-actions/runtime/na-object-menu-class.h
+++ b/nautilus-actions/private/na-object-menu-class.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_MENU_CLASS_H__
-#define __NA_RUNTIME_OBJECT_MENU_CLASS_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_CLASS_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_CLASS_H__
 
 /**
  * SECTION: na_object_menu
  * @short_description: #NAObjectMenu class definition.
- * @include: runtime/na-object-menu.h
+ * @include: nautilus-actions/private/na-object-menu.h
  *
  * This is a menu. It embeds other menus and/or actions.
  */
@@ -70,4 +70,4 @@ GType         na_object_menu_get_type( void );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_MENU_CLASS_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_CLASS_H__ */
diff --git a/nautilus-actions/runtime/na-object-menu-fn.h b/nautilus-actions/private/na-object-menu-fn.h
similarity index 87%
rename from nautilus-actions/runtime/na-object-menu-fn.h
rename to nautilus-actions/private/na-object-menu-fn.h
index 2216617..31e6a64 100644
--- a/nautilus-actions/runtime/na-object-menu-fn.h
+++ b/nautilus-actions/private/na-object-menu-fn.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_MENU_FN_H__
-#define __NA_RUNTIME_OBJECT_MENU_FN_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_FN_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_FN_H__
 
 /**
  * SECTION: na_object_menu
  * @short_description: #NAObjectMenu class definition.
- * @include: runtime/na-object-menu.h
+ * @include: nautilus-actions/private/na-object-menu.h
  *
  * This is a menu. It embeds other menus and/or actions.
  */
@@ -50,4 +50,4 @@ NAObjectMenu *na_object_menu_new( void );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_MENU_FN_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_FN_H__ */
diff --git a/nautilus-actions/runtime/na-object-menu-priv.h b/nautilus-actions/private/na-object-menu-priv.h
similarity index 88%
rename from nautilus-actions/runtime/na-object-menu-priv.h
rename to nautilus-actions/private/na-object-menu-priv.h
index c53f055..58188f1 100644
--- a/nautilus-actions/runtime/na-object-menu-priv.h
+++ b/nautilus-actions/private/na-object-menu-priv.h
@@ -28,8 +28,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_MENU_PRIV_H__
-#define __NA_RUNTIME_OBJECT_MENU_PRIV_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_PRIV_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_PRIV_H__
 
 #include "na-object-menu-class.h"
 
@@ -43,4 +43,4 @@ struct NAObjectMenuPrivate {
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_MENU_PRIV_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_MENU_PRIV_H__ */
diff --git a/nautilus-actions/runtime/na-object-menu.c b/nautilus-actions/private/na-object-menu.c
similarity index 99%
rename from nautilus-actions/runtime/na-object-menu.c
rename to nautilus-actions/private/na-object-menu.c
index 5cdb19b..8e39571 100644
--- a/nautilus-actions/runtime/na-object-menu.c
+++ b/nautilus-actions/private/na-object-menu.c
@@ -32,9 +32,11 @@
 #include <config.h>
 #endif
 
+#include <runtime/na-utils.h>
+
 #include "na-object-api.h"
+#include "na-iduplicable.h"
 #include "na-object-menu-priv.h"
-#include "na-utils.h"
 
 /* private class data
  */
diff --git a/nautilus-actions/runtime/na-object-priv.h b/nautilus-actions/private/na-object-priv.h
similarity index 88%
rename from nautilus-actions/runtime/na-object-priv.h
rename to nautilus-actions/private/na-object-priv.h
index 5f6e25a..b2b5a95 100644
--- a/nautilus-actions/runtime/na-object-priv.h
+++ b/nautilus-actions/private/na-object-priv.h
@@ -28,8 +28,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_PRIV_H__
-#define __NA_RUNTIME_OBJECT_PRIV_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PRIV_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PRIV_H__
 
 #include "na-object-class.h"
 
@@ -43,4 +43,4 @@ struct NAObjectPrivate {
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_PRIV_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PRIV_H__ */
diff --git a/nautilus-actions/runtime/na-object-profile-class.h b/nautilus-actions/private/na-object-profile-class.h
similarity index 91%
rename from nautilus-actions/runtime/na-object-profile-class.h
rename to nautilus-actions/private/na-object-profile-class.h
index e80b43a..4ead284 100644
--- a/nautilus-actions/runtime/na-object-profile-class.h
+++ b/nautilus-actions/private/na-object-profile-class.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_PROFILE_CLASS_H__
-#define __NA_RUNTIME_OBJECT_PROFILE_CLASS_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_CLASS_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_CLASS_H__
 
 /**
  * SECTION: na_object_profile
  * @short_description: #NAObjectProfile class definition.
- * @include: runtime/na-object-profile-class.h
+ * @include: nautilus-actions/private/na-object-profile-class.h
  *
  * This is a companion class of NAObjectAction. It embeds the profile
  * definition of an action.
@@ -74,4 +74,4 @@ GType na_object_profile_get_type( void );
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_PROFILE_CLASS_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_CLASS_H__ */
diff --git a/nautilus-actions/runtime/na-object-profile-fn.h b/nautilus-actions/private/na-object-profile-fn.h
similarity index 94%
rename from nautilus-actions/runtime/na-object-profile-fn.h
rename to nautilus-actions/private/na-object-profile-fn.h
index c873d1d..3212454 100644
--- a/nautilus-actions/runtime/na-object-profile-fn.h
+++ b/nautilus-actions/private/na-object-profile-fn.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_PROFILE_FN_H__
-#define __NA_RUNTIME_OBJECT_PROFILE_FN_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_FN_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_FN_H__
 
 /**
  * SECTION: na_object_profile
  * @short_description: #NAObjectProfile public function declarations.
- * @include: runtime/na-object-profile.h
+ * @include: nautilus-actions/private/na-object-profile.h
  */
 
 #include <glib/gi18n.h>
@@ -83,4 +83,4 @@ gchar           *na_object_profile_parse_parameters( const NAObjectProfile *prof
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_PROFILE_FN_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_FN_H__ */
diff --git a/nautilus-actions/runtime/na-object-profile-priv.h b/nautilus-actions/private/na-object-profile-priv.h
similarity index 89%
rename from nautilus-actions/runtime/na-object-profile-priv.h
rename to nautilus-actions/private/na-object-profile-priv.h
index f074701..f3aa994 100644
--- a/nautilus-actions/runtime/na-object-profile-priv.h
+++ b/nautilus-actions/private/na-object-profile-priv.h
@@ -28,8 +28,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NA_RUNTIME_OBJECT_PROFILE_PRIV_H__
-#define __NA_RUNTIME_OBJECT_PROFILE_PRIV_H__
+#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_PRIV_H__
+#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_PRIV_H__
 
 #include "na-object-profile-class.h"
 
@@ -62,4 +62,4 @@ struct NAObjectProfilePrivate {
 
 G_END_DECLS
 
-#endif /* __NA_RUNTIME_OBJECT_PROFILE_PRIV_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_PROFILE_PRIV_H__ */
diff --git a/nautilus-actions/runtime/na-object-profile.c b/nautilus-actions/private/na-object-profile.c
similarity index 99%
rename from nautilus-actions/runtime/na-object-profile.c
rename to nautilus-actions/private/na-object-profile.c
index 1aa0d79..088391a 100644
--- a/nautilus-actions/runtime/na-object-profile.c
+++ b/nautilus-actions/private/na-object-profile.c
@@ -36,11 +36,12 @@
 
 #include <libnautilus-extension/nautilus-file-info.h>
 
+#include <runtime/na-utils.h>
+
 #include "na-iduplicable.h"
 #include "na-object-api.h"
 #include "na-object-profile-priv.h"
 #include "na-gnome-vfs-uri.h"
-#include "na-utils.h"
 
 /* private class data
  */
diff --git a/nautilus-actions/runtime/na-object.c b/nautilus-actions/private/na-object.c
similarity index 100%
rename from nautilus-actions/runtime/na-object.c
rename to nautilus-actions/private/na-object.c
diff --git a/nautilus-actions/runtime/Makefile.am b/nautilus-actions/runtime/Makefile.am
index a2f8e68..deae049 100644
--- a/nautilus-actions/runtime/Makefile.am
+++ b/nautilus-actions/runtime/Makefile.am
@@ -30,6 +30,7 @@ pkglib_LTLIBRARIES = libna-runtime.la
 
 AM_CPPFLAGS += \
 	-I $(top_srcdir)							\
+	-I $(top_srcdir)/nautilus-actions			\
 	-DPKGLIBDIR=\""$(pkglibdir)"\"				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_RUNTIME}\"	\
@@ -45,12 +46,8 @@ libna_runtime_la_SOURCES = \
 	na-gconf-provider-keys.h					\
 	na-gconf-utils.c							\
 	na-gconf-utils.h							\
-	na-gnome-vfs-uri.c							\
-	na-gnome-vfs-uri.h							\
 	na-iabout.c									\
 	na-iabout.h									\
-	na-iduplicable.c							\
-	na-iduplicable.h							\
 	na-io-provider.c							\
 	na-io-provider.h							\
 	na-ipivot-consumer.c						\
@@ -59,31 +56,6 @@ libna_runtime_la_SOURCES = \
 	na-iprefs.h									\
 	na-module.c									\
 	na-module.h									\
-	na-object-api.h								\
-	na-object.c									\
-	na-object-class.h							\
-	na-object-fn.h								\
-	na-object-priv.h							\
-	na-object-id.c								\
-	na-object-id-class.h						\
-	na-object-id-fn.h							\
-	na-object-id-priv.h							\
-	na-object-item.c							\
-	na-object-item-class.h						\
-	na-object-item-fn.h							\
-	na-object-item-priv.h						\
-	na-object-action.c							\
-	na-object-action-class.h					\
-	na-object-action-fn.h						\
-	na-object-action-priv.h						\
-	na-object-menu.c							\
-	na-object-menu-class.h						\
-	na-object-menu-fn.h							\
-	na-object-menu-priv.h						\
-	na-object-profile.c							\
-	na-object-profile-class.h					\
-	na-object-profile-fn.h						\
-	na-object-profile-priv.h					\
 	na-pivot.c									\
 	na-pivot.h									\
 	na-utils.c									\
diff --git a/nautilus-actions/runtime/na-gconf-provider.c b/nautilus-actions/runtime/na-gconf-provider.c
index a0be710..ad0c1ba 100644
--- a/nautilus-actions/runtime/na-gconf-provider.c
+++ b/nautilus-actions/runtime/na-gconf-provider.c
@@ -34,7 +34,8 @@
 
 #include <string.h>
 
-#include "na-object-api.h"
+#include <private/na-object-api.h>
+
 #include "na-gconf-monitor.h"
 #include "na-gconf-provider.h"
 #include "na-gconf-provider-keys.h"
diff --git a/nautilus-actions/runtime/na-io-provider.c b/nautilus-actions/runtime/na-io-provider.c
index 5a57d61..4d67a59 100644
--- a/nautilus-actions/runtime/na-io-provider.c
+++ b/nautilus-actions/runtime/na-io-provider.c
@@ -34,9 +34,10 @@
 
 #include <string.h>
 
-#include <nautilus-actions/api/na-iio-provider.h>
+#include <api/na-iio-provider.h>
+
+#include <private/na-object-api.h>
 
-#include "na-object-api.h"
 #include "na-io-provider.h"
 #include "na-iprefs.h"
 #include "na-utils.h"
diff --git a/nautilus-actions/runtime/na-pivot.c b/nautilus-actions/runtime/na-pivot.c
index 5bd9daf..de18840 100644
--- a/nautilus-actions/runtime/na-pivot.c
+++ b/nautilus-actions/runtime/na-pivot.c
@@ -35,7 +35,8 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
-#include "na-object-api.h"
+#include <private/na-object-api.h>
+
 #include "na-io-provider.h"
 #include "na-gconf-monitor.h"
 #include "na-gconf-provider.h"
diff --git a/nautilus-actions/runtime/na-pivot.h b/nautilus-actions/runtime/na-pivot.h
index e3da3e8..845776e 100644
--- a/nautilus-actions/runtime/na-pivot.h
+++ b/nautilus-actions/runtime/na-pivot.h
@@ -74,9 +74,10 @@
  *    subsystem.
  */
 
-#include "na-object-class.h"
-#include "na-object-id-class.h"
-#include "na-object-item-class.h"
+#include <private/na-object-class.h>
+#include <private/na-object-id-class.h>
+#include <private/na-object-item-class.h>
+
 #include "na-ipivot-consumer.h"
 
 G_BEGIN_DECLS
diff --git a/nautilus-actions/test/Makefile.am b/nautilus-actions/test/Makefile.am
index fc89557..2b019f0 100644
--- a/nautilus-actions/test/Makefile.am
+++ b/nautilus-actions/test/Makefile.am
@@ -61,6 +61,7 @@ test_parse_uris_SOURCES = \
 
 test_parse_uris_LDADD = \
 	-L$(top_builddir)/nautilus-actions/api		-lna-api		\
+	-L$(top_builddir)/nautilus-actions/private	-lna-private	\
 	-L$(top_builddir)/nautilus-actions/runtime	-lna-runtime	\
 	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
diff --git a/nautilus-actions/test/test-parse-uris.c b/nautilus-actions/test/test-parse-uris.c
index 7f55aed..b619ef7 100644
--- a/nautilus-actions/test/test-parse-uris.c
+++ b/nautilus-actions/test/test-parse-uris.c
@@ -37,7 +37,7 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 
-#include <runtime/na-gnome-vfs-uri.h>
+#include <private/na-gnome-vfs-uri.h>
 
 static const gchar *uris[] = {
 		"http://robert:azerty01 mon domain com/path/to/a/document?query#anchor",
diff --git a/nautilus-actions/utils/Makefile.am b/nautilus-actions/utils/Makefile.am
index 5acfd41..cecfd81 100644
--- a/nautilus-actions/utils/Makefile.am
+++ b/nautilus-actions/utils/Makefile.am
@@ -48,6 +48,7 @@ nautilus_actions_new_SOURCES = \
 nautilus_actions_new_LDADD = \
 	$(top_builddir)/nautilus-actions/common/libna-common.la		\
 	-L$(top_builddir)/nautilus-actions/api		-lna-api		\
+	-L$(top_builddir)/nautilus-actions/private	-lna-private	\
 	-L$(top_builddir)/nautilus-actions/runtime	-lna-runtime	\
 	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
@@ -61,6 +62,7 @@ nautilus_actions_schemas_SOURCES = \
 nautilus_actions_schemas_LDADD = \
 	$(top_builddir)/nautilus-actions/common/libna-common.la		\
 	-L$(top_builddir)/nautilus-actions/api		-lna-api		\
+	-L$(top_builddir)/nautilus-actions/private	-lna-private	\
 	-L$(top_builddir)/nautilus-actions/runtime	-lna-runtime	\
 	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4721cbc..27aa224 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,10 +24,10 @@ nautilus-actions/nact/nact-window.c
 nautilus-actions/nact/nact-xml-reader.c
 nautilus-actions/nact/nautilus-actions-config-tool.ui
 nautilus-actions/plugin/nautilus-actions.c
+nautilus-actions/private/na-object-action-fn.h
+nautilus-actions/private/na-object-menu-fn.h
+nautilus-actions/private/na-object-profile-fn.h
 nautilus-actions/runtime/na-iabout.c
-nautilus-actions/runtime/na-object-action-fn.h
-nautilus-actions/runtime/na-object-menu-fn.h
-nautilus-actions/runtime/na-object-profile-fn.h
 nautilus-actions/test/test-parse-uris.c
 nautilus-actions/utils/nautilus-actions-new.c
 nautilus-actions/utils/nautilus-actions-schemas.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]