s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change D-Bus signal name KeyPressed to KeyActivated.

Browse Source
This commit is contained in:
Daiki Ueno
2011-08-31 10:00:00 +09:00
parent 747ce4e00b
commit 53e853fbc9
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/python/eekboard/context.py
View File

@ -60,7 +60,7 @@ class Context(gobject.GObject):
self.__context.connect_to_signal('Enabled', self.__enabled_cb) self.__context.connect_to_signal('Enabled', self.__enabled_cb)
self.__context.connect_to_signal('Disabled', self.__disabled_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('Destroyed', self.__destroyed_cb)
self.__context.connect_to_signal('VisibilityChanged', self.__visibility_changed_cb) self.__context.connect_to_signal('VisibilityChanged', self.__visibility_changed_cb)
self.__context.connect_to_signal('KeyboardChanged', self.__keyboard_changed_cb) self.__context.connect_to_signal('KeyboardChanged', self.__keyboard_changed_cb)

14
eekboard/eekboard-context-service.c
View File

@ -114,7 +114,7 @@ static const gchar introspection_xml[] =
/* signals */ /* signals */
" <signal name='Enabled'/>" " <signal name='Enabled'/>"
" <signal name='Disabled'/>" " <signal name='Disabled'/>"
" <signal name='KeyPressed'>" " <signal name='KeyActivated'>"
" <arg type='s' name='keyname'/>" " <arg type='s' name='keyname'/>"
" <arg type='v' name='symbol'/>" " <arg type='v' name='symbol'/>"
" <arg type='u' name='modifiers'/>" " <arg type='u' name='modifiers'/>"
@ -553,7 +553,7 @@ emit_group_changed_signal (EekboardContextService *context,
} }
static void static void
emit_key_pressed_dbus_signal (EekboardContextService *context, emit_key_activated_dbus_signal (EekboardContextService *context,
EekKey *key) EekKey *key)
{ {
EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context); EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
@ -572,7 +572,7 @@ emit_key_pressed_dbus_signal (EekboardContextService *context,
NULL, NULL,
priv->object_path, priv->object_path,
EEKBOARD_CONTEXT_SERVICE_INTERFACE, EEKBOARD_CONTEXT_SERVICE_INTERFACE,
"KeyPressed", "KeyActivated",
g_variant_new ("(svu)", g_variant_new ("(svu)",
keyname, keyname,
variant, variant,
@ -593,7 +593,7 @@ on_repeat_timeout (EekboardContextService *context)
g_settings_get (priv->settings, "repeat-interval", "u", &delay); 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 = priv->repeat_timeout_id =
g_timeout_add (delay, g_timeout_add (delay,
@ -608,7 +608,7 @@ on_repeat_timeout_init (EekboardContextService *context)
{ {
EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(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 /* FIXME: clear modifiers for further key repeat; better not
depend on modifier behavior is LATCH */ depend on modifier behavior is LATCH */
@ -664,8 +664,8 @@ on_key_released (EekKeyboard *keyboard,
g_source_remove (priv->repeat_timeout_id); g_source_remove (priv->repeat_timeout_id);
priv->repeat_timeout_id = 0; priv->repeat_timeout_id = 0;
/* KeyPressed signal has not been emitted in repeat handler */ /* KeyActivated signal has not been emitted in repeat handler */
emit_key_pressed_dbus_signal (context, priv->repeat_key); emit_key_activated_dbus_signal (context, priv->repeat_key);
} }
} }

2
eekboard/eekboard-context.c
View File

@ -81,7 +81,7 @@ eekboard_context_real_g_signal (GDBusProxy *self,
return; return;
} }
if (g_strcmp0 (signal_name, "KeyPressed") == 0) { if (g_strcmp0 (signal_name, "KeyActivated") == 0) {
const gchar *keyname; const gchar *keyname;
GVariant *variant = NULL; GVariant *variant = NULL;
guint modifiers = 0; guint modifiers = 0;