devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-25 13:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into refactor2

Browse Source 
Conflicts:
	src/ui/core.c
This commit is contained in:
James Booth
2013-11-11 20:51:35 +00:00
parent 3e86d108a3 c5f76721ce
commit 8c97658b8d
16 changed files with 139 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/contact.h
View File

@@ -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);