# HG changeset patch
# User mikael
# Date 1112704014 0
# Node ID a7c699bd09e0b6fdbb5478f13aef6599f18ca7fd
# Parent  d79ff2ce61c4b9185a8e68ccf7b8fe0fca4ff0ed
[/trunk] Changeset 57 by mikael

* Fix a bug when jid has uppercase characters...


diff -r d79ff2ce61c4 -r a7c699bd09e0 mcabber/src/buddies.c
--- a/mcabber/src/buddies.c	Mon Apr 04 20:59:45 2005 +0000
+++ b/mcabber/src/buddies.c	Tue Apr 05 12:26:54 2005 +0000
@@ -31,7 +31,7 @@
 
   list_for_each_safe(pos, n, &buddy_list) {
     tmp = buddy_entry(pos);
-    if (!strcmp(tmp->jid, jidfrom)) {
+    if (!strcasecmp(tmp->jid, jidfrom)) {
       if (tmp->flags != status) {
         oldstatus = tmp->flags;
 	tmp->flags = status;
@@ -42,8 +42,8 @@
   }
   if (changed) {
     bud_DrawRoster(scr_GetRosterWindow());
-    scr_LogPrint("<%s> status has changed: [%c>%c]", jidfrom,
-            imstatus2char[oldstatus], imstatus2char[status]);
+    scr_LogPrint("Buddy status has changed: [%c>%c] <%s>",
+            imstatus2char[oldstatus], imstatus2char[status], jidfrom);
   }
 }
 
@@ -264,6 +264,8 @@
     free(str);
   }
 
+  ut_WriteLog("Adding buddy: %s <%s>\n", tmp->name, tmp->jid);
+
   list_add_tail(&tmp->list, &buddy_list);
   bud_DrawRoster(scr_GetRosterWindow());
 
diff -r d79ff2ce61c4 -r a7c699bd09e0 mcabber/src/jabglue.c
--- a/mcabber/src/jabglue.c	Mon Apr 04 20:59:45 2005 +0000
+++ b/mcabber/src/jabglue.c	Tue Apr 05 12:26:54 2005 +0000
@@ -604,7 +604,6 @@
           p = xmlnode_get_data(x); if (p) ns = p;
 
           if (ns) {
-            //scr_LogPrint("New status: %s (%s)", ns, from);
             if (!strcmp(ns, "away"))      ust = away;
             else if (!strcmp(ns, "dnd"))  ust = dontdisturb;
             else if (!strcmp(ns, "xa"))   ust = notavail;
@@ -613,9 +612,9 @@
         }
 
         if (type && !strcmp(type, "unavailable")) {
-          //scr_LogPrint("New status: unavailable/offline");
           ust = offline;
         }
+        //scr_LogPrint("New status: ust=%d (%s)", ust, from);
 
         bud_SetBuddyStatus(jidtodisp(from), ust);
         /*
diff -r d79ff2ce61c4 -r a7c699bd09e0 mcabber/src/jabglue.h
--- a/mcabber/src/jabglue.h	Mon Apr 04 20:59:45 2005 +0000
+++ b/mcabber/src/jabglue.h	Tue Apr 05 12:26:54 2005 +0000
@@ -6,7 +6,7 @@
 extern jconn jc;
 
 enum imstatus {
-    offline = 0,
+    offline,
     available,
     invisible,
     freeforchat,