[evolution] Remove ESEvent.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Remove ESEvent.
- Date: Mon, 8 Jul 2013 00:40:50 +0000 (UTC)
commit 5c866713c795795ef46cc90ed95ed7de98152971
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jul 7 20:37:43 2013 -0400
Remove ESEvent.
Nudging EPlugin closer to full removal.
Nothing in Evolution uses this anymore and 3rd-party plugins should be
using EShell's "event::ready-to-start" signal or else GApplication's
"startup" signal.
doc/reference/evolution-shell/Makefile.am | 1 -
plugins/publish-calendar/publish-calendar.c | 1 -
shell/Makefile.am | 4 +-
shell/e-shell-migrate.c | 15 ---
shell/es-event.c | 125 ---------------------------
shell/es-event.h | 87 -------------------
shell/main.c | 3 -
7 files changed, 2 insertions(+), 234 deletions(-)
---
diff --git a/doc/reference/evolution-shell/Makefile.am b/doc/reference/evolution-shell/Makefile.am
index 5ff5a0a..7afbc72 100644
--- a/doc/reference/evolution-shell/Makefile.am
+++ b/doc/reference/evolution-shell/Makefile.am
@@ -15,7 +15,6 @@ CFILE_GLOB=$(top_srcdir)/shell/*.c
IGNORE_HFILES= \
evo-version.h \
e-shell-window-private.h \
- es-event.h \
$(NULL)
GTKDOC_CFLAGS= \
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 51ea980..2f14801 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -30,7 +30,6 @@
#include <gio/gio.h>
#include <calendar/gui/e-cal-config.h>
-#include <shell/es-event.h>
#include <shell/e-shell.h>
#include <shell/e-shell-view.h>
diff --git a/shell/Makefile.am b/shell/Makefile.am
index a39558b..7d42a68 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -35,7 +35,7 @@ evolution_shell_include_HEADERS = \
e-shell-view.h \
e-shell-window.h \
e-shell-window-actions.h \
- es-event.h
+ $(NULL)
libevolution_shell_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@ -83,7 +83,7 @@ libevolution_shell_la_SOURCES = \
e-shell-migrate.h \
e-shell-window-actions.c \
evo-version.h \
- es-event.c
+ $(NULL)
libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 9d74d15..20e9696 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -25,7 +25,6 @@
#include <glib/gstdio.h>
#include <libedataserver/libedataserver.h>
-#include "es-event.h"
#include "evo-version.h"
static gboolean
@@ -216,7 +215,6 @@ shell_migrate_ready_to_start_event_cb (EShell *shell)
gboolean
e_shell_migrate_attempt (EShell *shell)
{
- ESEvent *ese;
gint major, minor, micro;
g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
@@ -241,19 +239,6 @@ e_shell_migrate_attempt (EShell *shell)
shell, "event::ready-to-start",
G_CALLBACK (shell_migrate_ready_to_start_event_cb), NULL);
- /* @Event: Shell attempted upgrade
- * @Id: upgrade.done
- * @Target: ESMenuTargetState
- *
- * This event is emitted whenever the shell successfully attempts
- * an upgrade.
- */
- ese = es_event_peek ();
- e_event_emit (
- (EEvent *) ese, "upgrade.done",
- (EEventTarget *) es_event_target_new_upgrade (
- ese, EVO_MAJOR_VERSION, EVO_MINOR_VERSION, EVO_MICRO_VERSION));
-
return TRUE;
}
diff --git a/shell/main.c b/shell/main.c
index b070c03..7d73235 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -59,7 +59,6 @@
#include "e-shell.h"
#include "e-shell-migrate.h"
-#include "es-event.h"
#ifdef G_OS_WIN32
#include "e-util/e-win32-defaults.h"
@@ -665,7 +664,6 @@ main (gint argc,
if (!disable_eplugin) {
/* Register built-in plugin hook types. */
- es_event_hook_get_type ();
g_type_ensure (E_TYPE_IMPORT_HOOK);
g_type_ensure (E_TYPE_PLUGIN_UI_HOOK);
@@ -678,7 +676,6 @@ main (gint argc,
* as both shell backends and certain plugins hook into this. */
e_shell_migrate_attempt (shell);
- /* This is an alternative to the "upgrade.done" EEvent. */
e_shell_event (shell, "ready-to-start", NULL);
g_idle_add ((GSourceFunc) idle_cb, remaining_args);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]