GNOME.org
 

[evolution/email-factory-3-4] Keep e-marshal in e-util.

commit 3e56c33c028e0b5411b8c2d708d9f1075504212a
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jan 17 16:23:30 2012 -0500

    Keep e-marshal in e-util.
    
    Start using g_cclosure_marshal_generic() in signals.

 addressbook/gui/widgets/e-addressbook-model.c |    2 +-
 composer/e-composer-private.h                 |    2 +-
 e-util/Makefile.am                            |    8 +-
 e-util/e-marshal.list                         |    3 -
 e-util/e-util.h                               |    2 +-
 libemail-engine/mail-folder-cache.c           |   13 +-
 libemail-utils/Makefile.am                    |   14 +-
 libemail-utils/e-marshal.c                    | 2570 -------------------------
 libemail-utils/e-marshal.h                    |  547 ------
 libemail-utils/e-marshal.list                 |   62 -
 mail/e-mail-account-store.c                   |    2 +-
 mail/mail-folder-cache.c                      |    2 +-
 widgets/misc/e-contact-map.c                  |    2 +-
 13 files changed, 19 insertions(+), 3210 deletions(-)
---
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index f8456d0..fa61c4e 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include "e-addressbook-model.h"
-#include <libemail-utils/e-marshal.h>
+#include <e-util/e-marshal.h>
 #include <e-util/e-util.h>
 #include "eab-gui-util.h"
 
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 360f8cd..4282d57 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -37,7 +37,7 @@
 #include "e-composer-header-table.h"
 #include "e-util/e-alert-sink.h"
 #include "e-util/e-charset.h"
-#include "libemail-utils/e-marshal.h"
+#include "e-util/e-marshal.h"
 #include "e-util/e-mktemp.h"
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-selection.h"
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index b8cb56f..0196071 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -9,6 +9,7 @@ glib_enum_define=E
 glib_enum_prefix=e
 
 ENUM_GENERATED = e-util-enumtypes.h e-util-enumtypes.c
+MARSHAL_GENERATED = e-marshal.c e-marshal.h
 
 if OS_WIN32
 PLATFORM_SOURCES = e-win32-reloc.c e-win32-defaults.c e-win32-defaults.h
@@ -33,6 +34,7 @@ eutilinclude_HEADERS = 				\
 	e-html-utils.h				\
 	e-icon-factory.h			\
 	e-import.h				\
+	e-marshal.h				\
 	e-mktemp.h				\
 	e-poolv.h				\
 	e-print.h				\
@@ -100,6 +102,7 @@ libeutil_la_SOURCES =				\
 	e-html-utils.c				\
 	e-icon-factory.c			\
 	e-import.c				\
+	e-marshal.c				\
 	e-mktemp.c				\
 	e-poolv.c				\
 	e-plugin.c				\
@@ -134,9 +137,10 @@ errordir = $(privdatadir)/errors
 @EVO_PLUGIN_RULE@
 
 EXTRA_DIST =				\
-	e-system.error.xml		
+	e-system.error.xml		\
+	e-marshal.list
 
-BUILT_SOURCES = $(ENUM_GENERATED) $(error_DATA)
+BUILT_SOURCES = $(ENUM_GENERATED) $(MARSHAL_GENERATED) $(error_DATA)
 CLEANFILES    = $(BUILT_SOURCES)
 
 dist-hook:
diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list
index 6d3c1fc..bf15633 100644
--- a/e-util/e-marshal.list
+++ b/e-util/e-marshal.list
@@ -42,9 +42,6 @@ NONE:OBJECT,BOOLEAN
 NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
 NONE:OBJECT,OBJECT
 NONE:OBJECT,STRING
-NONE:OBJECT,STRING,INT
-NONE:OBJECT,STRING,INT,STRING,STRING,STRING
-NONE:OBJECT,STRING,STRING
 NONE:OBJECT,STRING,UINT
 NONE:POINTER,INT
 NONE:POINTER,INT,INT,INT,INT
diff --git a/e-util/e-util.h b/e-util/e-util.h
index c1a94bf..14237da 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -28,7 +28,7 @@
 #include <limits.h>
 #include <gconf/gconf-client.h>
 
-#include <libemail-utils/e-marshal.h>
+#include <e-util/e-marshal.h>
 #include <e-util/e-util-enums.h>
 #include <libedataserver/e-source-list.h>
 
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index c62ccf4..914c0f3 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -39,7 +39,6 @@
 #include <glib/gstdio.h>
 
 #include <libedataserver/e-data-server-util.h>
-#include <libemail-utils/e-marshal.h>
 
 #include "libemail-utils/mail-mt.h"
 #include "mail-folder-cache.h"
@@ -1415,7 +1414,7 @@ mail_folder_cache_class_init (MailFolderCacheClass *class)
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (MailFolderCacheClass, folder_available),
 		NULL, NULL, /* accumulator */
-		e_marshal_VOID__OBJECT_STRING,
+		NULL,
 		G_TYPE_NONE, 2,
 		CAMEL_TYPE_STORE,
 		G_TYPE_STRING);
@@ -1435,7 +1434,7 @@ mail_folder_cache_class_init (MailFolderCacheClass *class)
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (MailFolderCacheClass, folder_unavailable),
 		NULL, NULL, /* accumulator */
-		e_marshal_VOID__OBJECT_STRING,
+		NULL,
 		G_TYPE_NONE, 2,
 		CAMEL_TYPE_STORE,
 		G_TYPE_STRING);
@@ -1453,7 +1452,7 @@ mail_folder_cache_class_init (MailFolderCacheClass *class)
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (MailFolderCacheClass, folder_deleted),
 		NULL, NULL, /* accumulator */
-		e_marshal_VOID__OBJECT_STRING,
+		NULL,
 		G_TYPE_NONE, 2,
 		CAMEL_TYPE_STORE,
 		G_TYPE_STRING);
@@ -1472,7 +1471,7 @@ mail_folder_cache_class_init (MailFolderCacheClass *class)
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (MailFolderCacheClass, folder_renamed),
 		NULL, NULL, /* accumulator */
-		e_marshal_VOID__OBJECT_STRING_STRING,
+		NULL,
 		G_TYPE_NONE, 3,
 		CAMEL_TYPE_STORE,
 		G_TYPE_STRING,
@@ -1492,7 +1491,7 @@ mail_folder_cache_class_init (MailFolderCacheClass *class)
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (MailFolderCacheClass, folder_unread_updated),
 		NULL, NULL, /* accumulator */
-		e_marshal_VOID__OBJECT_STRING_INT,
+		NULL,
 		G_TYPE_NONE, 3,
 		CAMEL_TYPE_STORE,
 		G_TYPE_STRING,
@@ -1516,7 +1515,7 @@ mail_folder_cache_class_init (MailFolderCacheClass *class)
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (MailFolderCacheClass, folder_changed),
 		NULL, NULL, /* accumulator */
-		e_marshal_VOID__OBJECT_STRING_INT_STRING_STRING_STRING,
+		NULL,
 		G_TYPE_NONE, 6,
 		CAMEL_TYPE_STORE,
 		G_TYPE_STRING,
diff --git a/libemail-utils/Makefile.am b/libemail-utils/Makefile.am
index 227f679..638fcfa 100644
--- a/libemail-utils/Makefile.am
+++ b/libemail-utils/Makefile.am
@@ -4,10 +4,6 @@ lib_LTLIBRARIES = libemail-utils.la
 AM_CFLAGS = -I. -I$(top_builddir) @GNOME_PLATFORM_CFLAGS@ -Wall -Werror -g3 -O0 -ggdb -DPKGDATADIR="\"$(pkgdatadir)\""
 AM_LDFLAGS = @GNOME_PLATFORM_LIBS@ 
 
-include $(top_srcdir)/glib-gen.mak
-glib_enum_prefix=e
-MARSHAL_GENERATED = e-marshal.c e-marshal.h
-
 libemail_utils_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)	\
 	$(CAMEL_CFLAGS)		\
@@ -23,7 +19,6 @@ libemail_utils_la_LIBADD = 	\
 libemail_utils_la_LDFLAGS = 
 
 libemail_utils_la_SOURCES = 	\
-		e-marshal.c	\
 		e-account-utils.c	\
 		mail-mt.c	\
 		e-signature.c	\
@@ -33,7 +28,6 @@ libemail_utils_la_SOURCES = 	\
 
 libmailutilsincludedir = $(privincludedir)/libemail-utils
 libmailutilsinclude_HEADERS = 	\
-		e-marshal.h	\
 		e-account-utils.h	\
 		mail-mt.h	\
 		e-signature.h	\
@@ -44,12 +38,6 @@ libmailutilsinclude_HEADERS = 	\
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libemail-utils.pc
 
-BUILT_SOURCES = $(MARSHAL_GENERATED) 
-
-EXTRA_DIST = e-marshal.list
-CLEANFILES    = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
+-include $(top_srcdir)/git.mk
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index 4f9d3b6..2b62b29 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -24,7 +24,7 @@
 
 #include <libebackend/e-extensible.h>
 
-#include <libemail-utils/e-marshal.h>
+#include <e-util/e-marshal.h>
 #include <libemail-utils/e-account-utils.h>
 #include <e-util/e-alert-dialog.h>
 #include <libemail-engine/mail-ops.h>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 43805fb..b8c18ba 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -39,7 +39,7 @@
 #include <glib/gstdio.h>
 
 #include <libedataserver/e-data-server-util.h>
-#include <libemail-utils/e-marshal.h>
+#include <e-util/e-marshal.h>
 #include <e-util/e-util.h>
 
 #include "libemail-utils/mail-mt.h"
diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c
index b544eb5..b2f6ff5 100644
--- a/widgets/misc/e-contact-map.c
+++ b/widgets/misc/e-contact-map.c
@@ -26,7 +26,7 @@
 #include "e-contact-map.h"
 #include "e-contact-marker.h"
 
-#include <libemail-utils/e-marshal.h>
+#include <e-util/e-marshal.h>
 
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]