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

Renamed jabber_status_t -> jabber_conn_status_t

Browse Source
This commit is contained in:
James Booth 2012-05-27 19:20:17 +01:00
parent 9f5cff096c
commit 619496f5dd
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command.c
View File

@ -110,7 +110,7 @@ static gboolean _handle_command(const char * const command, const char * const i
static gboolean _cmd_connect(const char * const inp)
{
gboolean result = FALSE;
jabber_status_t conn_status = jabber_connection_status();
jabber_conn_status_t conn_status = jabber_connection_status();
if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) {
cons_show("You are either connected already, or a login is in process.");
@ -154,7 +154,7 @@ static gboolean _cmd_help(void)
static gboolean _cmd_ros(void)
{
jabber_status_t conn_status = jabber_connection_status();
jabber_conn_status_t conn_status = jabber_connection_status();
if (conn_status != JABBER_CONNECTED)
cons_show("You are not currently connected.");
@ -166,7 +166,7 @@ static gboolean _cmd_ros(void)
static gboolean _cmd_who(void)
{
jabber_status_t conn_status = jabber_connection_status();
jabber_conn_status_t conn_status = jabber_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
@ -183,7 +183,7 @@ static gboolean _cmd_msg(const char * const inp)
char *usr = NULL;
char *msg = NULL;
jabber_status_t conn_status = jabber_connection_status();
jabber_conn_status_t conn_status = jabber_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");

7
jabber.c
View File

@ -39,7 +39,7 @@ static struct _jabber_conn_t {
xmpp_log_t *log;
xmpp_ctx_t *ctx;
xmpp_conn_t *conn;
jabber_status_t conn_status;
jabber_conn_status_t conn_status;
int tls_disabled;
} jabber_conn;
@ -81,12 +81,13 @@ void jabber_init(const int disable_tls)
jabber_conn.tls_disabled = disable_tls;
}
jabber_status_t jabber_connection_status(void)
jabber_conn_status_t jabber_connection_status(void)
{
return (jabber_conn.conn_status);
}
jabber_status_t jabber_connect(const char * const user, const char * const passwd)
jabber_conn_status_t jabber_connect(const char * const user,
const char * const passwd)
{
xmpp_initialize();

7
jabber.h
View File

@ -28,11 +28,12 @@ typedef enum {
JABBER_CONNECTING,
JABBER_CONNECTED,
JABBER_DISCONNECTED
} jabber_status_t;
} jabber_conn_status_t;
void jabber_init(const int disable_tls);
jabber_status_t jabber_connection_status(void);
jabber_status_t jabber_connect(const char * const user, const char * const passwd);
jabber_conn_status_t jabber_connection_status(void);
jabber_conn_status_t jabber_connect(const char * const user,
const char * const passwd);
void jabber_disconnect(void);
void jabber_roster_request(void);
void jabber_process_events(void);