--- a/mcabber/mcabber/commands.c	Tue Jan 19 16:09:27 2010 +0200
+++ b/mcabber/mcabber/commands.c	Tue Jan 19 19:16:38 2010 +0200
@@ -888,7 +888,7 @@
   char *msg;
   enum imstatus st;
 
-  if (!lconnection || !lm_connection_is_authenticated(lconnection)) {
+  if (!xmpp_is_online()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
     return;
   }
@@ -1022,7 +1022,7 @@
   char *id, *nick;
   char *jid_utf8 = NULL;
 
-  if (!lconnection || !lm_connection_is_authenticated(lconnection)) {
+  if (!xmpp_is_online()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
     return;
   }
@@ -1184,7 +1184,7 @@
   int isroom;
   gpointer xep184 = NULL;
 
-  if (!lconnection || !lm_connection_is_authenticated(lconnection)) {
+  if (!xmpp_is_online()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
     return 1;
   }
@@ -1529,7 +1529,7 @@
   LmMessageSubType msg_type = LM_MESSAGE_SUB_TYPE_NOT_SET;
   bool quiet = FALSE;
 
-  if (!lconnection || !lm_connection_is_authenticated(lconnection)) {
+  if (!xmpp_is_online()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
     return;
   }
@@ -2249,7 +2249,7 @@
   char **paramlst;
   char *subcmd;
 
-  if (!lconnection || !lm_connection_is_authenticated(lconnection)) {
+  if (!xmpp_is_online()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
     return;
   }
@@ -3042,7 +3042,7 @@
   char *subcmd;
   gpointer bud;
 
-  if (!lconnection || !lm_connection_is_authenticated(lconnection)) {
+  if (!xmpp_is_online()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
     return;
   }
@@ -3139,7 +3139,7 @@
   char *subcmd;
   char *jid_utf8;
 
-  if (!lconnection || !lm_connection_is_authenticated(lconnection)) {
+  if (!xmpp_is_online()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
     return;
   }
@@ -3253,7 +3253,7 @@
     return;
   }
 
-  if (!lconnection || !lm_connection_is_authenticated(lconnection)) {
+  if (!xmpp_is_online()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
     free_arg_lst(paramlst);
     return;