diff options
63 files changed, 122 insertions, 586 deletions
diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/addressbook/gui/component/e-book-shell-view-private.h index 6eda9a08e8..bdfc362ee3 100644 --- a/addressbook/gui/component/e-book-shell-view-private.h +++ b/addressbook/gui/component/e-book-shell-view-private.h @@ -36,7 +36,6 @@ #include <shell/e-shell-sidebar.h> #include <shell/e-activity-handler.h> -#include <eab-menu.h> #include <eab-gui-util.h> #include <e-addressbook-view.h> #include <e-book-shell-sidebar.h> @@ -103,8 +102,6 @@ struct _EBookShellViewPrivate { EBook *book; guint activity_id; gchar *password; - - EABMenu *menu; }; void e_book_shell_view_private_init diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index e8692bb7f2..bed73df00b 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,12 @@ 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 e629877eb0..7e85394f02 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -56,7 +56,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 90005ac0f9..4b3b8f4395 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -26,8 +26,8 @@ #include <glib/gi18n.h> #include "eab-editor.h" +#include "e-util/e-util.h" #include "addressbook/gui/widgets/eab-gui-util.h" -#include "e-contact-editor-marshal.h" static void eab_editor_default_show (EABEditor *editor); static void eab_editor_default_raise (EABEditor *editor); @@ -140,7 +140,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); @@ -150,7 +150,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); @@ -160,7 +160,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..5b75f92861 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,6 @@ 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 827757c4f1..6ffa03204d 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -24,17 +24,14 @@ noinst_LTLIBRARIES = \ eabincludedir = $(privincludedir)/addressbook/gui/widgets eabinclude_HEADERS = \ - eab-config.h \ - eab-menu.h + eab-config.h libeabwidgets_la_SOURCES = \ - $(MARSHAL_GENERATED) \ eab-config.c \ eab-contact-display.c \ eab-contact-display.h \ eab-gui-util.c \ eab-gui-util.h \ - eab-menu.c \ eab-vcard-control.c \ eab-vcard-control.h \ e-minicard.c \ @@ -63,10 +60,6 @@ libeabwidgets_la_SOURCES = \ libeabwidgets_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la -MARSHAL_GENERATED = eab-marshal.c eab-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) dist-hook: @@ -76,5 +69,4 @@ etspec_DATA= e-addressbook-view.etspec EXTRA_DIST = \ $(etspec_DATA) \ - $(rule_DATA) \ - eab-marshal.list + $(rule_DATA) diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index b26c68e755..b129051228 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -10,8 +10,8 @@ #include <config.h> #include <string.h> #include <glib/gi18n.h> -#include "eab-marshal.h" #include "e-addressbook-model.h" +#include <e-util/e-util.h> #include <misc/e-gui-utils.h> #include "eab-gui-util.h" @@ -576,7 +576,7 @@ addressbook_model_class_init (EAddressbookModelClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EAddressbookModelClass, contact_added), NULL, NULL, - eab_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); signals[CONTACTS_REMOVED] = diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index a099c40ae7..d344641c8f 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -20,12 +20,12 @@ #include <string.h> #include <glib/gi18n.h> -#include "eab-marshal.h" #include "e-addressbook-reflow-adapter.h" #include "e-addressbook-model.h" #include "eab-gui-util.h" #include "e-minicard.h" +#include <e-util/e-util.h> #include <misc/e-gui-utils.h> #include "addressbook/printing/e-contact-print.h" @@ -433,7 +433,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 6ba56ae7a4..ca25548c56 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -32,7 +32,6 @@ #include <e-shell-sidebar.h> #include "addressbook/printing/e-contact-print.h" -#include "addressbook/gui/widgets/eab-menu.h" #include "a11y/addressbook/ea-addressbook.h" #include "e-util/e-print.h" @@ -43,7 +42,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-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 283b5d6cd0..93d67a2a22 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -51,9 +51,6 @@ G_BEGIN_DECLS -struct _EABMenu; -struct _EABMenuTargetSelect; - typedef enum { E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */ E_ADDRESSBOOK_VIEW_MINICARD, diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index c820ded1a5..8e4c9c8966 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -22,7 +22,6 @@ #include <config.h> #include "e-minicard-label.h" -#include "eab-marshal.h" #include <gtk/gtksignal.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 2796bfe433..2d43aca39e 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 5ef464973a..37ffc8844d 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -25,7 +25,6 @@ #include "e-minicard-view.h" #include "eab-gui-util.h" -#include "eab-marshal.h" #include "util/eab-book-util.h" #include <gtk/gtk.h> @@ -33,6 +32,7 @@ #include <misc/e-canvas.h> #include <glib/gi18n.h> #include <string.h> +#include "e-util/e-util.h" #include "a11y/addressbook/ea-addressbook.h" static void e_minicard_view_drag_data_get(GtkWidget *widget, @@ -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 a4bda1ac4a..8d50b6ee5b 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -30,7 +30,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" @@ -206,7 +205,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] = @@ -215,7 +214,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/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c deleted file mode 100644 index 603e93893c..0000000000 --- a/addressbook/gui/widgets/eab-menu.c +++ /dev/null @@ -1,258 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Michael Zucchi <notzed@ximian.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <string.h> -#include <stdlib.h> - -#include <glib.h> - -#include <libebook/e-contact.h> - -#include "eab-menu.h" - -static void eabm_standard_menu_factory(EMenu *emp, void *data); - -static GObjectClass *eabm_parent; - -static void -eabm_init(GObject *o) -{ - /*EABMenu *emp = (EABMenu *)o; */ -} - -static void -eabm_finalise(GObject *o) -{ - ((GObjectClass *)eabm_parent)->finalize(o); -} - -static void -eabm_target_free(EMenu *ep, EMenuTarget *t) -{ - switch (t->type) { - case EAB_MENU_TARGET_SELECT: { - EABMenuTargetSelect *s = (EABMenuTargetSelect *)t; - int i; - - for (i=0;i<s->cards->len;i++) - g_object_unref(s->cards->pdata[i]); - g_ptr_array_free(s->cards, TRUE); - if (s->book) - g_object_unref(s->book); - break; } - } - - ((EMenuClass *)eabm_parent)->target_free(ep, t); -} - -static void -eabm_class_init(GObjectClass *klass) -{ - klass->finalize = eabm_finalise; - ((EMenuClass *)klass)->target_free = eabm_target_free; - - e_menu_class_add_factory((EMenuClass *)klass, NULL, (EMenuFactoryFunc)eabm_standard_menu_factory, NULL); -} - -GType -eab_menu_get_type(void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo info = { - sizeof(EABMenuClass), - NULL, NULL, - (GClassInitFunc)eabm_class_init, - NULL, NULL, - sizeof(EABMenu), 0, - (GInstanceInitFunc)eabm_init - }; - eabm_parent = g_type_class_ref(e_menu_get_type()); - type = g_type_register_static(e_menu_get_type(), "EABMenu", &info, 0); - } - - return type; -} - -EABMenu *eab_menu_new(const char *menuid) -{ - EABMenu *emp = g_object_new(eab_menu_get_type(), NULL); - - e_menu_construct(&emp->menu, menuid); - - return emp; -} - -/** - * eab_menu_target_new_select - create a menu target of the current selection. - * @eabp: Address book menu. - * @book: Book the cards belong to. May be NULL in which case cards must be an empty GPtrArray. - * @readonly: Book is read-only mode. FIXME: Why can't we just get this off the book? - * @cards: Cards selected. This will be freed on completion and the array indices unreferenced. - * - * Create a new selection menu target. - * - * Return value: - **/ -EABMenuTargetSelect * -eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, int readonly, GPtrArray *cards) -{ - EABMenuTargetSelect *t = e_menu_target_new(&eabp->menu, EAB_MENU_TARGET_SELECT, sizeof(*t)); - guint32 mask = ~0; - int has_email = FALSE, i; - - /* FIXME: duplicated in eab-popup.c */ - - t->book = book; - if (book) - g_object_ref(book); - t->cards = cards; - - for (i=0;i<cards->len && !has_email;i++) { - EContact *contact = cards->pdata[i]; - GList *email; - - email = e_contact_get(E_CONTACT(contact), E_CONTACT_EMAIL); - if (email) { - has_email = TRUE; - - g_list_foreach(email, (GFunc)g_free, NULL); - g_list_free(email); - } - } - - if (has_email) - mask &= ~EAB_MENU_SELECT_EMAIL; - - if (!readonly) - mask &= ~EAB_MENU_SELECT_EDITABLE; - - if (cards->len == 1) - mask &= ~EAB_MENU_SELECT_ONE; - - if (cards->len > 1) - mask &= ~EAB_MENU_SELECT_MANY; - - if (cards->len >= 1) - mask &= ~EAB_MENU_SELECT_ANY; - - t->target.mask = mask; - - return t; -} - -static void -eabm_standard_menu_factory(EMenu *emp, void *data) -{ - /* noop */ -} - -/* ********************************************************************** */ - -/* menu plugin handler */ - -/* -<e-plugin - class="org.gnome.mail.plugin.popup:1.0" - id="org.gnome.mail.plugin.popup.item:1.0" - type="shlib" - location="/opt/gnome2/lib/camel/1.0/libcamelimap.so" - name="imap" - description="IMAP4 and IMAP4v1 mail store"> - <hook class="org.gnome.mail.popupMenu:1.0" - handler="HandlePopup"> - <menu id="any" target="select"> - <item - type="item|toggle|radio|image|submenu|bar" - active - path="foo/bar" - label="label" - icon="foo" - mask="select_one" - activate="eabm_view_emacs"/> - </menu> - </extension> - -*/ - -static void *eabmph_parent_class; -#define eabmph ((EABMenuHook *)eph) - -static const EMenuHookTargetMask eabmph_select_masks[] = { - { "one", EAB_MENU_SELECT_ONE }, - { "many", EAB_MENU_SELECT_MANY }, - { "any", EAB_MENU_SELECT_ANY }, - { "editable", EAB_MENU_SELECT_EDITABLE }, - { "email", EAB_MENU_SELECT_EMAIL }, - { NULL } -}; - -static const EMenuHookTargetMap eabmph_targets[] = { - { "select", EAB_MENU_TARGET_SELECT, eabmph_select_masks }, - { NULL } -}; - -static void -eabmph_finalise(GObject *o) -{ - /*EPluginHook *eph = (EPluginHook *)o;*/ - - ((GObjectClass *)eabmph_parent_class)->finalize(o); -} - -static void -eabmph_class_init(EPluginHookClass *klass) -{ - int i; - - ((GObjectClass *)klass)->finalize = eabmph_finalise; - ((EPluginHookClass *)klass)->id = "org.gnome.evolution.addressbook.bonobomenu:1.0"; - - for (i=0;eabmph_targets[i].type;i++) - e_menu_hook_class_add_target_map((EMenuHookClass *)klass, &eabmph_targets[i]); - - /* FIXME: leaks parent set class? */ - ((EMenuHookClass *)klass)->menu_class = g_type_class_ref(eab_menu_get_type()); -} - -GType -eab_menu_hook_get_type(void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof(EABMenuHookClass), NULL, NULL, (GClassInitFunc) eabmph_class_init, NULL, NULL, - sizeof(EABMenuHook), 0, (GInstanceInitFunc) NULL, - }; - - eabmph_parent_class = g_type_class_ref(e_menu_hook_get_type()); - type = g_type_register_static(e_menu_hook_get_type(), "EABMenuHook", &info, 0); - } - - return type; -} diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h deleted file mode 100644 index 7da05c133b..0000000000 --- a/addressbook/gui/widgets/eab-menu.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Michel Zucchi <notzed@ximian.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef __EAB_MENU_H__ -#define __EAB_MENU_H__ - -#include <glib-object.h> - -#include "e-util/e-menu.h" - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - -struct _EBook; - -typedef struct _EABMenu EABMenu; -typedef struct _EABMenuClass EABMenuClass; - -/* Current target description */ -enum _eab_menu_target_t { - EAB_MENU_TARGET_SELECT, -}; - -/** - * enum _eab_menu_target_select_t - EABMenuTargetSelect qualifiers. - * - * @EAB_MENU_SELECT_ONE: Only one item is selected. - * @EAB_MENU_SELECT_MANY: More than one item selected. - * @EAB_MENU_SELECT_ANY: One or more items selected. - * @EAB_MENU_SELECT_EDITABLE: Editable addressbook. - * @EAB_MENU_SELECT_EMAIL: Has an email address. - **/ -enum _eab_menu_target_select_t { - EAB_MENU_SELECT_ONE = 1<<0, - EAB_MENU_SELECT_MANY = 1<<1, - EAB_MENU_SELECT_ANY = 1<<2, - EAB_MENU_SELECT_EDITABLE = 1<<3, - EAB_MENU_SELECT_EMAIL = 1<<4, -}; - -typedef struct _EABMenuTargetSelect EABMenuTargetSelect; - -struct _EABMenuTargetSelect { - EMenuTarget target; - - struct _EBook *book; - GPtrArray *cards; -}; - -typedef struct _EMenuItem EABMenuItem; - -/* The object */ -struct _EABMenu { - EMenu menu; - - struct _EABMenuPrivate *priv; -}; - -struct _EABMenuClass { - EMenuClass menu_class; -}; - -GType eab_menu_get_type(void); - -EABMenu *eab_menu_new(const char *menuid); - -EABMenuTargetSelect *eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, int readonly, GPtrArray *cards); - -/* ********************************************************************** */ - -typedef struct _EABMenuHook EABMenuHook; -typedef struct _EABMenuHookClass EABMenuHookClass; - -struct _EABMenuHook { - EMenuHook hook; -}; - -struct _EABMenuHookClass { - EMenuHookClass hook_class; -}; - -GType eab_menu_hook_get_type(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __EAB_MENU_H__ */ diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index cdafbb272d..ca7340017a 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,7 @@ 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 f08b0272c3..84b7bd25dc 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -2,10 +2,6 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la endif -# The marshallers -MARSHAL_GENERATED = e-calendar-marshal.c e-calendar-marshal.h -@EVO_MARSHAL_RULE@ - SUBDIRS = alarm-notify dialogs ecalendarincludedir = $(privincludedir)/calendar/gui @@ -104,7 +100,6 @@ etspec_DATA = \ e-memo-table.etspec #libevolution_calendar_la_SOURCES = \ -# $(MARSHAL_GENERATED) \ # cal-search-bar.c \ # cal-search-bar.h \ # calendar-config.c \ @@ -309,7 +304,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-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/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am index 6a19153634..f277a4feae 100644 --- a/doc/reference/shell/Makefile.am +++ b/doc/reference/shell/Makefile.am @@ -87,6 +87,7 @@ GTKDOC_LIBS= \ $(top_builddir)/e-util/.libs/e-icon-factory.o \ $(top_builddir)/e-util/.libs/e-import.o \ $(top_builddir)/e-util/.libs/e-logger.o \ + $(top_builddir)/e-util/.libs/e-marshal.o \ $(top_builddir)/e-util/.libs/e-mktemp.o \ $(top_builddir)/e-util/.libs/e-plugin.o \ $(top_builddir)/e-util/.libs/e-plugin-ui.o \ diff --git a/e-util/Makefile.am b/e-util/Makefile.am index f22d8e6161..8855115582 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -57,6 +57,7 @@ eutilinclude_HEADERS = \ e-icon-factory.h \ e-import.h \ e-logger.h \ + e-marshal.h \ e-menu.h \ e-mktemp.h \ e-print.h \ @@ -75,16 +76,14 @@ 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 \ e-config-listener.c \ + e-config.c \ e-corba-utils.c \ e-cursor.c \ e-dialog-utils.c \ @@ -98,10 +97,11 @@ libeutil_la_SOURCES = \ e-icon-factory.c \ e-import.c \ e-logger.c \ + e-marshal.c \ e-menu.c \ e-mktemp.c \ - e-plugin.c \ e-plugin-ui.c \ + e-plugin.c \ e-popup.c \ e-print.c \ e-profile-event.c \ @@ -121,7 +121,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) @@ -162,7 +162,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-util-marshal.list b/e-util/e-marshal.list index 9314f25777..f440c3d5d1 100644 --- a/e-util/e-util-marshal.list +++ b/e-util/e-marshal.list @@ -1,10 +1,16 @@ +BOOLEAN:BOXED,POINTER,POINTER 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 +BOOLEAN:POINTER,BOOLEAN,POINTER +BOOLEAN:POINTER,POINTER BOOLEAN:POINTER,POINTER,INT,INT,INT BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT +BOOLEAN:POINTER,POINTER,POINTER,POINTER +BOOLEAN:STRING BOOLEAN:STRING,INT DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN INT:BOXED @@ -15,6 +21,9 @@ INT:OBJECT,BOXED INT:POINTER NONE:BOXED,INT NONE:BOXED,INT,INT +NONE:ENUM,ENUM +NONE:ENUM,STRING +NONE:INT,BOOLEAN NONE:INT,INT NONE:INT,INT,BOXED NONE:INT,INT,OBJECT @@ -24,6 +33,7 @@ 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,OBJECT NONE:INT,POINTER NONE:INT,POINTER,INT,BOXED NONE:INT,POINTER,INT,OBJECT @@ -31,10 +41,12 @@ 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:LONG,LONG NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN +NONE:OBJECT,OBJECT NONE:POINTER,BOOLEAN NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN +NONE:POINTER,ENUM NONE:POINTER,INT NONE:POINTER,INT,INT NONE:POINTER,INT,INT,INT @@ -42,5 +54,13 @@ NONE:POINTER,INT,INT,INT,INT NONE:POINTER,INT,OBJECT NONE:POINTER,POINTER NONE:POINTER,POINTER,INT +NONE:POINTER,STRING +NONE:STRING,BOOL,INT,INT +NONE:STRING,INT +NONE:STRING,INT,INT +NONE:STRING,POINTER,POINTER +NONE:STRING,STRING +NONE:STRING,STRING,STRING +NONE:STRING,STRING,UINT OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN POINTER:NONE 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.c b/e-util/e-util.c index 06d7e1fcee..cec2ec1b69 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -288,10 +288,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 2abe72ced9..d1a76c8ea6 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -30,7 +30,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 e15deb1a3c..2b6f473db9 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -28,8 +28,6 @@ libfilter_la_SOURCES = \ filter-int.h \ filter-label.c \ filter-label.h \ - filter-marshal.c \ - filter-marshal.h \ filter-option.c \ filter-option.h \ filter-part.c \ @@ -51,16 +49,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 c7e79269e6..80c8c8440c 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -32,7 +32,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 2a370fd2af..ecbdafefdd 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -49,7 +49,6 @@ #include "filter-input.h" #include "filter-int.h" #include "filter-label.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-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 16b560ce49..f142d5d020 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -73,7 +73,6 @@ eshellinclude_HEADERS = \ libeshell_la_SOURCES = \ $(IDL_GENERATED) \ - $(MARSHAL_GENERATED) \ e-activity-handler.c \ e-shell-content.c \ e-shell-module.c \ @@ -179,11 +178,6 @@ uninstall-local: uninstall-evolution endif -MARSHAL_GENERATED = \ - e-shell-marshal.c \ - e-shell-marshal.h -@EVO_MARSHAL_RULE@ - # Extra dist stuff EXTRA_DIST = \ @@ -191,7 +185,6 @@ EXTRA_DIST = \ $(glade_DATA) \ $(schema_in_files) \ ChangeLog.pre-1-4 \ - e-shell-marshal.list \ evolution-nognome.in # Purify support @@ -208,7 +201,7 @@ evolution.pure: evolution endif -BUILT_SOURCES = $(MARSHAL_GENERATED) $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) +BUILT_SOURCES = $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) diff --git a/shell/e-shell.c b/shell/e-shell.c index 304a90e10e..73ff91dd15 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -24,7 +24,6 @@ #include <e-preferences-window.h> #include <e-util/e-util.h> -#include <e-shell-marshal.h> #include <e-shell-module.h> #include <e-shell-window.h> @@ -333,7 +332,7 @@ shell_class_init (EShellClass *class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, g_signal_accumulator_true_handled, NULL, - e_shell_marshal_BOOLEAN__STRING, + e_marshal_BOOLEAN__STRING, G_TYPE_BOOLEAN, 1, G_TYPE_STRING); diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index df055929dd..2b9e74d3bf 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 \ @@ -34,10 +33,4 @@ libessmime_la_LIBADD = \ 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 1c879177f1..c00c3fe26b 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -71,7 +71,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" @@ -334,7 +333,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); @@ -344,7 +343,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); @@ -354,7 +353,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 82847d729e..1ffe823f4c 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -35,7 +35,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 2a2725c4ef..6fd7021b54 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -31,7 +31,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" @@ -1470,7 +1469,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 fa8b099569..1cd67e8459 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -33,7 +33,6 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> #include <e-util/e-util.h> -#include <e-util/e-util-marshal.h> #include <e-action-combo-box.h> #include <e-gui-utils.h> 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-spin-button.c b/widgets/table/e-cell-spin-button.c index ea7f294cfa..405546be3e 100644 --- a/widgets/table/e-cell-spin-button.c +++ b/widgets/table/e-cell-spin-button.c @@ -149,7 +149,7 @@ e_cell_spin_button_class_init (ECellSpinButtonClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECellSpinButtonClass, step), NULL, NULL, - e_util_marshal_NONE__POINTER_INT_INT_INT, + e_marshal_NONE__POINTER_INT_INT_INT, G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index d0da6beadf..9975dba559 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -1785,7 +1785,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); @@ -1796,7 +1796,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 cbbd02c839..cebef080d8 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 e4138370da..441f665987 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -36,7 +36,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 a4ec641cc0..c8409fb720 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -3127,7 +3127,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); @@ -3137,7 +3137,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); @@ -3147,7 +3147,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); @@ -3157,7 +3157,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); @@ -3167,7 +3167,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 c260199ecb..9583494bd1 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -3142,7 +3142,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); @@ -3152,7 +3152,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); @@ -3162,7 +3162,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); @@ -3172,7 +3172,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); @@ -3182,7 +3182,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); @@ -3201,7 +3201,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] = @@ -3210,7 +3210,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, @@ -3221,7 +3221,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, @@ -3232,7 +3232,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, @@ -3246,7 +3246,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, @@ -3258,7 +3258,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, @@ -3270,7 +3270,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, @@ -3284,7 +3284,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, @@ -3298,7 +3298,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, @@ -3317,7 +3317,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 127c643758..28a856abc9 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -107,7 +107,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] = @@ -116,7 +116,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] = @@ -125,7 +125,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 6d375cdfc1..90cce8e1bb 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -34,7 +34,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" @@ -3119,7 +3118,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] = @@ -3128,7 +3127,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] = @@ -3146,7 +3145,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); @@ -3156,7 +3155,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); @@ -3166,7 +3165,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); @@ -3176,7 +3175,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); @@ -3186,7 +3185,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); @@ -3205,7 +3204,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] = @@ -3214,7 +3213,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, @@ -3226,7 +3225,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, @@ -3238,7 +3237,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, @@ -3253,7 +3252,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, @@ -3266,7 +3265,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, @@ -3279,7 +3278,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, @@ -3294,7 +3293,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, @@ -3309,7 +3308,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, @@ -3329,7 +3328,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 dca16f0da9..32910b05f9 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -3534,7 +3534,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] = @@ -3543,7 +3543,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, |