[gtksourceview] Use generic marshaller
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Use generic marshaller
- Date: Wed, 9 Jul 2014 21:53:13 +0000 (UTC)
commit caff655503fc6dc7365ccb508f3f9e1905204dca
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Jul 9 23:50:09 2014 +0200
Use generic marshaller
It simplifies the code.
configure.ac | 3 +-
docs/reference/Makefile.am | 1 -
gtksourceview/Makefile.am | 14 +------
.../words/gtksourcecompletionwordslibrary.c | 14 ++-----
.../words/gtksourcecompletionwordsproposal.c | 7 +---
gtksourceview/gtksourcebuffer.c | 23 ++++--------
gtksourceview/gtksourcecompletion.c | 34 +++++-------------
gtksourceview/gtksourcecompletioncontext.c | 7 +---
gtksourceview/gtksourcecompletioninfo.c | 7 +---
gtksourceview/gtksourcecompletionproposal.c | 11 ++----
gtksourceview/gtksourcegutter.c | 1 -
gtksourceview/gtksourcegutterrenderer.c | 20 +++-------
gtksourceview/gtksourcelanguage.c | 1 -
gtksourceview/gtksourcemarkattributes.c | 9 +----
gtksourceview/gtksourcestyleschememanager.c | 1 -
gtksourceview/gtksourceundomanager.c | 9 +----
gtksourceview/gtksourceview-marshal.list | 23 ------------
gtksourceview/gtksourceview.c | 38 +++++--------------
18 files changed, 52 insertions(+), 171 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1196c97..93d3c88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,8 +65,7 @@ GLADE_UI_REQUIRED=3.9
AC_SUBST(GTK_REQUIRED_VERSION)
AC_SUBST(LIBXML_REQUIRED_VERSION)
-# Pull glib-genmarshal & co.
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+# Pull glib-mkenums & co.
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index effba76..62ee12f 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -45,7 +45,6 @@ IGNORE_HFILES = \
gtksourcetypes-private.h \
gtksourceundomanagerdefault.h \
gtksourceview-i18n.h \
- gtksourceview-marshal.h \
gtksourceview-typebuiltins.h \
gtksourceview-utils.h \
gtktextregion.h
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index f9307f9..e14d736 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -15,8 +15,6 @@ AM_CPPFLAGS = \
$(DEP_CFLAGS)
BUILT_SOURCES = \
- gtksourceview-marshal.c \
- gtksourceview-marshal.h \
gtksourceview-resources.c \
gtksourceview-typebuiltins.c \
gtksourceview-typebuiltins.h
@@ -170,13 +168,6 @@ libgtksourceview_3_0_includedir = $(includedir)/gtksourceview-3.0/gtksourceview
libgtksourceview_3_0_include_HEADERS = $(libgtksourceview_headers)
nodist_libgtksourceview_3_0_include_HEADERS = gtksourceview-typebuiltins.h
-gtksourceview-marshal.h: gtksourceview-marshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=_gtksourceview_marshal > $@
-
-gtksourceview-marshal.c: gtksourceview-marshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN) echo "#include \"gtksourceview-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --body --prefix=_gtksourceview_marshal >> $@
-
gtksourceview-resources.c: gtksourceview.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--sourcedir=$(srcdir) --generate-dependencies $(srcdir)/gtksourceview.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source
$(srcdir)/gtksourceview.gresource.xml
@@ -221,9 +212,8 @@ stamp-gtksourceview-typebuiltins.h: Makefile.am $(libgtksourceview_headers)
&& (cmp -s xgen-gth gtksourceview-typebuiltins.h || cp xgen-gth gtksourceview-typebuiltins.h) \
&& rm -f xgen-gth && echo stamp > $(@F)
-EXTRA_DIST = \
- gtksourceview-marshal.list \
- gtksourceview.gresource.xml \
+EXTRA_DIST = \
+ gtksourceview.gresource.xml \
gtksourcecompletion.ui
CLEANFILES = \
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c
b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c
index 69afa3c..51187bb 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c
@@ -63,22 +63,16 @@ gtk_source_completion_words_library_class_init (GtkSourceCompletionWordsLibraryC
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
signals[UNLOCK] =
g_signal_new ("unlock",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
}
static void
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c
b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c
index f8d30fd..c37befa 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c
@@ -84,11 +84,8 @@ gtk_source_completion_words_proposal_class_init (GtkSourceCompletionWordsProposa
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
}
static void
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index 2c4b98c..1f33026 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -43,7 +43,6 @@
#include "gtksourcemarkssequence.h"
#include "gtksourcesearchcontext.h"
#include "gtksourceview-i18n.h"
-#include "gtksourceview-marshal.h"
#include "gtksourceview-typebuiltins.h"
/**
@@ -395,9 +394,7 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
g_signal_newv ("highlight_updated",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- NULL,
- NULL, NULL,
- _gtksourceview_marshal_VOID__BOXED_BOXED,
+ NULL, NULL, NULL, NULL,
G_TYPE_NONE,
2, param_types);
@@ -414,8 +411,7 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0,
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1, GTK_TYPE_TEXT_MARK);
@@ -431,10 +427,8 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceBufferClass, undo),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/**
* GtkSourceBuffer::redo:
@@ -447,10 +441,8 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceBufferClass, redo),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/**
* GtkSourceBuffer::bracket-matched:
@@ -469,8 +461,7 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceBufferClass, bracket_matched),
- NULL, NULL,
- _gtksourceview_marshal_VOID__BOXED_ENUM,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2,
GTK_TYPE_TEXT_ITER,
GTK_SOURCE_TYPE_BRACKET_MATCH_TYPE);
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index 61e7aea..989c22f 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -89,7 +89,6 @@
#include "gtksourcecompletioncontainer.h"
#include "gtksourcebuffer.h"
#include "gtksourceview.h"
-#include "gtksourceview-marshal.h"
#include "gtksourceview-i18n.h"
/* Signals */
@@ -2304,11 +2303,8 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, show),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/**
@@ -2323,11 +2319,8 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, hide),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/**
* GtkSourceCompletion::populate-context:
@@ -2342,9 +2335,7 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, populate_context),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GTK_SOURCE_TYPE_COMPLETION_CONTEXT);
@@ -2379,9 +2370,7 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, move_cursor),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__ENUM_INT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GTK_TYPE_SCROLL_STEP,
@@ -2418,9 +2407,7 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, move_page),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__ENUM_INT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GTK_TYPE_SCROLL_STEP,
@@ -2443,11 +2430,8 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionClass, activate_proposal),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/* Key bindings */
binding_set = gtk_binding_set_by_class (klass);
diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c
index f89abe5..778d805 100644
--- a/gtksourceview/gtksourcecompletioncontext.c
+++ b/gtksourceview/gtksourcecompletioncontext.c
@@ -257,11 +257,8 @@ gtk_source_completion_context_class_init (GtkSourceCompletionContextClass *klass
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionContextClass, cancelled),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/**
* GtkSourceCompletionContext:completion:
diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c
index 497dfc1..05a768e 100644
--- a/gtksourceview/gtksourcecompletioninfo.c
+++ b/gtksourceview/gtksourcecompletioninfo.c
@@ -335,11 +335,8 @@ gtk_source_completion_info_class_init (GtkSourceCompletionInfoClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION | G_SIGNAL_DEPRECATED,
0,
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
}
void
diff --git a/gtksourceview/gtksourcecompletionproposal.c b/gtksourceview/gtksourcecompletionproposal.c
index e958830..47bf925 100644
--- a/gtksourceview/gtksourcecompletionproposal.c
+++ b/gtksourceview/gtksourcecompletionproposal.c
@@ -30,9 +30,7 @@
* should be taken when the completion item is activated.
*/
-#include <gtksourceview/gtksourcecompletionproposal.h>
-
-#include "gtksourceview-marshal.h"
+#include "gtksourcecompletionproposal.h"
/* Signals */
enum
@@ -119,11 +117,8 @@ gtk_source_completion_proposal_default_init (GtkSourceCompletionProposalIface *i
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceCompletionProposalIface, changed),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
initialized = TRUE;
}
diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtksourcegutter.c
index a1e8e39..fe60c16 100644
--- a/gtksourceview/gtksourcegutter.c
+++ b/gtksourceview/gtksourcegutter.c
@@ -23,7 +23,6 @@
#include "gtksourcegutter-private.h"
#include "gtksourceview.h"
#include "gtksourceview-i18n.h"
-#include "gtksourceview-marshal.h"
#include "gtksourcegutterrenderer.h"
#include "gtksourcegutterrenderer-private.h"
diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c
index 0a2ba38..2eb8277 100644
--- a/gtksourceview/gtksourcegutterrenderer.c
+++ b/gtksourceview/gtksourcegutterrenderer.c
@@ -21,7 +21,6 @@
#include "gtksourcegutterrenderer.h"
#include "gtksourcegutterrenderer-private.h"
-#include "gtksourceview-marshal.h"
#include "gtksourceview-typebuiltins.h"
#include "gtksourceview-i18n.h"
@@ -594,9 +593,7 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, activate),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__BOXED_BOXED_BOXED,
+ NULL, NULL, NULL,
G_TYPE_NONE,
3,
GTK_TYPE_TEXT_ITER,
@@ -617,11 +614,8 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, queue_draw),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/**
* GtkSourceGutterRenderer::query-tooltip:
@@ -643,7 +637,7 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, query_tooltip),
g_signal_accumulator_true_handled,
NULL,
- _gtksourceview_marshal_BOOLEAN__BOXED_BOXED_INT_INT_OBJECT,
+ NULL,
G_TYPE_BOOLEAN,
5,
GTK_TYPE_TEXT_ITER,
@@ -670,9 +664,7 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, query_data),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__BOXED_BOXED_FLAGS,
+ NULL, NULL, NULL,
G_TYPE_NONE,
3,
GTK_TYPE_TEXT_ITER,
@@ -697,7 +689,7 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
G_STRUCT_OFFSET (GtkSourceGutterRendererClass, query_activatable),
g_signal_accumulator_true_handled,
NULL,
- _gtksourceview_marshal_BOOLEAN__BOXED_BOXED_BOXED,
+ NULL,
G_TYPE_BOOLEAN,
3,
GTK_TYPE_TEXT_ITER,
diff --git a/gtksourceview/gtksourcelanguage.c b/gtksourceview/gtksourcelanguage.c
index b5447fc..b97cfab 100644
--- a/gtksourceview/gtksourcelanguage.c
+++ b/gtksourceview/gtksourcelanguage.c
@@ -38,7 +38,6 @@
#include "gtksourceview-i18n.h"
#include "gtksourcelanguage-private.h"
#include "gtksourcelanguage.h"
-#include "gtksourceview-marshal.h"
/**
* SECTION:language
diff --git a/gtksourceview/gtksourcemarkattributes.c b/gtksourceview/gtksourcemarkattributes.c
index a9552eb..b357833 100644
--- a/gtksourceview/gtksourcemarkattributes.c
+++ b/gtksourceview/gtksourcemarkattributes.c
@@ -24,7 +24,6 @@
#include "gtksourcemark.h"
#include "gtksourceview-i18n.h"
#include "gtksourcepixbufhelper.h"
-#include "gtksourceview-marshal.h"
/**
* SECTION:markattributes
@@ -360,9 +359,7 @@ gtk_source_mark_attributes_class_init (GtkSourceMarkAttributesClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
- NULL,
- NULL,
- _gtksourceview_marshal_STRING__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_STRING,
1,
GTK_SOURCE_TYPE_MARK);
@@ -383,9 +380,7 @@ gtk_source_mark_attributes_class_init (GtkSourceMarkAttributesClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
- NULL,
- NULL,
- _gtksourceview_marshal_STRING__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_STRING,
1,
GTK_SOURCE_TYPE_MARK);
diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c
index 89aec7e..066575f 100644
--- a/gtksourceview/gtksourcestyleschememanager.c
+++ b/gtksourceview/gtksourcestyleschememanager.c
@@ -21,7 +21,6 @@
#include "gtksourcestyleschememanager.h"
#include "gtksourcestylescheme.h"
-#include "gtksourceview-marshal.h"
#include "gtksourceview-i18n.h"
#include "gtksourceview-utils.h"
#include <string.h>
diff --git a/gtksourceview/gtksourceundomanager.c b/gtksourceview/gtksourceundomanager.c
index 42acc1c..159932a 100644
--- a/gtksourceview/gtksourceundomanager.c
+++ b/gtksourceview/gtksourceundomanager.c
@@ -31,7 +31,6 @@
#include <string.h>
#include "gtksourceundomanager.h"
-#include "gtksourceview-marshal.h"
/**
* SECTION:undomanager
@@ -127,9 +126,7 @@ gtk_source_undo_manager_default_init (GtkSourceUndoManagerIface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceUndoManagerIface, can_undo_changed),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE,
0);
@@ -147,9 +144,7 @@ gtk_source_undo_manager_default_init (GtkSourceUndoManagerIface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceUndoManagerIface, can_redo_changed),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE,
0);
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index 90e3c2b..ed5a568 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -36,7 +36,6 @@
#include "gtksourcebuffer.h"
#include "gtksourcebuffer-private.h"
#include "gtksourceview-i18n.h"
-#include "gtksourceview-marshal.h"
#include "gtksourceview-typebuiltins.h"
#include "gtksourcemark.h"
#include "gtksourcemarkattributes.h"
@@ -466,22 +465,16 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceViewClass, undo),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
signals [REDO] =
g_signal_new ("redo",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceViewClass, redo),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/**
* GtkSourceView::show-completion:
@@ -503,11 +496,8 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceViewClass, show_completion),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/**
* GtkSourceView::line-mark-activated:
@@ -524,9 +514,7 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSourceViewClass, line_mark_activated),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__BOXED_POINTER,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GTK_TYPE_TEXT_ITER,
@@ -553,9 +541,7 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceViewClass, move_lines),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__BOOLEAN_INT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2,
G_TYPE_BOOLEAN,
G_TYPE_INT);
@@ -577,9 +563,7 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkSourceViewClass, move_words),
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__INT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_INT);
@@ -602,9 +586,7 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
- NULL,
- NULL,
- _gtksourceview_marshal_VOID__BOXED_INT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GTK_TYPE_TEXT_ITER,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
