aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-09-25 23:00:08 +01:00
commit 3bb1c84220
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

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

2
configure.ac
View File

@ -1,7 +1,7 @@
# -*- Autoconf -*- # -*- Autoconf -*-
# Process this file with autoconf to produce a configure script. # 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_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_SRCDIR([src/main.c])

3
src/xmpp/capabilities.c
View File

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