Merge branch 'master' into next

[i3/i3] / src / match.c

diff --git a/src/match.c b/src/match.c
index e92a95d2d8458d8e84a5c3e03ab8ca8552139720..350a2c11d0e115091e01ab7af96a31af55e29ebd 100644 (file)
--- a/src/match.c
+++ b/src/match.c
@@ -1,3 +1,5 @@
+#undef I3__FILE__
+#define I3__FILE__ "match.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -111,9 +113,9 @@ bool match_matches_window(Match *match, i3Window *window) {
     }
 
     if (match->title != NULL) {
-        if (window->name_json != NULL &&
-            regex_matches(match->title, window->name_json)) {
-            LOG("title matches (%s)\n", window->name_json);
+        if (window->name != NULL &&
+            regex_matches(match->title, i3string_as_utf8(window->name))) {
+            LOG("title matches (%s)\n", i3string_as_utf8(window->name));
         } else {
             return false;
         }