Use input method protocol from wayland-protocols
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Reviewed-by: Jan Arne Petersen <janarne@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/ivi-shell/input-panel-ivi.c b/ivi-shell/input-panel-ivi.c
index ecd497e..721d31c 100644
--- a/ivi-shell/input-panel-ivi.c
+++ b/ivi-shell/input-panel-ivi.c
@@ -32,7 +32,7 @@
#include <string.h>
#include "ivi-shell.h"
-#include "input-method-server-protocol.h"
+#include "input-method-unstable-v1-server-protocol.h"
#include "ivi-layout-private.h"
#include "shared/helpers.h"
@@ -282,7 +282,7 @@
input_panel_surface->panel = 1;
}
-static const struct wl_input_panel_surface_interface input_panel_surface_implementation = {
+static const struct zwp_input_panel_surface_v1_interface input_panel_surface_implementation = {
input_panel_surface_set_toplevel,
input_panel_surface_set_overlay_panel
};
@@ -324,14 +324,16 @@
ipsurf->resource =
wl_resource_create(client,
- &wl_input_panel_surface_interface, 1, id);
+ &zwp_input_panel_surface_v1_interface,
+ 1,
+ id);
wl_resource_set_implementation(ipsurf->resource,
&input_panel_surface_implementation,
ipsurf,
destroy_input_panel_surface_resource);
}
-static const struct wl_input_panel_interface input_panel_implementation = {
+static const struct zwp_input_panel_v1_interface input_panel_implementation = {
input_panel_get_input_panel_surface
};
@@ -351,7 +353,7 @@
struct wl_resource *resource;
resource = wl_resource_create(client,
- &wl_input_panel_interface, 1, id);
+ &zwp_input_panel_v1_interface, 1, id);
if (shell->input_panel.binding == NULL) {
wl_resource_set_implementation(resource,
@@ -390,7 +392,7 @@
wl_list_init(&shell->input_panel.surfaces);
if (wl_global_create(shell->compositor->wl_display,
- &wl_input_panel_interface, 1,
+ &zwp_input_panel_v1_interface, 1,
shell, bind_input_panel) == NULL)
return -1;