Reorder the xdg_shell implementations to fit the spec'd order
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index e8abeb5..dcf2520 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1979,22 +1979,6 @@
wl_signal_add(&seat->keyboard->focus_signal, listener);
}
-static void
-xdg_surface_set_transient_for(struct wl_client *client,
- struct wl_resource *resource,
- struct wl_resource *parent_resource)
-{
- struct shell_surface *shsurf = wl_resource_get_user_data(resource);
- struct weston_surface *parent;
-
- if (parent_resource)
- parent = wl_resource_get_user_data(parent_resource);
- else
- parent = NULL;
-
- shell_surface_set_parent(shsurf, parent);
-}
-
static struct shell_client *
get_shell_client(struct wl_client *client)
{
@@ -3180,6 +3164,22 @@
}
static void
+xdg_surface_set_transient_for(struct wl_client *client,
+ struct wl_resource *resource,
+ struct wl_resource *parent_resource)
+{
+ struct shell_surface *shsurf = wl_resource_get_user_data(resource);
+ struct weston_surface *parent;
+
+ if (parent_resource)
+ parent = wl_resource_get_user_data(parent_resource);
+ else
+ parent = NULL;
+
+ shell_surface_set_parent(shsurf, parent);
+}
+
+static void
xdg_surface_set_margin(struct wl_client *client,
struct wl_resource *resource,
int32_t left,