mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
Merge branch 'master' into plugins
This commit is contained in:
commit
a0b80e730a
@ -968,8 +968,8 @@ ui_new_chat_win(const char * const to)
|
||||
|
||||
if (contact != NULL) {
|
||||
if (strcmp(p_contact_presence(contact), "offline") == 0) {
|
||||
const char const *show = p_contact_presence(contact);
|
||||
const char const *status = p_contact_status(contact);
|
||||
const char * const show = p_contact_presence(contact);
|
||||
const char * const status = p_contact_status(contact);
|
||||
_show_status_string(window, to, show, status, NULL, "--", "offline");
|
||||
}
|
||||
}
|
||||
|
@ -519,7 +519,7 @@ roster_barejid_from_name(const char * const name)
|
||||
}
|
||||
|
||||
PContact
|
||||
roster_get_contact(const char const *barejid)
|
||||
roster_get_contact(const char * const barejid)
|
||||
{
|
||||
return g_hash_table_lookup(contacts, barejid);
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ void caps_close(void);
|
||||
void roster_clear(void);
|
||||
gboolean roster_update_presence(const char * const barejid,
|
||||
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,
|
||||
const char * const resource, const char * const status);
|
||||
void roster_reset_search_attempts(void);
|
||||
|
Loading…
Reference in New Issue
Block a user