[Gaim-commits] CVS: gaim/src/protocols/zephyr zephyr.c,1.52,1.53

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/zephyr
In directory sc8-pr-cvs1:/tmp/cvs-serv23266/src/protocols/zephyr

Modified Files:
	zephyr.c 
Log Message:
(10:10:23) Robot101: kills off OPT_CONN_* in favour of an enum, and deprecates all 
the IM_FLAGS_* except IM_FLAG_AWAY which is made into GAIM_IM_AUTO_RESP in a 
GaimImFlags enum.


Index: zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- zephyr.c	17 Aug 2003 17:55:46 -0000	1.52
+++ zephyr.c	25 Aug 2003 14:12:28 -0000	1.53
@@ -358,7 +358,7 @@
 		char *sendertmp;
 		char *ptr = notice.z_message + strlen(notice.z_message) + 1;
 		int len = notice.z_message_len - (ptr - notice.z_message);
-		int away;
+		GaimImFlags flags;
 		if (len > 0) {
 			buf = g_malloc(len + 1);
 			g_snprintf(buf, len + 1, "%s", ptr);
@@ -368,10 +368,8 @@
 			if (!g_ascii_strcasecmp(notice.z_class, "MESSAGE") &&
                             !g_ascii_strcasecmp(notice.z_class_inst, "PERSONAL")) {
 				if (!g_ascii_strcasecmp(notice.z_message, "Automated reply:"))
-					away = TRUE;
-				else
-					away = FALSE;
-				serv_got_im(zgc, notice.z_sender, buf2, 0, time(NULL), -1);
+					flags |= GAIM_IM_AUTO_RESP;
+				serv_got_im(zgc, notice.z_sender, buf2, flags, time(NULL), -1);
 			} else {
 				zephyr_triple *zt1, *zt2;
 				zt1 = new_triple(notice.z_class, notice.z_class_inst,
@@ -783,12 +781,12 @@
 	return 0;
 }
 
-static int zephyr_send_im(GaimConnection *gc, const char *who, const char *im, int len, int flags) {
+static int zephyr_send_im(GaimConnection *gc, const char *who, const char *im, int len, GaimImFlags flags) {
 	ZNotice_t notice;
 	char *buf;
 	const char *sig;
 
-	if (flags & IM_FLAG_AWAY)
+	if (flags & GAIM_IM_AUTO_RESP)
 		sig = "Automated reply:";
 	else {
 		sig = ZGetVariable("zwrite-signature");