[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.46,1.47

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/msn2
In directory subversions:/tmp/cvs-serv15498/modules/msn2

Modified Files:
        msn.C 
Log Message:
spec debug for msn


Index: msn.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/msn.C,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- msn.C       25 Jan 2003 00:10:33 -0000      1.46
+++ msn.C       26 Jan 2003 22:29:16 -0000      1.47
@@ -147,6 +147,9 @@
 static int do_check_connection = 0;
 static int do_reconnect = 0;
 
+int do_msn_debug = 0;
+#define DBG_MSN do_msn_debug
+
 static int do_mail_notify = 1;
 static int do_mail_notify_show = 1;
 static int do_mail_notify_folders = 0;
@@ -177,7 +180,7 @@
 {
        int count=0;
 
-       eb_debug(DBG_MOD, "MSN\n");
+       eb_debug(DBG_MSN, "MSN\n");
        for(count=0;count<20;count++)
                tags[count].fd=-1;
        ref_count=0;
@@ -258,6 +261,13 @@
        il->widget.checkbox.label = _("Reconnect if connection unexpectedly 
drops");
        il->type = EB_INPUT_CHECKBOX;
 
+       il->next = g_new0(input_list, 1);
+       il = il->next;
+       il->widget.checkbox.value = &do_msn_debug;
+       il->widget.checkbox.name = "do_msn_debug";
+       il->widget.checkbox.label = _("Enable debugging");
+       il->type = EB_INPUT_CHECKBOX;
+
        
         psmileys=add_protocol_smiley(psmileys, "(y)", "yes");
         psmileys=add_protocol_smiley(psmileys, "(Y)", "yes");
@@ -398,7 +408,7 @@
 
 int plugin_finish()
 {
-       eb_debug(DBG_MOD, "Returning the ref_count: %i\n", ref_count);
+       eb_debug(DBG_MSN, "Returning the ref_count: %i\n", ref_count);
        return(ref_count);
 }
 
@@ -494,7 +504,7 @@
 gboolean eb_msn_query_connected( eb_account * account )
 {
     eb_msn_account_data * mad = (eb_msn_account_data 
*)account->protocol_account_data;
-    eb_debug(DBG_MOD,"msn ref_count=%d\n",ref_count);
+    eb_debug(DBG_MSN,"msn ref_count=%d\n",ref_count);
     if(ref_count <= 0 )
         mad->status = MSN_OFFLINE;
     return mad->status != MSN_OFFLINE;
@@ -515,9 +525,9 @@
        char * local_account_name = NULL;
        local_account_name=((authdata_NS *)conn->auth)->username;
        ela = find_local_account_by_handle(local_account_name, 
SERVICE_INFO.protocol_id);
-       eb_debug(DBG_MOD, "msn: checking conn\n");
+       eb_debug(DBG_MSN, "msn: checking conn\n");
        if(waiting_ans > 2) {
-               eb_debug(DBG_MOD, "msn conn closed !(no answer to fname 
set)\n");
+               eb_debug(DBG_MSN, "msn conn closed !(no answer to fname 
set)\n");
                close_conn(conn);
                waiting_ans = 0; 
                if (do_reconnect) {
@@ -532,7 +542,7 @@
                waiting_ans++;
        }
        if (status == 0) {
-               eb_debug(DBG_MOD, "conn closed... :(\n");
+               eb_debug(DBG_MSN, "conn closed... :(\n");
                close_conn(conn);
                waiting_ans = 0; 
                if (do_reconnect) {
@@ -549,7 +559,7 @@
        int port;
 
        if(account->connected!=0) {
-               eb_debug(DBG_MOD, "called while already logged or logging 
in\n");
+               eb_debug(DBG_MSN, "called while already logged or logging 
in\n");
                return;
        }
        
@@ -560,7 +570,7 @@
        mlad->mc = new msnconn;
        if(!mainconn)
                mainconn=mlad->mc;
-       eb_debug(DBG_MOD, "mainconn=%p, mlad->mc=%p\n",mainconn,mlad->mc);
+       eb_debug(DBG_MSN, "mainconn=%p, mlad->mc=%p\n",mainconn,mlad->mc);
        ref_count++;
        msn_init(mlad->mc, account->handle, mlad->password);
        port=atoi(msn_port);
@@ -583,7 +593,7 @@
 
        if(!account->connected)
                return;
-       eb_debug(DBG_MOD, "Logging out\n");
+       eb_debug(DBG_MSN, "Logging out\n");
        for (l = msn_contacts; l != NULL && l->data != NULL; l = l->next) {
                eb_account * ea = (eb_account *)find_account_by_handle((char 
*)l->data, SERVICE_INFO.protocol_id);
                eb_msn_account_data * mad = (eb_msn_account_data 
*)ea->protocol_account_data;
@@ -593,7 +603,7 @@
        }
        account->connected = 0;
        eb_set_active_menu_status(account->status_menu, MSN_OFFLINE);
-       eb_debug(DBG_MOD, "mlad->mc now %p\n",mlad->mc);
+       eb_debug(DBG_MSN, "mlad->mc now %p\n",mlad->mc);
        if(mlad->mc)
        {
                msn_clean_up(mlad->mc);
@@ -687,7 +697,7 @@
                do_error_dialog("Could not read file", "Error");
                return;
        }
-       eb_debug(DBG_MOD, "file==%s\n",file);
+       eb_debug(DBG_MSN, "file==%s\n",file);
 
         llist * list;
 
@@ -850,7 +860,7 @@
                }
                break;
        default:
-               eb_debug(DBG_MOD, "Calling MSN_ChangeState as state: %i\n", 
state);
+               eb_debug(DBG_MSN, "Calling MSN_ChangeState as state: %i\n", 
state);
                if(!account->connected)
                        eb_msn_login(account);
                else if(account->connected==1) // This is a stupid workaround 
to something that
@@ -879,18 +889,18 @@
   char * username;
   username = (char *) data;
   eb_account *ac = find_account_by_handle(username,SERVICE_INFO.protocol_id);
-  eb_debug(DBG_MOD,"entering authorize_callback\n");
+  eb_debug(DBG_MSN,"entering authorize_callback\n");
   if(response) {
     if (ac == NULL) {
       ac = eb_msn_new_account(username);
       add_account_silent(username, ac);
       eb_msn_add_user(ac);
     }
-    eb_debug(DBG_MOD, "User (%s) authorized - adding to allow list (AL)\n", 
username);
+    eb_debug(DBG_MSN, "User (%s) authorized - adding to allow list (AL)\n", 
username);
       
   } else {
      if (ac != NULL) {
-        eb_debug(DBG_MOD, "User (%s) not authorized - removing 
account\n",username);
+        eb_debug(DBG_MSN, "User (%s) not authorized - removing 
account\n",username);
         remove_account(ac);
      }      
      msn_add_to_list(mainconn, "BL", username);
@@ -912,17 +922,17 @@
 
   inv = (invitation_ftp *) data;
 
-  if(inv == NULL) {eb_debug(DBG_MOD, "inv==NULL\n");}
-  else           {eb_debug(DBG_MOD, "inv!=NULL, inv->cookie = 
%s\n",inv->cookie);}
+  if(inv == NULL) {eb_debug(DBG_MSN, "inv==NULL\n");}
+  else           {eb_debug(DBG_MSN, "inv!=NULL, inv->cookie = 
%s\n",inv->cookie);}
 
   snprintf(filepath, 1023, "%s/%s", getenv("HOME"), inv->filename);
 
   if(response) {
-    eb_debug(DBG_MOD, "accepting transfer\n");
+    eb_debug(DBG_MSN, "accepting transfer\n");
     eb_do_file_selector(filepath, _("Save file as"), eb_msn_filetrans_accept, 
(void *)inv);
   }
   else {
-    eb_debug(DBG_MOD, "rejecting transfer\n");
+    eb_debug(DBG_MSN, "rejecting transfer\n");
     msn_filetrans_reject(inv);
   }
 }
@@ -933,14 +943,14 @@
   int tag = progress_window_new(filename, inv->filesize);
   transfer_window * t_win = new transfer_window;
 
-  eb_debug(DBG_MOD, "Accepting now\n");
+  eb_debug(DBG_MSN, "Accepting now\n");
   t_win->inv = inv;
   t_win->window_tag = tag;
   msn_add_to_llist(transfer_windows, t_win);
     
   msn_filetrans_accept(inv, filename);
 
-  eb_debug(DBG_MOD, "Accept done\n");
+  eb_debug(DBG_MSN, "Accept done\n");
 }
 
 void ext_filetrans_success(invitation_ftp * inv) {
@@ -967,7 +977,7 @@
 void ext_filetrans_progress(invitation_ftp * inv, char * status, unsigned long 
recv, unsigned long total)
 {
         int tag=-1;
-        eb_debug(DBG_MOD, "%s: (%lu/%lu bytes transferred)\n", status, recv, 
total);
+        eb_debug(DBG_MSN, "%s: (%lu/%lu bytes transferred)\n", status, recv, 
total);
        transfer_window * t_win = NULL;
        t_win = eb_find_window_tag(inv);
        if (t_win != NULL)
@@ -1167,16 +1177,16 @@
 {
   char dialog_message[1025];
   char *uname;
-  eb_debug(DBG_MOD,"entering authorize_user\n");
+  eb_debug(DBG_MSN,"entering authorize_user\n");
   /* that's not the right fix */
   if (strlen(friendlyname) > 254 || strlen (username) > 254) {
-         eb_debug(DBG_MOD, "refusing contact %s because its name is too 
long\n", username);
+         eb_debug(DBG_MSN, "refusing contact %s because its name is too 
long\n", username);
          msn_add_to_list(mainconn, "BL", username);
          return 0;
   }
   if(!is_waiting_auth(username)) {
          char *tmp = Utf8ToStr(friendlyname);
-         eb_debug(DBG_MOD, "** %s (%s) has added you to their list.\n", 
friendlyname, username);
+         eb_debug(DBG_MSN, "** %s (%s) has added you to their list.\n", 
friendlyname, username);
          sprintf(dialog_message, _("The MSN user %s (%s) would like to add you 
to their contact list.\nDo you want to allow them to see when you are 
online?"), 
                          tmp, username);
          free(tmp);
@@ -1235,7 +1245,7 @@
        
        if(strstr(group,","))
                group[ strstr(group,",")-group ] = 0;
-       eb_debug(DBG_MOD,"got a friend %s, %s (all=%s)\n",name,group,groups);
+       eb_debug(DBG_MSN,"got a friend %s, %s (all=%s)\n",name,group,groups);
        
        ea = eb_msn_new_account(name);
        
@@ -1243,7 +1253,7 @@
                value_pair *grpinfo = (value_pair *)walk->data;
                if(grpinfo && !strcmp(grpinfo->value, group)) {
                        strcpy(groupname, grpinfo->key);
-                       eb_debug(DBG_MOD,"found group id %s: %s\n",group, 
groupname);
+                       eb_debug(DBG_MSN,"found group id %s: %s\n",group, 
groupname);
                }
        }
        if (groupname == NULL || !groupname[0] || !strcmp("~", groupname))
@@ -1263,7 +1273,7 @@
                eb_name = _("Buddies");
        else
                eb_name = Utf8ToStr(name);
-       eb_debug(DBG_MOD,"got group id %s, %s\n",id,eb_name);
+       eb_debug(DBG_MSN,"got group id %s, %s\n",id,eb_name);
        msn_grouplist = value_pair_add (msn_grouplist, eb_name, strdup(id));
        if(!find_grouplist_by_name(eb_name))
                add_group(eb_name);
@@ -1292,7 +1302,7 @@
                int_old_group = old_group;
        if (!mainconn || listsyncing) /* not now */
                return;
-       eb_debug(DBG_MOD,"moving %s from %s to %s\n", ea->handle, 
int_old_group, int_new_group);
+       eb_debug(DBG_MSN,"moving %s from %s to %s\n", ea->handle, 
int_old_group, int_new_group);
        oldid = value_pair_get_value(msn_grouplist, int_old_group);
        newid = value_pair_get_value(msn_grouplist, int_new_group);
        if (newid == NULL || !strcmp("-1",newid)) {
@@ -1326,10 +1336,10 @@
        if (ea && ogroup && ngroup) {
                char *id = value_pair_get_value(msn_grouplist, ngroup);
                if (id == NULL || !strcmp(id,"-1")) {
-                       eb_debug(DBG_MOD,"ID still %s\n",id);
+                       eb_debug(DBG_MSN,"ID still %s\n",id);
                        return TRUE;
                }
-               eb_debug(DBG_MOD,"Got ID %s\n",id);
+               eb_debug(DBG_MSN,"Got ID %s\n",id);
                eb_msn_real_change_group(ea,ogroup,ngroup);
                return FALSE;
        }
@@ -1465,7 +1475,7 @@
 
 void ext_register_sock(int s, int reading, int writing)
 {
-  eb_debug(DBG_MOD, "Registering sock %i\n", s);
+  eb_debug(DBG_MSN, "Registering sock %i\n", s);
   for(int a=0; a<20; a++)
   {
     if(tags[a].fd==-1) {
@@ -1483,7 +1493,7 @@
          tags[a].tag_w=eb_input_add(s, EB_INPUT_WRITE, eb_msn_incoming, NULL);
         }
 
-        eb_debug(DBG_MOD, "Successful %i\n", s);
+        eb_debug(DBG_MSN, "Successful %i\n", s);
        return;
     }
   }
@@ -1491,7 +1501,7 @@
 
 void ext_unregister_sock(int s)
 {
-  eb_debug(DBG_MOD, "Unregistering sock %i\n", s);
+  eb_debug(DBG_MSN, "Unregistering sock %i\n", s);
   for(int a=0; a<20; a++)
   {
     if(tags[a].fd==s) {
@@ -1499,7 +1509,7 @@
         if(tags[a].tag_w!=-1) { eb_input_remove(tags[a].tag_w); }
        tags[a].fd=-1;
        tags[a].tag_r=tags[a].tag_w=0;
-        eb_debug(DBG_MOD, "Successful %i\n", s);
+        eb_debug(DBG_MSN, "Successful %i\n", s);
        return;
     }
   }
@@ -1510,7 +1520,7 @@
   eb_local_account * ela = NULL;
   char * local_account_name = NULL;
   char * tmp = Utf8ToStr(friendlyname);
-  eb_debug(DBG_MOD, "Your friendlyname is now: %s\n", friendlyname);
+  eb_debug(DBG_MSN, "Your friendlyname is now: %s\n", friendlyname);
   local_account_name=((authdata_NS *)conn->auth)->username;
   ela = find_local_account_by_handle(local_account_name, 
SERVICE_INFO.protocol_id);
   strncpy(ela->alias, tmp, 255);
@@ -1520,7 +1530,7 @@
   free(tmp);
 
   if(!ela->connected) {
-         eb_debug(DBG_MOD,"not connected, shouldn't get it\n");
+         eb_debug(DBG_MSN,"not connected, shouldn't get it\n");
          ela->connected = 1;
          close_conn(conn);
          msn_clean_up(conn);
@@ -1531,7 +1541,7 @@
 void ext_got_info(msnconn * conn, syncinfo * info)
 {
   LList *existing = get_all_accounts(SERVICE_INFO.protocol_id); 
-  eb_debug(DBG_MOD, "Got the sync info!\n");
+  eb_debug(DBG_MSN, "Got the sync info!\n");
   msn_set_state(conn, "NLN");
   /* hack to check conn status */
   if (conncheck_handler == -1 && do_check_connection)
@@ -1540,11 +1550,11 @@
   for(existing; existing != NULL && existing->data != NULL; existing = 
existing->next) {
         char *cnt = (char*) existing->data;
         if (!is_on_list(cnt,info->al)) {
-                eb_debug(DBG_MOD,"adding %s to al\n",cnt);
+                eb_debug(DBG_MSN,"adding %s to al\n",cnt);
             msn_add_to_list(mainconn, "AL", cnt);
         }
         if (!is_on_list(cnt,info->fl)) {
-                eb_debug(DBG_MOD,"adding %s to fl\n",cnt);
+                eb_debug(DBG_MSN,"adding %s to fl\n",cnt);
             msn_add_to_list(mainconn, "FL", cnt);
         }
   }
@@ -1558,39 +1568,39 @@
 
 void ext_latest_serial(msnconn * conn, int serial)
 {
-  eb_debug(DBG_MOD, "The latest serial number is: %d\n", serial);
+  eb_debug(DBG_MSN, "The latest serial number is: %d\n", serial);
 }
 
 void ext_got_GTC(msnconn * conn, char c)
 {
-  eb_debug(DBG_MOD, "Your GTC value is now %c\n", c);
+  eb_debug(DBG_MSN, "Your GTC value is now %c\n", c);
 }
 
 void ext_got_BLP(msnconn * conn, char c)
 {
-  eb_debug(DBG_MOD, "Your BLP value is now %cL\n", c);
+  eb_debug(DBG_MSN, "Your BLP value is now %cL\n", c);
 }
 
 int ext_new_RL_entry(msnconn * conn, char * username, char * friendlyname)
 {
-  eb_debug(DBG_MOD, "%s (%s) has added you to their contact list.\nYou might 
want to add them to your Allow or Block list\n", username, friendlyname);
+  eb_debug(DBG_MSN, "%s (%s) has added you to their contact list.\nYou might 
want to add them to your Allow or Block list\n", username, friendlyname);
   return eb_msn_authorize_user(username, friendlyname);
 }
 
 void ext_new_list_entry(msnconn * conn, char * list, char * username)
 {
-  eb_debug(DBG_MOD, "%s is now on your %s\n", username, list);
+  eb_debug(DBG_MSN, "%s is now on your %s\n", username, list);
 }
 
 void ext_del_list_entry(msnconn * conn, char * list, char * username)
 {
-  eb_debug(DBG_MOD, "%s has been removed from your %s\n", username, list);
+  eb_debug(DBG_MSN, "%s has been removed from your %s\n", username, list);
 }
 
 void ext_show_error(msnconn * conn, char * msg)
 {
   do_error_dialog(msg, "MSN Error");
-  eb_debug(DBG_MOD, "MSN: Error: %s\n", msg);
+  eb_debug(DBG_MSN, "MSN: Error: %s\n", msg);
 }
 
 int get_status_num(char *status)
@@ -1617,7 +1627,7 @@
           rename_contact(ea->account_contact, tmp);    
        }
     } else {
-           eb_debug(DBG_MOD, "ea not found, creating new account\n");
+           eb_debug(DBG_MSN, "ea not found, creating new account\n");
            ea = eb_msn_new_account(buddy);
             mad = (eb_msn_account_data *)ea->protocol_account_data;
            if(!find_grouplist_by_name(_("Buddies")))
@@ -1635,8 +1645,8 @@
     if (mad->status != state) {            
            mad->status = state;
            buddy_update_status_and_log(ea);
-           eb_debug(DBG_MOD, "Buddy->online=%i\n", ea->online);
-           eb_debug(DBG_MOD, "%s (%s) is now %s\n", tmp, buddy, status);
+           eb_debug(DBG_MSN, "Buddy->online=%i\n", ea->online);
+           eb_debug(DBG_MSN, "%s (%s) is now %s\n", tmp, buddy, status);
     }
     
     free(tmp);
@@ -1647,7 +1657,7 @@
        eb_account * ea = (eb_account *)find_account_by_handle(buddy, 
SERVICE_INFO.protocol_id);
        eb_msn_account_data * mad = NULL;
 
-       eb_debug(DBG_MOD, "%s is now offline\n", buddy);
+       eb_debug(DBG_MSN, "%s is now offline\n", buddy);
        if(ea)
        {
                mad =(eb_msn_account_data *)ea->protocol_account_data;
@@ -1703,7 +1713,7 @@
   eb_chat_room_buddy_arrive(ecr, ((authdata_SB *)conn->auth)->username,  
((authdata_SB *)conn->auth)->username);
 
 
-  eb_debug(DBG_MOD, "Got switchboard connection\n");
+  eb_debug(DBG_MSN, "Got switchboard connection\n");
 }
 
 void ext_user_joined(msnconn * conn, char * username, char * friendlyname, int 
is_initial)
@@ -1712,10 +1722,10 @@
 
   if((ecr=eb_msn_get_chat_room(conn))==NULL)
   {
-    eb_debug(DBG_MOD, "It's not a group chat\n");
+    eb_debug(DBG_MSN, "It's not a group chat\n");
     if(msn_count_llist(conn->users)>1)
     {
-      eb_debug(DBG_MOD, "making new chat\n");
+      eb_debug(DBG_MSN, "making new chat\n");
 
       ecr = g_new0(eb_chat_room, 1);
       eb_msn_chatroom * emc = new eb_msn_chatroom;
@@ -1754,7 +1764,7 @@
         if(l==NULL) { return; }
         pending_file_send * pfs=(pending_file_send *)l->data;
 
-        eb_debug(DBG_MOD, "Checking %s against %s\n", pfs->dest, username);
+        eb_debug(DBG_MSN, "Checking %s against %s\n", pfs->dest, username);
 
         if(!strcmp(pfs->dest, username))
         {
@@ -1777,11 +1787,11 @@
       }
     }
   } else {
-    eb_debug(DBG_MOD, "Ordinary chat arrival\n");
+    eb_debug(DBG_MSN, "Ordinary chat arrival\n");
     eb_chat_room_buddy_arrive(ecr, username, username);
   }
 
-  eb_debug(DBG_MOD, "%s (%s) is now in the session\n", friendlyname, username);
+  eb_debug(DBG_MSN, "%s (%s) is now in the session\n", friendlyname, username);
 }
 
 void ext_user_left(msnconn * conn, char * username)
@@ -1802,7 +1812,7 @@
     eb_update_status(ea, _("(closed window)"));
   }
 
-  eb_debug(DBG_MOD, "%s has now left the session\n", username);
+  eb_debug(DBG_MSN, "%s has now left the session\n", username);
 }
 
 void ext_got_IM(msnconn * conn, char * username, char * friendlyname, message 
* msg)
@@ -1832,19 +1842,19 @@
     ela = find_local_account_by_handle(local_account_name, 
SERVICE_INFO.protocol_id);
     if(!ela)
     {
-        eb_debug(DBG_MOD, "Unable to find local account by handle: %s\n", 
local_account_name);
+        eb_debug(DBG_MSN, "Unable to find local account by handle: %s\n", 
local_account_name);
         ela=msn_local_account;
     }
     /* Do we need to set our state? */
     sender = find_account_by_handle(username, SERVICE_INFO.protocol_id);
     if (sender == NULL) {
-        eb_debug(DBG_MOD, "Cannot find sender: %s, calling AddHotmail\n", 
username);
+        eb_debug(DBG_MSN, "Cannot find sender: %s, calling AddHotmail\n", 
username);
 //        AddHotmail(im->sender, &newHandle);
 //        sender = find_account_by_handle(newHandle, SERVICE_INFO.protocol_id);
 //        free(newHandle);
     }
     if (sender == NULL) {
-        eb_debug(DBG_MOD, "Still cannot find sender: %s, calling 
add_unknown\n", username);
+        eb_debug(DBG_MSN, "Still cannot find sender: %s, calling 
add_unknown\n", username);
         ea = (eb_account *)malloc(sizeof(eb_account));
         mad = g_new0(eb_msn_account_data, 1);
         strcpy(ea->handle, username);
@@ -1874,7 +1884,7 @@
     if(!strcmp(username, "Hotmail") && (!lmess || !lmess[0]))
     {
        mlad = (eb_msn_local_account_data *)ela->protocol_local_account_data;
-       eb_debug(DBG_MOD, "Setting our state to: %s\n", 
msn_state_strings[mlad->status]);
+       eb_debug(DBG_MSN, "Setting our state to: %s\n", 
msn_state_strings[mlad->status]);
        msn_set_state(mlad->mc, msn_state_strings[mlad->status]);
        return;
     }
@@ -1899,7 +1909,7 @@
   sprintf(dialog_message, _("The MSN user %s (%s) would like to send you\n %s 
(%lu bytes).\nDo you want to accept this file ?"),
          tmp, from, inv->filename, inv->filesize);
   free(tmp);
-  eb_debug(DBG_MOD, "got invitation : inv->filename:%s, inv->filesize:%lu\n",
+  eb_debug(DBG_MSN, "got invitation : inv->filename:%s, inv->filesize:%lu\n",
         inv->filename,
         inv->filesize);
   eb_do_dialog(dialog_message, _("Accept file"), eb_msn_filetrans_callback, 
(gpointer) inv );
@@ -1976,7 +1986,7 @@
     ela = find_local_account_by_handle(local_account_name, 
SERVICE_INFO.protocol_id);
     if(!ela)
     {
-        eb_debug(DBG_MOD, "Unable to find local account by handle: %s\n", 
local_account_name);
+        eb_debug(DBG_MSN, "Unable to find local account by handle: %s\n", 
local_account_name);
         ela=msn_local_account;
     }
     mlad = (eb_msn_local_account_data *)ela->protocol_local_account_data;
@@ -1986,7 +1996,7 @@
     ext_disable_conncheck();
 
   }
-  eb_debug(DBG_MOD, "Closed connection with socket %d\n", conn->sock);
+  eb_debug(DBG_MSN, "Closed connection with socket %d\n", conn->sock);
 }
 
 void close_conn(msnconn *conn) {
@@ -1995,7 +2005,7 @@
 
 void ext_changed_state(msnconn * conn, char * state)
 {
-  eb_debug(DBG_MOD, "Your state is now: %s\n", state);
+  eb_debug(DBG_MSN, "Your state is now: %s\n", state);
 }
 
 int ext_connect_socket(char * hostname, int port)
@@ -2003,7 +2013,7 @@
   struct sockaddr_in sa;
   struct hostent     *hp;
   int s;
-  eb_debug(DBG_MOD,"Connecting to %s...\n", hostname);
+  eb_debug(DBG_MSN,"Connecting to %s...\n", hostname);
   if ((hp= gethostbyname(hostname)) == NULL) { /* do we know the host's */
 #ifndef __MINGW32__
     errno= ECONNREFUSED;                       /* address? */
@@ -2038,11 +2048,11 @@
       {
         if(pfd.revents&POLLERR||pfd.revents&POLLHUP||pfd.revents&POLLNVAL)
         {
-          eb_debug(DBG_MOD, "Error!\n");
+          eb_debug(DBG_MSN, "Error!\n");
           close(s);
           return -1;
         } else {
-          eb_debug(DBG_MOD, "Connect went fine\n");
+          eb_debug(DBG_MSN, "Connect went fine\n");
           sleep(2);
           return s;
         }
@@ -2209,13 +2219,13 @@
     eb_msn_chatroom * emc=(eb_msn_chatroom *)l->data;
 
 
-    if(emc->conn == conn) { eb_debug(DBG_MOD, "Found chatroom\n"); return 
emc->ecr; }
+    if(emc->conn == conn) { eb_debug(DBG_MSN, "Found chatroom\n"); return 
emc->ecr; }
 
-    eb_debug(DBG_MOD, "Checking conn with socket %d\n", emc->conn->sock);
+    eb_debug(DBG_MSN, "Checking conn with socket %d\n", emc->conn->sock);
 
     l=l->next;
   }
-  eb_debug(DBG_MOD, "Not found chatroom\n");
+  eb_debug(DBG_MSN, "Not found chatroom\n");
   return NULL;
 }