From c881b5bc5e61d04b18d4ab46ad70533e7340d15b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 21 Oct 2010 16:21:19 -0400 Subject: Simplify EActivity. With unintrusive error dialogs gone, we can cut some unnecessary bits out of EActivity. I'm also adding a new enum property called "state", which is one of: E_ACTIVITY_RUNNING E_ACTIVITY_WAITING E_ACTIVITY_CANCELLED E_ACTIVITY_COMPLETED The state of an activity must be explicitly changed. In particular, when the user cancels an activity the state should be set only after confirming the operation has been cancelled and not when cancellation is requested (e.g. after receiving a G_IO_ERROR_CANCELLED, not when the GCancellable emits "cancelled"). EActivityBar and EActivityProxy widgets have been updated to make this distinction clearer in the UI. E_ACTIVITY_WAITING will be used when activities have to be queued and dispatched in sequence, which I haven't written yet. --- e-util/Makefile.am | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'e-util/Makefile.am') diff --git a/e-util/Makefile.am b/e-util/Makefile.am index d96b2b0bc3..3f4388ebe1 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -2,6 +2,14 @@ eutilincludedir = $(privincludedir)/e-util ecpsdir = $(privdatadir)/ecps ruledir = $(privdatadir) +include $(top_srcdir)/glib-gen.mak +glib_enum_headers=e-util-enums.h +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 endif @@ -28,7 +36,6 @@ eutilinclude_HEADERS = \ e-html-utils.h \ e-icon-factory.h \ e-import.h \ - e-io-activity.h \ e-marshal.h \ e-mktemp.h \ e-module.h \ @@ -49,6 +56,8 @@ eutilinclude_HEADERS = \ e-text-event-processor.h \ e-ui-manager.h \ e-util.h \ + e-util-enums.h \ + e-util-enumtypes.h \ e-unicode.h \ e-xml-utils.h \ gconf-bridge.h @@ -103,7 +112,6 @@ libeutil_la_SOURCES = \ e-html-utils.c \ e-icon-factory.c \ e-import.c \ - e-io-activity.c \ e-marshal.c \ e-mktemp.c \ e-module.c \ @@ -124,15 +132,13 @@ libeutil_la_SOURCES = \ e-ui-manager.c \ e-util.c \ e-unicode.c \ + e-util-enumtypes.c \ e-util-private.h \ e-xml-utils.c \ gconf-bridge.c \ gtk-compat.h \ $(PLATFORM_SOURCES) -MARSHAL_GENERATED = e-marshal.c e-marshal.h -@EVO_MARSHAL_RULE@ - libeutil_la_LDFLAGS = $(NO_UNDEFINED) libeutil_la_LIBADD = \ @@ -149,7 +155,7 @@ EXTRA_DIST = \ e-system.error.xml \ e-marshal.list -BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) +BUILT_SOURCES = $(ENUM_GENERATED) $(MARSHAL_GENERATED) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) dist-hook: -- cgit