Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop set of /qubes-keyboard as it's done core GUI extension #32

Closed
wants to merge 1 commit into from
Closed

Drop set of /qubes-keyboard as it's done core GUI extension #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions gui-daemon/xside.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3431,7 +3431,6 @@ int main(int argc, char **argv)
char dbg_log_old[256];
char shmid_filename[SHMID_FILENAME_LEN];
int logfd;
char cmd_tmp[256];
struct stat stat_buf;
char *display_str;
int display_num;
Expand Down Expand Up @@ -3597,19 +3596,7 @@ int main(int argc, char **argv)


xfd = ConnectionNumber(ghandles.display);

/* provide keyboard map before VM Xserver starts */

/* cast return value to unsigned, so (unsigned)-1 > sizeof(cmd_tmp) */
if ((unsigned)snprintf(cmd_tmp, sizeof(cmd_tmp), "/usr/bin/qubesdb-write -d %s "
"/qubes-keyboard \"`/usr/bin/setxkbmap -print`\"",
ghandles.vmname) < sizeof(cmd_tmp)) {
/* intentionally ignore return value - don't fail gui-daemon if only
* keyboard layout fails */
ignore_result(system(cmd_tmp));
}
vchan_register_at_eof(restart_guid);

get_protocol_version(&ghandles);
send_xconf(&ghandles);

Expand Down