Merge remote-tracking branch 'origin/master'

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;

src/ui/mucwin.c

@@ -32,6 +32,8 @@
  *
  */
 
+#define _GNU_SOURCE 1
+
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>