diff options
| author | James Booth <boothj5@gmail.com> | 2013-11-10 18:49:59 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-11-10 18:49:59 +0000 |
| commit | 528562b6034e1b1063cf0986bc74db5a63a2e25c (patch) | |
| tree | 57185aa6a8b624d1b5d58423f6be7676df22f147 /src | |
| parent | 48a5ea26ca690926b70f6d37e6206e73d767e9ba (diff) | |
| parent | c5f76721ce9d10b127d54e127ac34e555c749465 (diff) | |
| download | profani-tty-528562b6034e1b1063cf0986bc74db5a63a2e25c.tar.gz | |
Merge branch 'master' into otr
Diffstat (limited to 'src')
| -rw-r--r-- | src/contact.h | 2 | ||||
| -rw-r--r-- | src/ui/core.c | 4 | ||||
| -rw-r--r-- | src/xmpp/roster.c | 2 | ||||
| -rw-r--r-- | src/xmpp/xmpp.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/contact.h b/src/contact.h index e71e0f7d..20c0e3dd 100644 --- 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); diff --git a/src/ui/core.c b/src/ui/core.c index 2249a944..a6c54faf 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -965,8 +965,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"); } } diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index c073464d..5fbb7be7 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -518,7 +518,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); } diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 407fe0e2..f1b3ba6c 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -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); |