diff --git a/bindings/python/eekboard/context.py b/bindings/python/eekboard/context.py index d5f557ff..b7eafb47 100644 --- a/bindings/python/eekboard/context.py +++ b/bindings/python/eekboard/context.py @@ -60,7 +60,7 @@ class Context(gobject.GObject): self.__context.connect_to_signal('Enabled', self.__enabled_cb) self.__context.connect_to_signal('Disabled', self.__disabled_cb) - self.__context.connect_to_signal('KeyPressed', self.__key_pressed_cb) + self.__context.connect_to_signal('KeyActivated', self.__key_pressed_cb) self.__context.connect_to_signal('Destroyed', self.__destroyed_cb) self.__context.connect_to_signal('VisibilityChanged', self.__visibility_changed_cb) self.__context.connect_to_signal('KeyboardChanged', self.__keyboard_changed_cb) diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c index 9e6bf942..83b61021 100644 --- a/eekboard/eekboard-context-service.c +++ b/eekboard/eekboard-context-service.c @@ -114,7 +114,7 @@ static const gchar introspection_xml[] = /* signals */ " " " " - " " + " " " " " " " " @@ -553,8 +553,8 @@ emit_group_changed_signal (EekboardContextService *context, } static void -emit_key_pressed_dbus_signal (EekboardContextService *context, - EekKey *key) +emit_key_activated_dbus_signal (EekboardContextService *context, + EekKey *key) { EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context); @@ -572,7 +572,7 @@ emit_key_pressed_dbus_signal (EekboardContextService *context, NULL, priv->object_path, EEKBOARD_CONTEXT_SERVICE_INTERFACE, - "KeyPressed", + "KeyActivated", g_variant_new ("(svu)", keyname, variant, @@ -593,7 +593,7 @@ on_repeat_timeout (EekboardContextService *context) g_settings_get (priv->settings, "repeat-interval", "u", &delay); - emit_key_pressed_dbus_signal (context, priv->repeat_key); + emit_key_activated_dbus_signal (context, priv->repeat_key); priv->repeat_timeout_id = g_timeout_add (delay, @@ -608,7 +608,7 @@ on_repeat_timeout_init (EekboardContextService *context) { EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context); - emit_key_pressed_dbus_signal (context, priv->repeat_key); + emit_key_activated_dbus_signal (context, priv->repeat_key); /* FIXME: clear modifiers for further key repeat; better not depend on modifier behavior is LATCH */ @@ -664,8 +664,8 @@ on_key_released (EekKeyboard *keyboard, g_source_remove (priv->repeat_timeout_id); priv->repeat_timeout_id = 0; - /* KeyPressed signal has not been emitted in repeat handler */ - emit_key_pressed_dbus_signal (context, priv->repeat_key); + /* KeyActivated signal has not been emitted in repeat handler */ + emit_key_activated_dbus_signal (context, priv->repeat_key); } } diff --git a/eekboard/eekboard-context.c b/eekboard/eekboard-context.c index 09dd1dbb..32f8e7f0 100644 --- a/eekboard/eekboard-context.c +++ b/eekboard/eekboard-context.c @@ -81,7 +81,7 @@ eekboard_context_real_g_signal (GDBusProxy *self, return; } - if (g_strcmp0 (signal_name, "KeyPressed") == 0) { + if (g_strcmp0 (signal_name, "KeyActivated") == 0) { const gchar *keyname; GVariant *variant = NULL; guint modifiers = 0;