From e42f27652709397453431b75c32601a4f4effd48 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 10:02:07 -0400 Subject: Bug 577929 – Consolidate marshallers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate all marshalling specifications to e-util/e-marshal.list. This reduces code duplication and makes it slightly easier to locate unused marshallers. --- addressbook/gui/contact-editor/Makefile.am | 10 +--------- addressbook/gui/contact-editor/e-contact-editor-marshal.list | 1 - addressbook/gui/contact-editor/e-contact-editor.c | 1 - addressbook/gui/contact-editor/eab-editor.c | 8 ++++---- addressbook/gui/contact-list-editor/Makefile.am | 4 ---- addressbook/gui/widgets/Makefile.am | 8 -------- addressbook/gui/widgets/e-addressbook-model.c | 4 ++-- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 4 ++-- addressbook/gui/widgets/e-addressbook-view.c | 1 - addressbook/gui/widgets/e-minicard-label.c | 1 - addressbook/gui/widgets/e-minicard-view-widget.c | 4 ++-- addressbook/gui/widgets/e-minicard-view.c | 4 ++-- addressbook/gui/widgets/e-minicard.c | 5 ++--- addressbook/gui/widgets/eab-marshal.list | 2 -- addressbook/util/Makefile.am | 10 ---------- addressbook/util/eab-marshal.list | 0 16 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 addressbook/gui/contact-editor/e-contact-editor-marshal.list delete mode 100644 addressbook/gui/widgets/eab-marshal.list delete mode 100644 addressbook/util/eab-marshal.list (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index e8692bb7f2..32d5531859 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -18,7 +18,6 @@ privsolib_LTLIBRARIES = \ libecontacteditor.la libecontacteditor_la_SOURCES = \ - $(MARSHAL_GENERATED) \ eab-editor.c \ eab-editor.h \ e-contact-editor-im.c \ @@ -40,17 +39,10 @@ libecontacteditor_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) -MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h -@EVO_MARSHAL_RULE@ - glade_DATA = \ im.glade \ contact-editor.glade \ fulladdr.glade \ fullname.glade -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST= $(glade_DATA) \ - e-contact-editor-marshal.list +EXTRA_DIST= $(glade_DATA) diff --git a/addressbook/gui/contact-editor/e-contact-editor-marshal.list b/addressbook/gui/contact-editor/e-contact-editor-marshal.list deleted file mode 100644 index f871960b0d..0000000000 --- a/addressbook/gui/contact-editor/e-contact-editor-marshal.list +++ /dev/null @@ -1 +0,0 @@ -NONE:INT,OBJECT diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 0fad7abb29..ac4f663ffc 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -59,7 +59,6 @@ #include "e-contact-editor-address.h" #include "e-contact-editor-im.h" #include "e-contact-editor-fullname.h" -#include "e-contact-editor-marshal.h" #define EMAIL_SLOTS 4 #define PHONE_SLOTS 8 diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index e97917b77f..b94dff2953 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -29,7 +29,7 @@ #include "eab-editor.h" #include "addressbook/gui/widgets/eab-gui-util.h" -#include "e-contact-editor-marshal.h" +#include "e-util/e-util.h" static void eab_editor_default_show (EABEditor *editor); static void eab_editor_default_raise (EABEditor *editor); @@ -142,7 +142,7 @@ eab_editor_class_init (EABEditorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EABEditorClass, contact_added), NULL, NULL, - e_contact_editor_marshal_NONE__INT_OBJECT, + e_marshal_NONE__INT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_OBJECT); @@ -152,7 +152,7 @@ eab_editor_class_init (EABEditorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EABEditorClass, contact_modified), NULL, NULL, - e_contact_editor_marshal_NONE__INT_OBJECT, + e_marshal_NONE__INT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_OBJECT); @@ -162,7 +162,7 @@ eab_editor_class_init (EABEditorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EABEditorClass, contact_deleted), NULL, NULL, - e_contact_editor_marshal_NONE__INT_OBJECT, + e_marshal_NONE__INT_OBJECT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_OBJECT); diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 76122c2421..e0605d534a 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -17,7 +17,6 @@ privsolib_LTLIBRARIES = \ libecontactlisteditor.la libecontactlisteditor_la_SOURCES = \ - $(MARSHAL_GENERATED) \ e-contact-list-editor.c \ e-contact-list-editor.h \ e-contact-list-model.c \ @@ -36,7 +35,4 @@ libecontactlisteditor_la_LIBADD = \ glade_DATA = contact-list-editor.glade -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - EXTRA_DIST = $(glade_DATA) diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 88c7f07011..e14f274f4e 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -27,7 +27,6 @@ eabinclude_HEADERS = \ eab-popup.h libeabwidgets_la_SOURCES = \ - $(MARSHAL_GENERATED) \ eab-config.c \ eab-contact-display.c \ eab-contact-display.h \ @@ -61,12 +60,6 @@ libeabwidgets_la_SOURCES = \ gal-view-factory-minicard.c \ gal-view-factory-minicard.h -MARSHAL_GENERATED = eab-marshal.c eab-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) @@ -74,5 +67,4 @@ etspec_DATA= e-addressbook-view.etspec EXTRA_DIST = \ $(etspec_DATA) \ - eab-marshal.list \ addresstypes.xml diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 7599a85abd..7273689fd1 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -24,7 +24,7 @@ #include #include #include -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-addressbook-model.h" #include #include @@ -380,7 +380,7 @@ eab_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EABModelClass, contact_added), NULL, NULL, - eab_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); eab_model_signals [CONTACTS_REMOVED] = diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 1630161878..1f2b1aad7a 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -20,7 +20,7 @@ #include #include -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-addressbook-reflow-adapter.h" #include "e-addressbook-model.h" #include "e-addressbook-view.h" @@ -434,7 +434,7 @@ e_addressbook_reflow_adapter_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EAddressbookReflowAdapterClass, drag_begin), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); model_class->set_width = addressbook_set_width; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index c138df8ff2..3c0c28f6ad 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -45,7 +45,6 @@ #include "gal-view-minicard.h" #include "gal-view-factory-minicard.h" -#include "eab-marshal.h" #include "e-addressbook-view.h" #include "e-addressbook-model.h" #include "eab-gui-util.h" diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 85f2c5fd28..696d42dcd9 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -23,7 +23,6 @@ #include #include "e-minicard-label.h" -#include "eab-marshal.h" #include #include diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index d416da2015..0f9ae7c143 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -27,7 +27,7 @@ #include #include -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-minicard-view-widget.h" static void e_minicard_view_widget_init (EMinicardViewWidget *widget); @@ -164,7 +164,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardViewWidgetClass, right_click), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); } diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 803df061a2..ccf3ecc6f9 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -25,8 +25,8 @@ #include "e-minicard-view.h" #include "eab-gui-util.h" -#include "eab-marshal.h" #include "util/eab-book-util.h" +#include "e-util/e-util.h" #include #include @@ -553,7 +553,7 @@ e_minicard_view_class_init (EMinicardViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardViewClass, right_click), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); item_class->event = e_minicard_view_event; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 83e3692921..cbbcc80d5c 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -31,7 +31,6 @@ #include #include #include -#include "eab-marshal.h" #include "eab-gui-util.h" #include "e-minicard.h" #include "e-minicard-label.h" @@ -207,7 +206,7 @@ e_minicard_class_init (EMinicardClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardClass, selected), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); e_minicard_signals [DRAG_BEGIN] = @@ -216,7 +215,7 @@ e_minicard_class_init (EMinicardClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardClass, drag_begin), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); e_minicard_signals [STYLE_SET] = diff --git a/addressbook/gui/widgets/eab-marshal.list b/addressbook/gui/widgets/eab-marshal.list deleted file mode 100644 index 867355e96e..0000000000 --- a/addressbook/gui/widgets/eab-marshal.list +++ /dev/null @@ -1,2 +0,0 @@ -INT:POINTER -NONE:INT,INT diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index cdafbb272d..0f66310033 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -13,7 +13,6 @@ INCLUDES = \ privsolib_LTLIBRARIES = libeabutil.la libeabutil_la_SOURCES = \ - eab-marshal.c \ eab-book-util.c \ eab-book-util.h @@ -24,14 +23,5 @@ libeabutil_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la -MARSHAL_GENERATED = eab-marshal.c eab-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - eab-marshal.list - dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/addressbook/util/eab-marshal.list b/addressbook/util/eab-marshal.list deleted file mode 100644 index e69de29bb2..0000000000 -- cgit