devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Renamed jabber_presence_t->presence_t

Browse Source
This commit is contained in:
James Booth
2013-02-10 11:31:31 +00:00
parent ec78914044
commit 591f8a8dbf
15 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xmpp/connection.c
View File

@@ -47,7 +47,7 @@ static struct _jabber_conn_t {
xmpp_ctx_t *ctx;
xmpp_conn_t *conn;
jabber_conn_status_t conn_status;
jabber_presence_t presence_type;
presence_t presence_type;
char *presence_message;
int priority;
int tls_disabled;
@@ -228,7 +228,7 @@ jabber_get_jid(void)
return xmpp_conn_get_jid(jabber_conn.conn);
}
jabber_presence_t
presence_t
jabber_get_presence_type(void)
{
return jabber_conn.presence_type;
@@ -247,7 +247,7 @@ jabber_get_account_name(void)
}
void
connection_set_presence_type(const jabber_presence_t presence_type)
connection_set_presence_type(const presence_t presence_type)
{
jabber_conn.presence_type = presence_type;
}

2
src/xmpp/connection.h
View File

@@ -29,7 +29,7 @@ void connection_free_resources(void);
xmpp_conn_t *connection_get_conn(void);
xmpp_ctx_t *connection_get_ctx(void);
int connection_error_handler(xmpp_stanza_t * const stanza);
void connection_set_presence_type(jabber_presence_t presence_type);
void connection_set_presence_type(presence_t presence_type);
void connection_set_priority(int priority);
void connection_set_presence_message(const char * const message);

2
src/xmpp/iq.c
View File

@@ -153,7 +153,7 @@ _iq_handle_roster_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
item = xmpp_stanza_get_next(item);
}
jabber_presence_t connect_presence = accounts_get_login_presence(jabber_get_account_name());
presence_t connect_presence = accounts_get_login_presence(jabber_get_account_name());
presence_update(connect_presence, NULL, 0);
}

6
src/xmpp/presence.c
View File

@@ -106,7 +106,7 @@ presence_free_sub_requests(void)
}
void
presence_update(jabber_presence_t presence_type, const char * const msg,
presence_update(presence_t presence_type, const char * const msg,
int idle)
{
xmpp_ctx_t *ctx = connection_get_ctx();
@@ -161,7 +161,7 @@ presence_join_room(Jid *jid)
{
xmpp_ctx_t *ctx = connection_get_ctx();
xmpp_conn_t *conn = connection_get_conn();
jabber_presence_t presence_type = jabber_get_presence_type();
presence_t presence_type = jabber_get_presence_type();
const char *show = stanza_get_presence_string_from_type(presence_type);
char *status = jabber_get_presence_message();
int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),
@@ -184,7 +184,7 @@ presence_change_room_nick(const char * const room, const char * const nick)
{
xmpp_ctx_t *ctx = connection_get_ctx();
xmpp_conn_t *conn = connection_get_conn();
jabber_presence_t presence_type = jabber_get_presence_type();
presence_t presence_type = jabber_get_presence_type();
const char *show = stanza_get_presence_string_from_type(presence_type);
char *status = jabber_get_presence_message();
int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),

2
src/xmpp/stanza.c
View File

@@ -664,7 +664,7 @@ stanza_attach_caps(xmpp_ctx_t * const ctx, xmpp_stanza_t * const presence)
}
const char *
stanza_get_presence_string_from_type(jabber_presence_t presence_type)
stanza_get_presence_string_from_type(presence_t presence_type)
{
switch(presence_type)
{

2
src/xmpp/stanza.h
View File

@@ -160,6 +160,6 @@ void stanza_attach_show(xmpp_ctx_t * const ctx, xmpp_stanza_t * const presence,
void stanza_attach_status(xmpp_ctx_t * const ctx, xmpp_stanza_t * const presence,
const char * const status);
const char * stanza_get_presence_string_from_type(jabber_presence_t presence_type);
const char * stanza_get_presence_string_from_type(presence_t presence_type);
#endif

4
src/xmpp/xmpp.h
View File

@@ -66,7 +66,7 @@ void jabber_disconnect(void);
void jabber_process_events(void);
const char * jabber_get_jid(void);
jabber_conn_status_t jabber_get_connection_status(void);
jabber_presence_t jabber_get_presence_type(void);
presence_t jabber_get_presence_type(void);
char * jabber_get_presence_message(void);
void jabber_set_autoping(int seconds);
char* jabber_get_account_name(void);
@@ -85,7 +85,7 @@ GList* presence_get_subscription_requests(void);
void presence_join_room(Jid *jid);
void presence_change_room_nick(const char * const room, const char * const nick);
void presence_leave_chat_room(const char * const room_jid);
void presence_update(jabber_presence_t status, const char * const msg,
void presence_update(presence_t status, const char * const msg,
int idle);
// caps functions