--- /Users/jcovert/Desktop/Gtalk/jabber.h.1.6.1.head.h	2009-10-13 13:43:45.000000000 -0400
+++ /Users/jcovert/Desktop/Gtalk/jabber.h.1.6.1.gtalk-web.h	2009-10-13 13:43:08.000000000 -0400
@@ -70,8 +70,9 @@
  * resulting in a maximum total size (including the '@' and '/' separators) 
  * of 3071 bytes.
  */
-#define AJI_MAX_JIDLEN 3071
+#define AJI_MAX_JIDLEN    3071
 #define AJI_MAX_RESJIDLEN 1023
+#define AJI_MAX_ATTRLEN   256
 
 enum aji_state {
 	AJI_DISCONNECTING,
@@ -92,14 +93,15 @@
 };
 
 struct aji_version {
-	char version[50];
+	char version[AJI_MAX_ATTRLEN];
+	char ext[AJI_MAX_ATTRLEN];
 	int jingle;
 	struct aji_capabilities *parent;
 	struct aji_version *next;
 };
 
 struct aji_capabilities {
-	char node[200];
+	char node[AJI_MAX_ATTRLEN];
 	struct aji_version *versions;
 	struct aji_capabilities *next;
 };
@@ -116,14 +118,14 @@
 struct aji_message {
 	char *from;
 	char *message;
-	char id[25];
+	char id[AJI_MAX_ATTRLEN];
 	time_t arrived;
 	AST_LIST_ENTRY(aji_message) list;
 };
 
 struct aji_buddy {
 	ASTOBJ_COMPONENTS_FULL(struct aji_buddy, AJI_MAX_JIDLEN, 1);
-	char channel[160];
+	char channel[AST_CHANNEL_NAME];
 	struct aji_resource *resources;
 	enum aji_btype btype;
 	struct ast_flags flags;
@@ -139,13 +141,13 @@
 
 struct aji_client {
 	ASTOBJ_COMPONENTS(struct aji_client);
-	char password[160];
+	char password[AJI_MAX_ATTRLEN];
 	char user[AJI_MAX_JIDLEN];
 	char serverhost[AJI_MAX_RESJIDLEN];
-	char statusmessage[256];
-	char name_space[256];
-	char sid[10]; /* Session ID */
-	char mid[6]; /* Message ID */
+	char statusmessage[AJI_MAX_ATTRLEN];
+	char name_space[AJI_MAX_ATTRLEN];
+	char sid[AJI_MAX_ATTRLEN]; /* Session ID */
+	char mid[AJI_MAX_ATTRLEN]; /* Message ID */
 	iksid *jid;
 	iksparser *p;
 	iksfilter *f;