GNOME.org
 

[nautilus-actions: 13/30] Move na-object-api.h to api/ directory

commit 4e79e2a3232b25692fa436f2ca3d187d217ee5ad
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Nov 19 00:18:42 2009 +0100

    Move na-object-api.h to api/ directory
    
    All I/O providers need to create and setup #NAObjects ; it doesn't make sense
    to leave this header in private directory.

 ChangeLog                                         |   37 +++++++++++++++++++++
 nautilus-actions/api/Makefile.am                  |    1 +
 nautilus-actions/{private => api}/na-object-api.h |   22 ++++++-------
 nautilus-actions/nact/nact-assistant-export-ask.c |    2 +-
 nautilus-actions/nact/nact-assistant-export.c     |    3 +-
 nautilus-actions/nact/nact-assistant-import-ask.c |    2 +-
 nautilus-actions/nact/nact-assistant-import.c     |    2 +-
 nautilus-actions/nact/nact-clipboard.c            |    2 +-
 nautilus-actions/nact/nact-iaction-tab.c          |    2 +-
 nautilus-actions/nact/nact-iactions-list.c        |    3 +-
 nautilus-actions/nact/nact-iadvanced-tab.c        |    2 +-
 nautilus-actions/nact/nact-ibackground-tab.c      |    2 +-
 nautilus-actions/nact/nact-icommand-tab.c         |    2 +-
 nautilus-actions/nact/nact-iconditions-tab.c      |    2 +-
 nautilus-actions/nact/nact-main-menubar.c         |    2 +-
 nautilus-actions/nact/nact-main-window.c          |    2 +-
 nautilus-actions/nact/nact-tree-model.c           |    2 +-
 nautilus-actions/nact/nact-window.c               |    2 +-
 nautilus-actions/nact/nact-xml-reader.c           |    2 +-
 nautilus-actions/plugin/nautilus-actions.c        |    2 +-
 nautilus-actions/private/Makefile.am              |    1 -
 nautilus-actions/private/na-object-action.c       |    3 +-
 nautilus-actions/private/na-object-id.c           |    3 +-
 nautilus-actions/private/na-object-item.c         |    3 +-
 nautilus-actions/private/na-object-menu.c         |    3 +-
 nautilus-actions/private/na-object-profile.c      |    3 +-
 nautilus-actions/private/na-object.c              |    3 +-
 nautilus-actions/runtime/na-gconf-provider.c      |    2 +-
 nautilus-actions/runtime/na-io-provider.c         |    3 +-
 nautilus-actions/runtime/na-pivot.c               |    2 +-
 nautilus-actions/runtime/na-xml-writer.c          |    2 +-
 nautilus-actions/utils/nautilus-actions-new.c     |    3 +-
 32 files changed, 84 insertions(+), 43 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 447ab5b..bbc2c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,42 @@
 2009-11-18 Pierre Wieser <pwieser trychlos org>
 
+	Move private/na-object-api.h to private/.
+
+	* nautilus-actions/private/na-object-api.h:
+	Moved to private/.
+
+	* nautilus-actions/api/Makefile.am:
+	* nautilus-actions/nact/nact-assistant-export-ask.c:
+	* nautilus-actions/nact/nact-assistant-export.c:
+	* nautilus-actions/nact/nact-assistant-import-ask.c:
+	* nautilus-actions/nact/nact-assistant-import.c:
+	* nautilus-actions/nact/nact-clipboard.c:
+	* nautilus-actions/nact/nact-iaction-tab.c:
+	* nautilus-actions/nact/nact-iactions-list.c:
+	* nautilus-actions/nact/nact-iadvanced-tab.c:
+	* nautilus-actions/nact/nact-ibackground-tab.c:
+	* nautilus-actions/nact/nact-icommand-tab.c:
+	* nautilus-actions/nact/nact-iconditions-tab.c:
+	* nautilus-actions/nact/nact-main-menubar.c:
+	* nautilus-actions/nact/nact-main-window.c:
+	* nautilus-actions/nact/nact-tree-model.c:
+	* nautilus-actions/nact/nact-window.c:
+	* nautilus-actions/nact/nact-xml-reader.c:
+	* nautilus-actions/plugin/nautilus-actions.c:
+	* nautilus-actions/private/Makefile.am:
+	* nautilus-actions/private/na-object-action.c:
+	* nautilus-actions/private/na-object-id.c:
+	* nautilus-actions/private/na-object-item.c:
+	* nautilus-actions/private/na-object-menu.c:
+	* nautilus-actions/private/na-object-profile.c:
+	* nautilus-actions/private/na-object.c:
+	* nautilus-actions/runtime/na-gconf-provider.c:
+	* nautilus-actions/runtime/na-io-provider.c:
+	* nautilus-actions/runtime/na-pivot.c:
+	* nautilus-actions/runtime/na-xml-writer.c:
+	* nautilus-actions/utils/nautilus-actions-new.c:
+	Updated accordingly.
+
 	Move na-xml-* to runtime library, thus removing common/.
 
 	* nautilus-actions/common/na-xml-names.h:
diff --git a/nautilus-actions/api/Makefile.am b/nautilus-actions/api/Makefile.am
index 7315414..e0e1bcc 100644
--- a/nautilus-actions/api/Makefile.am
+++ b/nautilus-actions/api/Makefile.am
@@ -40,6 +40,7 @@ libna_api_include_HEADERS = \
 	na-api.h											\
 	na-gconf-keys.h										\
 	na-iio-provider.h									\
+	na-object-api.h										\
 	$(NULL)
 
 libna_api_la_SOURCES = \
diff --git a/nautilus-actions/private/na-object-api.h b/nautilus-actions/api/na-object-api.h
similarity index 91%
rename from nautilus-actions/private/na-object-api.h
rename to nautilus-actions/api/na-object-api.h
index cf80adb..01aa7cc 100644
--- a/nautilus-actions/private/na-object-api.h
+++ b/nautilus-actions/api/na-object-api.h
@@ -28,27 +28,25 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_API_H__
-#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_API_H__
+#ifndef __NAUTILUS_ACTIONS_NA_OBJECT_API_H__
+#define __NAUTILUS_ACTIONS_NA_OBJECT_API_H__
 
 /**
  * SECTION: na_object
  * @short_description: #NAObject public API.
- * @include: nautilus-actions/private/na-object-api.h
+ * @include: nautilus-actions/api/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
  * are casted directly in the macro.
- *
- * Only define here the API which is relevant in libna-runtime library.
  */
 
-#include "na-object-fn.h"
-#include "na-object-id-fn.h"
-#include "na-object-item-fn.h"
-#include "na-object-menu-fn.h"
-#include "na-object-action-fn.h"
-#include "na-object-profile-fn.h"
+#include <nautilus-actions/private/na-object-fn.h>
+#include <nautilus-actions/private/na-object-id-fn.h>
+#include <nautilus-actions/private/na-object-item-fn.h>
+#include <nautilus-actions/private/na-object-menu-fn.h>
+#include <nautilus-actions/private/na-object-action-fn.h>
+#include <nautilus-actions/private/na-object-profile-fn.h>
 
 G_BEGIN_DECLS
 
@@ -115,4 +113,4 @@ G_BEGIN_DECLS
 
 G_END_DECLS
 
-#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_API_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_OBJECT_API_H__ */
diff --git a/nautilus-actions/nact/nact-assistant-export-ask.c b/nautilus-actions/nact/nact-assistant-export-ask.c
index 9a4e2cf..6d78329 100644
--- a/nautilus-actions/nact/nact-assistant-export-ask.c
+++ b/nautilus-actions/nact/nact-assistant-export-ask.c
@@ -34,7 +34,7 @@
 
 #include <glib/gi18n.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-pivot.h>
diff --git a/nautilus-actions/nact/nact-assistant-export.c b/nautilus-actions/nact/nact-assistant-export.c
index 192c686..3ba32fb 100644
--- a/nautilus-actions/nact/nact-assistant-export.c
+++ b/nautilus-actions/nact/nact-assistant-export.c
@@ -36,7 +36,8 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
+
 #include <private/na-iduplicable.h>
 
 #include <runtime/na-iprefs.h>
diff --git a/nautilus-actions/nact/nact-assistant-import-ask.c b/nautilus-actions/nact/nact-assistant-import-ask.c
index dfbd348..0469868 100644
--- a/nautilus-actions/nact/nact-assistant-import-ask.c
+++ b/nautilus-actions/nact/nact-assistant-import-ask.c
@@ -34,7 +34,7 @@
 
 #include <glib/gi18n.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-pivot.h>
diff --git a/nautilus-actions/nact/nact-assistant-import.c b/nautilus-actions/nact/nact-assistant-import.c
index c8b78a7..73c30d9 100644
--- a/nautilus-actions/nact/nact-assistant-import.c
+++ b/nautilus-actions/nact/nact-assistant-import.c
@@ -37,7 +37,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-pivot.h>
diff --git a/nautilus-actions/nact/nact-clipboard.c b/nautilus-actions/nact/nact-clipboard.c
index bd3cc44..8f00eaf 100644
--- a/nautilus-actions/nact/nact-clipboard.c
+++ b/nautilus-actions/nact/nact-clipboard.c
@@ -35,7 +35,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-pivot.h>
diff --git a/nautilus-actions/nact/nact-iaction-tab.c b/nautilus-actions/nact/nact-iaction-tab.c
index e4c8571..b2336ad 100644
--- a/nautilus-actions/nact/nact-iaction-tab.c
+++ b/nautilus-actions/nact/nact-iaction-tab.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include "base-window.h"
 #include "nact-application.h"
diff --git a/nautilus-actions/nact/nact-iactions-list.c b/nautilus-actions/nact/nact-iactions-list.c
index 537d4c1..a9c1b5f 100644
--- a/nautilus-actions/nact/nact-iactions-list.c
+++ b/nautilus-actions/nact/nact-iactions-list.c
@@ -35,7 +35,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
+
 #include <private/na-iduplicable.h>
 
 #include "nact-application.h"
diff --git a/nautilus-actions/nact/nact-iadvanced-tab.c b/nautilus-actions/nact/nact-iadvanced-tab.c
index 5f21744..adbbc65 100644
--- a/nautilus-actions/nact/nact-iadvanced-tab.c
+++ b/nautilus-actions/nact/nact-iadvanced-tab.c
@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-utils.h>
 
diff --git a/nautilus-actions/nact/nact-ibackground-tab.c b/nautilus-actions/nact/nact-ibackground-tab.c
index 0661a49..74ac616 100644
--- a/nautilus-actions/nact/nact-ibackground-tab.c
+++ b/nautilus-actions/nact/nact-ibackground-tab.c
@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-pivot.h>
diff --git a/nautilus-actions/nact/nact-icommand-tab.c b/nautilus-actions/nact/nact-icommand-tab.c
index df5449b..6cf11bb 100644
--- a/nautilus-actions/nact/nact-icommand-tab.c
+++ b/nautilus-actions/nact/nact-icommand-tab.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-pivot.h>
diff --git a/nautilus-actions/nact/nact-iconditions-tab.c b/nautilus-actions/nact/nact-iconditions-tab.c
index 0213616..78ec16e 100644
--- a/nautilus-actions/nact/nact-iconditions-tab.c
+++ b/nautilus-actions/nact/nact-iconditions-tab.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-utils.h>
 
diff --git a/nautilus-actions/nact/nact-main-menubar.c b/nautilus-actions/nact/nact-main-menubar.c
index b589659..c3df99b 100644
--- a/nautilus-actions/nact/nact-main-menubar.c
+++ b/nautilus-actions/nact/nact-main-menubar.c
@@ -34,7 +34,7 @@
 
 #include <glib/gi18n.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iabout.h>
 #include <runtime/na-iprefs.h>
diff --git a/nautilus-actions/nact/nact-main-window.c b/nautilus-actions/nact/nact-main-window.c
index 93aa188..9f69843 100644
--- a/nautilus-actions/nact/nact-main-window.c
+++ b/nautilus-actions/nact/nact-main-window.c
@@ -37,7 +37,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iabout.h>
 #include <runtime/na-ipivot-consumer.h>
diff --git a/nautilus-actions/nact/nact-tree-model.c b/nautilus-actions/nact/nact-tree-model.c
index 15724a8..e521b84 100644
--- a/nautilus-actions/nact/nact-tree-model.c
+++ b/nautilus-actions/nact/nact-tree-model.c
@@ -34,7 +34,7 @@
 
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-utils.h>
diff --git a/nautilus-actions/nact/nact-window.c b/nautilus-actions/nact/nact-window.c
index 0f7ec00..5436e8c 100644
--- a/nautilus-actions/nact/nact-window.c
+++ b/nautilus-actions/nact/nact-window.c
@@ -37,7 +37,7 @@
 
 #include <api/na-iio-provider.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-utils.h>
diff --git a/nautilus-actions/nact/nact-xml-reader.c b/nautilus-actions/nact/nact-xml-reader.c
index 0b4fdae..152b407 100644
--- a/nautilus-actions/nact/nact-xml-reader.c
+++ b/nautilus-actions/nact/nact-xml-reader.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-gconf-provider-keys.h>
 #include <runtime/na-gconf-utils.h>
diff --git a/nautilus-actions/plugin/nautilus-actions.c b/nautilus-actions/plugin/nautilus-actions.c
index 8080b6a..abb0820 100644
--- a/nautilus-actions/plugin/nautilus-actions.c
+++ b/nautilus-actions/plugin/nautilus-actions.c
@@ -38,7 +38,7 @@
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-pivot.h>
 #include <runtime/na-iabout.h>
diff --git a/nautilus-actions/private/Makefile.am b/nautilus-actions/private/Makefile.am
index a9c5bb8..d215f6f 100644
--- a/nautilus-actions/private/Makefile.am
+++ b/nautilus-actions/private/Makefile.am
@@ -40,7 +40,6 @@ 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						\
diff --git a/nautilus-actions/private/na-object-action.c b/nautilus-actions/private/na-object-action.c
index 24986b7..238a7ac 100644
--- a/nautilus-actions/private/na-object-action.c
+++ b/nautilus-actions/private/na-object-action.c
@@ -34,10 +34,11 @@
 
 #include <string.h>
 
+#include <api/na-object-api.h>
+
 #include <runtime/na-utils.h>
 
 #include "na-iduplicable.h"
-#include "na-object-api.h"
 #include "na-object-action-priv.h"
 
 /* private class data
diff --git a/nautilus-actions/private/na-object-id.c b/nautilus-actions/private/na-object-id.c
index cc44892..9e303be 100644
--- a/nautilus-actions/private/na-object-id.c
+++ b/nautilus-actions/private/na-object-id.c
@@ -35,8 +35,9 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
+#include <api/na-object-api.h>
+
 #include "na-iduplicable.h"
-#include "na-object-api.h"
 #include "na-object-id-priv.h"
 
 /* private class data
diff --git a/nautilus-actions/private/na-object-item.c b/nautilus-actions/private/na-object-item.c
index a1c0e63..95199a5 100644
--- a/nautilus-actions/private/na-object-item.c
+++ b/nautilus-actions/private/na-object-item.c
@@ -35,10 +35,11 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
+#include <api/na-object-api.h>
+
 #include <runtime/na-utils.h>
 
 #include "na-iduplicable.h"
-#include "na-object-api.h"
 #include "na-object-item-priv.h"
 
 /* private class data
diff --git a/nautilus-actions/private/na-object-menu.c b/nautilus-actions/private/na-object-menu.c
index 8e39571..3eb7c11 100644
--- a/nautilus-actions/private/na-object-menu.c
+++ b/nautilus-actions/private/na-object-menu.c
@@ -32,9 +32,10 @@
 #include <config.h>
 #endif
 
+#include <api/na-object-api.h>
+
 #include <runtime/na-utils.h>
 
-#include "na-object-api.h"
 #include "na-iduplicable.h"
 #include "na-object-menu-priv.h"
 
diff --git a/nautilus-actions/private/na-object-profile.c b/nautilus-actions/private/na-object-profile.c
index 9d5cfab..00e1801 100644
--- a/nautilus-actions/private/na-object-profile.c
+++ b/nautilus-actions/private/na-object-profile.c
@@ -36,10 +36,11 @@
 
 #include <libnautilus-extension/nautilus-file-info.h>
 
+#include <api/na-object-api.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"
 
diff --git a/nautilus-actions/private/na-object.c b/nautilus-actions/private/na-object.c
index 0ea6c93..8da6909 100644
--- a/nautilus-actions/private/na-object.c
+++ b/nautilus-actions/private/na-object.c
@@ -34,7 +34,8 @@
 
 #include <string.h>
 
-#include "na-object-api.h"
+#include <api/na-object-api.h>
+
 #include "na-iduplicable.h"
 #include "na-object-priv.h"
 
diff --git a/nautilus-actions/runtime/na-gconf-provider.c b/nautilus-actions/runtime/na-gconf-provider.c
index ad0c1ba..55c7e4e 100644
--- a/nautilus-actions/runtime/na-gconf-provider.c
+++ b/nautilus-actions/runtime/na-gconf-provider.c
@@ -34,7 +34,7 @@
 
 #include <string.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include "na-gconf-monitor.h"
 #include "na-gconf-provider.h"
diff --git a/nautilus-actions/runtime/na-io-provider.c b/nautilus-actions/runtime/na-io-provider.c
index 4d67a59..824741b 100644
--- a/nautilus-actions/runtime/na-io-provider.c
+++ b/nautilus-actions/runtime/na-io-provider.c
@@ -35,8 +35,7 @@
 #include <string.h>
 
 #include <api/na-iio-provider.h>
-
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include "na-io-provider.h"
 #include "na-iprefs.h"
diff --git a/nautilus-actions/runtime/na-pivot.c b/nautilus-actions/runtime/na-pivot.c
index de18840..9bb3469 100644
--- a/nautilus-actions/runtime/na-pivot.c
+++ b/nautilus-actions/runtime/na-pivot.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include "na-io-provider.h"
 #include "na-gconf-monitor.h"
diff --git a/nautilus-actions/runtime/na-xml-writer.c b/nautilus-actions/runtime/na-xml-writer.c
index f1a4d6b..c6298d4 100644
--- a/nautilus-actions/runtime/na-xml-writer.c
+++ b/nautilus-actions/runtime/na-xml-writer.c
@@ -35,7 +35,7 @@
 #include <gio/gio.h>
 #include <libxml/tree.h>
 
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-gconf-provider-keys.h>
 #include <runtime/na-iprefs.h>
diff --git a/nautilus-actions/utils/nautilus-actions-new.c b/nautilus-actions/utils/nautilus-actions-new.c
index 47e1d4f..de3832c 100644
--- a/nautilus-actions/utils/nautilus-actions-new.c
+++ b/nautilus-actions/utils/nautilus-actions-new.c
@@ -37,8 +37,7 @@
 #include <stdlib.h>
 
 #include <api/na-iio-provider.h>
-
-#include <private/na-object-api.h>
+#include <api/na-object-api.h>
 
 #include <runtime/na-gconf-provider.h>
 #include <runtime/na-io-provider.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]