evolution r36368 - in branches/kill-bonobo: addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/contact-list-editor addressbook/gui/widgets addressbook/util calendar/gui doc/reference/shell e-util filter mail shell smime/lib widgets/misc widgets/table widgets/text
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r36368 - in branches/kill-bonobo: addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/contact-list-editor addressbook/gui/widgets addressbook/util calendar/gui doc/reference/shell e-util filter mail shell smime/lib widgets/misc widgets/table widgets/text
- Date: Thu, 18 Sep 2008 03:31:42 +0000 (UTC)
Author: mbarnes
Date: Thu Sep 18 03:31:42 2008
New Revision: 36368
URL: http://svn.gnome.org/viewvc/evolution?rev=36368&view=rev
Log:
Progress update:
- Kill EABMenu.
- Centralize marshallers to eliminate duplication.
Added:
branches/kill-bonobo/e-util/e-marshal.list (contents, props changed)
- copied, changed from r36304, /branches/kill-bonobo/e-util/e-util-marshal.list
Removed:
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor-marshal.list
branches/kill-bonobo/addressbook/gui/widgets/eab-marshal.list
branches/kill-bonobo/addressbook/gui/widgets/eab-menu.c
branches/kill-bonobo/addressbook/gui/widgets/eab-menu.h
branches/kill-bonobo/addressbook/util/eab-marshal.list
branches/kill-bonobo/calendar/gui/e-calendar-marshal.list
branches/kill-bonobo/e-util/e-util-marshal.list
branches/kill-bonobo/filter/filter-marshal.list
branches/kill-bonobo/mail/em-marshal.list
branches/kill-bonobo/smime/lib/smime-marshal.list
Modified:
branches/kill-bonobo/addressbook/gui/component/e-book-shell-view-private.h
branches/kill-bonobo/addressbook/gui/contact-editor/Makefile.am
branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c
branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.c
branches/kill-bonobo/addressbook/gui/contact-list-editor/Makefile.am
branches/kill-bonobo/addressbook/gui/widgets/Makefile.am
branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-model.c
branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.c
branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.h
branches/kill-bonobo/addressbook/gui/widgets/e-minicard-label.c
branches/kill-bonobo/addressbook/gui/widgets/e-minicard-view-widget.c
branches/kill-bonobo/addressbook/gui/widgets/e-minicard-view.c
branches/kill-bonobo/addressbook/gui/widgets/e-minicard.c
branches/kill-bonobo/addressbook/util/Makefile.am
branches/kill-bonobo/calendar/gui/Makefile.am
branches/kill-bonobo/doc/reference/shell/Makefile.am
branches/kill-bonobo/e-util/Makefile.am
branches/kill-bonobo/e-util/e-signature-list.c
branches/kill-bonobo/e-util/e-text-event-processor.c
branches/kill-bonobo/e-util/e-util.c
branches/kill-bonobo/e-util/e-util.h
branches/kill-bonobo/filter/Makefile.am
branches/kill-bonobo/filter/filter-rule.c
branches/kill-bonobo/filter/rule-context.c
branches/kill-bonobo/mail/Makefile.am
branches/kill-bonobo/shell/Makefile.am
branches/kill-bonobo/shell/e-shell.c
branches/kill-bonobo/smime/lib/Makefile.am
branches/kill-bonobo/smime/lib/e-cert-db.c
branches/kill-bonobo/widgets/misc/e-dateedit.c
branches/kill-bonobo/widgets/misc/e-image-chooser.c
branches/kill-bonobo/widgets/misc/e-map.c
branches/kill-bonobo/widgets/misc/e-printable.c
branches/kill-bonobo/widgets/misc/e-reflow-model.c
branches/kill-bonobo/widgets/misc/e-reflow.c
branches/kill-bonobo/widgets/misc/e-search-bar.c
branches/kill-bonobo/widgets/misc/e-selection-model.c
branches/kill-bonobo/widgets/table/e-cell-spin-button.c
branches/kill-bonobo/widgets/table/e-cell-text.c
branches/kill-bonobo/widgets/table/e-table-click-to-add.c
branches/kill-bonobo/widgets/table/e-table-column.c
branches/kill-bonobo/widgets/table/e-table-group.c
branches/kill-bonobo/widgets/table/e-table-header-item.c
branches/kill-bonobo/widgets/table/e-table-header.c
branches/kill-bonobo/widgets/table/e-table-item.c
branches/kill-bonobo/widgets/table/e-table-model.c
branches/kill-bonobo/widgets/table/e-table-search.c
branches/kill-bonobo/widgets/table/e-table.c
branches/kill-bonobo/widgets/table/e-tree-model.c
branches/kill-bonobo/widgets/table/e-tree.c
branches/kill-bonobo/widgets/text/e-text-model.c
branches/kill-bonobo/widgets/text/e-text.c
Modified: branches/kill-bonobo/addressbook/gui/component/e-book-shell-view-private.h
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/e-book-shell-view-private.h (original)
+++ branches/kill-bonobo/addressbook/gui/component/e-book-shell-view-private.h Thu Sep 18 03:31:42 2008
@@ -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 @@
EBook *book;
guint activity_id;
gchar *password;
-
- EABMenu *menu;
};
void e_book_shell_view_private_init
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/Makefile.am
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/Makefile.am (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/Makefile.am Thu Sep 18 03:31:42 2008
@@ -18,7 +18,6 @@
libecontacteditor.la
libecontacteditor_la_SOURCES = \
- $(MARSHAL_GENERATED) \
eab-editor.c \
eab-editor.h \
e-contact-editor-im.c \
@@ -40,17 +39,12 @@
$(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)
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/e-contact-editor.c Thu Sep 18 03:31:42 2008
@@ -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
Modified: branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.c (original)
+++ branches/kill-bonobo/addressbook/gui/contact-editor/eab-editor.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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 @@
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 @@
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);
Modified: branches/kill-bonobo/addressbook/gui/contact-list-editor/Makefile.am
==============================================================================
--- branches/kill-bonobo/addressbook/gui/contact-list-editor/Makefile.am (original)
+++ branches/kill-bonobo/addressbook/gui/contact-list-editor/Makefile.am Thu Sep 18 03:31:42 2008
@@ -17,7 +17,6 @@
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 @@
glade_DATA = contact-list-editor.glade
-BUILT_SOURCES = $(MARSHAL_GENERATED)
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(glade_DATA)
Modified: branches/kill-bonobo/addressbook/gui/widgets/Makefile.am
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/Makefile.am (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/Makefile.am Thu Sep 18 03:31:42 2008
@@ -24,17 +24,14 @@
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_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 @@
EXTRA_DIST = \
$(etspec_DATA) \
- $(rule_DATA) \
- eab-marshal.list
+ $(rule_DATA)
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-model.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-model.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-model.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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] =
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-reflow-adapter.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-reflow-adapter.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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;
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.c Thu Sep 18 03:31:42 2008
@@ -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"
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.h
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.h (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-addressbook-view.h Thu Sep 18 03:31:42 2008
@@ -51,9 +51,6 @@
G_BEGIN_DECLS
-struct _EABMenu;
-struct _EABMenuTargetSelect;
-
typedef enum {
E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */
E_ADDRESSBOOK_VIEW_MINICARD,
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-minicard-label.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-minicard-label.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-minicard-label.c Thu Sep 18 03:31:42 2008
@@ -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>
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-minicard-view-widget.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-minicard-view-widget.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-minicard-view-widget.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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);
}
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-minicard-view.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-minicard-view.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-minicard-view.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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;
Modified: branches/kill-bonobo/addressbook/gui/widgets/e-minicard.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/widgets/e-minicard.c (original)
+++ branches/kill-bonobo/addressbook/gui/widgets/e-minicard.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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 @@
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] =
Modified: branches/kill-bonobo/addressbook/util/Makefile.am
==============================================================================
--- branches/kill-bonobo/addressbook/util/Makefile.am (original)
+++ branches/kill-bonobo/addressbook/util/Makefile.am Thu Sep 18 03:31:42 2008
@@ -13,7 +13,6 @@
privsolib_LTLIBRARIES = libeabutil.la
libeabutil_la_SOURCES = \
- eab-marshal.c \
eab-book-util.c \
eab-book-util.h
@@ -24,14 +23,7 @@
$(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)
Modified: branches/kill-bonobo/calendar/gui/Makefile.am
==============================================================================
--- branches/kill-bonobo/calendar/gui/Makefile.am (original)
+++ branches/kill-bonobo/calendar/gui/Makefile.am Thu Sep 18 03:31:42 2008
@@ -2,10 +2,6 @@
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 @@
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 @@
@INTLTOOL_SCHEMAS_RULE@
EXTRA_DIST = \
- e-calendar-marshal.list \
$(glade_DATA) \
$(schema_in_files) \
$(etspec_DATA) \
Modified: branches/kill-bonobo/doc/reference/shell/Makefile.am
==============================================================================
--- branches/kill-bonobo/doc/reference/shell/Makefile.am (original)
+++ branches/kill-bonobo/doc/reference/shell/Makefile.am Thu Sep 18 03:31:42 2008
@@ -87,6 +87,7 @@
$(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 \
Modified: branches/kill-bonobo/e-util/Makefile.am
==============================================================================
--- branches/kill-bonobo/e-util/Makefile.am (original)
+++ branches/kill-bonobo/e-util/Makefile.am Thu Sep 18 03:31:42 2008
@@ -57,6 +57,7 @@
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 @@
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 @@
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 @@
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 @@
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)
Copied: branches/kill-bonobo/e-util/e-marshal.list (from r36304, /branches/kill-bonobo/e-util/e-util-marshal.list)
==============================================================================
--- /branches/kill-bonobo/e-util/e-util-marshal.list (original)
+++ branches/kill-bonobo/e-util/e-marshal.list Thu Sep 18 03:31:42 2008
@@ -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: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,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,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,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
Modified: branches/kill-bonobo/e-util/e-signature-list.c
==============================================================================
--- branches/kill-bonobo/e-util/e-signature-list.c (original)
+++ branches/kill-bonobo/e-util/e-signature-list.c Thu Sep 18 03:31:42 2008
@@ -29,8 +29,6 @@
#include <libedataserver/e-uid.h>
-#include "e-util-marshal.h"
-
#include "e-signature-list.h"
struct _ESignatureListPrivate {
Modified: branches/kill-bonobo/e-util/e-text-event-processor.c
==============================================================================
--- branches/kill-bonobo/e-util/e-text-event-processor.c (original)
+++ branches/kill-bonobo/e-util/e-text-event-processor.c Thu Sep 18 03:31:42 2008
@@ -24,7 +24,6 @@
#include <glib/gi18n.h>
-#include "e-util-marshal.h"
#include "e-text-event-processor.h"
#include "e-util.h"
Modified: branches/kill-bonobo/e-util/e-util.c
==============================================================================
--- branches/kill-bonobo/e-util/e-util.c (original)
+++ branches/kill-bonobo/e-util/e-util.c Thu Sep 18 03:31:42 2008
@@ -288,10 +288,6 @@
return res;
}
-/* Include build marshalers */
-
-#include "e-util-marshal.h"
-
static gint
epow10 (gint number)
{
Modified: branches/kill-bonobo/e-util/e-util.h
==============================================================================
--- branches/kill-bonobo/e-util/e-util.h (original)
+++ branches/kill-bonobo/e-util/e-util.h Thu Sep 18 03:31:42 2008
@@ -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
Modified: branches/kill-bonobo/filter/Makefile.am
==============================================================================
--- branches/kill-bonobo/filter/Makefile.am (original)
+++ branches/kill-bonobo/filter/Makefile.am Thu Sep 18 03:31:42 2008
@@ -28,8 +28,6 @@
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 @@
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)
Modified: branches/kill-bonobo/filter/filter-rule.c
==============================================================================
--- branches/kill-bonobo/filter/filter-rule.c (original)
+++ branches/kill-bonobo/filter/filter-rule.c Thu Sep 18 03:31:42 2008
@@ -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)
Modified: branches/kill-bonobo/filter/rule-context.c
==============================================================================
--- branches/kill-bonobo/filter/rule-context.c (original)
+++ branches/kill-bonobo/filter/rule-context.c Thu Sep 18 03:31:42 2008
@@ -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"
Modified: branches/kill-bonobo/mail/Makefile.am
==============================================================================
--- branches/kill-bonobo/mail/Makefile.am (original)
+++ branches/kill-bonobo/mail/Makefile.am Thu Sep 18 03:31:42 2008
@@ -92,7 +92,6 @@
libevolution_mail_la_SOURCES = \
$(MAIL_IDL_GENERATED) \
- $(MARSHAL_GENERATED) \
$(mailinclude_HEADERS) \
e-searching-tokenizer.c \
e-searching-tokenizer.h \
@@ -241,15 +240,12 @@
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 @@
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)
Modified: branches/kill-bonobo/shell/Makefile.am
==============================================================================
--- branches/kill-bonobo/shell/Makefile.am (original)
+++ branches/kill-bonobo/shell/Makefile.am Thu Sep 18 03:31:42 2008
@@ -73,7 +73,6 @@
libeshell_la_SOURCES = \
$(IDL_GENERATED) \
- $(MARSHAL_GENERATED) \
e-activity-handler.c \
e-shell-content.c \
e-shell-module.c \
@@ -179,11 +178,6 @@
endif
-MARSHAL_GENERATED = \
- e-shell-marshal.c \
- e-shell-marshal.h
- EVO_MARSHAL_RULE@
-
# Extra dist stuff
EXTRA_DIST = \
@@ -191,7 +185,6 @@
$(glade_DATA) \
$(schema_in_files) \
ChangeLog.pre-1-4 \
- e-shell-marshal.list \
evolution-nognome.in
# Purify support
@@ -208,7 +201,7 @@
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)
Modified: branches/kill-bonobo/shell/e-shell.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell.c (original)
+++ branches/kill-bonobo/shell/e-shell.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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);
Modified: branches/kill-bonobo/smime/lib/Makefile.am
==============================================================================
--- branches/kill-bonobo/smime/lib/Makefile.am (original)
+++ branches/kill-bonobo/smime/lib/Makefile.am Thu Sep 18 03:31:42 2008
@@ -16,7 +16,6 @@
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_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
Modified: branches/kill-bonobo/smime/lib/e-cert-db.c
==============================================================================
--- branches/kill-bonobo/smime/lib/e-cert-db.c (original)
+++ branches/kill-bonobo/smime/lib/e-cert-db.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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 @@
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 @@
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);
}
Modified: branches/kill-bonobo/widgets/misc/e-dateedit.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-dateedit.c (original)
+++ branches/kill-bonobo/widgets/misc/e-dateedit.c Thu Sep 18 03:31:42 2008
@@ -35,7 +35,6 @@
#endif
#include "e-dateedit.h"
-#include "e-util/e-util-marshal.h"
#include <ctype.h>
#include <stdio.h>
Modified: branches/kill-bonobo/widgets/misc/e-image-chooser.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-image-chooser.c (original)
+++ branches/kill-bonobo/widgets/misc/e-image-chooser.c Thu Sep 18 03:31:42 2008
@@ -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"
Modified: branches/kill-bonobo/widgets/misc/e-map.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-map.c (original)
+++ branches/kill-bonobo/widgets/misc/e-map.c Thu Sep 18 03:31:42 2008
@@ -183,7 +183,7 @@
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);
Modified: branches/kill-bonobo/widgets/misc/e-printable.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-printable.c (original)
+++ branches/kill-bonobo/widgets/misc/e-printable.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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 @@
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 @@
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 @@
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);
Modified: branches/kill-bonobo/widgets/misc/e-reflow-model.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-reflow-model.c (original)
+++ branches/kill-bonobo/widgets/misc/e-reflow-model.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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] =
Modified: branches/kill-bonobo/widgets/misc/e-reflow.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-reflow.c (original)
+++ branches/kill-bonobo/widgets/misc/e-reflow.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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);
Modified: branches/kill-bonobo/widgets/misc/e-search-bar.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-search-bar.c (original)
+++ branches/kill-bonobo/widgets/misc/e-search-bar.c Thu Sep 18 03:31:42 2008
@@ -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>
Modified: branches/kill-bonobo/widgets/misc/e-selection-model.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-selection-model.c (original)
+++ branches/kill-bonobo/widgets/misc/e-selection-model.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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 @@
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] =
Modified: branches/kill-bonobo/widgets/table/e-cell-spin-button.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-cell-spin-button.c (original)
+++ branches/kill-bonobo/widgets/table/e-cell-spin-button.c Thu Sep 18 03:31:42 2008
@@ -149,7 +149,7 @@
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);
Modified: branches/kill-bonobo/widgets/table/e-cell-text.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-cell-text.c (original)
+++ branches/kill-bonobo/widgets/table/e-cell-text.c Thu Sep 18 03:31:42 2008
@@ -1785,7 +1785,7 @@
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 @@
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);
Modified: branches/kill-bonobo/widgets/table/e-table-click-to-add.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-click-to-add.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-click-to-add.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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] =
Modified: branches/kill-bonobo/widgets/table/e-table-column.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-column.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-column.c Thu Sep 18 03:31:42 2008
@@ -70,14 +70,14 @@
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);
}
Modified: branches/kill-bonobo/widgets/table/e-table-group.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-group.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-group.c Thu Sep 18 03:31:42 2008
@@ -675,7 +675,7 @@
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 @@
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 @@
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 @@
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 @@
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);
}
Modified: branches/kill-bonobo/widgets/table/e-table-header-item.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-header-item.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-header-item.c Thu Sep 18 03:31:42 2008
@@ -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"
Modified: branches/kill-bonobo/widgets/table/e-table-header.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-header.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-header.c Thu Sep 18 03:31:42 2008
@@ -304,7 +304,7 @@
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;
Modified: branches/kill-bonobo/widgets/table/e-table-item.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-item.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-item.c Thu Sep 18 03:31:42 2008
@@ -3127,7 +3127,7 @@
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 @@
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 @@
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 @@
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 @@
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);
Modified: branches/kill-bonobo/widgets/table/e-table-model.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-model.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-model.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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 @@
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 @@
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;
Modified: branches/kill-bonobo/widgets/table/e-table-search.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table-search.c (original)
+++ branches/kill-bonobo/widgets/table/e-table-search.c Thu Sep 18 03:31:42 2008
@@ -129,7 +129,7 @@
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] =
Modified: branches/kill-bonobo/widgets/table/e-table.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-table.c (original)
+++ branches/kill-bonobo/widgets/table/e-table.c Thu Sep 18 03:31:42 2008
@@ -3142,7 +3142,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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,
Modified: branches/kill-bonobo/widgets/table/e-tree-model.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-tree-model.c (original)
+++ branches/kill-bonobo/widgets/table/e-tree-model.c Thu Sep 18 03:31:42 2008
@@ -107,7 +107,7 @@
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 @@
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 @@
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] =
Modified: branches/kill-bonobo/widgets/table/e-tree.c
==============================================================================
--- branches/kill-bonobo/widgets/table/e-tree.c (original)
+++ branches/kill-bonobo/widgets/table/e-tree.c Thu Sep 18 03:31:42 2008
@@ -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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
Modified: branches/kill-bonobo/widgets/text/e-text-model.c
==============================================================================
--- branches/kill-bonobo/widgets/text/e-text-model.c (original)
+++ branches/kill-bonobo/widgets/text/e-text-model.c Thu Sep 18 03:31:42 2008
@@ -85,7 +85,7 @@
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);
Modified: branches/kill-bonobo/widgets/text/e-text.c
==============================================================================
--- branches/kill-bonobo/widgets/text/e-text.c (original)
+++ branches/kill-bonobo/widgets/text/e-text.c Thu Sep 18 03:31:42 2008
@@ -3534,7 +3534,7 @@
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 @@
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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
