Merge branch 'master' of https://github.com/wengxt/kitty into master

This commit is contained in:
Kovid Goyal 2020-08-01 07:30:09 +05:30
commit df48061a8f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

2
glfw/ibus_glfw.c vendored
View File

@ -269,7 +269,7 @@ setup_connection(_GLFWIBUSData *ibus) {
ibus->conn = NULL; ibus->conn = NULL;
} }
debug("Connecting to IBUS daemon @ %s for IME input management\n", ibus->address); debug("Connecting to IBUS daemon @ %s for IME input management\n", ibus->address);
ibus->conn = glfw_dbus_connect_to(ibus->address, "Failed to connect to the IBUS daemon, with error", "ibus", false); ibus->conn = glfw_dbus_connect_to(ibus->address, "Failed to connect to the IBUS daemon, with error", "ibus", true);
if (!ibus->conn) return false; if (!ibus->conn) return false;
free((void*)ibus->input_ctx_path); ibus->input_ctx_path = NULL; free((void*)ibus->input_ctx_path); ibus->input_ctx_path = NULL;
if (!glfw_dbus_call_method_with_reply( if (!glfw_dbus_call_method_with_reply(