# HG changeset patch
# User mikael
# Date 1112643070 0
# Node ID 8f1a5e79ca405b3027f2cde4ce17f7786af88a52
# Parent  a8ceaa3005fd8f2b379be35b3247b0f751a314b1
[/trunk] Changeset 52 by mikael

* Clean up


diff -r a8ceaa3005fd -r 8f1a5e79ca40 mcabber/src/harddefines.h
--- a/mcabber/src/harddefines.h	Mon Apr 04 19:13:58 2005 +0000
+++ b/mcabber/src/harddefines.h	Mon Apr 04 19:31:10 2005 +0000
@@ -1,5 +1,5 @@
-#ifndef __AJMACIAS__
-#define __AJMACIAS__ 0xWIN!
+#ifndef __MCABBER__
+#define __MCABBER__
 
 #define VERSION "MCabber v0.6.0-dev -- based on http://cabber.sourceforge.net"
 #define EMAIL "Email: bmikael [at] lists [dot] lilotux [dot] net"
diff -r a8ceaa3005fd -r 8f1a5e79ca40 mcabber/src/jabglue.c
--- a/mcabber/src/jabglue.c	Mon Apr 04 19:13:58 2005 +0000
+++ b/mcabber/src/jabglue.c	Mon Apr 04 19:31:10 2005 +0000
@@ -46,12 +46,12 @@
 
 void screen_logger(jconn j, int io, const char *buf)
 {
-  scr_LogPrint("%.03s: %s", ((io == 0) ? "OUT" : "IN"), buf);
+  scr_LogPrint("%03s: %s", ((io == 0) ? "OUT" : "IN"), buf);
 }
 
 void file_logger(jconn j, int io, const char *buf)
 {
-  ut_WriteLog("%.03s: %s\n", ((io == 0) ? "OUT" : "IN"), buf);
+  ut_WriteLog("%03s: %s\n", ((io == 0) ? "OUT" : "IN"), buf);
 }
 
 void big_logger(jconn j, int io, const char *buf)
diff -r a8ceaa3005fd -r 8f1a5e79ca40 mcabber/src/main.c
--- a/mcabber/src/main.c	Mon Apr 04 19:13:58 2005 +0000
+++ b/mcabber/src/main.c	Mon Apr 04 19:31:10 2005 +0000
@@ -14,7 +14,6 @@
 #include "harddefines.h"
 #include "jabglue.h"
 
-//int sock;
 
 void sig_handler(int signum)
 {
@@ -174,14 +173,7 @@
     return -2;
   }
 
-  /*
-  bud_InitBuddies(sock); // TODO
-
-  ut_WriteLog("Sending presence...\n");
-  srv_setpresence(sock, "Online!");
-  */
-
-  ping = 15;
+  ping = 20;
   if (cfg_read("pinginterval"))
     ping = (unsigned int) atoi(cfg_read("pinginterval"));
 
@@ -197,19 +189,14 @@
     if (key != ERR)
       ret = process_key(key);
     jb_main();
-    if (update_roster) {
-      // scr_LogPrint("Update roster");
+    if (update_roster)
       bud_DrawRoster(scr_GetRosterWindow());
-    }
   }
 
   jb_disconnect();
   bud_TerminateBuddies();
   scr_TerminateCurses();
 
-  //srv_setpresence(sock, "unavailable");
-  //close(sock);
-
   printf("\n\nHave a nice day!\nBye!\n");
 
   return 0;