[nautilus-actions: 14/30] Move runtime/na-gconf-monitor.{c,h} to API
- From: Pierre Wieser <pwieser src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [nautilus-actions: 14/30] Move runtime/na-gconf-monitor.{c,h} to API
- Date: Sat, 21 Nov 2009 18:02:26 +0000 (UTC)
commit 29b1a6c7d33ff9b270b67d3dae97a6e707fb8d28
Author: Pierre Wieser <pwieser trychlos org>
Date: Thu Nov 19 00:32:28 2009 +0100
Move runtime/na-gconf-monitor.{c,h} to API
ChangeLog | 12 ++++++++++++
nautilus-actions/api/Makefile.am | 2 ++
.../{runtime => api}/na-gconf-monitor.c | 0
.../{runtime => api}/na-gconf-monitor.h | 8 ++++----
nautilus-actions/runtime/Makefile.am | 2 --
nautilus-actions/runtime/na-gconf-provider.c | 2 +-
nautilus-actions/runtime/na-pivot.c | 2 +-
7 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bbc2c44..291c602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2009-11-18 Pierre Wieser <pwieser trychlos org>
+ Move runtime/na-gconf-monitor.{c,h} to api/.
+
+ * nautilus-actions/runtime/na-gconf-monitor.c:
+ * nautilus-actions/runtime/na-gconf-monitor.h:
+ Moved to api/, thus removed from runtime/.
+
+ * nautilus-actions/api/Makefile.am:
+ * nautilus-actions/runtime/Makefile.am:
+ * nautilus-actions/runtime/na-gconf-provider.c:
+ * nautilus-actions/runtime/na-pivot.c:
+ Upated accordingly.
+
Move private/na-object-api.h to private/.
* nautilus-actions/private/na-object-api.h:
diff --git a/nautilus-actions/api/Makefile.am b/nautilus-actions/api/Makefile.am
index e0e1bcc..90a0f85 100644
--- a/nautilus-actions/api/Makefile.am
+++ b/nautilus-actions/api/Makefile.am
@@ -39,11 +39,13 @@ libna_api_includedir = $(pkgincludedir)/api
libna_api_include_HEADERS = \
na-api.h \
na-gconf-keys.h \
+ na-gconf-monitor.h \
na-iio-provider.h \
na-object-api.h \
$(NULL)
libna_api_la_SOURCES = \
+ na-gconf-monitor.c \
na-iio-provider.c \
$(NULL)
diff --git a/nautilus-actions/runtime/na-gconf-monitor.c b/nautilus-actions/api/na-gconf-monitor.c
similarity index 100%
rename from nautilus-actions/runtime/na-gconf-monitor.c
rename to nautilus-actions/api/na-gconf-monitor.c
diff --git a/nautilus-actions/runtime/na-gconf-monitor.h b/nautilus-actions/api/na-gconf-monitor.h
similarity index 93%
rename from nautilus-actions/runtime/na-gconf-monitor.h
rename to nautilus-actions/api/na-gconf-monitor.h
index 8ae31b7..5393a95 100644
--- a/nautilus-actions/runtime/na-gconf-monitor.h
+++ b/nautilus-actions/api/na-gconf-monitor.h
@@ -28,13 +28,13 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NA_RUNTIME_GCONF_MONITOR_H__
-#define __NA_RUNTIME_GCONF_MONITOR_H__
+#ifndef __NAUTILUS_ACTIONS_NA_GCONF_MONITOR_H__
+#define __NAUTILUS_ACTIONS_NA_GCONF_MONITOR_H__
/**
* SECTION: na_gconf_monitor
* @short_description: #NAGConfMonitor class definition.
- * @include: runtime/na-gconf-monitor.h
+ * @include: nautilus-actions/api/na-gconf-monitor.h
*
* This class manages the GConf monitoring.
* It is used to monitor both the GConf provider and the GConf runtime
@@ -76,4 +76,4 @@ void na_gconf_monitor_release_monitors( GList *monitors );
G_END_DECLS
-#endif /* __NA_RUNTIME_GCONF_MONITOR_MONITOR_H__ */
+#endif /* __NAUTILUS_ACTIONS_NA_GCONF_MONITOR_H__ */
diff --git a/nautilus-actions/runtime/Makefile.am b/nautilus-actions/runtime/Makefile.am
index de914ce..4b20618 100644
--- a/nautilus-actions/runtime/Makefile.am
+++ b/nautilus-actions/runtime/Makefile.am
@@ -38,8 +38,6 @@ AM_CPPFLAGS += \
$(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 \
diff --git a/nautilus-actions/runtime/na-gconf-provider.c b/nautilus-actions/runtime/na-gconf-provider.c
index 55c7e4e..d9369de 100644
--- a/nautilus-actions/runtime/na-gconf-provider.c
+++ b/nautilus-actions/runtime/na-gconf-provider.c
@@ -35,8 +35,8 @@
#include <string.h>
#include <api/na-object-api.h>
+#include <api/na-gconf-monitor.h>
-#include "na-gconf-monitor.h"
#include "na-gconf-provider.h"
#include "na-gconf-provider-keys.h"
#include "na-gconf-utils.h"
diff --git a/nautilus-actions/runtime/na-pivot.c b/nautilus-actions/runtime/na-pivot.c
index 9bb3469..e8c28a7 100644
--- a/nautilus-actions/runtime/na-pivot.c
+++ b/nautilus-actions/runtime/na-pivot.c
@@ -36,9 +36,9 @@
#include <uuid/uuid.h>
#include <api/na-object-api.h>
+#include <api/na-gconf-monitor.h>
#include "na-io-provider.h"
-#include "na-gconf-monitor.h"
#include "na-gconf-provider.h"
#include "na-iprefs.h"
#include "na-module.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]