nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Translate last unusual logging calls

Browse Source
This commit is contained in:
Benedikt Heine 2017-12-08 02:35:09 +01:00
parent 58dc09b415
commit 38dced7591
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dunst.c
View File

@ -26,10 +26,6 @@
#define VERSION "version info needed" #define VERSION "version info needed"
#endif #endif
#define MSG 1
#define INFO 2
#define DEBUG 3
typedef struct _x11_source { typedef struct _x11_source {
GSource source; GSource source;
Display *dpy; Display *dpy;

2
src/menu.c
View File

@ -34,7 +34,7 @@ static int regex_init(void)
"(\\([-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*\\)|[-[:alnum:]_\\@;/?:&=%$+*~])+"; "(\\([-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*\\)|[-[:alnum:]_\\@;/?:&=%$+*~])+";
int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE); int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE);
if (ret != 0) { if (ret != 0) {
fputs("failed to compile regex", stderr); LOG_W("Failed to compile regex.");
return 0; return 0;
} else { } else {
is_initialized = true; is_initialized = true;

3
src/x11/screen.c
View File

@ -331,8 +331,7 @@ static int FollowXErrorHandler(Display *display, XErrorEvent *e)
dunst_follow_errored = true; dunst_follow_errored = true;
char err_buf[BUFSIZ]; char err_buf[BUFSIZ];
XGetErrorText(display, e->error_code, err_buf, BUFSIZ); XGetErrorText(display, e->error_code, err_buf, BUFSIZ);
fputs(err_buf, stderr); LOG_W("%s", err_buf);
fputs("\n", stderr);
return 0; return 0;
} }

10
src/x11/x.c
View File

@ -832,7 +832,7 @@ gboolean x_mainloop_fd_prepare(GSource *source, gint *timeout)
if (timeout) if (timeout)
*timeout = -1; *timeout = -1;
else else
g_print("BUG: x_mainloop_fd_prepare: timeout == NULL\n"); LOG_E("x_mainloop_fd_prepare: timeout == NULL");
return false; return false;
} }
@ -992,7 +992,7 @@ void x_setup(void)
/* initialize xctx.dc, font, keyboard, colors */ /* initialize xctx.dc, font, keyboard, colors */
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
fputs("no locale support\n", stderr); LOG_W("No locale support");
if (!(xctx.dpy = XOpenDisplay(NULL))) { if (!(xctx.dpy = XOpenDisplay(NULL))) {
DIE("Cannot open X11 display."); DIE("Cannot open X11 display.");
} }
@ -1244,11 +1244,11 @@ static int GrabXErrorHandler(Display *display, XErrorEvent *e)
dunst_grab_errored = true; dunst_grab_errored = true;
char err_buf[BUFSIZ]; char err_buf[BUFSIZ];
XGetErrorText(display, e->error_code, err_buf, BUFSIZ); XGetErrorText(display, e->error_code, err_buf, BUFSIZ);
fputs(err_buf, stderr);
fputs("\n", stderr);
if (e->error_code != BadAccess) { if (e->error_code != BadAccess) {
exit(EXIT_FAILURE); DIE("%s", err_buf);
} else {
LOG_W("%s", err_buf);
} }
return 0; return 0;