compositor: Remove shell->activate callback

It's all internal to the shell plugin now.

compositor/compositor.h

@@ -148,9 +148,6 @@ struct wlsc_spring {
 };
 
 struct wlsc_shell {
-	void (*activate)(struct wlsc_shell *shell,
-			 struct wlsc_surface *es,
-			 struct wlsc_input_device *device, uint32_t time);
 	void (*lock)(struct wlsc_shell *shell);
 	void (*unlock)(struct wlsc_shell *shell);
 	void (*map)(struct wlsc_shell *shell, struct wlsc_surface *surface,

compositor/shell.c

@@ -861,8 +861,7 @@ click_to_activate_binding(struct wl_input_device *device,
 
 	focus = (struct wlsc_surface *) device->pointer_focus;
 	if (state && focus && device->grab == NULL)
-		compositor->shell->activate(compositor->shell,
+		activate(compositor->shell, focus, wd, time);
-					    focus, wd, time);
 }
 
 static void
@@ -1249,7 +1248,6 @@ shell_init(struct wlsc_compositor *ec)
 
 	memset(shell, 0, sizeof *shell);
 	shell->compositor = ec;
-	shell->shell.activate = activate;
 	shell->shell.lock = lock;
 	shell->shell.unlock = unlock;
 	shell->shell.map = map;

compositor/tablet-shell.c

@@ -388,13 +388,6 @@ toggle_switcher(struct tablet_shell *shell)
 	}
 }
 
-static void
-tablet_shell_activate(struct wlsc_shell *base, struct wlsc_surface *es,
-		      struct wlsc_input_device *device, uint32_t time)
-{
-	wlsc_surface_activate(es, device, time);
-}
-
 static void
 tablet_shell_lock(struct wlsc_shell *base)
 {
@@ -555,7 +548,6 @@ shell_init(struct wlsc_compositor *compositor)
 
 	compositor->shell = &shell->shell;
 
-	shell->shell.activate = tablet_shell_activate;
 	shell->shell.lock = tablet_shell_lock;
 	shell->shell.unlock = tablet_shell_unlock;
 	shell->shell.map = tablet_shell_map;