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

Merge branch 'maint'

Browse Source
This commit is contained in:
Nikos Tsipinakis 2018-05-06 13:36:07 +03:00
commit 7a9187728c
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -6,6 +6,12 @@
- `fullscreen` rule to hide notifications when a fullscreen window is active - `fullscreen` rule to hide notifications when a fullscreen window is active
## 1.3.2 - 2018-05-06
### Fixed
- Crash when trying to load an invalid or corrupt icon (#512)
## 1.3.1 - 2018-01-30 ## 1.3.1 - 2018-01-30
### Fixed ### Fixed

2
Makefile
View File

@ -3,7 +3,7 @@
include config.mk include config.mk
VERSION := "1.3.1-non-git" VERSION := "1.3.2-non-git"
ifneq ($(wildcard ./.git/),) ifneq ($(wildcard ./.git/),)
VERSION := $(shell git describe --tags) VERSION := $(shell git describe --tags)
endif endif

2
src/x11/x.c
View File

@ -330,7 +330,7 @@ static GdkPixbuf *get_pixbuf_from_file(const char *icon_path)
GError *error = NULL; GError *error = NULL;
pixbuf = gdk_pixbuf_new_from_file(icon_path, &error); pixbuf = gdk_pixbuf_new_from_file(icon_path, &error);
if (pixbuf == NULL) if (pixbuf == NULL)
g_free(error); g_error_free(error);
} }
return pixbuf; return pixbuf;
} }