Merge branch 'master' into chaz

[chaz/openbox] / obt / prop.c

diff --git a/obt/prop.c b/obt/prop.c
index f7919d6c380a64d919d2d909a5f6cede435f5490..0cecccf4dfa6d5b160a78e515aeca185b2b462f5 100644 (file)
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -314,6 +314,7 @@ static gboolean get_text_property(Window win, Atom prop,
         return tprop->encoding == OBT_PROP_ATOM(UTF8_STRING);
     default:
         g_assert_not_reached();
+        return FALSE;
     }
 }