[gedit] Remove gedit-marhal
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Remove gedit-marhal
- Date: Mon, 17 Aug 2015 12:29:56 +0000 (UTC)
commit 373adb7d041b0559953d0ac8cf2213ecc44db956
Author: Paolo Borelli <pborelli gnome org>
Date: Mon Aug 17 13:06:31 2015 +0200
Remove gedit-marhal
These days we can use the automatic ffi marshalling
configure.ac | 1 -
docs/reference/Makefile.am | 1 -
gedit/Gedit-3.0.metadata | 1 -
gedit/Makefile.am | 12 +---
gedit/gedit-file-chooser-dialog.c | 9 +--
gedit/gedit-marshal.list | 21 -----
gedit/gedit-message-bus.c | 14 +---
gedit/gedit-multi-notebook.c | 28 ++-----
gedit/gedit-notebook.c | 10 +--
gedit/gedit-print-job.c | 1 -
gedit/gedit-view.c | 4 +-
gedit/gedit-window.c | 16 +---
plugins/filebrowser/Makefile.am | 12 +---
.../filebrowser/gedit-file-browser-marshal.list | 5 -
plugins/filebrowser/gedit-file-browser-store.c | 81 ++++++++-----------
plugins/filebrowser/gedit-file-browser-view.c | 21 ++---
plugins/filebrowser/gedit-file-browser-widget.c | 52 ++++---------
17 files changed, 84 insertions(+), 205 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 99b768d..723244e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,7 +441,6 @@ GLIB_GSETTINGS
VAPIGEN_CHECK([0.25.1])
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
GNOME_COMPILE_WARNINGS([maximum])
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index fc36f10..4b7d82e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -44,7 +44,6 @@ IGNORE_HFILES = \
gedit-highlight-mode-selector.h \
gedit-history-entry.h \
gedit-io-error-info-bar.h \
- gedit-marshal.h \
gedit-menu-stack-switcher.h \
gedit-metadata-manager.h \
gedit-multi-notebook.h \
diff --git a/gedit/Gedit-3.0.metadata b/gedit/Gedit-3.0.metadata
index a787d65..08b0057 100644
--- a/gedit/Gedit-3.0.metadata
+++ b/gedit/Gedit-3.0.metadata
@@ -20,7 +20,6 @@ WindowState cheader_filename="gedit/gedit-window.h"
commands_* cheader_filename="gedit/gedit-commands.h"
debug* cheader_filename="gedit/gedit-debug.h"
-marshal_* cheader_filename="gedit/gedit-marshal.h"
utils_* cheader_filename="gedit/gedit-utils.h"
LOCKDOWN_ALL cheader_filename="gedit/gedit-app.h"
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 7ff13d7..8ed167b 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -94,9 +94,7 @@ endif
gedit_built_sources = \
gedit/gedit-enum-types.c \
- gedit/gedit-enum-types.h \
- gedit/gedit-marshal.c \
- gedit/gedit-marshal.h
+ gedit/gedit-enum-types.h
gedit_NOINST_H_FILES = \
gedit/gedit-app-private.h \
@@ -233,13 +231,6 @@ gedit/gedit-enum-types.h: gedit/gedit-enum-types.h.template $(gedit_ENUM_TYPES)
gedit/gedit-enum-types.c: gedit/gedit-enum-types.c.template $(gedit_ENUM_TYPES) $(GLIB_MKENUMS)
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gedit/gedit-enum-types.c.template
$(gedit_ENUM_TYPES)) > $@
-gedit/gedit-marshal.h: gedit/gedit-marshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gedit_marshal > $@
-
-gedit/gedit-marshal.c: gedit/gedit-marshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN) echo "#include \"gedit-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
-
gedit_resource_deps = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir
$(srcdir)/gedit/resources --sourcedir $(builddir)/gedit/resources
$(builddir)/gedit/resources/gedit.gresource.xml)
gedit_resources_c_deps = $(builddir)/gedit/resources/gedit.gresource.xml $(gedit_resource_deps)
@@ -266,7 +257,6 @@ gedit_dist_resource_deps = \
EXTRA_DIST += \
gedit/gedit-enum-types.h.template \
gedit/gedit-enum-types.c.template \
- gedit/gedit-marshal.list \
gedit/gedit.rc \
gedit/Gedit-3.0.metadata \
gedit/resources/gedit.gresource.xml.in \
diff --git a/gedit/gedit-file-chooser-dialog.c b/gedit/gedit-file-chooser-dialog.c
index 365fcfd..5a7c428 100644
--- a/gedit/gedit-file-chooser-dialog.c
+++ b/gedit/gedit-file-chooser-dialog.c
@@ -30,8 +30,6 @@
#include "gedit-file-chooser-dialog-gtk.h"
#endif
-#include "gedit-marshal.h"
-
G_DEFINE_INTERFACE (GeditFileChooserDialog, gedit_file_chooser_dialog, G_TYPE_OBJECT)
static gboolean
@@ -56,8 +54,8 @@ gedit_file_chooser_dialog_default_init (GeditFileChooserDialogInterface *iface)
g_signal_new ("response",
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
- 0, NULL, NULL,
- g_cclosure_marshal_VOID__INT,
+ 0,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
G_TYPE_INT);
@@ -66,8 +64,7 @@ gedit_file_chooser_dialog_default_init (GeditFileChooserDialogInterface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
0,
- confirm_overwrite_accumulator, NULL,
- gedit_marshal_ENUM__VOID,
+ confirm_overwrite_accumulator, NULL, NULL,
GTK_TYPE_FILE_CHOOSER_CONFIRMATION,
0);
}
diff --git a/gedit/gedit-message-bus.c b/gedit/gedit-message-bus.c
index 718e0f9..b2aedc1 100644
--- a/gedit/gedit-message-bus.c
+++ b/gedit/gedit-message-bus.c
@@ -26,8 +26,6 @@
#include <stdarg.h>
#include <gobject/gvaluecollector.h>
-#include "gedit-marshal.h"
-
/**
* GeditMessageCallback:
* @bus: the #GeditMessageBus on which the message was sent
@@ -285,9 +283,7 @@ gedit_message_bus_class_init (GeditMessageBusClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GeditMessageBusClass, dispatch),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GEDIT_TYPE_MESSAGE);
@@ -307,9 +303,7 @@ gedit_message_bus_class_init (GeditMessageBusClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GeditMessageBusClass, registered),
- NULL,
- NULL,
- gedit_marshal_VOID__STRING_STRING,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
G_TYPE_STRING,
@@ -330,9 +324,7 @@ gedit_message_bus_class_init (GeditMessageBusClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GeditMessageBusClass, unregistered),
- NULL,
- NULL,
- gedit_marshal_VOID__STRING_STRING,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
G_TYPE_STRING,
diff --git a/gedit/gedit-multi-notebook.c b/gedit/gedit-multi-notebook.c
index f5a4a63..6f9d54f 100644
--- a/gedit/gedit-multi-notebook.c
+++ b/gedit/gedit-multi-notebook.c
@@ -23,7 +23,6 @@
#include "gedit-multi-notebook.h"
#include "gedit-enum-types.h"
-#include "gedit-marshal.h"
#include "gedit-settings.h"
#include "gedit-tab-private.h"
#include "gedit-tab.h"
@@ -158,8 +157,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, notebook_added),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GEDIT_TYPE_NOTEBOOK);
@@ -168,8 +166,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, notebook_removed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GEDIT_TYPE_NOTEBOOK);
@@ -178,8 +175,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, tab_added),
- NULL, NULL,
- gedit_marshal_VOID__OBJECT_OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GEDIT_TYPE_NOTEBOOK,
@@ -189,8 +185,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, tab_removed),
- NULL, NULL,
- gedit_marshal_VOID__OBJECT_OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GEDIT_TYPE_NOTEBOOK,
@@ -200,8 +195,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, switch_tab),
- NULL, NULL,
- gedit_marshal_VOID__OBJECT_OBJECT_OBJECT_OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
4,
GEDIT_TYPE_NOTEBOOK,
@@ -213,8 +207,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, tab_close_request),
- NULL, NULL,
- gedit_marshal_VOID__OBJECT_OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GEDIT_TYPE_NOTEBOOK,
@@ -224,8 +217,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, create_window),
- NULL, NULL,
- gedit_marshal_OBJECT__OBJECT_OBJECT_INT_INT,
+ NULL, NULL, NULL,
GTK_TYPE_NOTEBOOK, 4,
GEDIT_TYPE_NOTEBOOK, GTK_TYPE_WIDGET,
G_TYPE_INT, G_TYPE_INT);
@@ -234,8 +226,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, page_reordered),
- NULL, NULL,
- gedit_marshal_VOID__OBJECT_OBJECT_INT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
3,
GEDIT_TYPE_NOTEBOOK, GTK_TYPE_WIDGET,
@@ -245,8 +236,7 @@ gedit_multi_notebook_class_init (GeditMultiNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditMultiNotebookClass, show_popup_menu),
- NULL, NULL,
- gedit_marshal_VOID__BOXED_OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE,
diff --git a/gedit/gedit-notebook.c b/gedit/gedit-notebook.c
index e6fce54..a4b6e8d 100644
--- a/gedit/gedit-notebook.c
+++ b/gedit/gedit-notebook.c
@@ -29,7 +29,6 @@
#include "gedit-notebook.h"
#include "gedit-tab-label.h"
-#include "gedit-marshal.h"
#define GEDIT_NOTEBOOK_GROUP_NAME "GeditNotebookGroup"
@@ -462,8 +461,7 @@ gedit_notebook_class_init (GeditNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GeditNotebookClass, tab_close_request),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GEDIT_TYPE_TAB);
@@ -473,8 +471,7 @@ gedit_notebook_class_init (GeditNotebookClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditNotebookClass, show_popup_menu),
- NULL, NULL,
- gedit_marshal_VOID__BOXED_OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE,
@@ -485,8 +482,7 @@ gedit_notebook_class_init (GeditNotebookClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GeditNotebookClass, change_to_page),
- NULL, NULL,
- gedit_marshal_BOOLEAN__INT,
+ NULL, NULL, NULL,
G_TYPE_BOOLEAN, 1,
G_TYPE_INT);
diff --git a/gedit/gedit-print-job.c b/gedit/gedit-print-job.c
index 7589469..c6130b3 100644
--- a/gedit/gedit-print-job.c
+++ b/gedit/gedit-print-job.c
@@ -27,7 +27,6 @@
#include "gedit-debug.h"
#include "gedit-print-preview.h"
-#include "gedit-marshal.h"
#include "gedit-utils.h"
#include "gedit-dirs.h"
#include "gedit-settings.h"
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index b4dc063..c1744c8 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -28,7 +28,6 @@
#include "gedit-view-activatable.h"
#include "gedit-plugins-engine.h"
#include "gedit-debug.h"
-#include "gedit-marshal.h"
#include "gedit-utils.h"
#include "gedit-settings.h"
#include "gedit-app.h"
@@ -749,8 +748,7 @@ gedit_view_class_init (GeditViewClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GeditViewClass, drop_uris),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL, NULL, NULL,
G_TYPE_NONE, 1, G_TYPE_STRV);
binding_set = gtk_binding_set_by_class (klass);
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index c039b2a..3bb733c 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -56,7 +56,6 @@
#include "gedit-dirs.h"
#include "gedit-status-menu-button.h"
#include "gedit-settings.h"
-#include "gedit-marshal.h"
#include "gedit-small-button.h"
#include "gedit-menu-stack-switcher.h"
#include "gedit-highlight-mode-selector.h"
@@ -429,8 +428,7 @@ gedit_window_class_init (GeditWindowClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditWindowClass, tab_added),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GEDIT_TYPE_TAB);
@@ -439,8 +437,7 @@ gedit_window_class_init (GeditWindowClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditWindowClass, tab_removed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GEDIT_TYPE_TAB);
@@ -449,8 +446,7 @@ gedit_window_class_init (GeditWindowClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditWindowClass, tabs_reordered),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE,
0);
signals[ACTIVE_TAB_CHANGED] =
@@ -458,8 +454,7 @@ gedit_window_class_init (GeditWindowClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditWindowClass, active_tab_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GEDIT_TYPE_TAB);
@@ -468,8 +463,7 @@ gedit_window_class_init (GeditWindowClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GeditWindowClass, active_tab_state_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL, NULL, NULL,
G_TYPE_NONE,
0);
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index d4d4fc1..a62e415 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -16,8 +16,6 @@ plugins_filebrowser_libfilebrowser_la_CFLAGS = \
plugins_filebrowser_BUILTSOURCES = \
plugins/filebrowser/gedit-file-browser-enum-types.h \
plugins/filebrowser/gedit-file-browser-enum-types.c \
- plugins/filebrowser/gedit-file-browser-marshal.h \
- plugins/filebrowser/gedit-file-browser-marshal.c \
plugins/filebrowser/gedit-file-browser-resources.c
plugins_filebrowser_messages_NOINST_H_FILES = \
@@ -94,13 +92,6 @@ plugins/filebrowser/gedit-file-browser-enum-types.c: $(filebrowser_enum_c_templa
--template $(filebrowser_enum_register_c_template) \
$(plugins_filebrowser_libfilebrowser_la_NOINST_H_FILES)) > $@
-plugins/filebrowser/gedit-file-browser-marshal.h: plugins/filebrowser/gedit-file-browser-marshal.list
$(GLIB_GENMARSHAL)
- $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gedit_file_browser_marshal > $@
-
-plugins/filebrowser/gedit-file-browser-marshal.c: plugins/filebrowser/gedit-file-browser-marshal.list
$(GLIB_GENMARSHAL)
- $(AM_V_GEN) echo "#include \"gedit-file-browser-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --body --prefix=gedit_file_browser_marshal >> $@
-
plugin_gsettings_SCHEMAS += plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml
gsettings_ENUMS += plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.enums.xml
@@ -115,5 +106,4 @@ EXTRA_DIST += \
$(filebrowser_resources_deps) \
plugins/filebrowser/gedit-file-browser-enum-types.h.template \
plugins/filebrowser/gedit-file-browser-enum-types.c.template \
- plugins/filebrowser/gedit-file-browser-enum-register.c.template \
- plugins/filebrowser/gedit-file-browser-marshal.list
+ plugins/filebrowser/gedit-file-browser-enum-register.c.template
diff --git a/plugins/filebrowser/gedit-file-browser-store.c b/plugins/filebrowser/gedit-file-browser-store.c
index cbad20d..08baeb5 100644
--- a/plugins/filebrowser/gedit-file-browser-store.c
+++ b/plugins/filebrowser/gedit-file-browser-store.c
@@ -28,7 +28,6 @@
#include <gedit/gedit-utils.h>
#include "gedit-file-browser-store.h"
-#include "gedit-file-browser-marshal.h"
#include "gedit-file-browser-enum-types.h"
#include "gedit-file-browser-error.h"
#include "gedit-file-browser-utils.h"
@@ -385,76 +384,64 @@ gedit_file_browser_store_class_init (GeditFileBrowserStoreClass *klass)
g_signal_new ("begin-loading",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- begin_loading), NULL, NULL,
- g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1,
- GTK_TYPE_TREE_ITER);
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, begin_loading),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
model_signals[END_LOADING] =
g_signal_new ("end-loading",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- end_loading), NULL, NULL,
- g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1,
- GTK_TYPE_TREE_ITER);
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, end_loading),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
model_signals[ERROR] =
g_signal_new ("error", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- error), NULL, NULL,
- gedit_file_browser_marshal_VOID__UINT_STRING,
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, error),
+ NULL, NULL, NULL,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
model_signals[NO_TRASH] =
g_signal_new ("no-trash", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- no_trash), g_signal_accumulator_true_handled, NULL,
- gedit_file_browser_marshal_BOOL__POINTER,
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, no_trash),
+ g_signal_accumulator_true_handled, NULL, NULL,
G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
model_signals[RENAME] =
g_signal_new ("rename",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- rename), NULL, NULL,
- gedit_file_browser_marshal_VOID__OBJECT_OBJECT,
- G_TYPE_NONE, 2,
- G_TYPE_FILE,
- G_TYPE_FILE);
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, rename),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 2, G_TYPE_FILE, G_TYPE_FILE);
model_signals[BEGIN_REFRESH] =
g_signal_new ("begin-refresh",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- begin_refresh), NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, begin_refresh),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
model_signals[END_REFRESH] =
g_signal_new ("end-refresh",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- end_refresh), NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, end_refresh),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
model_signals[UNLOAD] =
g_signal_new ("unload",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- unload), NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1,
- G_TYPE_FILE);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, unload),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1, G_TYPE_FILE);
model_signals[BEFORE_ROW_DELETED] =
g_signal_new ("before-row-deleted",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserStoreClass,
- before_row_deleted), NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
- G_TYPE_NONE, 1,
- GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE);
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GeditFileBrowserStoreClass, before_row_deleted),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE);
}
static void
diff --git a/plugins/filebrowser/gedit-file-browser-view.c b/plugins/filebrowser/gedit-file-browser-view.c
index 7a4ebed..d25c1af 100644
--- a/plugins/filebrowser/gedit-file-browser-view.c
+++ b/plugins/filebrowser/gedit-file-browser-view.c
@@ -27,7 +27,6 @@
#include "gedit-file-browser-store.h"
#include "gedit-file-bookmarks-store.h"
#include "gedit-file-browser-view.h"
-#include "gedit-file-browser-marshal.h"
#include "gedit-file-browser-enum-types.h"
struct _GeditFileBrowserViewPrivate
@@ -940,33 +939,29 @@ gedit_file_browser_view_class_init (GeditFileBrowserViewClass *klass)
g_signal_new ("error",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserViewClass,
- error), NULL, NULL,
- gedit_file_browser_marshal_VOID__UINT_STRING,
+ G_STRUCT_OFFSET (GeditFileBrowserViewClass, error),
+ NULL, NULL, NULL,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
signals[FILE_ACTIVATED] =
g_signal_new ("file-activated",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserViewClass,
- file_activated), NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ G_STRUCT_OFFSET (GeditFileBrowserViewClass, file_activated),
+ NULL, NULL, NULL,
G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
signals[DIRECTORY_ACTIVATED] =
g_signal_new ("directory-activated",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserViewClass,
- directory_activated), NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ G_STRUCT_OFFSET (GeditFileBrowserViewClass, directory_activated),
+ NULL, NULL, NULL,
G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
signals[BOOKMARK_ACTIVATED] =
g_signal_new ("bookmark-activated",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserViewClass,
- bookmark_activated), NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
+ G_STRUCT_OFFSET (GeditFileBrowserViewClass, bookmark_activated),
+ NULL, NULL, NULL,
G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
}
diff --git a/plugins/filebrowser/gedit-file-browser-widget.c b/plugins/filebrowser/gedit-file-browser-widget.c
index 5e72b20..fe38395 100644
--- a/plugins/filebrowser/gedit-file-browser-widget.c
+++ b/plugins/filebrowser/gedit-file-browser-widget.c
@@ -36,7 +36,6 @@
#include "gedit-file-browser-view.h"
#include "gedit-file-browser-store.h"
#include "gedit-file-bookmarks-store.h"
-#include "gedit-file-browser-marshal.h"
#include "gedit-file-browser-enum-types.h"
#define LOCATION_DATA_KEY "gedit-file-browser-widget-location"
@@ -483,65 +482,46 @@ gedit_file_browser_widget_class_init (GeditFileBrowserWidgetClass *klass)
g_signal_new ("location-activated",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserWidgetClass,
- location_activated), NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
- G_TYPE_FILE);
+ G_STRUCT_OFFSET (GeditFileBrowserWidgetClass, location_activated),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1, G_TYPE_FILE);
+
signals[ERROR] =
g_signal_new ("error", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserWidgetClass,
- error), NULL, NULL,
- gedit_file_browser_marshal_VOID__UINT_STRING,
+ G_STRUCT_OFFSET (GeditFileBrowserWidgetClass, error),
+ NULL, NULL, NULL,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
signals[CONFIRM_DELETE] =
g_signal_new ("confirm-delete", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserWidgetClass,
- confirm_delete),
- g_signal_accumulator_true_handled,
- NULL,
- gedit_file_browser_marshal_BOOL__OBJECT_POINTER,
- G_TYPE_BOOLEAN,
- 2,
- G_TYPE_OBJECT,
- G_TYPE_POINTER);
+ G_STRUCT_OFFSET (GeditFileBrowserWidgetClass, confirm_delete),
+ g_signal_accumulator_true_handled, NULL, NULL,
+ G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, G_TYPE_POINTER);
signals[CONFIRM_NO_TRASH] =
g_signal_new ("confirm-no-trash", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GeditFileBrowserWidgetClass,
- confirm_no_trash),
- g_signal_accumulator_true_handled,
- NULL,
- gedit_file_browser_marshal_BOOL__POINTER,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_POINTER);
+ G_STRUCT_OFFSET (GeditFileBrowserWidgetClass, confirm_no_trash),
+ g_signal_accumulator_true_handled, NULL, NULL,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
signals[OPEN_IN_TERMINAL] =
g_signal_new ("open-in-terminal",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GeditFileBrowserWidgetClass, open_in_terminal),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE,
- 1,
- G_TYPE_FILE);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1, G_TYPE_FILE);
signals[SET_ACTIVE_ROOT] =
g_signal_new ("set-active-root",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GeditFileBrowserWidgetClass, set_active_root),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
/* Bind class to template */
gtk_widget_class_set_template_from_resource (widget_class,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
