--- a/mcabber/src/jabglue.c Sat Jul 23 09:14:50 2005 +0100
+++ b/mcabber/src/jabglue.c Sat Jul 23 11:39:39 2005 +0100
@@ -139,8 +139,7 @@
port = JABBERPORT;
}
- //if (jc)
- // free(jc); XXX
+ jb_disconnect();
s_id = 1;
jc = jab_new((char*)jid, (char*)pass, port, ssl);
@@ -580,7 +579,7 @@
switch(state) {
case JCONN_STATE_OFF:
if (previous_state != JCONN_STATE_OFF)
- scr_LogPrint("+ JCONN_STATE_OFF");
+ scr_LogPrint("[Jabber] Not connected to the server");
online = FALSE;
mystatus = offline;
@@ -589,20 +588,21 @@
break;
case JCONN_STATE_CONNECTED:
- scr_LogPrint("+ JCONN_STATE_CONNECTED");
+ scr_LogPrint("[Jabber] Connected to the server");
break;
case JCONN_STATE_AUTH:
- scr_LogPrint("+ JCONN_STATE_AUTH");
+ scr_LogPrint("[Jabber] Authenticating to the server");
break;
case JCONN_STATE_ON:
- scr_LogPrint("+ JCONN_STATE_ON");
+ scr_LogPrint("[Jabber] Communication with the server established");
online = TRUE;
break;
case JCONN_STATE_CONNECTING:
- scr_LogPrint("+ JCONN_STATE_CONNECTING");
+ if (previous_state != state)
+ scr_LogPrint("[Jabber] Connecting to the server");
break;
default:
--- a/mcabber/src/main.c Sat Jul 23 09:14:50 2005 +0100
+++ b/mcabber/src/main.c Sat Jul 23 11:39:39 2005 +0100
@@ -76,8 +76,12 @@
jb_set_priority(settings_opt_get_int("priority"));
/* Connect to server */
- ut_WriteLog("Connecting to server: %s:%d\n", servername, port);
- scr_LogPrint("Connecting to server: %s:%d", servername, port);
+ ut_WriteLog("Connecting to server: %s\n", servername);
+ scr_LogPrint("Connecting to server: %s", servername);
+ if (port) {
+ ut_WriteLog(" using port %d\n", port);
+ scr_LogPrint(" using port %d", port);
+ }
jid = compose_jid(username, servername, resource);
jc = jb_connect(jid, port, ssl, password);