# HG changeset patch
# User mikael
# Date 1112645776 0
# Node ID 1441ba37a5c10d0a414fce24d7e5e5fbf8b3a5e4
# Parent  8f1a5e79ca405b3027f2cde4ce17f7786af88a52
[/trunk] Changeset 53 by mikael

* Work on libjabber integration.
* Clean up.


diff -r 8f1a5e79ca40 -r 1441ba37a5c1 mcabber/src/jabglue.c
--- a/mcabber/src/jabglue.c	Mon Apr 04 19:31:10 2005 +0000
+++ b/mcabber/src/jabglue.c	Mon Apr 04 20:16:16 2005 +0000
@@ -319,7 +319,6 @@
       else
         buddyname = jidtodisp(alias);
 
-      //scr_LogPrint("New buddy: %s", buddyname);
       bud_AddBuddy(alias, buddyname);
       if (!name)
         free(buddyname);
@@ -354,17 +353,16 @@
 
   switch(state) {
     case JCONN_STATE_OFF:
-        scr_LogPrint("+ JCONN_STATE_OFF");
-        /*
-           jhook.flogged = jhook.fonline = FALSE;
+
+        /* jhook.flogged = jhook.fonline = FALSE; */
 
-           if (previous_state != JCONN_STATE_OFF) {
-           logger.putourstatus(jhook.proto, jhook.getstatus(), jhook.ourstatus = offline);
-           jhook.log(logDisconnected);
+        if (previous_state != JCONN_STATE_OFF) {
+          scr_LogPrint("+ JCONN_STATE_OFF");
+          /*
            jhook.roster.clear();
            jhook.agents.clear();
-           }
-           */
+          */
+        }
         break;
 
     case JCONN_STATE_CONNECTED:
@@ -393,7 +391,7 @@
 void packethandler(jconn conn, jpacket packet)
 {
   char *p;
-  xmlnode x; // , y;
+  xmlnode x, y;
   // string from, type, body, enc, ns, id, u, h, s;
   char *from=NULL, *type=NULL, *body=NULL, *enc=NULL;
   char *ns=NULL;
@@ -406,7 +404,6 @@
 
   p = xmlnode_get_attrib(packet->x, "from"); if (p) from = p;
   p = xmlnode_get_attrib(packet->x, "type"); if (p) type = p;
-  //imcontact ic(jidtodisp(from), jhook.proto);
 
   switch (packet->type) {
     case JPACKET_MESSAGE:
@@ -419,7 +416,7 @@
             strcpy(tmp, p);
             strcat(tmp, ": ");
             strcat(tmp, body);
-            body = tmp; // XXX check it is free'd later...
+            body = tmp; // XXX we should free it later...
           }
 
         /* there can be multiple <x> tags. we're looking for one with
@@ -427,7 +424,8 @@
 
         for (x = xmlnode_get_firstchild(packet->x); x; x = xmlnode_get_nextsibling(x)) {
           if ((p = xmlnode_get_name(x)) && !strcmp(p, "x"))
-            if ((p = xmlnode_get_attrib(x, "xmlns")) && !strcasecmp(p, "jabber:x:encrypted"))
+            if ((p = xmlnode_get_attrib(x, "xmlns")) &&
+                !strcasecmp(p, "jabber:x:encrypted"))
               if ((p = xmlnode_get_data(x)) != NULL) {
                 enc = p;
                 break;
@@ -486,7 +484,6 @@
             if (!strcmp(ns, NS_ROSTER)) {
               gotroster(x);
             } else if (!strcmp(ns, NS_AGENTS)) {
-              /* TODO...
               for (y = xmlnode_get_tag(x, "agent"); y; y = xmlnode_get_nextsibling(y)) {
                 const char *alias = xmlnode_get_attrib(y, "jid");
 
@@ -494,16 +491,17 @@
                   const char *name = xmlnode_get_tag_data(y, "name");
                   const char *desc = xmlnode_get_tag_data(y, "description");
                   const char *service = xmlnode_get_tag_data(y, "service");
-                  agent::agent_type atype = agent::atUnknown;
+                  enum agtype atype = unknown;
 
-                  if (xmlnode_get_tag(y, "groupchat")) atype = agent::atGroupchat; else
-                    if (xmlnode_get_tag(y, "transport")) atype = agent::atTransport; else
-                      if (xmlnode_get_tag(y, "search")) atype = agent::atSearch;
+                  if (xmlnode_get_tag(y, "groupchat")) atype = groupchat; else
+                    if (xmlnode_get_tag(y, "transport")) atype = transport; else
+                      if (xmlnode_get_tag(y, "search")) atype = search;
 
                   if (alias && name && desc) {
-                    jhook.agents.push_back(agent(alias, name, desc, atype));
+                    scr_LogPrint("Agent: %s / %s / %s / type=%d",
+                                 alias, name, desc, atype);
 
-                    if (atype == agent::atSearch) {
+                    if (atype == search) {
                       x = jutil_iqnew (JPACKET__GET, NS_SEARCH);
                       xmlnode_put_attrib(x, "to", alias);
                       xmlnode_put_attrib(x, "id", "Agent info");
@@ -522,6 +520,7 @@
                 }
               }
 
+              /*
               if (find(jhook.agents.begin(), jhook.agents.end(), DEFAULT_CONFSERV) == jhook.agents.end())
                 jhook.agents.insert(jhook.agents.begin(), agent(DEFAULT_CONFSERV, DEFAULT_CONFSERV,
                             _("Default Jabber conference server"), agent::atGroupchat));
diff -r 8f1a5e79ca40 -r 1441ba37a5c1 mcabber/src/jabglue.h
--- a/mcabber/src/jabglue.h	Mon Apr 04 19:31:10 2005 +0000
+++ b/mcabber/src/jabglue.h	Mon Apr 04 20:16:16 2005 +0000
@@ -17,6 +17,13 @@
     imstatus_size
 };
 
+enum agtype {
+    unknown,
+    groupchat,
+    transport,
+    search
+};
+
 static char imstatus2char[imstatus_size] = {
     '_', 'o', 'i', 'f', 'd', 'c', 'n', 'a'
 };