[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.21,1.22

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv21978/src/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
i should have hidden something ultra-secret in this.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- jabber.c	2001/09/28 07:46:36	1.21
+++ jabber.c	2001/10/14 11:36:36	1.22
@@ -65,10 +65,10 @@
 #define IQ_AUTH 0
 #define IQ_ROSTER 1
 
-#define UC_AWAY 0x38
-#define UC_CHAT 0x48
-#define UC_XA   0x98
-#define UC_DND  0x118
+#define UC_AWAY (0x02 | UC_UNAVAILABLE)
+#define UC_CHAT  0x04
+#define UC_XA   (0x08 | UC_UNAVAILABLE)
+#define UC_DND  (0x10 | UC_UNAVAILABLE)
 
 #define DEFAULT_SERVER "jabber.org"
 #define DEFAULT_GROUPCHAT "conference.jabber.org"
@@ -700,7 +700,7 @@
 	char *buddy;
 	xmlnode y;
 	char *show;
-	int state = UC_NORMAL;
+	int state = 0;
 	GSList *resources;
 	char *res;
 	struct conversation *cnv = NULL;
@@ -713,7 +713,7 @@
 	if ((y = xmlnode_get_tag(p->x, "show"))) {
 		show = xmlnode_get_data(y);
 		if (!show) {
-			state = UC_NORMAL;
+			state = 0;
 		} else if (!strcasecmp(show, "away")) {
 			state = UC_AWAY;
 		} else if (!strcasecmp(show, "chat")) {
@@ -724,7 +724,7 @@
 			state = UC_DND;
 		}
 	} else {
-		state = UC_NORMAL;
+		state = 0;
 	}
 
 	who = jid_new(j->p, from);
@@ -1647,7 +1647,7 @@
 	return m;
 }
 
-static GList *jabber_away_states() {
+static GList *jabber_away_states(struct gaim_connection *gc) {
 	GList *m = NULL;
 
 	m = g_list_append(m, "Online");