Move EActivity and subclasses to e-util.

Planning to write some asynchronous utility functions in e-util that
return EActivity objects.

12 files changed, 14 insertions, 14 deletions

diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index a869cf1667..2d66a708a4 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -11,6 +11,8 @@ privsolib_LTLIBRARIES = libeutil.la libeconduit.la
 
 eutilinclude_HEADERS = 				\
 	e-account-utils.h			\
+	e-activity.h				\
+	e-alert-activity.h			\
 	e-bconf-map.h				\
 	e-binding.h				\
 	e-categories-config.h			\
@@ -45,6 +47,7 @@ eutilinclude_HEADERS = 				\
 	e-text-event-processor-emacs-like.h	\
 	e-text-event-processor-types.h		\
 	e-text-event-processor.h		\
+	e-timeout-activity.h			\
 	e-util.h				\
 	e-unicode.h				\
 	e-xml-utils.h
@@ -81,6 +84,8 @@ libeutil_la_CPPFLAGS =							\
 libeutil_la_SOURCES =				\
 	$(eutilinclude_HEADERS)			\
 	e-account-utils.c			\
+	e-activity.c				\
+	e-alert-activity.c			\
 	e-bconf-map.c				\
 	e-binding.c				\
 	e-categories-config.c			\
@@ -112,8 +117,9 @@ libeutil_la_SOURCES =				\
 	e-bit-array.c				\
 	e-sorter.c				\
 	e-sorter-array.c			\
-	e-text-event-processor-emacs-like.c     \
-	e-text-event-processor.c                \
+	e-text-event-processor-emacs-like.c	\
+	e-text-event-processor.c		\
+	e-timeout-activity.c			\
 	e-util.c				\
 	e-unicode.c				\
 	e-util-private.h			\
diff --git a/widgets/misc/e-activity.c b/e-util/e-activity.c
index 9f8faf75cb..9f8faf75cb 100644
--- a/widgets/misc/e-activity.c
+++ b/e-util/e-activity.c
diff --git a/widgets/misc/e-activity.h b/e-util/e-activity.h
index b396e3a630..b396e3a630 100644
--- a/widgets/misc/e-activity.h
+++ b/e-util/e-activity.h
diff --git a/widgets/misc/e-alert-activity.c b/e-util/e-alert-activity.c
index 1e8f915213..1e8f915213 100644
--- a/widgets/misc/e-alert-activity.c
+++ b/e-util/e-alert-activity.c
diff --git a/widgets/misc/e-alert-activity.h b/e-util/e-alert-activity.h
index 5557094dda..b19d7600e3 100644
--- a/widgets/misc/e-alert-activity.h
+++ b/e-util/e-alert-activity.h
@@ -22,7 +22,7 @@
 #ifndef E_ALERT_ACTIVITY_H
 #define E_ALERT_ACTIVITY_H
 
-#include <e-timeout-activity.h>
+#include <e-util/e-timeout-activity.h>
 
 /* Standard GObject macros */
 #define E_TYPE_ALERT_ACTIVITY \
diff --git a/widgets/misc/e-timeout-activity.c b/e-util/e-timeout-activity.c
index aa57960fe0..aa57960fe0 100644
--- a/widgets/misc/e-timeout-activity.c
+++ b/e-util/e-timeout-activity.c
diff --git a/widgets/misc/e-timeout-activity.h b/e-util/e-timeout-activity.h
index 82dd1138c2..7545568e13 100644
--- a/widgets/misc/e-timeout-activity.h
+++ b/e-util/e-timeout-activity.h
@@ -22,7 +22,7 @@
 #ifndef E_TIMEOUT_ACTIVITY_H
 #define E_TIMEOUT_ACTIVITY_H
 
-#include <e-activity.h>
+#include <e-util/e-activity.h>
 
 /* Standard GObject macros */
 #define E_TYPE_TIMEOUT_ACTIVITY \
diff --git a/mail/em-utils.c b/mail/em-utils.c
index ec1b030f77..0e9742d8ab 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -68,9 +68,9 @@
 #include "e-util/e-mktemp.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/e-dialog-utils.h"
+#include "e-util/e-alert-activity.h"
 #include "e-util/e-error.h"
 #include "shell/e-shell.h"
-#include "widgets/misc/e-alert-activity.h"
 #include "widgets/misc/e-attachment.h"
 
 #include "em-utils.h"
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index d3d1aa3737..d1aea41ad6 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -37,7 +37,7 @@
 #include "misc/e-gui-utils.h"
 #include "e-util/e-error.h"
 #include "e-util/e-icon-factory.h"
-#include "widgets/misc/e-alert-activity.h"
+#include "e-util/e-alert-activity.h"
 
 #include "mail-config.h"
 #include "mail-session.h"
diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h
index 8a6fd7a47e..7b56865e4a 100644
--- a/shell/e-shell-backend.h
+++ b/shell/e-shell-backend.h
@@ -29,7 +29,7 @@
 #define E_SHELL_BACKEND_H
 
 #include <shell/e-shell-common.h>
-#include <misc/e-activity.h>
+#include <e-util/e-activity.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SHELL_BACKEND \
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index d98acf3c2a..f847021985 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -22,9 +22,7 @@ widgetsinclude_HEADERS =			\
 	e-account-manager.h			\
 	e-account-tree-view.h			\
 	e-action-combo-box.h			\
-	e-activity.h				\
 	e-activity-proxy.h			\
-	e-alert-activity.h			\
 	e-attachment.h				\
 	e-attachment-button.h			\
 	e-attachment-dialog.h			\
@@ -75,7 +73,6 @@ widgetsinclude_HEADERS =			\
 	e-signature-tree-view.h			\
 	e-spinner.c				\
 	e-spinner.h				\
-	e-timeout-activity.h			\
 	e-url-entry.h				\
 	e-web-view.h				\
 	ea-calendar-cell.h			\
@@ -101,9 +98,7 @@ libemiscwidgets_la_SOURCES =			\
 	e-account-manager.c			\
 	e-account-tree-view.c			\
 	e-action-combo-box.c			\
-	e-activity.c				\
 	e-activity-proxy.c			\
-	e-alert-activity.c			\
 	e-attachment.c				\
 	e-attachment-button.c			\
 	e-attachment-dialog.c			\
@@ -152,7 +147,6 @@ libemiscwidgets_la_SOURCES =			\
 	e-signature-preview.c			\
 	e-signature-script-dialog.c		\
 	e-signature-tree-view.c			\
-	e-timeout-activity.c			\
 	e-url-entry.c				\
 	e-web-view.c				\
 	ea-calendar-cell.c			\
diff --git a/widgets/misc/e-activity-proxy.h b/widgets/misc/e-activity-proxy.h
index 714dc63e0f..8844988e3d 100644
--- a/widgets/misc/e-activity-proxy.h
+++ b/widgets/misc/e-activity-proxy.h
@@ -23,7 +23,7 @@
 #define E_ACTIVITY_PROXY_H
 
 #include <gtk/gtk.h>
-#include <e-activity.h>
+#include <e-util/e-activity.h>
 
 /* Standard GObject macros */
 #define E_TYPE_ACTIVITY_PROXY \