From fbd913ec626d8436ea4efdde4ffc8090a3b52cfc Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 25 Feb 2016 01:51:33 +0000 Subject: [PATCH 1/2] Remove default from plugin theme NULL checks --- src/plugins/themes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/themes.c b/src/plugins/themes.c index 42e7b7a1..f441af84 100644 --- a/src/plugins/themes.c +++ b/src/plugins/themes.c @@ -74,7 +74,7 @@ plugin_themes_close(void) theme_item_t plugin_themes_get(const char *const group, const char *const key, const char *const def) { - if (group && key && def && g_key_file_has_key(themes, group, key, NULL)) { + if (group && key && g_key_file_has_key(themes, group, key, NULL)) { gchar *result = g_key_file_get_string(themes, group, key, NULL); theme_item_t ret; From accde2a61c2d9dd8ee1d7ad58ccf4b1c2ec7fa58 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 28 Feb 2016 19:05:26 +0000 Subject: [PATCH 2/2] Fixed cygwin compile --- Makefile.am | 2 +- src/ui/mucwin.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fc7882d6..365fd21c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -189,7 +189,7 @@ endif if BUILD_C_API lib_LTLIBRARIES = libprofanity.la -libprofanity_la_LDFLAGS=-avoid-version -shared +libprofanity_la_LDFLAGS=-avoid-version -shared -no-undefined libprofanity_la_SOURCES = src/plugins/profapi.c library_includedir=$(includedir) diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index e3826eb1..4d323ef1 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -32,6 +32,8 @@ * */ +#define _GNU_SOURCE 1 + #include #include #include