diff --git a/src/server/textinput_interface.cpp b/src/server/textinput_interface.cpp
--- a/src/server/textinput_interface.cpp
+++ b/src/server/textinput_interface.cpp
@@ -77,12 +77,7 @@
     emit p->q_func()->requestHideInputPanel();
 }
 
-void TextInputInterface::Private::setSurroundingTextCallback(wl_client *client, wl_resource *resource, const char * text, uint32_t cursor, uint32_t anchor)
-{
-    setSurroundingText2Callback(client, resource, text, cursor, anchor);
-}
-
-void TextInputInterface::Private::setSurroundingText2Callback(wl_client *client, wl_resource *resource, const char * text, int32_t cursor, int32_t anchor)
+void TextInputInterface::Private::setSurroundingTextCallback(wl_client *client, wl_resource *resource, const char * text, int32_t cursor, int32_t anchor)
 {
     auto p = cast<Private>(resource);
     Q_ASSERT(*p->client == client);
diff --git a/src/server/textinput_interface_p.h b/src/server/textinput_interface_p.h
--- a/src/server/textinput_interface_p.h
+++ b/src/server/textinput_interface_p.h
@@ -91,8 +91,7 @@
     static void disableCallback(wl_client *client, wl_resource *resource, wl_resource * surface);
     static void showInputPanelCallback(wl_client *client, wl_resource *resource);
     static void hideInputPanelCallback(wl_client *client, wl_resource *resource);
-    static void setSurroundingTextCallback(wl_client *client, wl_resource *resource, const char * text, uint32_t cursor, uint32_t anchor);
-    static void setSurroundingText2Callback(wl_client *client, wl_resource *resource, const char * text, int32_t cursor, int32_t anchor);
+    static void setSurroundingTextCallback(wl_client *client, wl_resource *resource, const char * text, int32_t cursor, int32_t anchor);
     static void setContentTypeCallback(wl_client *client, wl_resource *resource, uint32_t hint, uint32_t purpose);
     static void setCursorRectangleCallback(wl_client *client, wl_resource *resource, int32_t x, int32_t y, int32_t width, int32_t height);
     static void setPreferredLanguageCallback(wl_client *client, wl_resource *resource, const char * language);
diff --git a/src/server/textinput_interface_v0.cpp b/src/server/textinput_interface_v0.cpp
--- a/src/server/textinput_interface_v0.cpp
+++ b/src/server/textinput_interface_v0.cpp
@@ -61,6 +61,7 @@
     }
 
     static void resetCallback(wl_client *client, wl_resource *resource);
+    static void setSurroundingTextUintCallback(wl_client *client, wl_resource *resource, const char * text, uint32_t cursor, uint32_t anchor);
     static void commitStateCallback(wl_client *client, wl_resource *resource, uint32_t serial);
     static void invokeActionCallback(wl_client *client, wl_resource *resource, uint32_t button, uint32_t index);
 
@@ -74,7 +75,7 @@
     showInputPanelCallback,
     hideInputPanelCallback,
     resetCallback,
-    setSurroundingTextCallback,
+    setSurroundingTextUintCallback,
     setContentTypeCallback,
     setCursorRectangleCallback,
     setPreferredLanguageCallback,
@@ -229,6 +230,11 @@
     emit p->q_func()->requestReset();
 }
 
+void TextInputUnstableV0Interface::Private::setSurroundingTextUintCallback(wl_client *client, wl_resource *resource, const char * text, uint32_t cursor, uint32_t anchor)
+{
+    setSurroundingTextCallback(client, resource, text, cursor, anchor);
+}
+
 void TextInputUnstableV0Interface::Private::commitStateCallback(wl_client *client, wl_resource *resource, uint32_t serial)
 {
     auto p = cast<Private>(resource);
diff --git a/src/server/textinput_interface_v2.cpp b/src/server/textinput_interface_v2.cpp
--- a/src/server/textinput_interface_v2.cpp
+++ b/src/server/textinput_interface_v2.cpp
@@ -70,7 +70,7 @@
     disableCallback,
     showInputPanelCallback,
     hideInputPanelCallback,
-    setSurroundingText2Callback,
+    setSurroundingTextCallback,
     setContentTypeCallback,
     setCursorRectangleCallback,
     setPreferredLanguageCallback,