open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(info): fix compilation warnings

Browse Source
This commit is contained in:
Federico Terzi 2021-03-28 18:36:12 +02:00
parent e29dbfc9d5
commit 1dad647310
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
espanso-info/build.rs
View File

@ -40,7 +40,7 @@ fn cc_config() {
println!("cargo:rerun-if-changed=src/x11/native.c"); println!("cargo:rerun-if-changed=src/x11/native.c");
cc::Build::new() cc::Build::new()
.cpp(true) .cpp(true)
.include("src/x11/native.h") .include("src/x11")
.file("src/x11/native.cpp") .file("src/x11/native.cpp")
.compile("espansoinfo"); .compile("espansoinfo");

6
espanso-info/src/x11/native.cpp
View File

@ -82,8 +82,8 @@ char *get_property(Display *disp, Window win,
// Function taken from Window Management Library for Ruby // Function taken from Window Management Library for Ruby
char *xwm_get_win_title(Display *disp, Window win) char *xwm_get_win_title(Display *disp, Window win)
{ {
char *wname = (char *)get_property(disp, win, XA_STRING, "WM_NAME", NULL); char *wname = (char *)get_property(disp, win, XA_STRING, (char*)"WM_NAME", NULL);
char *nwname = (char *)get_property(disp, win, XInternAtom(disp, "UTF8_STRING", False), "_NET_WM_NAME", NULL); char *nwname = (char *)get_property(disp, win, XInternAtom(disp, (char*)"UTF8_STRING", False), (char*)"_NET_WM_NAME", NULL);
return nwname ? nwname : (wname ? wname : NULL); return nwname ? nwname : (wname ? wname : NULL);
} }
@ -143,7 +143,7 @@ int32_t info_get_exec(char *buffer, int32_t buffer_size)
else else
{ {
// Get the window process PID // Get the window process PID
char *pid_raw = (char *)get_property(display, focused, XA_CARDINAL, "_NET_WM_PID", NULL); char *pid_raw = (char *)get_property(display, focused, XA_CARDINAL, (char*)"_NET_WM_PID", NULL);
if (pid_raw == NULL) if (pid_raw == NULL)
{ {
result = -3; result = -3;