[gnome-system-log] all: don't generate custom signal marshallers
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-log] all: don't generate custom signal marshallers
- Date: Thu, 28 Jun 2012 21:15:38 +0000 (UTC)
commit 6bb3071aa96664c4c46fcc580adec45b997a8396
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu Jun 28 17:14:50 2012 -0400
all: don't generate custom signal marshallers
Use the generic GObject marshaller instead.
src/Makefile.am | 10 ----------
src/logview-manager.c | 4 +---
src/logview-marshal.list | 1 -
3 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index d55d484..d8dde66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,6 @@ logview-resources.h: logview.gresource.xml $(ui_files)
$(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name logview $(srcdir)/logview.gresource.xml
BUILT_SOURCES = \
- logview-marshal.c \
- logview-marshal.h \
logview-resources.c \
logview-resources.h
@@ -61,15 +59,7 @@ gnome_system_log_LDADD = \
$(Z_LIBS) \
-lm
-logview-marshal.h: logview-marshal.list $(GLIB_GENMARSHAL)
- $(GLIB_GENMARSHAL) $< --header --prefix=logview_marshal >> $@
-
-logview-marshal.c: logview-marshal.list $(GLIB_GENMARSHAL)
- echo "#include \"logview-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --body --prefix=logview_marshal >> $@
-
EXTRA_DIST =
- logview-marshal.list \
logview.gresource.xml \
$(ui_files)
diff --git a/src/logview-manager.c b/src/logview-manager.c
index df8e4ea..ba9e49e 100644
--- a/src/logview-manager.c
+++ b/src/logview-manager.c
@@ -30,7 +30,6 @@
#include <glib/gi18n.h>
#include "logview-prefs.h"
-#include "logview-marshal.h"
#include "logview-app.h"
enum {
@@ -112,8 +111,7 @@ logview_manager_class_init (LogviewManagerClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (LogviewManagerClass, active_changed),
- NULL, NULL,
- logview_marshal_VOID__OBJECT_OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2,
LOGVIEW_TYPE_LOG,
LOGVIEW_TYPE_LOG);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]