diff options
| author | James Booth <boothj5@gmail.com> | 2016-02-28 23:18:50 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2016-02-28 23:18:50 +0000 |
| commit | da7e59bc86668083270b31574886d3a5e2549eee (patch) | |
| tree | b9da150bacea8fb85df244a4900132d999b0178d | |
| parent | ab08d0a3780474b1b01e23acb2985bcb7de7439e (diff) | |
| parent | accde2a61c2d9dd8ee1d7ad58ccf4b1c2ec7fa58 (diff) | |
| download | profani-tty-da7e59bc86668083270b31574886d3a5e2549eee.tar.gz | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/plugins/themes.c | 2 | ||||
| -rw-r--r-- | src/ui/mucwin.c | 2 |
3 files changed, 4 insertions, 2 deletions
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/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; 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 <string.h> #include <assert.h> #include <stdlib.h> |