From: Jan Arne Petersen <jpeter...@openismus.com>
Use ::commit_state as a request name to make clear what is commited.
Signed-off-by: Jan Arne Petersen <jpeter...@openismus.com>
---
clients/editor.c | 2 +-
protocol/text.xml | 2 +-
src/text-backend.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/clients/editor.c b/clients/editor.c
index 7b6ad35..1696fca 100644
--- a/clients/editor.c
+++ b/clients/editor.c
@@ -640,7 +640,7 @@ text_entry_update(struct text_entry *entry)
text_model_set_preferred_language(entry->model,
entry->preferred_language);
- text_model_commit(entry->model);
+ text_model_commit_state(entry->model);
}
static void
diff --git a/protocol/text.xml b/protocol/text.xml
index 508f8de..ea5bfe1 100644
--- a/protocol/text.xml
+++ b/protocol/text.xml
@@ -140,7 +140,7 @@
<arg name="button" type="uint"/>
<arg name="index" type="uint"/>
</request>
- <request name="commit">
+ <request name="commit_state">
</request>
<request name="show_input_panel">
<description summary="show input panels">
diff --git a/src/text-backend.c b/src/text-backend.c
index 7741123..7d1d7d7 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
@@ -261,8 +261,8 @@ text_model_invoke_action(struct wl_client *client,
}
static void
-text_model_commit(struct wl_client *client,
- struct wl_resource *resource)
+text_model_commit_state(struct wl_client *client,
+ struct wl_resource *resource)
{
struct text_model *text_model = resource->data;
struct input_method *input_method, *next;
@@ -324,7 +324,7 @@ static const struct text_model_interface
text_model_implementation = {
text_model_set_micro_focus,
text_model_set_content_type,
text_model_invoke_action,
- text_model_commit,
+ text_model_commit_state,
text_model_show_input_panel,
text_model_hide_input_panel,
text_model_set_preferred_language
--
1.8.1.4
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
