mirror of
https://github.com/profanity-im/profanity.git
synced 2024-09-29 19:56:07 -04:00
Renamed jabber_status_t -> jabber_conn_status_t
This commit is contained in:
parent
9f5cff096c
commit
619496f5dd
@ -110,7 +110,7 @@ static gboolean _handle_command(const char * const command, const char * const i
|
|||||||
static gboolean _cmd_connect(const char * const inp)
|
static gboolean _cmd_connect(const char * const inp)
|
||||||
{
|
{
|
||||||
gboolean result = FALSE;
|
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)) {
|
if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) {
|
||||||
cons_show("You are either connected already, or a login is in process.");
|
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)
|
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)
|
if (conn_status != JABBER_CONNECTED)
|
||||||
cons_show("You are not currently connected.");
|
cons_show("You are not currently connected.");
|
||||||
@ -166,7 +166,7 @@ static gboolean _cmd_ros(void)
|
|||||||
|
|
||||||
static gboolean _cmd_who(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) {
|
if (conn_status != JABBER_CONNECTED) {
|
||||||
cons_show("You are not currently connected.");
|
cons_show("You are not currently connected.");
|
||||||
@ -183,7 +183,7 @@ static gboolean _cmd_msg(const char * const inp)
|
|||||||
char *usr = NULL;
|
char *usr = NULL;
|
||||||
char *msg = 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) {
|
if (conn_status != JABBER_CONNECTED) {
|
||||||
cons_show("You are not currently connected.");
|
cons_show("You are not currently connected.");
|
||||||
|
7
jabber.c
7
jabber.c
@ -39,7 +39,7 @@ static struct _jabber_conn_t {
|
|||||||
xmpp_log_t *log;
|
xmpp_log_t *log;
|
||||||
xmpp_ctx_t *ctx;
|
xmpp_ctx_t *ctx;
|
||||||
xmpp_conn_t *conn;
|
xmpp_conn_t *conn;
|
||||||
jabber_status_t conn_status;
|
jabber_conn_status_t conn_status;
|
||||||
int tls_disabled;
|
int tls_disabled;
|
||||||
} jabber_conn;
|
} jabber_conn;
|
||||||
|
|
||||||
@ -81,12 +81,13 @@ void jabber_init(const int disable_tls)
|
|||||||
jabber_conn.tls_disabled = 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);
|
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();
|
xmpp_initialize();
|
||||||
|
|
||||||
|
7
jabber.h
7
jabber.h
@ -28,11 +28,12 @@ typedef enum {
|
|||||||
JABBER_CONNECTING,
|
JABBER_CONNECTING,
|
||||||
JABBER_CONNECTED,
|
JABBER_CONNECTED,
|
||||||
JABBER_DISCONNECTED
|
JABBER_DISCONNECTED
|
||||||
} jabber_status_t;
|
} jabber_conn_status_t;
|
||||||
|
|
||||||
void jabber_init(const int disable_tls);
|
void jabber_init(const int disable_tls);
|
||||||
jabber_status_t jabber_connection_status(void);
|
jabber_conn_status_t jabber_connection_status(void);
|
||||||
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);
|
||||||
void jabber_disconnect(void);
|
void jabber_disconnect(void);
|
||||||
void jabber_roster_request(void);
|
void jabber_roster_request(void);
|
||||||
void jabber_process_events(void);
|
void jabber_process_events(void);
|
||||||
|
Loading…
Reference in New Issue
Block a user