Merge branch 'master' into refactor2

Conflicts: src/ui/core.c
2013-11-11 20:51:35 +00:00
parent 3e86d108a3 c5f76721ce
commit 8c97658b8d
16 changed files with 139 additions and 31 deletions
--- a/src/contact.h
+++ b/src/contact.h
@@ -35,7 +35,7 @@ gboolean p_contact_remove_resource(PContact contact, const char * const resource
 void p_contact_free(PContact contact);
 const char* p_contact_barejid(PContact contact);
 const char* p_contact_name(PContact contact);
-const char * p_contact_name_or_jid(const PContact contact);
+const char* p_contact_name_or_jid(const PContact contact);
 const char* p_contact_presence(PContact contact);
 const char* p_contact_status(PContact contact);
 const char* p_contact_subscription(const PContact contact);