aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into otr

Browse Source
This commit is contained in:
James Booth 2013-11-10 18:49:59 +00:00
commit 528562b603
4 changed files with 5 additions and 5 deletions
Show Stats 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); void p_contact_free(PContact contact);
const char* p_contact_barejid(PContact contact); const char* p_contact_barejid(PContact contact);
const char* p_contact_name(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_presence(PContact contact);
const char* p_contact_status(PContact contact); const char* p_contact_status(PContact contact);
const char* p_contact_subscription(const PContact contact); const char* p_contact_subscription(const PContact contact);

4
src/ui/core.c
View File

@ -965,8 +965,8 @@ ui_new_chat_win(const char * const to)
if (contact != NULL) { if (contact != NULL) {
if (strcmp(p_contact_presence(contact), "offline") == 0) { if (strcmp(p_contact_presence(contact), "offline") == 0) {
const char const *show = p_contact_presence(contact); const char * const show = p_contact_presence(contact);
const char const *status = p_contact_status(contact); const char * const status = p_contact_status(contact);
_show_status_string(window, to, show, status, NULL, "--", "offline"); _show_status_string(window, to, show, status, NULL, "--", "offline");
} }
} }

2
src/xmpp/roster.c
View File

@ -518,7 +518,7 @@ roster_barejid_from_name(const char * const name)
} }
PContact PContact
roster_get_contact(const char const *barejid) roster_get_contact(const char * const barejid)
{ {
return g_hash_table_lookup(contacts, barejid); return g_hash_table_lookup(contacts, barejid);
} }

2
src/xmpp/xmpp.h
View File

@ -127,7 +127,7 @@ void caps_close(void);
void roster_clear(void); void roster_clear(void);
gboolean roster_update_presence(const char * const barejid, gboolean roster_update_presence(const char * const barejid,
Resource *resource, GDateTime *last_activity); Resource *resource, GDateTime *last_activity);
PContact roster_get_contact(const char const *barejid); PContact roster_get_contact(const char * const barejid);
gboolean roster_contact_offline(const char * const barejid, gboolean roster_contact_offline(const char * const barejid,
const char * const resource, const char * const status); const char * const resource, const char * const status);
void roster_reset_search_attempts(void); void roster_reset_search_attempts(void);