Merge branch 'master' into osx-functional

CHANGELOG

@@ -1,3 +1,8 @@
+0.5.1
+=====
+
+- Allow positioning input window at top of screen (/inputwin)
+
 0.5.0
 =====
 

configure.ac

@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([profanity], [0.5.1], [boothj5web@gmail.com])
+AC_INIT([profanity], [0.6.0], [boothj5web@gmail.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/main.c])

src/xmpp/capabilities.c

@@ -310,8 +310,7 @@ caps_lookup(const char *const jid)
 gboolean
 caps_jid_has_feature(const char *const jid, const char *const feature)
 {
-    char *ver = g_hash_table_lookup(jid_to_ver, jid);
-    EntityCapabilities *caps = ver ? _caps_by_ver(ver) : _caps_by_jid(jid);
+    EntityCapabilities *caps = caps_lookup(jid);
 
     if (caps == NULL) {
         return FALSE;