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

Tidy up a merge

Browse Source
This commit is contained in:
David Boddie
2019-07-19 18:18:47 +00:00
parent 54b0f59935
commit b1edcfcb1b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server-context-service.c
View File

@ -82,7 +82,7 @@ on_notify_keyboard (GObject *object,
GParamSpec *spec, GParamSpec *spec,
ServerContextService *context) ServerContextService *context)
{ {
EekKeyboard *keyboard; const EekKeyboard *keyboard;
keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context)); keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
@ -96,13 +96,12 @@ on_notify_keyboard (GObject *object,
keyboard); keyboard);
/* Recreate the keyboard widget to keep in sync with the keymap. */ /* Recreate the keyboard widget to keep in sync with the keymap. */
EekboardContextService *service = EEKBOARD_CONTEXT_SERVICE(context);
gboolean visible; gboolean visible;
g_object_get(service, "visible", &visible, NULL); g_object_get (context, "visible", &visible, NULL);
if (visible) { if (visible) {
eekboard_context_service_hide_keyboard (service); eekboard_context_service_hide_keyboard(EEKBOARD_CONTEXT_SERVICE(context));
eekboard_context_service_show_keyboard (service); eekboard_context_service_show_keyboard(EEKBOARD_CONTEXT_SERVICE(context));
} }
} }
@ -261,7 +260,7 @@ server_context_service_real_show_keyboard (EekboardContextService *_context)
if (!context->window) if (!context->window)
make_window (context); make_window (context);
if (context->widget) { if (context->widget) {
gtk_widget_destroy (GTK_WIDGET (context->widget)); gtk_widget_destroy(context->widget);
context->widget = NULL; context->widget = NULL;
} }