diff options
72 files changed, 115 insertions, 313 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index e8692bb7f2..32d5531859 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -18,7 +18,6 @@ privsolib_LTLIBRARIES = \ libecontacteditor.la libecontacteditor_la_SOURCES = \ - $(MARSHAL_GENERATED) \ eab-editor.c \ eab-editor.h \ e-contact-editor-im.c \ @@ -40,17 +39,10 @@ libecontacteditor_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) -MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h -@EVO_MARSHAL_RULE@ - glade_DATA = \ im.glade \ contact-editor.glade \ fulladdr.glade \ fullname.glade -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST= $(glade_DATA) \ - e-contact-editor-marshal.list +EXTRA_DIST= $(glade_DATA) diff --git a/addressbook/gui/contact-editor/e-contact-editor-marshal.list b/addressbook/gui/contact-editor/e-contact-editor-marshal.list deleted file mode 100644 index f871960b0d..0000000000 --- a/addressbook/gui/contact-editor/e-contact-editor-marshal.list +++ /dev/null @@ -1 +0,0 @@ -NONE:INT,OBJECT diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 0fad7abb29..ac4f663ffc 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -59,7 +59,6 @@ #include "e-contact-editor-address.h" #include "e-contact-editor-im.h" #include "e-contact-editor-fullname.h" -#include "e-contact-editor-marshal.h" #define EMAIL_SLOTS 4 #define PHONE_SLOTS 8 diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index e97917b77f..b94dff2953 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -29,7 +29,7 @@ #include "eab-editor.h" #include "addressbook/gui/widgets/eab-gui-util.h" -#include "e-contact-editor-marshal.h" +#include "e-util/e-util.h" static void eab_editor_default_show (EABEditor *editor); static void eab_editor_default_raise (EABEditor *editor); @@ -142,7 +142,7 @@ eab_editor_class_init (EABEditorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EABEditorClass, contact_added), NULL, NULL, - e_contact_editor_marshal_NONE__INT_OBJECT, + e_marshal_NONE__INT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_OBJECT); @@ -152,7 +152,7 @@ eab_editor_class_init (EABEditorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EABEditorClass, contact_modified), NULL, NULL, - e_contact_editor_marshal_NONE__INT_OBJECT, + e_marshal_NONE__INT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_OBJECT); @@ -162,7 +162,7 @@ eab_editor_class_init (EABEditorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EABEditorClass, contact_deleted), NULL, NULL, - e_contact_editor_marshal_NONE__INT_OBJECT, + e_marshal_NONE__INT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_OBJECT); diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 76122c2421..e0605d534a 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -17,7 +17,6 @@ privsolib_LTLIBRARIES = \ libecontactlisteditor.la libecontactlisteditor_la_SOURCES = \ - $(MARSHAL_GENERATED) \ e-contact-list-editor.c \ e-contact-list-editor.h \ e-contact-list-model.c \ @@ -36,7 +35,4 @@ libecontactlisteditor_la_LIBADD = \ glade_DATA = contact-list-editor.glade -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - EXTRA_DIST = $(glade_DATA) diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 88c7f07011..e14f274f4e 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -27,7 +27,6 @@ eabinclude_HEADERS = \ eab-popup.h libeabwidgets_la_SOURCES = \ - $(MARSHAL_GENERATED) \ eab-config.c \ eab-contact-display.c \ eab-contact-display.h \ @@ -61,12 +60,6 @@ libeabwidgets_la_SOURCES = \ gal-view-factory-minicard.c \ gal-view-factory-minicard.h -MARSHAL_GENERATED = eab-marshal.c eab-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) @@ -74,5 +67,4 @@ etspec_DATA= e-addressbook-view.etspec EXTRA_DIST = \ $(etspec_DATA) \ - eab-marshal.list \ addresstypes.xml diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 7599a85abd..7273689fd1 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -24,7 +24,7 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-addressbook-model.h" #include <libxml/tree.h> #include <libxml/parser.h> @@ -380,7 +380,7 @@ eab_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EABModelClass, contact_added), NULL, NULL, - eab_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); eab_model_signals [CONTACTS_REMOVED] = diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 1630161878..1f2b1aad7a 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -20,7 +20,7 @@ #include <string.h> #include <glib/gi18n.h> -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-addressbook-reflow-adapter.h" #include "e-addressbook-model.h" #include "e-addressbook-view.h" @@ -434,7 +434,7 @@ e_addressbook_reflow_adapter_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EAddressbookReflowAdapterClass, drag_begin), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); model_class->set_width = addressbook_set_width; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index c138df8ff2..3c0c28f6ad 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -45,7 +45,6 @@ #include "gal-view-minicard.h" #include "gal-view-factory-minicard.h" -#include "eab-marshal.h" #include "e-addressbook-view.h" #include "e-addressbook-model.h" #include "eab-gui-util.h" diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 85f2c5fd28..696d42dcd9 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -23,7 +23,6 @@ #include <config.h> #include "e-minicard-label.h" -#include "eab-marshal.h" #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index d416da2015..0f9ae7c143 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -27,7 +27,7 @@ #include <misc/e-canvas.h> #include <glib/gi18n.h> -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-minicard-view-widget.h" static void e_minicard_view_widget_init (EMinicardViewWidget *widget); @@ -164,7 +164,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardViewWidgetClass, right_click), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); } diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 803df061a2..ccf3ecc6f9 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -25,8 +25,8 @@ #include "e-minicard-view.h" #include "eab-gui-util.h" -#include "eab-marshal.h" #include "util/eab-book-util.h" +#include "e-util/e-util.h" #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> @@ -553,7 +553,7 @@ e_minicard_view_class_init (EMinicardViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardViewClass, right_click), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); item_class->event = e_minicard_view_event; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 83e3692921..cbbcc80d5c 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -31,7 +31,6 @@ #include <misc/e-canvas-utils.h> #include <misc/e-canvas.h> #include <libebook/e-book.h> -#include "eab-marshal.h" #include "eab-gui-util.h" #include "e-minicard.h" #include "e-minicard-label.h" @@ -207,7 +206,7 @@ e_minicard_class_init (EMinicardClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardClass, selected), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); e_minicard_signals [DRAG_BEGIN] = @@ -216,7 +215,7 @@ e_minicard_class_init (EMinicardClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardClass, drag_begin), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); e_minicard_signals [STYLE_SET] = diff --git a/addressbook/gui/widgets/eab-marshal.list b/addressbook/gui/widgets/eab-marshal.list deleted file mode 100644 index 867355e96e..0000000000 --- a/addressbook/gui/widgets/eab-marshal.list +++ /dev/null @@ -1,2 +0,0 @@ -INT:POINTER -NONE:INT,INT diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index cdafbb272d..0f66310033 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -13,7 +13,6 @@ INCLUDES = \ privsolib_LTLIBRARIES = libeabutil.la libeabutil_la_SOURCES = \ - eab-marshal.c \ eab-book-util.c \ eab-book-util.h @@ -24,14 +23,5 @@ libeabutil_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la -MARSHAL_GENERATED = eab-marshal.c eab-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - eab-marshal.list - dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/addressbook/util/eab-marshal.list b/addressbook/util/eab-marshal.list deleted file mode 100644 index e69de29bb2..0000000000 --- a/addressbook/util/eab-marshal.list +++ /dev/null diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 77f27cd71e..e61f6a1f91 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -22,10 +22,6 @@ $(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H) IDL_GENERATED = $(CALENDAR_IDL_GENERATED) -# The marshallers -MARSHAL_GENERATED = e-calendar-marshal.c e-calendar-marshal.h -@EVO_MARSHAL_RULE@ - SUBDIRS = alarm-notify dialogs component_LTLIBRARIES = libevolution-calendar.la @@ -73,7 +69,6 @@ etspec_DATA = \ libevolution_calendar_la_SOURCES = \ $(IDL_GENERATED) \ - $(MARSHAL_GENERATED) \ cal-search-bar.c \ cal-search-bar.h \ calendar-config.c \ @@ -252,7 +247,6 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ EXTRA_DIST = \ - e-calendar-marshal.list \ $(glade_DATA) \ $(schema_in_files) \ $(etspec_DATA) \ diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 4007e1236f..4fcfbd7609 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -35,7 +35,7 @@ #include "e-cal-model.h" #include "itip-utils.h" #include "misc.h" -#include "e-calendar-marshal.h" +#include "e-util/e-util.h" #include "calendar-config.h" typedef struct { @@ -153,7 +153,7 @@ e_cal_model_class_init (ECalModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECalModelClass, time_range_changed), NULL, NULL, - e_calendar_marshal_VOID__LONG_LONG, + e_marshal_VOID__LONG_LONG, G_TYPE_NONE, 2, G_TYPE_LONG, G_TYPE_LONG); signals[ROW_APPENDED] = @@ -180,7 +180,7 @@ e_cal_model_class_init (ECalModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECalModelClass, cal_view_progress), NULL, NULL, - e_calendar_marshal_VOID__STRING_INT_INT, + e_marshal_VOID__STRING_INT_INT, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT); signals[CAL_VIEW_DONE] = g_signal_new ("cal_view_done", @@ -188,7 +188,7 @@ e_cal_model_class_init (ECalModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECalModelClass, cal_view_done), NULL, NULL, - e_calendar_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); } diff --git a/calendar/gui/e-calendar-marshal.list b/calendar/gui/e-calendar-marshal.list deleted file mode 100644 index 5e0a5c5b22..0000000000 --- a/calendar/gui/e-calendar-marshal.list +++ /dev/null @@ -1,17 +0,0 @@ -NONE:INT,STRING -NONE:INT,BOOL -NONE:INT,POINTER -NONE:INT,OBJECT -NONE:STRING,INT -NONE:INT,INT -NONE:ENUM,ENUM -NONE:ENUM,STRING -NONE:STRING,BOOL,INT,INT -NONE:STRING,STRING -NONE:STRING,STRING,STRING -NONE:STRING,POINTER,POINTER -NONE:POINTER,ENUM -NONE:POINTER,STRING -NONE:POINTER,POINTER -NONE:LONG,LONG -NONE:STRING,INT,INT diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 495b50d0e9..a6376a7385 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -31,10 +31,10 @@ #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> #include <libedataserver/e-time-utils.h> +#include <e-util/e-util.h> #include <e-util/e-error.h> #include <e-util/e-dialog-utils.h> #include <e-util/e-icon-factory.h> -#include "e-calendar-marshal.h" #include <libecal/e-cal-time-util.h> #include <libecal/e-cal-component.h> @@ -204,7 +204,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECalendarViewClass, timezone_changed), NULL, NULL, - e_calendar_marshal_VOID__POINTER_POINTER, + e_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); e_calendar_view_signals[EVENT_CHANGED] = diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c index 71cfb4e4c1..384743184a 100644 --- a/calendar/gui/e-memos.c +++ b/calendar/gui/e-memos.c @@ -44,7 +44,6 @@ #include <libedataserver/e-categories.h> #include "widgets/menus/gal-view-menus.h" #include "dialogs/delete-error.h" -#include "e-calendar-marshal.h" #include "calendar-config.h" #include "cal-search-bar.h" #include "calendar-component.h" diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c index fb742bf5c7..357eba4c5b 100644 --- a/calendar/gui/e-select-names-renderer.c +++ b/calendar/gui/e-select-names-renderer.c @@ -22,7 +22,7 @@ #include <config.h> -#include "e-calendar-marshal.h" +#include "e-util/e-util.h" #include "e-select-names-editable.h" #include "e-select-names-renderer.h" @@ -192,7 +192,7 @@ e_select_names_renderer_class_init (ESelectNamesRendererClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESelectNamesRendererClass, cell_edited), NULL, NULL, - e_calendar_marshal_VOID__STRING_POINTER_POINTER, + e_marshal_VOID__STRING_POINTER_POINTER, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER); } diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index f617a1bbd3..4efb688ae0 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -43,7 +43,6 @@ #include "widgets/menus/gal-view-menus.h" #include "dialogs/delete-error.h" #include "dialogs/task-editor.h" -#include "e-calendar-marshal.h" #include "cal-search-bar.h" #include "calendar-config.h" #include "calendar-component.h" diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 1bae7d2879..c2e4511ce6 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -47,6 +47,7 @@ #include <widgets/menus/gal-view-etable.h> #include <widgets/menus/gal-define-views-dialog.h> #include "widgets/menus/gal-view-menus.h" +#include "e-util/e-util.h" #include "e-util/e-error.h" #include "e-util/e-util-private.h" #include "e-comp-editor-registry.h" @@ -54,7 +55,6 @@ #include "dialogs/event-editor.h" #include "dialogs/task-editor.h" #include "comp-util.h" -#include "e-calendar-marshal.h" #include "e-cal-model-calendar.h" #include "e-day-view.h" #include "e-day-view-config.h" @@ -372,7 +372,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GnomeCalendarClass, source_added), NULL, NULL, - e_calendar_marshal_VOID__INT_OBJECT, + e_marshal_VOID__INT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_OBJECT); @@ -383,7 +383,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GnomeCalendarClass, source_removed), NULL, NULL, - e_calendar_marshal_VOID__INT_OBJECT, + e_marshal_VOID__INT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_OBJECT); diff --git a/e-util/Makefile.am b/e-util/Makefile.am index f003ff9068..73665a3516 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -58,6 +58,7 @@ eutilinclude_HEADERS = \ e-import.h \ e-logger.h \ e-non-intrusive-error-dialog.h \ + e-marshal.h \ e-menu.h \ e-mktemp.h \ e-print.h \ @@ -76,12 +77,10 @@ eutilinclude_HEADERS = \ e-text-event-processor.h \ e-util.h \ e-util-labels.h \ - e-util-marshal.h \ e-xml-utils.h libeutil_la_SOURCES = \ $(eutilinclude_HEADERS) \ - e-util-marshal.c \ e-bconf-map.c \ e-categories-config.c \ e-config.c \ @@ -100,6 +99,7 @@ libeutil_la_SOURCES = \ e-import.c \ e-logger.c \ e-non-intrusive-error-dialog.c \ + e-marshal.c \ e-menu.c \ e-mktemp.c \ e-plugin.c \ @@ -123,7 +123,7 @@ libeutil_la_SOURCES = \ gconf-bridge.h \ $(PLATFORM_SOURCES) -MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h +MARSHAL_GENERATED = e-marshal.c e-marshal.h @EVO_MARSHAL_RULE@ libeutil_la_LDFLAGS = $(NO_UNDEFINED) @@ -164,7 +164,7 @@ EXTRA_DIST = \ e-system.error.xml \ $(pilot_sources) \ ChangeLog.pre-1-4 \ - e-util-marshal.list + e-marshal.list BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index 898bff9057..d2b575c15a 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -29,8 +29,6 @@ #include <libedataserver/e-uid.h> -#include "e-util-marshal.h" - #include "e-signature-list.h" struct _ESignatureListPrivate { diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index e381e86342..b515f33f57 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -24,7 +24,6 @@ #include <glib/gi18n.h> -#include "e-util-marshal.h" #include "e-text-event-processor.h" #include "e-util.h" diff --git a/e-util/e-util-marshal.list b/e-util/e-util-marshal.list deleted file mode 100644 index 9314f25777..0000000000 --- a/e-util/e-util-marshal.list +++ /dev/null @@ -1,46 +0,0 @@ -BOOLEAN:INT,INT,OBJECT,INT,INT,UINT -BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT -BOOLEAN:NONE -BOOLEAN:OBJECT -BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN -BOOLEAN:POINTER,POINTER,INT,INT,INT -BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT -BOOLEAN:STRING,INT -DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN -INT:BOXED -INT:INT -INT:INT,INT,BOXED -INT:INT,POINTER,INT,BOXED -INT:OBJECT,BOXED -INT:POINTER -NONE:BOXED,INT -NONE:BOXED,INT,INT -NONE:INT,INT -NONE:INT,INT,BOXED -NONE:INT,INT,OBJECT -NONE:INT,INT,OBJECT,BOXED,UINT,UINT -NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT -NONE:INT,INT,OBJECT,POINTER,UINT,UINT -NONE:INT,INT,OBJECT,UINT -NONE:INT,INT,STRING,STRING -NONE:INT,INT,STRING,STRING,POINTER -NONE:INT,POINTER -NONE:INT,POINTER,INT,BOXED -NONE:INT,POINTER,INT,OBJECT -NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT -NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT -NONE:INT,POINTER,INT,OBJECT,UINT -NONE:INT,STRING -NONE:OBJECT,OBJECT -NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN -NONE:POINTER,BOOLEAN -NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN -NONE:POINTER,INT -NONE:POINTER,INT,INT -NONE:POINTER,INT,INT,INT -NONE:POINTER,INT,INT,INT,INT -NONE:POINTER,INT,OBJECT -NONE:POINTER,POINTER -NONE:POINTER,POINTER,INT -OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN -POINTER:NONE diff --git a/e-util/e-util.c b/e-util/e-util.c index d4bded2d6b..0b28404c82 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -335,10 +335,6 @@ e_write_file_uri (const gchar *filename, const gchar *data) return res; } -/* Include build marshalers */ - -#include "e-util-marshal.h" - static gint epow10 (gint number) { diff --git a/e-util/e-util.h b/e-util/e-util.h index 4f82df471b..021e3286c7 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -29,7 +29,7 @@ #include <gconf/gconf-client.h> #include <cairo.h> -#include <e-util/e-util-marshal.h> +#include <e-util/e-marshal.h> G_BEGIN_DECLS diff --git a/filter/Makefile.am b/filter/Makefile.am index 7d4e72daeb..7dc0353ded 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -27,8 +27,6 @@ libfilter_la_SOURCES = \ filter-input.h \ filter-int.c \ filter-int.h \ - filter-marshal.c \ - filter-marshal.h \ filter-option.c \ filter-option.h \ filter-part.c \ @@ -50,16 +48,12 @@ libfilter_la_LIBADD = \ EXTRA_DIST = \ $(glade_DATA) \ filter.error.xml \ - ChangeLog.pre-1-4 \ - filter-marshal.list + ChangeLog.pre-1-4 # basic rules. error_DATA = filter.error errordir = $(privdatadir)/errors @EVO_PLUGIN_RULE@ -MARSHAL_GENERATED = filter-marshal.c filter-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) +BUILT_SOURCES = $(error_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/filter/filter-marshal.list b/filter/filter-marshal.list deleted file mode 100644 index e69de29bb2..0000000000 --- a/filter/filter-marshal.list +++ /dev/null diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 794c94498d..9febe8d0ee 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -33,7 +33,6 @@ #include "e-util/e-error.h" #include "filter-rule.h" #include "rule-context.h" -#include "filter-marshal.h" #define d(x) diff --git a/filter/rule-context.c b/filter/rule-context.c index cc81513784..0a7438b12c 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -48,7 +48,6 @@ #include "filter-file.h" #include "filter-input.h" #include "filter-int.h" -#include "filter-marshal.h" #include "filter-option.h" #include "filter-rule.h" #include "rule-context.h" diff --git a/mail/Makefile.am b/mail/Makefile.am index e286a47908..23778d569c 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -92,7 +92,6 @@ mailinclude_HEADERS = \ libevolution_mail_la_SOURCES = \ $(MAIL_IDL_GENERATED) \ - $(MARSHAL_GENERATED) \ $(mailinclude_HEADERS) \ e-searching-tokenizer.c \ e-searching-tokenizer.h \ @@ -241,15 +240,12 @@ em-filter-i18n.h: filtertypes.xml vfoldertypes.xml searchtypes.xml sort -u >> $@ glade_DATA = mail-config.glade mail-dialogs.glade -MARSHAL_GENERATED = em-marshal.c em-marshal.h -@EVO_MARSHAL_RULE@ etspec_DATA = message-list.etspec EXTRA_DIST = \ ChangeLog.pre-1-4 \ README.async \ - em-marshal.list \ $(MAIL_IDL) \ mail.error.xml \ $(glade_DATA) \ @@ -306,7 +302,7 @@ endif dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) -BUILT_SOURCES = $(MAIL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_DATA) +BUILT_SOURCES = $(MAIL_IDL_GENERATED) $(server_DATA) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 0357a26142..8687b1cbd2 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -37,6 +37,7 @@ #include <libedataserver/e-xml-utils.h> #include <libedataserver/e-data-server-util.h> +#include <e-util/e-util.h> #include <e-util/e-mktemp.h> #include <glib/gi18n.h> @@ -57,7 +58,6 @@ #include <camel/camel-folder.h> #include <camel/camel-vee-store.h> -#include "em-marshal.h" #include "em-folder-tree-model.h" #define u(x) /* unread count debug */ @@ -152,7 +152,7 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EMFolderTreeModelClass, loading_row), NULL, NULL, - em_marshal_VOID__POINTER_POINTER, + e_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); @@ -163,7 +163,7 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EMFolderTreeModelClass, loaded_row), NULL, NULL, - em_marshal_VOID__POINTER_POINTER, + e_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); @@ -174,7 +174,7 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EMFolderTreeModelClass, folder_added), NULL, NULL, - em_marshal_VOID__STRING_STRING, + e_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 14bdc832c8..eebb15454c 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -66,7 +66,6 @@ #include "em-utils.h" #include "em-popup.h" -#include "em-marshal.h" #include "em-folder-tree.h" #include "em-folder-utils.h" #include "em-folder-selector.h" @@ -222,7 +221,7 @@ em_folder_tree_class_init (EMFolderTreeClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EMFolderTreeClass, folder_selected), NULL, NULL, - em_marshal_VOID__STRING_STRING_UINT, + e_marshal_VOID__STRING_STRING_UINT, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, @@ -234,7 +233,7 @@ em_folder_tree_class_init (EMFolderTreeClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EMFolderTreeClass, folder_activated), NULL, NULL, - em_marshal_VOID__STRING_STRING, + e_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 56111abe6c..ea177b65ce 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -65,7 +65,6 @@ #include "em-utils.h" #include "em-popup.h" -#include "em-marshal.h" #include "em-folder-tree.h" #include "em-folder-tree-model.h" #include "em-folder-utils.h" diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 54ea58529c..8e220955fa 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -98,7 +98,6 @@ #include "message-list.h" #include "em-utils.h" #include "em-composer-utils.h" -#include "em-marshal.h" #include "em-menu.h" #include "em-event.h" @@ -412,7 +411,7 @@ emfv_class_init(GObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMFolderViewClass, on_url), NULL, NULL, - em_marshal_VOID__STRING_STRING, + e_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index bef662452f..ad72ee8bdd 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -81,7 +81,6 @@ #include "mail-config.h" #include "em-format-html-display.h" -#include "em-marshal.h" #include "e-searching-tokenizer.h" #include "em-icon-stream.h" #include "em-utils.h" @@ -340,7 +339,7 @@ efhd_class_init(GObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(EMFormatHTMLDisplayClass, popup_event), efhd_bool_accumulator, NULL, - em_marshal_BOOLEAN__BOXED_POINTER_POINTER, + e_marshal_BOOLEAN__BOXED_POINTER_POINTER, G_TYPE_BOOLEAN, 3, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE, G_TYPE_POINTER, G_TYPE_POINTER); diff --git a/mail/em-marshal.list b/mail/em-marshal.list deleted file mode 100644 index 660c272832..0000000000 --- a/mail/em-marshal.list +++ /dev/null @@ -1,5 +0,0 @@ -BOOLEAN:BOXED,POINTER,POINTER -VOID:STRING,STRING,UINT -VOID:STRING,STRING -BOOLEAN:POINTER -VOID:POINTER,POINTER diff --git a/shell/Makefile.am b/shell/Makefile.am index cf53a5c79c..177d9e80be 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -96,7 +96,6 @@ eshellinclude_HEADERS = \ libeshell_la_SOURCES = \ $(IDL_GENERATED) \ - $(MARSHAL_GENERATED) \ e-component-view.c \ evolution-component.c \ evolution-listener.c \ @@ -221,10 +220,6 @@ uninstall-local: uninstall-evolution endif - -MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h -@EVO_MARSHAL_RULE@ - # Extra dist stuff EXTRA_DIST = \ @@ -234,7 +229,6 @@ EXTRA_DIST = \ $(glade_DATA) \ $(schema_in_files) \ ChangeLog.pre-1-4 \ - e-shell-marshal.list \ evolution-nognome.in # Purify support @@ -251,7 +245,7 @@ evolution.pure: evolution endif -BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) +BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) diff --git a/shell/e-shell-marshal.list b/shell/e-shell-marshal.list deleted file mode 100644 index 2b7c3eb383..0000000000 --- a/shell/e-shell-marshal.list +++ /dev/null @@ -1,26 +0,0 @@ -BOOL:POINTER,INT -NONE:BOOL,INT -NONE:INT,INT -NONE:INT,POINTER -NONE:INT,STRING -NONE:POINTER,INT -NONE:POINTER,INT,INT -NONE:POINTER,POINTER -NONE:POINTER,POINTER,POINTER -NONE:POINTER,POINTER,POINTER,BOOL -NONE:POINTER,POINTER,POINTER,POINTER -NONE:POINTER,POINTER,POINTER,POINTER,POINTER -NONE:POINTER,STRING -NONE:POINTER,STRING,BOOL -NONE:POINTER,STRING,STRING -NONE:POINTER,STRING,STRING,BOOL -NONE:POINTER,STRING,STRING,STRING,STRING -NONE:STRING,BOOL -NONE:STRING,INT -NONE:STRING,INT,INT -NONE:STRING,POINTER -NONE:STRING,POINTER,POINTER -NONE:STRING,STRING -NONE:STRING,STRING,STRING -NONE:STRING,STRING,STRING,STRING -NONE:STRING,POINTER,POINTER,UINT,UINT diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 5319acb3d2..204b9286b0 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -34,7 +34,6 @@ #include "e-component-registry.h" #include "e-shell-window-commands.h" -#include "e-shell-marshal.h" #include "e-sidebar.h" #include "es-menu.h" #include "es-event.h" diff --git a/shell/e-shell.c b/shell/e-shell.c index a512442133..061071efb8 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -61,7 +61,6 @@ #include "Evolution.h" #include "e-shell-constants.h" -#include "e-shell-marshal.h" #include "e-shell-settings-dialog.h" #include "e-shell.h" #include "e-shell-view.h" diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 5771e07dd1..37ff2fed13 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -26,7 +26,7 @@ #include "e-sidebar.h" -#include "e-shell-marshal.h" +#include "e-util/e-util.h" #include <gconf/gconf-client.h> #include <libgnome/gnome-gconf.h> @@ -501,7 +501,7 @@ e_sidebar_class_init (ESidebarClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESidebarClass, button_pressed), boolean_handled_accumulator, NULL, - e_shell_marshal_NONE__POINTER_INT, + e_marshal_NONE__POINTER_INT, G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_INT); } diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index 56c5b60048..35044c9dba 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -26,8 +26,6 @@ #include "evolution-config-control.h" -#include "e-shell-marshal.h" - #include <e-util/e-util.h> #include <bonobo/bonobo-control.h> diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index df055929dd..52ad228baa 100644 --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -16,7 +16,6 @@ INCLUDES = \ privsolib_LTLIBRARIES = libessmime.la libessmime_la_SOURCES = \ - $(MARSHAL_GENERATED) \ e-asn1-object.c \ e-asn1-object.h \ e-cert.c \ @@ -33,11 +32,3 @@ libessmime_la_LIBADD = \ $(CERT_UI_LIBS) libessmime_la_LDFLAGS = $(NO_UNDEFINED) - -MARSHAL_GENERATED = smime-marshal.c smime-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = smime-marshal.list diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index ed25356bd4..73bfc72131 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -53,7 +53,6 @@ #define CERT_NewTempCertificate __CERT_NewTempCertificate #define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm -#include "smime-marshal.h" #include "e-cert-db.h" #include "e-cert-trust.h" #include "e-pkcs12.h" @@ -316,7 +315,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, pk11_passwd), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER, + e_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER, G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_BOOLEAN, G_TYPE_POINTER); @@ -326,7 +325,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, pk11_change_passwd), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_POINTER, + e_marshal_BOOLEAN__POINTER_POINTER, G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_POINTER); @@ -336,7 +335,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, confirm_ca_cert_import), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER, + e_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER, G_TYPE_BOOLEAN, 4, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER); } diff --git a/smime/lib/smime-marshal.list b/smime/lib/smime-marshal.list deleted file mode 100644 index 6eb2617ec0..0000000000 --- a/smime/lib/smime-marshal.list +++ /dev/null @@ -1,3 +0,0 @@ -BOOL:POINTER,BOOL,POINTER -BOOL:POINTER,POINTER -BOOL:POINTER,POINTER,POINTER,POINTER diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 5bb175aad2..5169781870 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -29,7 +29,6 @@ #endif #include "e-dateedit.h" -#include "e-util/e-util-marshal.h" #include <ctype.h> #include <stdio.h> diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 8057d23aaa..20252f1b92 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -28,7 +28,6 @@ #include <glib/gi18n.h> #include "e-image-chooser.h" -#include "e-util/e-util-marshal.h" #include "e-util/e-icon-factory.h" #include "e-util/e-util.h" diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 347b97ca7c..f9742b597f 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -183,7 +183,7 @@ e_map_class_init (EMapClass *class) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (EMapClass, set_scroll_adjustments), NULL, NULL, - e_util_marshal_NONE__OBJECT_OBJECT, + e_marshal_NONE__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index f5392cc201..7f2db7ecc4 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -24,8 +24,6 @@ #include <gtk/gtk.h> -#include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" #include "e-printable.h" @@ -57,7 +55,7 @@ e_printable_class_init (EPrintableClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, print_page), NULL, NULL, - e_util_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); @@ -67,7 +65,7 @@ e_printable_class_init (EPrintableClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, data_left), NULL, NULL, - e_util_marshal_BOOLEAN__NONE, + e_marshal_BOOLEAN__NONE, G_TYPE_BOOLEAN, 0, G_TYPE_NONE); e_printable_signals [RESET] = @@ -85,7 +83,7 @@ e_printable_class_init (EPrintableClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, height), NULL, NULL, - e_util_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_DOUBLE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); @@ -95,7 +93,7 @@ e_printable_class_init (EPrintableClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, will_fit), NULL, NULL, - e_util_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_BOOLEAN, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index 8f206e20c6..eae3d43324 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -22,8 +22,6 @@ */ #include <config.h> -#include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" #include "e-reflow-model.h" @@ -178,7 +176,7 @@ e_reflow_model_class_init (EReflowModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_items_inserted), NULL, NULL, - e_util_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_reflow_model_signals [MODEL_ITEM_CHANGED] = diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index 4e4587d3e5..f51a502a83 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -29,7 +29,6 @@ #include "text/e-text.h" #include <glib/gi18n.h> -#include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "misc/e-unicode.h" @@ -1461,7 +1460,7 @@ e_reflow_class_init (EReflowClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowClass, selection_event), NULL, NULL, - e_util_marshal_INT__OBJECT_BOXED, + e_marshal_INT__OBJECT_BOXED, G_TYPE_INT, 2, G_TYPE_OBJECT, GDK_TYPE_EVENT); diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 33fa94ff7f..30cba7f074 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -41,7 +41,6 @@ #include "e-icon-entry.h" #include "e-search-bar.h" #include "e-util/e-util.h" -#include "e-util/e-util-marshal.h" enum { diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 4e473f80bb..697bb68096 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -25,7 +25,6 @@ #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "e-selection-model.h" @@ -151,7 +150,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESelectionModelClass, cursor_changed), NULL, NULL, - e_util_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_selection_model_signals [CURSOR_ACTIVATED] = @@ -160,7 +159,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESelectionModelClass, cursor_activated), NULL, NULL, - e_util_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_selection_model_signals [SELECTION_CHANGED] = diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index bb767c7bb0..15bd0504ec 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -1776,7 +1776,7 @@ e_cell_text_class_init (ECellTextClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ECellTextClass, text_inserted), NULL, NULL, - e_util_marshal_VOID__POINTER_INT_INT_INT_INT, + e_marshal_VOID__POINTER_INT_INT_INT_INT, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); @@ -1787,7 +1787,7 @@ e_cell_text_class_init (ECellTextClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ECellTextClass, text_deleted), NULL, NULL, - e_util_marshal_VOID__POINTER_INT_INT_INT_INT, + e_marshal_VOID__POINTER_INT_INT_INT_INT, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index c4d72e314b..4871b055eb 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -32,7 +32,6 @@ #include "a11y/e-table/gal-a11y-e-table-click-to-add.h" #include "text/e-text.h" #include <glib/gi18n.h> -#include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "misc/e-canvas-utils.h" #include "misc/e-canvas.h" @@ -538,7 +537,7 @@ etcta_class_init (ETableClickToAddClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClickToAddClass, cursor_change), NULL, NULL, - e_util_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); etcta_signals [STYLE_SET] = diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c index bf9ed10afe..54909a079d 100644 --- a/widgets/table/e-table-column.c +++ b/widgets/table/e-table-column.c @@ -70,14 +70,14 @@ e_table_column_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableColumn, structure_change), NULL, NULL, - e_util_marshal_NONE__NONE, + e_marshal_NONE__NONE, G_TYPE_NONE, 0); etc_signals [DIMENSION_CHANGE] = g_signal_new ("dimension_change", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableColumn, dimension_change), - e_util_marshal_NONE__INT, + e_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); } diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 9e558bcb3f..257d23fb66 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -675,7 +675,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, double_click), NULL, NULL, - e_util_marshal_NONE__INT_INT_BOXED, + e_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -685,7 +685,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, right_click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); etg_signals [CLICK] = @@ -694,7 +694,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -704,7 +704,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, key_press), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -714,7 +714,7 @@ etg_class_init (ETableGroupClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, start_drag), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); } diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 03cdf70754..7ffb1776ae 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -35,7 +35,6 @@ #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "misc/e-canvas.h" diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index 66e7d68680..3bd1409ade 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -304,7 +304,7 @@ e_table_header_class_init (ETableHeaderClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableHeaderClass, request_width), (GSignalAccumulator) NULL, NULL, - e_util_marshal_INT__INT, + e_marshal_INT__INT, G_TYPE_INT, 1, G_TYPE_INT); klass->structure_change = NULL; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 112865f01a..58d6c65f03 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -3123,7 +3123,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, double_click), NULL, NULL, - e_util_marshal_NONE__INT_INT_BOXED, + e_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3133,7 +3133,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, start_drag), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3143,7 +3143,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, right_click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3153,7 +3153,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3163,7 +3163,7 @@ eti_class_init (ETableItemClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, key_press), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index a7b6f9e714..41664e4757 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -25,7 +25,6 @@ #include <glib-object.h> -#include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "e-table-model.h" @@ -324,7 +323,7 @@ e_table_model_class_init (ETableModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_cell_changed), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_table_model_signals [MODEL_ROWS_INSERTED] = @@ -333,7 +332,7 @@ e_table_model_class_init (ETableModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_rows_inserted), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_table_model_signals [MODEL_ROWS_DELETED] = @@ -342,7 +341,7 @@ e_table_model_class_init (ETableModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_rows_deleted), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__INT_INT, + e_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); klass->column_count = NULL; diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 99fa7acb17..7a51b62f1c 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -129,7 +129,7 @@ e_table_search_class_init (ETableSearchClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableSearchClass, search), (GSignalAccumulator) NULL, NULL, - e_util_marshal_BOOLEAN__STRING_INT, + e_marshal_BOOLEAN__STRING_INT, G_TYPE_BOOLEAN, 2, G_TYPE_STRING, G_TYPE_INT); e_table_search_signals [SEARCH_ACCEPT] = diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index b2e6b0ecaf..69a300d950 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -3141,7 +3141,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, double_click), NULL, NULL, - e_util_marshal_NONE__INT_INT_BOXED, + e_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3151,7 +3151,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, right_click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3161,7 +3161,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, click), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3171,7 +3171,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, key_press), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3181,7 +3181,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, start_drag), NULL, NULL, - e_util_marshal_INT__INT_INT_BOXED, + e_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3200,7 +3200,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, white_space_event), NULL, NULL, - e_util_marshal_INT__BOXED, + e_marshal_INT__BOXED, G_TYPE_INT, 1, GDK_TYPE_EVENT); et_signals[TABLE_DRAG_BEGIN] = @@ -3209,7 +3209,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_begin), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT, + e_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3220,7 +3220,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_end), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT, + e_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3231,7 +3231,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_get), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT, + e_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT, G_TYPE_NONE, 6, G_TYPE_INT, G_TYPE_INT, @@ -3245,7 +3245,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_delete), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT, + e_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3257,7 +3257,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_leave), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT_UINT, + e_marshal_NONE__INT_INT_OBJECT_UINT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, @@ -3269,7 +3269,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_motion), NULL, NULL, - e_util_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, + e_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 6, G_TYPE_INT, G_TYPE_INT, @@ -3283,7 +3283,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_drop), NULL, NULL, - e_util_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, + e_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 6, G_TYPE_INT, G_TYPE_INT, @@ -3297,7 +3297,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_received), NULL, NULL, - e_util_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT, + e_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT, G_TYPE_NONE, 8, G_TYPE_INT, G_TYPE_INT, @@ -3316,7 +3316,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, set_scroll_adjustments), NULL, NULL, - e_util_marshal_NONE__OBJECT_OBJECT, + e_marshal_NONE__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD, diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index ed793ec426..10c7afeb54 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -106,7 +106,7 @@ e_tree_model_class_init (ETreeModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_col_changed), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__POINTER_INT, + e_marshal_VOID__POINTER_INT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT); e_tree_model_signals [NODE_INSERTED] = @@ -115,7 +115,7 @@ e_tree_model_class_init (ETreeModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_inserted), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__POINTER_POINTER, + e_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); e_tree_model_signals [NODE_REMOVED] = @@ -124,7 +124,7 @@ e_tree_model_class_init (ETreeModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_removed), (GSignalAccumulator) NULL, NULL, - e_util_marshal_VOID__POINTER_POINTER_INT, + e_marshal_VOID__POINTER_POINTER_INT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_INT); e_tree_model_signals [NODE_DELETED] = diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index ae60bb3cf3..0963229c94 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -33,7 +33,6 @@ #include "a11y/e-table/gal-a11y-e-tree.h" #include <glib/gi18n.h> #include "e-util/e-util.h" -#include "e-util/e-util-marshal.h" #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" #include "misc/e-canvas-background.h" @@ -3118,7 +3117,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, cursor_change), NULL, NULL, - e_util_marshal_NONE__INT_POINTER, + e_marshal_NONE__INT_POINTER, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER); et_signals [CURSOR_ACTIVATED] = @@ -3127,7 +3126,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, cursor_activated), NULL, NULL, - e_util_marshal_NONE__INT_POINTER, + e_marshal_NONE__INT_POINTER, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER); et_signals [SELECTION_CHANGE] = @@ -3145,7 +3144,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, double_click), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_BOXED, + e_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3155,7 +3154,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, right_click), NULL, NULL, - e_util_marshal_INT__INT_POINTER_INT_BOXED, + e_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3165,7 +3164,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, click), NULL, NULL, - e_util_marshal_INT__INT_POINTER_INT_BOXED, + e_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3175,7 +3174,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, key_press), NULL, NULL, - e_util_marshal_INT__INT_POINTER_INT_BOXED, + e_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3185,7 +3184,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, start_drag), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_BOXED, + e_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3204,7 +3203,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, white_space_event), NULL, NULL, - e_util_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, GDK_TYPE_EVENT); et_signals[TREE_DRAG_BEGIN] = @@ -3213,7 +3212,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_begin), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_BOXED, + e_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3225,7 +3224,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_end), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_BOXED, + e_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3237,7 +3236,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_get), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT, + e_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT, G_TYPE_NONE, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3252,7 +3251,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_delete), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_OBJECT, + e_marshal_NONE__INT_POINTER_INT_OBJECT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3265,7 +3264,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_leave), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_OBJECT_UINT, + e_marshal_NONE__INT_POINTER_INT_OBJECT_UINT, G_TYPE_NONE, 5, G_TYPE_INT, G_TYPE_POINTER, @@ -3278,7 +3277,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_motion), NULL, NULL, - e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, + e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3293,7 +3292,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_drop), NULL, NULL, - e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, + e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3308,7 +3307,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_received), NULL, NULL, - e_util_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT, + e_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT, G_TYPE_NONE, 9, G_TYPE_INT, G_TYPE_POINTER, @@ -3328,7 +3327,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, set_scroll_adjustments), NULL, NULL, - e_util_marshal_NONE__OBJECT_OBJECT, + e_marshal_NONE__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index c1704e532c..207ac6ce50 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -85,7 +85,7 @@ e_text_model_class_init (ETextModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextModelClass, reposition), NULL, NULL, - e_util_marshal_NONE__POINTER_POINTER, + e_marshal_NONE__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 5f3906fc71..f15317b01e 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -3536,7 +3536,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, keypress), NULL, NULL, - e_util_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); e_text_signals[E_TEXT_POPULATE_POPUP] = @@ -3545,7 +3545,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, populate_popup), NULL, NULL, - e_util_marshal_NONE__POINTER_INT_OBJECT, + e_marshal_NONE__POINTER_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, GTK_TYPE_MENU); g_object_class_install_property (gobject_class, PROP_MODEL, |