aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Moved function to get presence string from type to stanza.c

Browse Source
This commit is contained in:
James Booth 2013-02-03 22:18:40 +00:00
parent 1cea320a0c
commit 1cd2d6c7c9
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/xmpp/presence.c
View File

@ -43,7 +43,6 @@ static int _presence_handler(xmpp_conn_t * const conn,
static char* _handle_presence_caps(xmpp_stanza_t * const stanza); static char* _handle_presence_caps(xmpp_stanza_t * const stanza);
static int _room_presence_handler(const char * const jid, static int _room_presence_handler(const char * const jid,
xmpp_stanza_t * const stanza); xmpp_stanza_t * const stanza);
static const char * _get_presence_stanza_string_from_type(jabber_presence_t presence_type);
void void
presence_init(void) presence_init(void)
@ -113,7 +112,7 @@ presence_update(jabber_presence_t presence_type, const char * const msg,
xmpp_conn_t *conn = jabber_get_conn(); xmpp_conn_t *conn = jabber_get_conn();
int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),
presence_type); presence_type);
const char *show = _get_presence_stanza_string_from_type(presence_type); const char *show = stanza_get_presence_string_from_type(presence_type);
// don't send presence when disconnected // don't send presence when disconnected
if (jabber_get_connection_status() != JABBER_CONNECTED) if (jabber_get_connection_status() != JABBER_CONNECTED)
@ -160,7 +159,7 @@ presence_join_room(Jid *jid)
xmpp_ctx_t *ctx = jabber_get_ctx(); xmpp_ctx_t *ctx = jabber_get_ctx();
xmpp_conn_t *conn = jabber_get_conn(); xmpp_conn_t *conn = jabber_get_conn();
jabber_presence_t presence_type = jabber_get_presence_type(); jabber_presence_t presence_type = jabber_get_presence_type();
const char *show = _get_presence_stanza_string_from_type(presence_type); const char *show = stanza_get_presence_string_from_type(presence_type);
char *status = jabber_get_presence_message(); char *status = jabber_get_presence_message();
int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),
presence_type); presence_type);
@ -463,21 +462,3 @@ _room_presence_handler(const char * const jid, xmpp_stanza_t * const stanza)
return 1; return 1;
} }
static const char *
_get_presence_stanza_string_from_type(jabber_presence_t presence_type)
{
switch(presence_type)
{
case PRESENCE_AWAY:
return STANZA_TEXT_AWAY;
case PRESENCE_DND:
return STANZA_TEXT_DND;
case PRESENCE_CHAT:
return STANZA_TEXT_CHAT;
case PRESENCE_XA:
return STANZA_TEXT_XA;
default: // PRESENCE_ONLINE
return NULL;
}
}

18
src/xmpp/stanza.c
View File

@ -676,6 +676,24 @@ stanza_attach_caps(xmpp_ctx_t *ctx, xmpp_stanza_t *presence)
FREE_SET_NULL(sha1); FREE_SET_NULL(sha1);
} }
const char *
stanza_get_presence_string_from_type(jabber_presence_t presence_type)
{
switch(presence_type)
{
case PRESENCE_AWAY:
return STANZA_TEXT_AWAY;
case PRESENCE_DND:
return STANZA_TEXT_DND;
case PRESENCE_CHAT:
return STANZA_TEXT_CHAT;
case PRESENCE_XA:
return STANZA_TEXT_XA;
default: // PRESENCE_ONLINE
return NULL;
}
}
static int static int
_field_compare(FormField *f1, FormField *f2) _field_compare(FormField *f1, FormField *f2)
{ {

2
src/xmpp/stanza.h
View File

@ -154,4 +154,6 @@ void stanza_attach_priority(xmpp_ctx_t *ctx, xmpp_stanza_t *presence, int pri);
void stanza_attach_last_activity(xmpp_ctx_t *ctx, xmpp_stanza_t *presence, int idle); void stanza_attach_last_activity(xmpp_ctx_t *ctx, xmpp_stanza_t *presence, int idle);
void stanza_attach_caps(xmpp_ctx_t *ctx, xmpp_stanza_t *presence); void stanza_attach_caps(xmpp_ctx_t *ctx, xmpp_stanza_t *presence);
const char * stanza_get_presence_string_from_type(jabber_presence_t presence_type);
#endif #endif