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

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2016-04-09 20:20:35 +01:00
commit 3eaabac64b

View File

@ -4230,7 +4230,7 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args)
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currenlty connected.");
cons_show("You are not currently connected.");
return TRUE;
}
@ -5006,7 +5006,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args)
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currenlty connected.");
cons_show("You are not currently connected.");
} else {
ProfWin *window = wins_get_current();
if (window->type != WIN_MUC) {
@ -5021,7 +5021,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args)
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currenlty connected.");
cons_show("You are not currently connected.");
} else {
ProfWin *window = wins_get_current();
if (window->type != WIN_MUC) {
@ -5036,7 +5036,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args)
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currenlty connected.");
cons_show("You are not currently connected.");
} else {
if (g_strcmp0(args[1], "on") == 0) {
ProfWin *window = wins_get_current();
@ -5064,7 +5064,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args)
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currenlty connected.");
cons_show("You are not currently connected.");
} else {
if (g_strcmp0(args[1], "on") == 0) {
ProfWin *window = wins_get_current();
@ -5092,7 +5092,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args)
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currenlty connected.");
cons_show("You are not currently connected.");
} else {
ProfWin *window = wins_get_current();
if (window->type != WIN_MUC) {
@ -5294,7 +5294,7 @@ cmd_ping(ProfWin *window, const char *const command, gchar **args)
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currenlty connected.");
cons_show("You are not currently connected.");
return TRUE;
}