1 files changed, 11 insertions, 80 deletions

diff --git a/shell/es-event.c b/shell/es-event.c
index 7628f64869..9d31f390e9 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -34,36 +34,14 @@ static GObjectClass *eme_parent;
 static ESEvent *es_event;
 
 static void
-eme_init (GObject *o)
-{
-	/*ESEvent *eme = (ESEvent *)o; */
-}
-
-static void
-eme_finalise (GObject *o)
+eme_class_init (GObjectClass *class)
 {
-	((GObjectClass *) eme_parent)->finalize (o);
 }
 
 static void
-eme_target_free (EEvent *ep, EEventTarget *t)
-{
-	switch (t->type) {
-	case ES_EVENT_TARGET_STATE: {
-		ESEventTargetState *s = (ESEventTargetState *) t;
-
-		s = s;
-		break; }
-	}
-
-	((EEventClass *) eme_parent)->target_free (ep, t);
-}
-
-static void
-eme_class_init (GObjectClass *klass)
+eme_init (GObject *o)
 {
-	klass->finalize = eme_finalise;
-	((EEventClass *) klass)->target_free = eme_target_free;
+	/*ESEvent *eme = (ESEvent *)o; */
 }
 
 GType
@@ -109,34 +87,6 @@ ESEvent *es_event_peek (void)
 	return es_event;
 }
 
-ESEventTargetShell *
-es_event_target_new (ESEvent *eme)
-{
-	return e_event_target_new (
-		&eme->event, ES_EVENT_TARGET_SHELL,
-		sizeof (ESEventTargetShell));
-}
-
-ESEventTargetState *
-es_event_target_new_state (ESEvent *eme, gint state)
-{
-	ESEventTargetState *t;
-	guint32 mask = ~0;
-
-	t = e_event_target_new (
-		&eme->event, ES_EVENT_TARGET_STATE, sizeof (*t));
-	t->state = state;
-
-	if (state)
-		mask &= ~ES_EVENT_STATE_ONLINE;
-	else
-		mask &= ~ES_EVENT_STATE_OFFLINE;
-
-	t->target.mask = mask;
-
-	return t;
-}
-
 ESEventTargetUpgrade *
 es_event_target_new_upgrade (ESEvent *eme, gint major, gint minor, gint revision)
 {
@@ -151,34 +101,13 @@ es_event_target_new_upgrade (ESEvent *eme, gint major, gint minor, gint revision
 	return t;
 }
 
-ESEventTargetComponent *
-es_event_target_new_component (ESEvent *eme, const gchar *id)
-{
-	ESEventTargetComponent *t;
-
-	t = e_event_target_new (
-		&eme->event, ES_EVENT_TARGET_COMPONENT, sizeof (*t));
-	t->id = id;
-
-	return t;
-}
-
 /* ********************************************************************** */
 
 static gpointer emeh_parent_class;
 #define emeh ((ESEventHook *)eph)
 
-static const EEventHookTargetMask emeh_state_masks[] = {
-	{ "online", ES_EVENT_STATE_ONLINE },
-	{ "offline", ES_EVENT_STATE_OFFLINE },
-	{ NULL }
-};
-
 static const EEventHookTargetMap emeh_targets[] = {
-	{ "state", ES_EVENT_TARGET_STATE, emeh_state_masks },
 	{ "upgrade", ES_EVENT_TARGET_UPGRADE, NULL },
-	{ "shell", ES_EVENT_TARGET_SHELL, NULL },
-	{ "component", ES_EVENT_TARGET_COMPONENT, NULL },
 	{ NULL }
 };
 
@@ -191,7 +120,7 @@ emeh_finalise (GObject *o)
 }
 
 static void
-emeh_class_init (EPluginHookClass *klass)
+emeh_class_init (EPluginHookClass *class)
 {
 	gint i;
 
@@ -202,13 +131,14 @@ emeh_class_init (EPluginHookClass *klass)
 	 * A hook for events coming from the shell.
 	 **/
 
-	((GObjectClass *) klass)->finalize = emeh_finalise;
-	((EPluginHookClass *)klass)->id = "org.gnome.evolution.shell.events:1.0";
+	((GObjectClass *) class)->finalize = emeh_finalise;
+	((EPluginHookClass *)class)->id = "org.gnome.evolution.shell.events:1.0";
 
 	for (i=0;emeh_targets[i].type;i++)
-		e_event_hook_class_add_target_map ((EEventHookClass *) klass, &emeh_targets[i]);
+		e_event_hook_class_add_target_map (
+			(EEventHookClass *) class, &emeh_targets[i]);
 
-	((EEventHookClass *) klass)->event = (EEvent *) es_event_peek ();
+	((EEventHookClass *) class)->event = (EEvent *) es_event_peek ();
 }
 
 GType
@@ -227,7 +157,8 @@ es_event_hook_get_type (void)
 		};
 
 		emeh_parent_class = g_type_class_ref (e_event_hook_get_type ());
-		type = g_type_register_static(e_event_hook_get_type(), "ESEventHook", &info, 0);
+		type = g_type_register_static (
+			e_event_hook_get_type(), "ESEventHook", &info, 0);
 	}
 
 	return type;