diff options
| author | Will Song <incertia9474@gmail.com> | 2015-05-29 19:53:37 -0500 |
|---|---|---|
| committer | Will Song <incertia9474@gmail.com> | 2015-05-29 19:53:37 -0500 |
| commit | 9463c6719036957c8468e1363a48afbfe751fd3e (patch) | |
| tree | aed6ccd050fc182a0d4d111bef6f743d28a42a73 /src/contact.h | |
| parent | 7f436d614b11d72893d856f1c3d817ab34b0b9eb (diff) | |
| parent | 304e08a9c0bfa27ed84dc1ff0a2e2d32b36529f8 (diff) | |
| download | profani-tty-9463c6719036957c8468e1363a48afbfe751fd3e.tar.gz | |
fix conflicts
Diffstat (limited to 'src/contact.h')
| -rw-r--r-- | src/contact.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/contact.h b/src/contact.h index 17a3b210..343b230f 100644 --- a/src/contact.h +++ b/src/contact.h @@ -1,7 +1,7 @@ /* * contact.h * - * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com> + * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com> * * This file is part of Profanity. * @@ -47,7 +47,9 @@ void p_contact_add_resource(PContact contact, Resource *resource); 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_barejid_collate_key(PContact contact); const char* p_contact_name(PContact contact); +const char* p_contact_name_collate_key(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); |