[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.79,1.80

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

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

Modified Files:
	oscar.c 
Log Message:
icy cube


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- oscar.c	2001/12/01 01:13:12	1.79
+++ oscar.c	2001/12/02 10:08:09	1.80
@@ -457,7 +457,7 @@
 		odata->icq = TRUE;
 		/* this is odd but it's necessary for a proper do_import and do_export */
 		gc->protocol = PROTO_ICQ;
-		gc->checkbox = _("Send offline message");
+		gc->password[9] = 0;
 	} else {
 		gc->protocol = PROTO_TOC;
 		gc->flags |= OPT_CONN_HTML;
@@ -2238,8 +2238,6 @@
 	} else {
 		if (imflags & IM_FLAG_AWAY) {
 			ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_AWAY, message);
-		} else if (imflags & IM_FLAG_CHECKBOX) {
-			ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_OFFLINE, message);
 		} else {
 			struct aim_sendimext_args args;
 			GSList *h = odata->hasicons;
@@ -2248,6 +2246,8 @@
 			struct stat st;
 
 			args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES;
+			if (odata->icq)
+				args.flags |= AIM_IMFLAGS_OFFLINE;
 
 			args.features = gaim_features;
 			args.featureslen = sizeof(gaim_features);
@@ -2738,6 +2738,7 @@
 	GList *m = NULL;
 	struct proto_buddy_menu *pbm;
 	char *n = g_strdup(normalize(gc->username));
+	struct oscar_data *odata = gc->proto_data;
 
 	pbm = g_new0(struct proto_buddy_menu, 1);
 	pbm->label = _("Get Info");
@@ -2745,18 +2746,20 @@
 	pbm->gc = gc;
 	m = g_list_append(m, pbm);
 
-	pbm = g_new0(struct proto_buddy_menu, 1);
-	pbm->label = _("Get Away Msg");
-	pbm->callback = oscar_get_away_msg;
-	pbm->gc = gc;
-	m = g_list_append(m, pbm);
-
-	if (strcmp(n, normalize(who))) {
+	if (!odata->icq) {
 		pbm = g_new0(struct proto_buddy_menu, 1);
-		pbm->label = _("Direct IM");
-		pbm->callback = oscar_ask_direct_im;
+		pbm->label = _("Get Away Msg");
+		pbm->callback = oscar_get_away_msg;
 		pbm->gc = gc;
 		m = g_list_append(m, pbm);
+
+		if (strcmp(n, normalize(who))) {
+			pbm = g_new0(struct proto_buddy_menu, 1);
+			pbm->label = _("Direct IM");
+			pbm->callback = oscar_ask_direct_im;
+			pbm->gc = gc;
+			m = g_list_append(m, pbm);
+		}
 	}
 	g_free(n);