GNOME.org
 

[nautilus-actions: 11/30] Move na-xml-* to runtime library, thus removing common/ directory

commit 3a44de5a3e1c391bd175341dd885e1d0e071e870
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Nov 18 23:54:36 2009 +0100

    Move na-xml-* to runtime library, thus removing common/ directory

 ChangeLog                                         |   24 +
 configure.ac                                      |    1 -
 m4/na-log-domains.m4                              |   15 +-
 nautilus-actions/Makefile.am                      |    1 -
 nautilus-actions/common/na-xml-names.h            |  191 ----
 nautilus-actions/common/na-xml-writer.c           | 1072 ---------------------
 nautilus-actions/common/na-xml-writer.h           |   81 --
 nautilus-actions/nact/Makefile.am                 |    2 -
 nautilus-actions/nact/nact-assistant-export.c     |    5 +-
 nautilus-actions/nact/nact-clipboard.c            |    5 +-
 nautilus-actions/nact/nact-main.c                 |    2 +-
 nautilus-actions/nact/nact-tree-model.c           |    3 +-
 nautilus-actions/nact/nact-xml-reader.c           |    3 +-
 nautilus-actions/runtime/Makefile.am              |   64 +-
 nautilus-actions/runtime/README                   |    8 +-
 nautilus-actions/utils/Makefile.am                |    2 -
 nautilus-actions/utils/console-utils.c            |    2 +-
 nautilus-actions/utils/nautilus-actions-new.c     |    5 +-
 nautilus-actions/utils/nautilus-actions-schemas.c |    5 +-
 po/POTFILES.in                                    |    2 +-
 20 files changed, 80 insertions(+), 1413 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ecd8acb..447ab5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 2009-11-18 Pierre Wieser <pwieser trychlos org>
 
+	Move na-xml-* to runtime library, thus removing common/.
+
+	* nautilus-actions/common/na-xml-names.h:
+	* nautilus-actions/common/na-xml-writer.c:
+	* nautilus-actions/common/na-xml-writer.h:
+	Moved to runtime/ directory, thus removed from common.
+
+	* configure.ac:
+	* m4/na-log-domains.m4:
+	* nautilus-actions/Makefile.am:
+	* nautilus-actions/nact/Makefile.am:
+	* nautilus-actions/nact/nact-assistant-export.c:
+	* nautilus-actions/nact/nact-clipboard.c:
+	* nautilus-actions/nact/nact-main.c:
+	* nautilus-actions/nact/nact-tree-model.c:
+	* nautilus-actions/nact/nact-xml-reader.c:
+	* nautilus-actions/runtime/Makefile.am:
+	* nautilus-actions/runtime/README:
+	* nautilus-actions/utils/Makefile.am:
+	* nautilus-actions/utils/console-utils.c:
+	* nautilus-actions/utils/nautilus-actions-new.c:
+	* nautilus-actions/utils/nautilus-actions-schemas.c:
+	* po/POTFILES.in: Updated accordingly.
+
 	Merge common/na-utils.{c,h} into runtime/na-utils.{c,h}.
 
 	* nautilus-actions/common/na-utils.c:
diff --git a/configure.ac b/configure.ac
index 3ebd0e2..e57b119 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,6 @@ AC_CONFIG_FILES([
 	icons/scalable/Makefile
 	nautilus-actions/Makefile
 	nautilus-actions/api/Makefile
-	nautilus-actions/common/Makefile
 	nautilus-actions/nact/Makefile
 	nautilus-actions/plugin/Makefile
 	nautilus-actions/private/Makefile
diff --git a/m4/na-log-domains.m4 b/m4/na-log-domains.m4
index 24f9265..29559d4 100644
--- a/m4/na-log-domains.m4
+++ b/m4/na-log-domains.m4
@@ -8,21 +8,18 @@ AC_DEFUN([NA_LOG_DOMAINS],[
 	AC_SUBST([NA_LOGDOMAIN_API],[NA-api])
 	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_API],["NA-api"],[Log domain of API library])
 
+	AC_SUBST([NA_LOGDOMAIN_NACT],[NA-nact])
+	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_NACT],["NA-nact"],[Log domain of NACT user interface])
+
+	AC_SUBST([NA_LOGDOMAIN_PLUGIN],[NA-plugin])
+	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_PLUGIN],["NA-plugin"],[Log domain of Nautilus plugin])
+
 	AC_SUBST([NA_LOGDOMAIN_PRIVATE],[NA-private])
 	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_PRIVATE],["NA-private"],[Log domain of private library])
 
 	AC_SUBST([NA_LOGDOMAIN_RUNTIME],[NA-runtime])
 	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_RUNTIME],["NA-runtime"],[Log domain of runtime library])
 
-	AC_SUBST([NA_LOGDOMAIN_COMMON],[NA-common])
-	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_COMMON],["NA-common"],[Log domain of common library])
-
-	AC_SUBST([NA_LOGDOMAIN_PLUGIN],[NA-plugin])
-	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_PLUGIN],["NA-plugin"],[Log domain of Nautilus plugin])
-
-	AC_SUBST([NA_LOGDOMAIN_NACT],[NA-nact])
-	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_NACT],["NA-nact"],[Log domain of NACT user interface])
-
 	AC_SUBST([NA_LOGDOMAIN_TEST],[NA-test])
 	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_TEST],["NA-test"],[Log domain of test programs])
 
diff --git a/nautilus-actions/Makefile.am b/nautilus-actions/Makefile.am
index dc1ec32..d503dcd 100644
--- a/nautilus-actions/Makefile.am
+++ b/nautilus-actions/Makefile.am
@@ -28,7 +28,6 @@
 
 SUBDIRS = \
 	api							\
-	common						\
 	private						\
 	runtime						\
 	nact						\
diff --git a/nautilus-actions/nact/Makefile.am b/nautilus-actions/nact/Makefile.am
index 843940d..74fa0cb 100644
--- a/nautilus-actions/nact/Makefile.am
+++ b/nautilus-actions/nact/Makefile.am
@@ -113,8 +113,6 @@ nact-marshal.c: nact-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --body --prefix=nact_marshal >> $@
 
 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)									\
diff --git a/nautilus-actions/nact/nact-assistant-export.c b/nautilus-actions/nact/nact-assistant-export.c
index af0b2a6..192c686 100644
--- a/nautilus-actions/nact/nact-assistant-export.c
+++ b/nautilus-actions/nact/nact-assistant-export.c
@@ -36,15 +36,14 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <common/na-xml-names.h>
-#include <common/na-xml-writer.h>
-
 #include <private/na-object-api.h>
 #include <private/na-iduplicable.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-pivot.h>
 #include <runtime/na-utils.h>
+#include <runtime/na-xml-names.h>
+#include <runtime/na-xml-writer.h>
 
 #include "base-iprefs.h"
 #include "nact-application.h"
diff --git a/nautilus-actions/nact/nact-clipboard.c b/nautilus-actions/nact/nact-clipboard.c
index f66f162..bd3cc44 100644
--- a/nautilus-actions/nact/nact-clipboard.c
+++ b/nautilus-actions/nact/nact-clipboard.c
@@ -35,14 +35,13 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <common/na-xml-names.h>
-#include <common/na-xml-writer.h>
-
 #include <private/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-pivot.h>
 #include <runtime/na-utils.h>
+#include <runtime/na-xml-names.h>
+#include <runtime/na-xml-writer.h>
 
 #include "nact-application.h"
 #include "nact-assistant-export-ask.h"
diff --git a/nautilus-actions/nact/nact-main.c b/nautilus-actions/nact/nact-main.c
index 22eb33b..77f29b7 100644
--- a/nautilus-actions/nact/nact-main.c
+++ b/nautilus-actions/nact/nact-main.c
@@ -43,7 +43,7 @@ main( int argc, char *argv[] )
 	int ret;
 
 	g_log_set_handler( NA_LOGDOMAIN_NACT, G_LOG_LEVEL_DEBUG, na_log_handler, NULL );
-	g_log_set_handler( NA_LOGDOMAIN_COMMON, G_LOG_LEVEL_DEBUG, na_log_handler, NULL );
+	g_log_set_handler( NA_LOGDOMAIN_PRIVATE, G_LOG_LEVEL_DEBUG, na_log_handler, NULL );
 	g_log_set_handler( NA_LOGDOMAIN_RUNTIME, G_LOG_LEVEL_DEBUG, na_log_handler, NULL );
 
 	app = nact_application_new_with_args( argc, argv );
diff --git a/nautilus-actions/nact/nact-tree-model.c b/nautilus-actions/nact/nact-tree-model.c
index 102881b..15724a8 100644
--- a/nautilus-actions/nact/nact-tree-model.c
+++ b/nautilus-actions/nact/nact-tree-model.c
@@ -34,12 +34,11 @@
 
 #include <string.h>
 
-#include <common/na-xml-writer.h>
-
 #include <private/na-object-api.h>
 
 #include <runtime/na-iprefs.h>
 #include <runtime/na-utils.h>
+#include <runtime/na-xml-writer.h>
 
 #include "egg-tree-multi-dnd.h"
 #include "nact-application.h"
diff --git a/nautilus-actions/nact/nact-xml-reader.c b/nautilus-actions/nact/nact-xml-reader.c
index 25e5f42..0b4fdae 100644
--- a/nautilus-actions/nact/nact-xml-reader.c
+++ b/nautilus-actions/nact/nact-xml-reader.c
@@ -38,14 +38,13 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
-#include <common/na-xml-names.h>
-
 #include <private/na-object-api.h>
 
 #include <runtime/na-gconf-provider-keys.h>
 #include <runtime/na-gconf-utils.h>
 #include <runtime/na-iprefs.h>
 #include <runtime/na-utils.h>
+#include <runtime/na-xml-names.h>
 
 #include "nact-application.h"
 #include "nact-main-window.h"
diff --git a/nautilus-actions/runtime/Makefile.am b/nautilus-actions/runtime/Makefile.am
index 24718dd..de914ce 100644
--- a/nautilus-actions/runtime/Makefile.am
+++ b/nautilus-actions/runtime/Makefile.am
@@ -29,44 +29,48 @@
 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}\"	\
-	$(NAUTILUS_ACTIONS_CFLAGS)					\
+	-I $(top_srcdir)											\
+	-I $(top_srcdir)/nautilus-actions							\
+	-DPKGLIBDIR=\""$(pkglibdir)"\"								\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"					\
+	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_RUNTIME}\"					\
+	$(NAUTILUS_ACTIONS_CFLAGS)									\
 	$(NULL)
 
 libna_runtime_la_SOURCES = \
-	na-gconf-monitor.c							\
-	na-gconf-monitor.h							\
-	na-gconf-provider.c							\
-	na-gconf-provider.h							\
-	na-gconf-provider-keys.h					\
-	na-gconf-utils.c							\
-	na-gconf-utils.h							\
-	na-iabout.c									\
-	na-iabout.h									\
-	na-io-provider.c							\
-	na-io-provider.h							\
-	na-ipivot-consumer.c						\
-	na-ipivot-consumer.h						\
-	na-iprefs.c									\
-	na-iprefs.h									\
-	na-module.c									\
-	na-module.h									\
-	na-pivot.c									\
-	na-pivot.h									\
-	na-utils.c									\
-	na-utils.h									\
+	na-gconf-monitor.c											\
+	na-gconf-monitor.h											\
+	na-gconf-provider.c											\
+	na-gconf-provider.h											\
+	na-gconf-provider-keys.h									\
+	na-gconf-utils.c											\
+	na-gconf-utils.h											\
+	na-iabout.c													\
+	na-iabout.h													\
+	na-io-provider.c											\
+	na-io-provider.h											\
+	na-ipivot-consumer.c										\
+	na-ipivot-consumer.h										\
+	na-iprefs.c													\
+	na-iprefs.h													\
+	na-module.c													\
+	na-module.h													\
+	na-pivot.c													\
+	na-pivot.h													\
+	na-utils.c													\
+	na-utils.h													\
+	na-xml-names.h												\
+	na-xml-writer.c												\
+	na-xml-writer.h												\
 	$(NULL)
 
 libna_runtime_la_LIBADD = \
+	-L$(top_builddir)/nautilus-actions/api		-lna-api		\
 	$(NULL)
 
 VERSION_INFO = 1:0:0
 libna_runtime_la_LDFLAGS = \
-	-module										\
-	-no-undefined								\
-	-version-number $(VERSION_INFO)				\
+	-module														\
+	-no-undefined												\
+	-version-number $(VERSION_INFO)								\
 	$(NULL)
diff --git a/nautilus-actions/runtime/README b/nautilus-actions/runtime/README
index 6a0dd15..6ac1b9b 100644
--- a/nautilus-actions/runtime/README
+++ b/nautilus-actions/runtime/README
@@ -1,6 +1,4 @@
-This is a runtime convenience library linked against the plugin.
+This is the runtime dynamic library for Nautilus-Actions.
 
-in order to keep the plugin as light as possible, thus with as less as
-possible bugs, and, if any, as easy as possible to fix, please only put
-here code which is used by the plugin, and shared by some other part of
-the package.
+Come here which is not in the API nor in private, but should yet be
+shared between several N-A components.
diff --git a/nautilus-actions/utils/Makefile.am b/nautilus-actions/utils/Makefile.am
index cecfd81..ced80bf 100644
--- a/nautilus-actions/utils/Makefile.am
+++ b/nautilus-actions/utils/Makefile.am
@@ -46,7 +46,6 @@ nautilus_actions_new_SOURCES = \
 	$(NULL)
 
 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	\
@@ -60,7 +59,6 @@ nautilus_actions_schemas_SOURCES = \
 	$(NULL)
 
 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	\
diff --git a/nautilus-actions/utils/console-utils.c b/nautilus-actions/utils/console-utils.c
index 1c53879..316920b 100644
--- a/nautilus-actions/utils/console-utils.c
+++ b/nautilus-actions/utils/console-utils.c
@@ -49,7 +49,7 @@ static void log_handler( const gchar *log_domain, GLogLevelFlags log_level, cons
 void
 console_init_log_handler( void )
 {
-	g_log_set_handler( NA_LOGDOMAIN_COMMON, G_LOG_LEVEL_DEBUG, log_handler, NULL );
+	g_log_set_handler( NA_LOGDOMAIN_PRIVATE, G_LOG_LEVEL_DEBUG, log_handler, NULL );
 	g_log_set_handler( NA_LOGDOMAIN_RUNTIME, G_LOG_LEVEL_DEBUG, log_handler, NULL );
 	g_log_set_handler( NA_LOGDOMAIN_UTILS, G_LOG_LEVEL_DEBUG, log_handler, NULL );
 }
diff --git a/nautilus-actions/utils/nautilus-actions-new.c b/nautilus-actions/utils/nautilus-actions-new.c
index 46eb39a..47e1d4f 100644
--- a/nautilus-actions/utils/nautilus-actions-new.c
+++ b/nautilus-actions/utils/nautilus-actions-new.c
@@ -38,15 +38,14 @@
 
 #include <api/na-iio-provider.h>
 
-#include <common/na-xml-names.h>
-#include <common/na-xml-writer.h>
-
 #include <private/na-object-api.h>
 
 #include <runtime/na-gconf-provider.h>
 #include <runtime/na-io-provider.h>
 #include <runtime/na-iprefs.h>
 #include <runtime/na-utils.h>
+#include <runtime/na-xml-names.h>
+#include <runtime/na-xml-writer.h>
 
 #include "console-utils.h"
 
diff --git a/nautilus-actions/utils/nautilus-actions-schemas.c b/nautilus-actions/utils/nautilus-actions-schemas.c
index ba1d7b4..7253458 100644
--- a/nautilus-actions/utils/nautilus-actions-schemas.c
+++ b/nautilus-actions/utils/nautilus-actions-schemas.c
@@ -38,11 +38,10 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 
-#include <common/na-xml-names.h>
-#include <common/na-xml-writer.h>
-
 #include <runtime/na-iprefs.h>
 #include <runtime/na-utils.h>
+#include <runtime/na-xml-names.h>
+#include <runtime/na-xml-writer.h>
 
 #include "console-utils.h"
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 66f5e82..d2bcd0a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,4 @@
 data/nautilus-actions.schemas.in
-nautilus-actions/common/na-xml-names.h
 nautilus-actions/nact/base-application.c
 nautilus-actions/nact/base-assistant.c
 nautilus-actions/nact/base-window.c
@@ -28,6 +27,7 @@ nautilus-actions/private/na-object-id.c
 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-xml-names.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]