Changeset 8661caa for protocols/jabber/jabber.h

Timestamp:

2008-08-04T14:45:24Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

87f525e

Parents:

4ac647d (diff), 718e05f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged in upstream r410.

Only conflict was the correction of jabber normalization which I had already done.

File:

• protocols/jabber/jabber.h (modified) (2 diffs)

protocols/jabber/jabber.h

@@ -94 +94 @@
         char *away_message;
         
-        char *cached_id_prefix;
+        md5_state_t cached_id_prefix;
         GHashTable *node_cache;
         GHashTable *buddies;
@@ -177 +177 @@
 
 #define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
-
-#define JABBER_PORT_DEFAULT "5222"
-#define JABBER_PORT_MIN 5220
-#define JABBER_PORT_MAX 5229
 
 /* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the