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

Merge branch 'master' of github.com:knopwob/dunst

Browse Source
This commit is contained in:
Sascha Kruse 2013-03-15 16:07:16 +00:00
commit 1925b4bfc8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu.c
View File

@ -8,6 +8,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <glib.h>
#include "dunst.h" #include "dunst.h"
#include "utils.h" #include "utils.h"
@ -136,6 +137,7 @@ void invoke_action(const char *action)
*/ */
void dispatch_menu_result(const char *input) void dispatch_menu_result(const char *input)
{ {
g_strstrip(input);
switch (input[0]) { switch (input[0]) {
case '#': case '#':
invoke_action(input + 1); invoke_action(input + 1);

9
x.c
View File

@ -465,7 +465,10 @@ static void setopacity(Window win, unsigned long opacity)
*/ */
gboolean x_mainloop_fd_prepare(GSource * source, gint * timeout) gboolean x_mainloop_fd_prepare(GSource * source, gint * timeout)
{ {
if (timeout)
*timeout = -1; *timeout = -1;
else
g_print("BUG: x_mainloop_fd_prepare: timeout == NULL\n");
return false; return false;
} }
@ -510,9 +513,9 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
0) == settings.close_ks.sym 0) == settings.close_ks.sym
&& settings.close_ks.mask == ev.xkey.state) { && settings.close_ks.mask == ev.xkey.state) {
if (displayed) { if (displayed) {
notification_close notification *n = g_queue_peek_head(displayed);
(g_queue_peek_head_link(displayed)-> if (n)
data, 2); notification_close(n, 2);
} }
} }
if (settings.history_ks.str if (settings.history_ks.str