[nautilus-actions] Homogeneize core and nact marshalling
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Homogeneize core and nact marshalling
- Date: Thu, 3 Feb 2011 00:51:10 +0000 (UTC)
commit 175c9f6d9e9ff249fe75e601cf608ea579a51d96
Author: Pierre Wieser <pwieser trychlos org>
Date: Wed Feb 2 20:54:48 2011 +0100
Homogeneize core and nact marshalling
ChangeLog | 12 +++++++++++
src/core/Makefile.am | 33 ++++++++++++++++--------------
src/core/{na-marshal => na-marshal.def} | 2 +-
src/nact/Makefile.am | 8 +++---
src/nact/nact-iactions-list.c | 4 +-
src/nact/nact-main-window.c | 2 +-
src/nact/nact-marshal.def | 8 +++++++
src/nact/nact-marshal.list | 3 --
8 files changed, 46 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b3dd06b..b4cf3cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-02 Pierre Wieser <pwieser trychlos org>
+
+ Homogeneize marshalling
+
+ * src/core/na-marshal: Renamed as src/core/na-marshal.def
+ * src/nact/nact-marshal.list: Renamed as src/nact/nact-marshal.def
+
+ * src/core/Makefile.am:
+ * src/nact/Makefile.am:
+ * src/nact/nact-iactions-list.c (interface_base_init):
+ * src/nact/nact-main-window.c (class_init): Updated accordingly.
+
2011-02-01 Pierre Wieser <pwieser trychlos org>
Review menu items sensitivity updates
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 6628f55..95c9730 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -40,6 +40,11 @@ AM_CPPFLAGS += \
$(NAUTILUS_ACTIONS_CFLAGS) \
$(NULL)
+BUILT_SOURCES = \
+ na-marshal.c \
+ na-marshal.h \
+ $(NULL)
+
libna_core_la_SOURCES = \
na-boxed.c \
na-core-utils.c \
@@ -82,8 +87,6 @@ libna_core_la_SOURCES = \
na-ipivot-consumer.h \
na-iprefs.c \
na-iprefs.h \
- na-marshal.c \
- na-marshal.h \
na-module.c \
na-module.h \
na-object.c \
@@ -108,8 +111,16 @@ libna_core_la_SOURCES = \
na-tokens.h \
na-updater.c \
na-updater.h \
+ $(BUILT_SOURCES) \
$(NULL)
+na-marshal.h: na-marshal.def $(GLIB_GENMARSHAL)
+ $(GLIB_GENMARSHAL) $< --header --prefix=na_cclosure_marshal > $@
+
+na-marshal.c: na-marshal.def $(GLIB_GENMARSHAL)
+ echo "#include \"na-marshal.h\"" > $@
+ $(GLIB_GENMARSHAL) $< --body --prefix=na_cclosure_marshal >> $@
+
libna_core_la_LIBADD = \
$(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
@@ -124,19 +135,11 @@ pkgdata_DATA = \
na-importer-ask.ui \
$(NULL)
-EXTRA_DIST = \
- $(pkgdata_DATA) \
- na-marshal \
+CLEANFILES = \
+ $(BUILT_SOURCES) \
$(NULL)
-na-marshal.h: na-marshal
- glib-genmarshal --prefix=na_cclosure_marshal --header na-marshal > $@
-
-na-marshal.c: na-marshal.h
- echo "#include \"na-marshal.h\"" > $@
- glib-genmarshal --prefix=na_cclosure_marshal --body na-marshal >> $@
-
-CLEANFILES = \
- na-marshal.c \
- na-marshal.h \
+EXTRA_DIST = \
+ $(pkgdata_DATA) \
+ na-marshal.def \
$(NULL)
diff --git a/src/core/na-marshal b/src/core/na-marshal.def
similarity index 50%
rename from src/core/na-marshal
rename to src/core/na-marshal.def
index 97bc557..7551e1c 100644
--- a/src/core/na-marshal
+++ b/src/core/na-marshal.def
@@ -1,2 +1,2 @@
-# settings-key-changed signal
+# NASettings::settings-key-changed
VOID:STRING,STRING,POINTER,BOOLEAN
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 17ea2a7..345eebd 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -160,12 +160,12 @@ nautilus_actions_config_tool_SOURCES = \
$(BUILT_SOURCES) \
$(NULL)
-nact-marshal.h: nact-marshal.list $(GLIB_GENMARSHAL)
- $(GLIB_GENMARSHAL) $< --header --prefix=nact_marshal > $@
+nact-marshal.h: nact-marshal.def $(GLIB_GENMARSHAL)
+ $(GLIB_GENMARSHAL) $< --header --prefix=nact_cclosure_marshal > $@
-nact-marshal.c: nact-marshal.list $(GLIB_GENMARSHAL)
+nact-marshal.c: nact-marshal.def $(GLIB_GENMARSHAL)
echo "#include \"nact-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --body --prefix=nact_marshal >> $@
+ $(GLIB_GENMARSHAL) $< --body --prefix=nact_cclosure_marshal >> $@
nautilus_actions_config_tool_LDADD = \
$(top_builddir)/src/core/libna-core.la \
diff --git a/src/nact/nact-iactions-list.c b/src/nact/nact-iactions-list.c
index 4c36153..26ca779 100644
--- a/src/nact/nact-iactions-list.c
+++ b/src/nact/nact-iactions-list.c
@@ -167,7 +167,7 @@ interface_base_init( NactIActionsListInterface *klass )
0, /* no default handler */
NULL,
NULL,
- nact_marshal_VOID__INT_INT_INT,
+ nact_cclosure_marshal_VOID__INT_INT_INT,
G_TYPE_NONE,
3,
G_TYPE_INT,
@@ -256,7 +256,7 @@ interface_base_init( NactIActionsListInterface *klass )
G_CALLBACK( free_column_edited_callback ),
NULL,
NULL,
- nact_marshal_VOID__POINTER_POINTER_INT,
+ nact_cclosure_marshal_VOID__POINTER_POINTER_INT,
G_TYPE_NONE,
3,
G_TYPE_POINTER,
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 8ee2f64..70e2692 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -457,7 +457,7 @@ class_init( NactMainWindowClass *klass )
0, /* no default handler */
NULL,
NULL,
- nact_marshal_VOID__POINTER_BOOLEAN,
+ nact_cclosure_marshal_VOID__POINTER_BOOLEAN,
G_TYPE_NONE,
2,
G_TYPE_POINTER,
diff --git a/src/nact/nact-marshal.def b/src/nact/nact-marshal.def
new file mode 100644
index 0000000..7308c2e
--- /dev/null
+++ b/src/nact/nact-marshal.def
@@ -0,0 +1,8 @@
+# NactIActionsList::nact-iactions-list-count-updated
+VOID:INT,INT,INT
+#
+# NactIActionsList::nact-iactions-list-column-edited
+VOID:POINTER,POINTER,INT
+#
+# NactMainWindow::nact-tab-updatable-item-updated
+VOID:POINTER,BOOLEAN
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]