pidgin-commits Mailing List for Pidgin IM (Page 827)

A universal instant messaging (IM) program

Brought to you by: amc_grim, bigbrownchunx, qulogic, rekkanoryo, rlaager

pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (106)	Oct (334)	Nov (246)	Dec (145)
2002	Jan (42)	Feb (53)	Mar (232)	Apr (109)	May (137)	Jun (63)	Jul (26)	Aug (263)	Sep (193)	Oct (507)	Nov (440)	Dec (241)
2003	Jan (567)	Feb (195)	Mar (504)	Apr (481)	May (524)	Jun (522)	Jul (594)	Aug (502)	Sep (643)	Oct (508)	Nov (430)	Dec (377)
2004	Jan (361)	Feb (251)	Mar (219)	Apr (499)	May (461)	Jun (419)	Jul (314)	Aug (519)	Sep (416)	Oct (247)	Nov (305)	Dec (382)
2005	Jan (267)	Feb (282)	Mar (327)	Apr (338)	May (189)	Jun (400)	Jul (462)	Aug (530)	Sep (316)	Oct (523)	Nov (481)	Dec (650)
2006	Jan (536)	Feb (361)	Mar (287)	Apr (146)	May (101)	Jun (169)	Jul (221)	Aug (498)	Sep (300)	Oct (236)	Nov (209)	Dec (205)
2007	Jan (30)	Feb (23)	Mar (26)	Apr (15)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 825 826 827 828 829 .. 860 > >> (Page 827 of 860)

[Gaim-commits] CVS: gaim NEWS,1.109,1.110

From: Rob F. <rob...@us...> - 2002-01-24 16:58:40

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv16528

Modified Files:
	NEWS 
Log Message:
Yo



Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- NEWS	2002/01/23 18:01:12	1.109
+++ NEWS	2002/01/24 16:58:35	1.110
@@ -1,6 +1,12 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
 0.51 (01/24/2002):
+	Rob: Well, here we go. I FINALLY got around to making a release
+	after over a month, Sorry for the delay, all. Things got really
+	hectic around the gaim house hold.  This release isn't as complete
+	as I had hoped, but I promised to get something out. There's some
+	neat goodies in mind for the next release, right Sean? :-)
+
 
 0.50 (12/13/2001):
 	Rob: I am tired. Tonight was weird. Bleh!!!!

[Gaim-commits] CVS: gaim gaim.spec.in,1.36,1.37 ChangeLog,1.380,1.381 NEWS,1.108,1.109

From: Rob F. <rob...@us...> - 2002-01-23 18:01:17

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv13670

Modified Files:
	gaim.spec.in ChangeLog NEWS 
Log Message:
Had to go out of town. Lets see if we can get this out this Thursday. Sean, fire that patch off to me when you can.



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gaim.spec.in	2002/01/15 03:50:14	1.36
+++ gaim.spec.in	2002/01/23 18:01:12	1.37
@@ -99,7 +99,7 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
-* Thu Jan 17 2002 Rob Flynn <ro...@ma...> (0.51 release)
+* Thu Jan 24 2002 Rob Flynn <ro...@ma...> (0.51 release)
 - Arrow buttons in log viewer and some other dialogs work (thanks Ben Miller)
 - Option to only send auto-response while idle (thanks Sean Egan)
 - Control time between sending auto-responses (thanks Mark Doliner)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -d -r1.380 -r1.381
--- ChangeLog	2002/01/15 03:50:14	1.380
+++ ChangeLog	2002/01/23 18:01:12	1.381
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.51 (01/17/2002):
+version 0.51 (01/24/2002):
 	* Arrow buttons in log viewer and some other dialogs
 	  work (thanks Ben Miller)
 	* Option to only send auto-response while idle (thanks

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- NEWS	2002/01/15 03:50:14	1.108
+++ NEWS	2002/01/23 18:01:12	1.109
@@ -1,6 +1,6 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
-0.51 (01/17/2002):
+0.51 (01/24/2002):
 
 0.50 (12/13/2001):
 	Rob: I am tired. Tonight was weird. Bleh!!!!

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.48,1.49

From: Rob F. <rob...@us...> - 2002-01-16 17:56:03

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

Modified Files:
	msn.c 
Log Message:
I kind of like this a little more... for now? 



Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- msn.c	2001/12/16 02:28:35	1.48
+++ msn.c	2002/01/16 17:55:57	1.49
@@ -21,6 +21,7 @@
 			"X-MMS-IM-Format: FN=MS%20Sans%20Serif; EF=; CO=0; PF=0\r\n\r\n"
 
 #define HOTMAIL_URL "http://www.hotmail.com/cgi-bin/folders"
+#define PASSPORT_URL "http://lc1.law13.hotmail.passport.com/cgi-bin/dologin?login="
 
 #define MSN_ONLINE  1
 #define MSN_BUSY    2
@@ -285,24 +286,28 @@
 
 static void handle_hotmail(struct gaim_connection *gc, char *data)
 {
+	char login_url[2048];
+	
+	snprintf(login_url, sizeof(login_url), "%s%s&passwd=%s", PASSPORT_URL, gc->username, gc->password);
+
 	if (strstr(data, "Content-Type: text/x-msmsgsinitialemailnotification;")) {
 		char *x = strstr(data, "Inbox-Unread:");
 		if (!x) return;
 		x += strlen("Inbox-Unread: ");
-		connection_has_mail(gc, atoi(x), NULL, NULL, HOTMAIL_URL);
+		connection_has_mail(gc, atoi(x), NULL, NULL, login_url);
 	} else if (strstr(data, "Content-Type: text/x-msmsgsemailnotification;")) {
 		char *from = strstr(data, "From:");
 		char *subject = strstr(data, "Subject:");
 		char *x;
 		if (!from || !subject) {
-			connection_has_mail(gc, 1, NULL, NULL, HOTMAIL_URL);
+			connection_has_mail(gc, 1, NULL, NULL, login_url);
 			return;
 		}
 		from += strlen("From: ");
 		x = strstr(from, "\r\n"); *x = 0;
 		subject += strlen("Subject: ");
 		x = strstr(subject, "\r\n"); *x = 0;
-		connection_has_mail(gc, -1, from, subject, HOTMAIL_URL);
+		connection_has_mail(gc, -1, from, subject, login_url);
 	}
 }

[Gaim-commits] CVS: gaim/src/protocols/oscar chatnav.c,1.4,1.5 ft.c,1.12,1.13 misc.c,1.11,1.12 oscar.c,1.90,1.91 rxqueue.c,1.5,1.6 util.c,1.3,1.4

From: Adam F. <mi...@us...> - 2002-01-15 04:07:11

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

Modified Files:
	chatnav.c ft.c misc.c oscar.c rxqueue.c util.c 
Log Message:
heh.


Index: chatnav.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/chatnav.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- chatnav.c	2001/12/01 00:56:30	1.4
+++ chatnav.c	2002/01/15 04:07:08	1.5
@@ -36,7 +36,17 @@
 	/* exchange */
 	aimbs_put16(&fr->data, exchange);
 
-	/* action cookie */
+	/*
+	 * This looks to be a big hack.  You'll note that this entire
+	 * SNAC is just a room info structure, but the hard room name,
+	 * here, is set to "create".  
+	 *
+	 * Either this goes on the "list of questions concerning
+	 * why-the-hell-did-you-do-that", or this value is completly
+	 * ignored.  Without experimental evidence, but a good knowledge of
+	 * AOL style, I'm going to guess that it is the latter, and that
+	 * the value of the room name in create requests is ignored.
+	 */
 	aimbs_put8(&fr->data, strlen(ck));
 	aimbs_putraw(&fr->data, ck, strlen(ck));
 

Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ft.c	2001/12/22 08:11:11	1.12
+++ ft.c	2002/01/15 04:07:08	1.13
@@ -4,6 +4,7 @@
  */
 
 #define FAIM_INTERNAL
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

Index: misc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/misc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- misc.c	2001/12/10 00:48:27	1.11
+++ misc.c	2002/01/15 04:07:08	1.12
@@ -30,19 +30,16 @@
 {
 	aim_frame_t *fr;
 	aim_snacid_t snacid;
-	int i, len = 0;
+	int len = 0;
 	char *localcpy = NULL;
 	char *tmpptr = NULL;
 
 	if (!buddy_list || !(localcpy = strdup(buddy_list))) 
 		return -EINVAL;
 
-	i = 0;
-	tmpptr = strtok(localcpy, "&");
-	while ((tmpptr != NULL) && (i < 150)) {
-		faimdprintf(sess, 2, "---adding %d: %s (%d)\n", i, tmpptr, strlen(tmpptr));
-		len += 1+strlen(tmpptr);
-		i++;
+	for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
+		faimdprintf(sess, 2, "---adding: %s (%d)\n", tmpptr, strlen(tmpptr));
+		len += 1 + strlen(tmpptr);
 		tmpptr = strtok(NULL, "&");
 	}
 
@@ -50,18 +47,16 @@
 		return -ENOMEM;
 
 	snacid = aim_cachesnac(sess, 0x0003, 0x0004, 0x0000, NULL, 0);
-	
 	aim_putsnac(&fr->data, 0x0003, 0x0004, 0x0000, snacid);
 
-	strncpy(localcpy, buddy_list, strlen(buddy_list)+1);
-	i = 0;
-	tmpptr = strtok(localcpy, "&");
-	while ((tmpptr != NULL) & (i < 150)) {
-		faimdprintf(sess, 2, "---adding %d: %s (%d)\n", i, tmpptr, strlen(tmpptr));
-		
+	strncpy(localcpy, buddy_list, strlen(buddy_list) + 1);
+
+	for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
+
+		faimdprintf(sess, 2, "---adding: %s (%d)\n", tmpptr, strlen(tmpptr));
+
 		aimbs_put8(&fr->data, strlen(tmpptr));
 		aimbs_putraw(&fr->data, tmpptr, strlen(tmpptr));
-		i++;
 		tmpptr = strtok(NULL, "&");
 	}
 

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- oscar.c	2002/01/01 09:49:04	1.90
+++ oscar.c	2002/01/15 04:07:08	1.91
@@ -1776,7 +1776,7 @@
 			debug_printf("chat info: \tMax Concurrent Rooms: %d\n", maxrooms);
 			debug_printf("chat info: \tExchange List: (%d total)\n", exchangecount);
 			for (i = 0; i < exchangecount; i++)
-				debug_printf("chat info: \t\t%d\n", exchanges[i].number);
+				debug_printf("chat info: \t\t%d    %s\n", exchanges[i].number, exchanges[i].name ? exchanges[i].name : "");
 			while (odata->create_rooms) {
 				struct create_room *cr = odata->create_rooms->data;
 				debug_printf("creating room %s\n", cr->name);

Index: rxqueue.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/rxqueue.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rxqueue.c	2001/11/28 05:30:13	1.5
+++ rxqueue.c	2002/01/15 04:07:08	1.6
@@ -431,8 +431,7 @@
 
 		/* read the payload */
 		if (aim_bstream_recv(&newrx->data, conn->fd, payloadlen) < payloadlen) {
-			free(payload);
-			aim_frame_destroy(newrx);
+			aim_frame_destroy(newrx); /* free's payload */
 			aim_conn_close(conn);
 			return -1;
 		}

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- util.c	2001/11/05 02:05:06	1.3
+++ util.c	2002/01/15 04:07:08	1.4
@@ -162,6 +162,10 @@
 		}
 	}
 
+	/* Should both be NULL */
+	if (*curPtr1 != *curPtr2)
+		return 1;
+
 	return 0;
 }

[Gaim-commits] CVS: gaim ChangeLog,1.379,1.380 NEWS,1.107,1.108 gaim.spec.in,1.35,1.36

From: Rob F. <rob...@us...> - 2002-01-15 03:50:17

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv19110

Modified Files:
	ChangeLog NEWS gaim.spec.in 
Log Message:
Really, I  mean it. =-O



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -d -r1.379 -r1.380
--- ChangeLog	2002/01/11 01:11:37	1.379
+++ ChangeLog	2002/01/15 03:50:14	1.380
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.51 (01/10/2002):
+version 0.51 (01/17/2002):
 	* Arrow buttons in log viewer and some other dialogs
 	  work (thanks Ben Miller)
 	* Option to only send auto-response while idle (thanks

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- NEWS	2002/01/11 01:11:37	1.107
+++ NEWS	2002/01/15 03:50:14	1.108
@@ -1,6 +1,6 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
-0.51 (01/10/2002):
+0.51 (01/17/2002):
 
 0.50 (12/13/2001):
 	Rob: I am tired. Tonight was weird. Bleh!!!!

Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- gaim.spec.in	2002/01/11 01:13:49	1.35
+++ gaim.spec.in	2002/01/15 03:50:14	1.36
@@ -99,7 +99,7 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
-* Thu Jan 10 2002 Rob Flynn <ro...@ma...> (0.51 release)
+* Thu Jan 17 2002 Rob Flynn <ro...@ma...> (0.51 release)
 - Arrow buttons in log viewer and some other dialogs work (thanks Ben Miller)
 - Option to only send auto-response while idle (thanks Sean Egan)
 - Control time between sending auto-responses (thanks Mark Doliner)

[Gaim-commits] CVS: gaim/po fr.po,1.22,1.23

From: Rob F. <rob...@us...> - 2002-01-11 01:19:28

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv4067

Modified Files:
	fr.po 
Log Message:
Bleh



Index: fr.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fr.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- fr.po	2002/01/10 23:45:07	1.22
+++ fr.po	2002/01/11 01:19:23	1.23
@@ -54,7 +54,7 @@
 #: src/about.c:87
 #, c-format
 msgid "About Gaim v%s"
-msgstr "A propos de Gaim v%s"
+msgstr "À propos de Gaim v%s"
 
 #: src/about.c:124
 msgid ""
@@ -160,7 +160,7 @@
 
 #: src/applet.c:352
 msgid "About..."
-msgstr "A Propos..."
+msgstr "À Propos..."
 
 #: src/away.c:153
 msgid "Gaim - Away!"
@@ -424,7 +424,7 @@
 #: src/buddy.c:2708
 #, fuzzy
 msgid "About Gaim"
-msgstr "A propos..."
+msgstr "À propos..."
 
 #: src/buddy.c:2727 src/prefs.c:2671
 msgid "Buddy List"

[Gaim-commits] CVS: gaim gaim.spec.in,1.34,1.35

From: Rob F. <rob...@us...> - 2002-01-11 01:13:51

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv2566

Modified Files:
	gaim.spec.in 
Log Message:
I must be confused;.



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gaim.spec.in	2002/01/11 01:11:36	1.34
+++ gaim.spec.in	2002/01/11 01:13:49	1.35
@@ -99,7 +99,7 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
-* Thu Jan 10 (01/10/2002):
+* Thu Jan 10 2002 Rob Flynn <ro...@ma...> (0.51 release)
 - Arrow buttons in log viewer and some other dialogs work (thanks Ben Miller)
 - Option to only send auto-response while idle (thanks Sean Egan)
 - Control time between sending auto-responses (thanks Mark Doliner)

[Gaim-commits] CVS: gaim gaim.spec.in,1.33,1.34 NEWS,1.106,1.107 ChangeLog,1.378,1.379

From: Rob F. <rob...@us...> - 2002-01-11 01:11:39

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv2069

Modified Files:
	gaim.spec.in NEWS ChangeLog 
Log Message:
I may make a release. I'm not sure yet.



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gaim.spec.in	2001/12/14 06:28:03	1.33
+++ gaim.spec.in	2002/01/11 01:11:36	1.34
@@ -99,6 +99,14 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan 10 (01/10/2002):
+- Arrow buttons in log viewer and some other dialogs work (thanks Ben Miller)
+- Option to only send auto-response while idle (thanks Sean Egan)
+- Control time between sending auto-responses (thanks Mark Doliner)
+- Should be able to sign on to Oscar using Mac OS X (thanks Fingolfin, Vincas Ciziunas, et al.)
+- Finnish translation added (Thanks Tero Kuusela)
+- Updated French Translation (Thanks sebfrance)
+
 * Thu Dec 13 2001 Rob Flynn <ro...@ma...> (0.50 release)
 - Updated polish translation (Thanks Przemyslaw Sulek)
 - Able to import GnomeICU contact lists

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- NEWS	2001/12/16 02:29:56	1.106
+++ NEWS	2002/01/11 01:11:37	1.107
@@ -1,6 +1,6 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
-0.51:
+0.51 (01/10/2002):
 
 0.50 (12/13/2001):
 	Rob: I am tired. Tonight was weird. Bleh!!!!

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -d -r1.378 -r1.379
--- ChangeLog	2002/01/09 21:14:39	1.378
+++ ChangeLog	2002/01/11 01:11:37	1.379
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.51:
+version 0.51 (01/10/2002):
 	* Arrow buttons in log viewer and some other dialogs
 	  work (thanks Ben Miller)
 	* Option to only send auto-response while idle (thanks
@@ -10,7 +10,7 @@
 	* Should be able to sign on to Oscar using Mac OS X
 	  (thanks Fingolfin, Vincas Ciziunas, et al.)
 	* Finnish translation added (Thanks Tero Kuusela)
-	* Updated French Translation (Thanks sebfrance)`
+	* Updated French Translation (Thanks sebfrance)
 
 version 0.50 (12/14/2001):
 	* Updated polish translation (Thanks Przemyslaw Sulek)

[Gaim-commits] CVS: gaim/po fr.po,1.21,1.22

From: Rob F. <rob...@us...> - 2002-01-10 23:45:10

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv9920/po

Modified Files:
	fr.po 
Log Message:
Oops



Index: fr.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- fr.po	2002/01/09 23:25:27	1.21
+++ fr.po	2002/01/10 23:45:07	1.22
@@ -736,7 +736,7 @@
 #: src/dialogs.c:480
 #, c-format
 msgid "Message too long, last %s bytes truncated."
-msgstr "Message trop long, perte des %d derniers octets."
+msgstr "Message trop long, perte des %s derniers octets."
 
 #: src/dialogs.c:483
 #, c-format

[Gaim-commits] CVS: gaim/po fr.po,1.20,1.21

From: Rob F. <rob...@us...> - 2002-01-09 23:25:31

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv31591

Modified Files:
	fr.po 
Log Message:
oops



Index: fr.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fr.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- fr.po	2002/01/08 18:03:44	1.20
+++ fr.po	2002/01/09 23:25:27	1.21
@@ -33,7 +33,7 @@
 #: plugins/yay/yay.c:201
 #, c-format
 msgid "%s has made %s their buddy%s%s"
-msgstr "%s a ajouté %s dans sa liste""
+msgstr "%s a ajouté %s dans sa liste"
 
 #: plugins/yay/yay.c:203
 #, fuzzy

[Gaim-commits] CVS: gaim ChangeLog,1.377,1.378

From: Rob F. <rob...@us...> - 2002-01-09 21:14:42

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv20373

Modified Files:
	ChangeLog 
Log Message:
bla bla bla



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -d -r1.377 -r1.378
--- ChangeLog	2002/01/05 03:28:16	1.377
+++ ChangeLog	2002/01/09 21:14:39	1.378
@@ -10,6 +10,7 @@
 	* Should be able to sign on to Oscar using Mac OS X
 	  (thanks Fingolfin, Vincas Ciziunas, et al.)
 	* Finnish translation added (Thanks Tero Kuusela)
+	* Updated French Translation (Thanks sebfrance)`
 
 version 0.50 (12/14/2001):
 	* Updated polish translation (Thanks Przemyslaw Sulek)

[Gaim-commits] CVS: gaim/po fr.po,1.19,1.20

From: Rob F. <rob...@us...> - 2002-01-08 18:03:48

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv10133

Modified Files:
	fr.po 
Log Message:
Updated french translation, thanks Sebfrance


Index: fr.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fr.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- fr.po	2001/10/18 12:12:37	1.19
+++ fr.po	2002/01/08 18:03:44	1.20
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
 "POT-Creation-Date: 2001-06-17 23:41-0700\n"
-"PO-Revision-Date: 2000-06-13 22:26-0700\n"
+"PO-Revision-Date: 2001-12-27 22:26-0700\n"
 "Last-Translator: Sebfrance\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
@@ -17,28 +17,28 @@
 #: plugins/icq/gaim_icq.c:442 src/oscar.c:2895 src/toc.c:1031
 #, fuzzy
 msgid "Get Info"
-msgstr "Message d'Information"
+msgstr "Obtenir des informations"
 
 #: plugins/yay/yay.c:183
 #, fuzzy
 msgid "Your message did not get sent."
-msgstr "Son à l'envoi d'un message"
+msgstr "Votre message n'a pas été envoyé."
 
 #: plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
 #: src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
 #, fuzzy
 msgid "Gaim - Error"
-msgstr "Gaim - Erreur %d"
+msgstr "Gaim - Erreur"
 
 #: plugins/yay/yay.c:201
 #, c-format
 msgid "%s has made %s their buddy%s%s"
-msgstr ""
+msgstr "%s a ajouté %s dans sa liste""
 
 #: plugins/yay/yay.c:203
 #, fuzzy
 msgid "Gaim - Buddy"
-msgstr "Gaim - Ajouter un Pote"
+msgstr "Gaim - Pote"
 
 #: plugins/yay/yay.c:250 src/about.c:179 src/aim.c:303 src/buddy.c:2607
 #: src/buddy_chat.c:971 src/buddy_chat.c:1125 src/buddy_chat.c:1152
@@ -62,6 +62,9 @@
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
+"Gaim est un client supportant le protocol d'AIM. Il est écrit en Gtk+"
+"et est sous la GPL.\n"
+"URL: "
 
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
@@ -199,7 +202,7 @@
 
 #: src/buddy.c:446 src/buddy.c:2130 src/buddy.c:2485
 msgid "Chat"
-msgstr "Forum"
+msgstr "Salon"
 
 #: src/buddy.c:447 src/buddy.c:648 src/buddy.c:761 src/buddy.c:2483
 #: src/buddy_chat.c:507 src/buddy_chat.c:927
@@ -276,7 +279,7 @@
 #: src/buddy.c:2194
 #, fuzzy, c-format
 msgid "Logged in: %s\n"
-msgstr "Connection de %s.\n"
+msgstr "Connection de %s\n"
 
 #: src/buddy.c:2205
 #, c-format
@@ -323,12 +326,12 @@
 
 #: src/buddy.c:2517
 msgid "Start/join a Buddy Chat"
-msgstr "Ouvrir/Rallier un Forum"
+msgstr "Ouvrir/Rallier un Salon"
 
 #: src/buddy.c:2518
 #, fuzzy
 msgid "Activate Away Message"
-msgstr "Nouveau Message d'absence"
+msgstr "Activer le message d'absence"
 
 #: src/buddy.c:2582
 msgid "File"
@@ -341,12 +344,12 @@
 #: src/buddy.c:2588
 #, fuzzy
 msgid "Join A Chat"
-msgstr "Rallier le forum"
+msgstr "Rallier le salon"
 
 #: src/buddy.c:2590
 #, fuzzy
 msgid "New Instant Message"
-msgstr "Envoyer un message"
+msgstr "Nouveau message"
 
 #: src/buddy.c:2595
 msgid "Import Buddy List"
@@ -391,7 +394,7 @@
 #: src/buddy.c:2666
 #, fuzzy
 msgid "Protocol Actions"
-msgstr "Options"
+msgstr "Options du protocol"
 
 #: src/buddy.c:2673
 msgid "View System Log"
@@ -446,11 +449,11 @@
 
 #: src/buddy.c:2810
 msgid "Edit Buddies"
-msgstr "Editer ses amis"
+msgstr "Editer sa liste de potes"
 
 #: src/buddy.c:2847
 msgid "Gaim - Buddy List"
-msgstr "Gaim - Liste des Potes"
+msgstr "Gaim - Liste de Potes"
 
 #: src/buddy_chat.c:104 src/oscar.c:2590 src/toc.c:1001
 msgid "Join what group:"
@@ -458,16 +461,16 @@
 
 #: src/buddy_chat.c:202
 msgid "Join Chat"
-msgstr "Rallier le forum"
+msgstr "Rallier le salon"
 
 #: src/buddy_chat.c:209 src/buddy_chat.c:1057 src/buddy_chat.c:1069
 msgid "Buddy Chat"
-msgstr "Forum"
+msgstr "Salon"
 
 #: src/buddy_chat.c:220
 #, fuzzy
 msgid "Join Chat As:"
-msgstr "Rallier le forum"
+msgstr "Rallier le salon en tant que:"
 
 #: src/buddy_chat.c:241 src/buddy_chat.c:286 src/dialogs.c:410
 #: src/dialogs.c:697 src/dialogs.c:757 src/dialogs.c:885 src/dialogs.c:1002
@@ -497,7 +500,7 @@
 
 #: src/buddy_chat.c:331
 msgid "Invite to Buddy Chat"
-msgstr "Inviter à un Forum"
+msgstr "Inviter à un Salon"
 
 #: src/buddy_chat.c:513 src/buddy_chat.c:931
 msgid "Ignore"
@@ -506,12 +509,12 @@
 #: src/buddy_chat.c:565 src/buddy_chat.c:671
 #, c-format
 msgid "%d %s in room"
-msgstr "%d %s dans le Forum"
+msgstr "%d %s dans le salon"
 
 #: src/buddy_chat.c:572
 #, c-format
 msgid "%s entered the room."
-msgstr "%s entre dans le Forum."
+msgstr "%s est entré dans le salon."
 
 #: src/buddy_chat.c:635
 #, c-format
@@ -521,12 +524,12 @@
 #: src/buddy_chat.c:678
 #, c-format
 msgid "%s left the room."
-msgstr "%s quitte le Forum."
+msgstr "%s a quitté le salon."
 
 #: src/buddy_chat.c:805
 #, fuzzy
 msgid "Gaim - Group Chats"
-msgstr "Forum Gaim"
+msgstr "Salon Gaim"
 
 #: src/buddy_chat.c:866
 msgid "Topic:"
@@ -534,7 +537,7 @@
 
 #: src/buddy_chat.c:908
 msgid "0 people in room"
-msgstr "Personne dans ce Forum"
+msgstr "Personne dans ce Salon"
 
 #: src/buddy_chat.c:982 src/buddy_chat.c:1123
 msgid "Whisper"
@@ -752,7 +755,7 @@
 #: src/dialogs.c:492
 #, c-format
 msgid "Chat in %s is not available."
-msgstr "Le forum %s est inaccessible."
+msgstr "Le Salon %s est inaccessible."
 
 #: src/dialogs.c:495
 #, c-format
@@ -1352,22 +1355,22 @@
 #: src/oscar.c:370 src/toc.c:585
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Vous avez été déconnecté du forum %s."
+msgstr "Vous avez été déconnecté du salon %s."
 
 #: src/oscar.c:371
 #, fuzzy
 msgid "Chat Error!"
-msgstr "Erreur de forum!"
+msgstr "Erreur de salon!"
 
 #: src/oscar.c:381
 #, fuzzy
 msgid "Chat is currently unavailable"
-msgstr "Le forum est inaccessible."
+msgstr "Le salon est inaccessible."
 
 #: src/oscar.c:382
 #, fuzzy
 msgid "Gaim - Chat"
-msgstr "Gaim - Forum"
+msgstr "Gaim - Salon"
 
 #: src/oscar.c:437 src/oscar.c:490
 #, fuzzy
@@ -1974,15 +1977,15 @@
 
 #: src/prefs.c:973
 msgid "Chat Tab Placement:"
-msgstr "Placement des onglets sur la fenêtre de Forum"
+msgstr "Placement des onglets sur la fenêtre de Salon"
 
 #: src/prefs.c:1031 src/prefs.c:1033 src/prefs.c:1241 src/prefs.c:1243
 msgid "Gaim Chat"
-msgstr "Forum Gaim"
+msgstr "Salon Gaim"
 
 #: src/prefs.c:1179 src/prefs.c:2697
 msgid "Chat Rooms"
-msgstr "Forums"
+msgstr "Salons"
 
 #: src/prefs.c:1197
 msgid "Refresh"
@@ -1990,11 +1993,11 @@
 
 #: src/prefs.c:1222
 msgid "List of available chats"
-msgstr "Liste des forums disponibles"
+msgstr "Liste des salons disponibles"
 
 #: src/prefs.c:1232
 msgid "List of subscribed chats"
-msgstr "Liste des forums souscrits"
+msgstr "Liste des salons souscrits"
 
 #: src/prefs.c:1358 src/prefs.c:2692
 #, fuzzy
@@ -2093,22 +2096,22 @@
 #: src/prefs.c:1699
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
-msgstr "Son lorsque les personnes entrent d'un forum"
+msgstr "Son lorsque les personnes entrent dans un salon"
 
 #: src/prefs.c:1700
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
-msgstr "Son lorsque les personnes sortent d'un forum"
+msgstr "Son lorsque les personnes sortent d'un salon"
 
 #: src/prefs.c:1701
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
-msgstr "Son lorsque vous parlez dans un forum"
+msgstr "Son lorsque vous parlez dans un salon"
 
 #: src/prefs.c:1702
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
-msgstr "Son lorsque les autres personnes parlent dans un forum"
+msgstr "Son lorsque les autres personnes parlent dans un salon"
 
 #: src/prefs.c:1827 src/prefs.c:2719
 #, fuzzy
@@ -2334,7 +2337,7 @@
 #: src/toc.c:587
 #, fuzzy
 msgid "Chat Error"
-msgstr "Erreur de Forum"
+msgstr "Erreur de Salon"
 
 #: src/toc.c:606
 #, fuzzy
@@ -2448,7 +2451,7 @@
 
 #, fuzzy
 #~ msgid "Ignore new conversations when away   "
-#~ msgstr "Ignorer les nouveaux forums lors des absences"
+#~ msgstr "Ignorer les nouveaux salons lors des absences"
 
 #, fuzzy
 #~ msgid "Change password for:"
@@ -2515,7 +2518,7 @@
 
 #, fuzzy
 #~ msgid "%sChat"
-#~ msgstr "Forum"
+#~ msgstr "%s Salon"
 
 #~ msgid "Message too long, some data truncated."
 #~ msgstr "Message trop long, données tronquées"
@@ -2612,7 +2615,7 @@
 #~ msgstr "Inactivité"
 
 #~ msgid "Raise chat windows when people speak"
-#~ msgstr "Avancer les fenêtres de forum quand les personnes parlent"
+#~ msgstr "Avancer les fenêtres de salon quand les personnes parlent"
 
 #~ msgid "Show Lag-O-Meter"
 #~ msgstr "Afficher le Lag-O-Metre"
@@ -2654,7 +2657,7 @@
 #~ msgstr "utiliser des icones diaboliques"
 
 #~ msgid "Buddy Chats"
-#~ msgstr "Forums"
+#~ msgstr "Salons"
 
 #~ msgid "Create new message"
 #~ msgstr "Créer un nouveau message"

[Gaim-commits] CVS: gaim/po .cvsignore,1.12,1.13

From: Rob F. <rob...@us...> - 2002-01-05 23:01:30

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv9581

Modified Files:
	.cvsignore 
Log Message:
Thanks, Mark Doliner, for pointing out my blindness ;-)



Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/po/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- .cvsignore	2001/12/04 07:53:54	1.12
+++ .cvsignore	2002/01/05 23:01:28	1.13
@@ -15,3 +15,4 @@
 pl.gmo
 nl.gmo
 sv.gmo
+fi.gmo

[Gaim-commits] CVS: gaim ChangeLog,1.376,1.377 configure.ac,1.40,1.41

From: Rob F. <rob...@us...> - 2002-01-05 03:28:19

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv24013

Modified Files:
	ChangeLog configure.ac 
Log Message:
Hmm



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -d -r1.376 -r1.377
--- ChangeLog	2001/12/21 10:23:03	1.376
+++ ChangeLog	2002/01/05 03:28:16	1.377
@@ -9,6 +9,7 @@
 	  Mark Doliner)
 	* Should be able to sign on to Oscar using Mac OS X
 	  (thanks Fingolfin, Vincas Ciziunas, et al.)
+	* Finnish translation added (Thanks Tero Kuusela)
 
 version 0.50 (12/14/2001):
 	* Updated polish translation (Thanks Przemyslaw Sulek)

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- configure.ac	2001/12/16 02:29:56	1.40
+++ configure.ac	2002/01/05 03:28:16	1.41
@@ -13,7 +13,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="de es fr ko ru zh_CN pl nl sv"
+ALL_LINGUAS="de es fr ko ru zh_CN pl nl sv fi"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

[Gaim-commits] CVS: gaim/po fi.po,NONE,1.1

From: Rob F. <rob...@us...> - 2002-01-05 03:28:19

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv24013/po

Added Files:
	fi.po 
Log Message:
Hmm



--- NEW FILE: fi.po ---
# Gaim - finnish translation.
# Copyright (C) 2002 Free Software Foundation, Inc.
# Tero Kuusela <te...@ya...>, 2002.
# 
msgid ""
msgstr ""
"Project-Id-Version: gaim 0.50\n"
"POT-Creation-Date: 2002-01-03 19:26+0200\n"
"PO-Revision-Date: 2002-01-03 22:17+0200\n"
"Last-Translator: Tero Kuusela <te...@ya...>\n"
"Language-Team: Finnish <fi...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"

#: src/protocols/gg/gg.c:68
msgid "Available"
msgstr "Käytettävissä"

[...2632 lines suppressed...]
#, c-format
msgid "(%d messages)"
msgstr "(%d viestiä)"

#: src/server.c:541
msgid "(1 message)"
msgstr "(1 viesti)"

#: src/server.c:756
msgid "Warned"
msgstr "Varoitettu"

#: src/server.c:827
msgid "Yes"
msgstr "Kyllä"

#: src/server.c:828
msgid "No"
msgstr "Ei"

[Gaim-commits] pbms in installing

From: Edwin R. <edw...@na...> - 2002-01-04 09:57:49

Previously I had gaim v0.48. It was working fine and all of a sudden I 
deleted the folder by mistake. Now when I try to install the gaim v0.50 
or anyother version using RPM files I get the following message "only 
packages with major numbers <= 3 are supported by this version of RPM  
error:gaim ........ cannot be installed". When I try to install using 
the tar file it gets installed but when  login to the chat thro any of 
the protocols(aim, yahoo,msn...) it gives me a message "could not 
connect to host".

Can anyone give me suggestion on this issue. Thanks in advance

Edwin

[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.28,1.29 info.c,1.11,1.12 oscar.c,1.89,1.90

From: Adam F. <mi...@us...> - 2002-01-01 09:49:07

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

Modified Files:
	aim.h info.c oscar.c 
Log Message:
who the hell cares.


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- aim.h	2001/12/22 08:11:11	1.28
+++ aim.h	2002/01/01 09:49:04	1.29
@@ -846,7 +846,8 @@
 #define AIM_CAPS_EMPTY		0x00002000
 #define AIM_CAPS_ICQSERVERRELAY 0x00004000
 #define AIM_CAPS_ICQUNKNOWN     0x00008000
-#define AIM_CAPS_LAST           0x00010000
+#define AIM_CAPS_TRILLIANCRYPT  0x00010000
+#define AIM_CAPS_LAST           0x00020000
 
 faim_export int aim_0002_000b(aim_session_t *sess, aim_conn_t *conn, const char *sn);
 
@@ -857,6 +858,7 @@
 
 #define AIM_GETINFO_GENERALINFO 0x00001
 #define AIM_GETINFO_AWAYMESSAGE 0x00003
+#define AIM_GETINFO_CAPABILITIES 0x0004
 
 struct aim_invite_priv {
 	char *sn;

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- info.c	2001/12/22 08:11:11	1.11
+++ info.c	2002/01/01 09:49:04	1.12
@@ -23,9 +23,6 @@
 	if (!sess || !conn || !sn)
 		return -EINVAL;
 
-	if ((infotype != AIM_GETINFO_GENERALINFO) && (infotype != AIM_GETINFO_AWAYMESSAGE))
-		return -EINVAL;
-
 	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 12+1+strlen(sn))))
 		return -ENOMEM;
 
@@ -209,6 +206,10 @@
 	 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
 
+	{AIM_CAPS_TRILLIANCRYPT,
+	 {0xf2, 0xe7, 0xc7, 0xf4, 0xfe, 0xad, 0x4d, 0xfb,
+	  0xb2, 0x35, 0x36, 0x79, 0x8b, 0xdf, 0x00, 0x00}},
+
 	{AIM_CAPS_LAST}
 };
 
@@ -238,8 +239,15 @@
 			}
 		}
 
-		if (!identified)
-			faimdprintf(sess, 0, "unknown capability!\n");
+		if (!identified) {
+			faimdprintf(sess, 0, "unknown capability: {%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
+					cap[0], cap[1], cap[2], cap[3],
+					cap[4], cap[5],
+					cap[6], cap[7],
+					cap[8], cap[9],
+					cap[10], cap[11], cap[12], cap[13],
+					cap[14], cap[15]);
+		}
 
 		free(cap);
 	}
@@ -601,7 +609,8 @@
 	inforeq = (struct aim_priv_inforeq *)origsnac->data;
 
 	if ((inforeq->infotype != AIM_GETINFO_GENERALINFO) &&
-			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE)) {
+			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE) &&
+			(inforeq->infotype != AIM_GETINFO_CAPABILITIES)) {
 		faimdprintf(sess, 0, "parse_userinfo_middle: unknown infotype in request! (0x%04x)\n", inforeq->infotype);
 		return 0;
 	}
@@ -614,18 +623,30 @@
 	 * Depending on what informational text was requested, different
 	 * TLVs will appear here.
 	 *
-	 * Profile will be 1 and 2, away message will be 3 and 4.
+	 * Profile will be 1 and 2, away message will be 3 and 4, caps
+	 * will be 5.
 	 */
-	if (aim_gettlv(tlvlist, 0x0001, 1)) {
+	if (inforeq->infotype == AIM_GETINFO_GENERALINFO) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0001, 1);
 		text = aim_gettlv_str(tlvlist, 0x0002, 1);
-	} else if (aim_gettlv(tlvlist, 0x0003, 1)) {
+	} else if (inforeq->infotype == AIM_GETINFO_AWAYMESSAGE) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0003, 1);
 		text = aim_gettlv_str(tlvlist, 0x0004, 1);
+	} else if (inforeq->infotype == AIM_GETINFO_CAPABILITIES) {
+		aim_tlv_t *ct;
+
+		if ((ct = aim_gettlv(tlvlist, 0x0005, 1))) {
+			aim_bstream_t cbs;
+
+			aim_bstream_init(&cbs, ct->value, ct->length);
+
+			userinfo.capabilities = aim_getcap(sess, &cbs, ct->length);
+			userinfo.capspresent = 1;
+		}
 	}
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-		ret = userfunc(sess, rx, &userinfo, text_encoding, text, inforeq->infotype);
+		ret = userfunc(sess, rx, &userinfo, inforeq->infotype, text_encoding, text);
 
 	free(text_encoding);
 	free(text);

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- oscar.c	2001/12/22 08:08:36	1.89
+++ oscar.c	2002/01/01 09:49:04	1.90
@@ -1570,6 +1570,78 @@
 	return buf;
 }
 
+/* XXX This is horribly copied from ../../buddy.c. */
+static char *caps_string(guint caps)
+{
+	static char buf[512], *tmp;
+	int count = 0, i = 0;
+	guint bit = 1;
+	while (bit <= 0x10000) {
+		if (bit & caps) {
+			switch (bit) {
+			case 0x1:
+				tmp = _("Buddy Icon");
+				break;
+			case 0x2:
+				tmp = _("Voice");
+				break;
+			case 0x4:
+				tmp = _("IM Image");
+				break;
+			case 0x8:
+				tmp = _("Chat");
+				break;
+			case 0x10:
+				tmp = _("Get File");
+				break;
+			case 0x20:
+				tmp = _("Send File");
+				break;
+			case 0x40:
+			case 0x200:
+				tmp = _("Games");
+				break;
+			case 0x80:
+				tmp = _("Stocks");
+				break;
+			case 0x100:
+				tmp = _("Send Buddy List");
+				break;
+			case 0x400:
+				tmp = _("EveryBuddy Bug");
+				break;
+			case 0x800:
+				tmp = _("AP User");
+				break;
+			case 0x1000:
+				tmp = _("ICQ RTF");
+				break;
+			case 0x2000:
+				tmp = _("Nihilist");
+				break;
+			case 0x4000:
+				tmp = _("ICQ Server Relay");
+				break;
+			case 0x8000:
+				tmp = _("ICQ Unknown");
+				break;
+			case 0x10000:
+				tmp = _("Trillian Encryption");
+				break;
+			default:
+				tmp = NULL;
+				break;
+			}
+			if (tmp)
+				i += g_snprintf(buf + i, sizeof(buf) - i, "%s%s", (count ? ", " : ""),
+						tmp);
+			count++;
+		}
+		bit <<= 1;
+	}
+	return buf;
+}
+
 static int gaim_parse_user_info(aim_session_t *sess, aim_frame_t *fr, ...) {
 	aim_userinfo_t *info;
 	char *prof_enc = NULL, *prof = NULL;
@@ -1580,15 +1652,14 @@
 	struct oscar_data *od = gc->proto_data;
 	GSList *l = od->evilhack;
 	gboolean evilhack = FALSE;
-	gboolean away;
 	va_list ap;
 	char *asc;
 
 	va_start(ap, fr);
 	info = va_arg(ap, aim_userinfo_t *);
+	infotype = (fu16_t)va_arg(ap, unsigned int);
 	prof_enc = va_arg(ap, char *);
 	prof = va_arg(ap, char *);
-	infotype = (fu16_t)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	g_snprintf(legend, sizeof legend,
@@ -1598,8 +1669,6 @@
 			"<IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br>"
 			"<IMG SRC=\"admin_icon.gif\"> : Administrator"));
 
-	away = infotype != AIM_GETINFO_GENERALINFO;
-
 	if (info->membersince)
 		asc = g_strdup_printf("Member Since : <B>%s</B><BR>\n",
 				asctime(localtime(&info->membersince)));
@@ -1629,7 +1698,7 @@
 		l = l->next;
 	}
 
-	if (away) {
+	if (infotype == AIM_GETINFO_AWAYMESSAGE) {
 		if (evilhack) {
 			g_show_info_text(gc, info->sn, 2,
 					 header,
@@ -1643,6 +1712,14 @@
 					 (prof && *prof) ? "<BR><HR><BR>" : NULL,
 					 NULL);
 		}
+	} else if (infotype == AIM_GETINFO_CAPABILITIES) {
+		g_show_info_text(gc, info->sn, 2,
+				header,
+				"<i>", _("Client Capabilities: "),
+				caps_string(info->capabilities),
+				"</i>",
+				legend,
+				NULL);
 	} else {
 		g_show_info_text(gc, info->sn, 1,
 				 (prof && *prof) ? away_subs(prof, gc->username) :
@@ -2324,6 +2401,11 @@
 		aim_getinfo(odata->sess, odata->conn, name, AIM_GETINFO_GENERALINFO);
 }
 
+static void oscar_get_caps(struct gaim_connection *g, char *name) {
+	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
+	aim_getinfo(odata->sess, odata->conn, name, AIM_GETINFO_CAPABILITIES);
+}
+
 static void oscar_set_dir(struct gaim_connection *g, char *first, char *middle, char *last,
 			  char *maiden, char *city, char *state, char *country, int web) {
 	/* FIXME : some of these things are wrong, but i'm lazy */
@@ -2774,6 +2856,13 @@
 			m = g_list_append(m, pbm);
 		}
 	}
+
+	pbm = g_new0(struct proto_buddy_menu, 1);
+	pbm->label = _("Get Capabilities");
+	pbm->callback = oscar_get_caps;
+	pbm->gc = gc;
+	m = g_list_append(m, pbm);
+
 	g_free(n);
 
 	return m;

[Gaim-commits] CVS: gaim/src buddy.c,1.283,1.284 core.h,1.14,1.15 server.c,1.215,1.216

From: Adam F. <mi...@us...> - 2002-01-01 09:49:07

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21166

Modified Files:
	buddy.c core.h server.c 
Log Message:
who the hell cares.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- buddy.c	2001/12/21 10:23:04	1.283
+++ buddy.c	2002/01/01 09:49:04	1.284
@@ -1894,12 +1894,12 @@
 	return 0;
 }
 
-static char *caps_string(gushort caps)
+static char *caps_string(guint caps)
 {
 	static char buf[256], *tmp;
 	int count = 0, i = 0;
-	gushort bit = 1;
-	while (bit <= 0x800) {
+	guint bit = 1;
+	while (bit <= 0x10000) {
 		if (bit & caps) {
 			switch (bit) {
 			case 0x1:
@@ -1927,11 +1927,29 @@
 			case 0x80:
 				tmp = _("Stocks");
 				break;
+			case 0x100:
+				tmp = _("Send Buddy List");
+				break;
 			case 0x400:
 				tmp = _("EveryBuddy Bug");
 				break;
 			case 0x800:
 				tmp = _("AP User");
+				break;
+			case 0x1000:
+				tmp = _("ICQ RTF");
+				break;
+			case 0x2000:
+				tmp = _("Nihilist");
+				break;
+			case 0x4000:
+				tmp = _("ICQ Server Relay");
+				break;
+			case 0x8000:
+				tmp = _("ICQ Unknown");
+				break;
+			case 0x10000:
+				tmp = _("Trillian Encryption");
 				break;
 			default:
 				tmp = NULL;

Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- core.h	2001/12/08 09:48:51	1.14
+++ core.h	2002/01/01 09:49:04	1.15
@@ -118,7 +118,7 @@
 	time_t signon;
 	time_t idle;
         int uc;
-	gushort caps; /* woohoo! */
+	guint caps; /* woohoo! */
 	void *proto_data; /* what a hack */
 	struct gaim_connection *gc; /* the connection it belongs to */
 };
@@ -190,7 +190,7 @@
 extern char *event_name(enum gaim_event);
 
 /* Functions in server.c */
-extern void serv_got_update(struct gaim_connection *, char *, int, int, time_t, time_t, int, gushort);
+extern void serv_got_update(struct gaim_connection *, char *, int, int, time_t, time_t, int, guint);
 extern void serv_got_im(struct gaim_connection *, char *, char *, guint32, time_t, gint);
 extern void serv_got_eviled(struct gaim_connection *, char *, int);
 extern void serv_got_chat_invite(struct gaim_connection *, char *, char *, char *, GList *);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- server.c	2001/12/21 10:23:04	1.215
+++ server.c	2002/01/01 09:49:04	1.216
@@ -650,7 +650,7 @@
 
 
 void serv_got_update(struct gaim_connection *gc, char *name, int loggedin, int evil, time_t signon,
-		     time_t idle, int type, gushort caps)
+		     time_t idle, int type, guint caps)
 {
 	struct buddy *b = find_buddy(gc, name);

[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.27,1.28 ft.c,1.11,1.12 info.c,1.10,1.11

From: Eric W. <war...@us...> - 2001-12-22 08:11:14

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

Modified Files:
	aim.h ft.c info.c 
Log Message:
jeez, i'm just undoing everything i did today, aren't i


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- aim.h	2001/12/22 04:02:28	1.27
+++ aim.h	2001/12/22 08:11:11	1.28
@@ -857,7 +857,6 @@
 
 #define AIM_GETINFO_GENERALINFO 0x00001
 #define AIM_GETINFO_AWAYMESSAGE 0x00003
-#define AIM_GETINFO_CAPABILITIES 0x0004
 
 struct aim_invite_priv {
 	char *sn;

Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ft.c	2001/12/22 04:02:29	1.11
+++ ft.c	2001/12/22 08:11:11	1.12
@@ -4,7 +4,6 @@
  */
 
 #define FAIM_INTERNAL
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- info.c	2001/12/22 04:02:29	1.10
+++ info.c	2001/12/22 08:11:11	1.11
@@ -23,6 +23,9 @@
 	if (!sess || !conn || !sn)
 		return -EINVAL;
 
+	if ((infotype != AIM_GETINFO_GENERALINFO) && (infotype != AIM_GETINFO_AWAYMESSAGE))
+		return -EINVAL;
+
 	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 12+1+strlen(sn))))
 		return -ENOMEM;
 
@@ -598,8 +601,7 @@
 	inforeq = (struct aim_priv_inforeq *)origsnac->data;
 
 	if ((inforeq->infotype != AIM_GETINFO_GENERALINFO) &&
-			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE) &&
-			(inforeq->infotype != AIM_GETINFO_CAPABILITIES)) {
+			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE)) {
 		faimdprintf(sess, 0, "parse_userinfo_middle: unknown infotype in request! (0x%04x)\n", inforeq->infotype);
 		return 0;
 	}
@@ -612,30 +614,18 @@
 	 * Depending on what informational text was requested, different
 	 * TLVs will appear here.
 	 *
-	 * Profile will be 1 and 2, away message will be 3 and 4, caps
-	 * will be 5.
+	 * Profile will be 1 and 2, away message will be 3 and 4.
 	 */
-	if (inforeq->infotype == AIM_GETINFO_GENERALINFO) {
+	if (aim_gettlv(tlvlist, 0x0001, 1)) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0001, 1);
 		text = aim_gettlv_str(tlvlist, 0x0002, 1);
-	} else if (inforeq->infotype == AIM_GETINFO_AWAYMESSAGE) {
+	} else if (aim_gettlv(tlvlist, 0x0003, 1)) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0003, 1);
 		text = aim_gettlv_str(tlvlist, 0x0004, 1);
-	} else if (inforeq->infotype == AIM_GETINFO_CAPABILITIES) {
-		aim_tlv_t *ct;
-
-		if ((ct = aim_gettlv(tlvlist, 0x0005, 1))) {
-			aim_bstream_t cbs;
-
-			aim_bstream_init(&cbs, ct->value, ct->length);
-
-			userinfo.capabilities = aim_getcap(sess, &cbs, ct->length);
-			userinfo.capspresent = 1;
-		}
 	}
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-		ret = userfunc(sess, rx, &userinfo, inforeq->infotype, text_encoding, text);
+		ret = userfunc(sess, rx, &userinfo, text_encoding, text, inforeq->infotype);
 
 	free(text_encoding);
 	free(text);

[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.39,1.40

From: Eric W. <war...@us...> - 2001-12-22 08:08:41

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

Modified Files:
	toc.c 
Log Message:
this was a bad hack.


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- toc.c	2001/12/22 03:38:20	1.39
+++ toc.c	2001/12/22 08:08:37	1.40
@@ -143,7 +143,7 @@
 
 	gc = new_gaim_conn(user);
 	gc->proto_data = tdt = g_new0(struct toc_data, 1);
-	gc->flags |= OPT_CONN_HTML | OPT_CONN_SHOW_HTML;
+	gc->flags |= OPT_CONN_HTML;
 
 	g_snprintf(buf, sizeof buf, "Looking up %s",
 		   user->proto_opt[USEROPT_AUTH][0] ? user->proto_opt[USEROPT_AUTH] : TOC_HOST);

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.29,1.30

From: Eric W. <war...@us...> - 2001-12-22 08:08:41

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

Modified Files:
	yahoo.c 
Log Message:
this was a bad hack.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- yahoo.c	2001/12/22 03:38:20	1.29
+++ yahoo.c	2001/12/22 08:08:37	1.30
@@ -707,8 +707,6 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
-	gc->flags = OPT_CONN_HTML | OPT_CONN_SHOW_HTML; /* it does to an extent.... */
-
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.68,1.69

From: Eric W. <war...@us...> - 2001-12-22 08:08:41

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

Modified Files:
	irc.c 
Log Message:
this was a bad hack.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- irc.c	2001/12/22 03:38:20	1.68
+++ irc.c	2001/12/22 08:08:36	1.69
@@ -1073,8 +1073,6 @@
 	struct irc_data *idata = gc->proto_data = g_new0(struct irc_data, 1);
 
 	g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", gc->username);
-	gc->flags = OPT_CONN_SHOW_HTML; /* this is bad. the reason for this is gtkimhtml doesn't
-					   understand the xchat escapes. so we translate. */
 
 	g_snprintf(buf, sizeof(buf), "Signon: %s", gc->username);
 	set_login_progress(gc, 2, buf);

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.88,1.89

From: Eric W. <war...@us...> - 2001-12-22 08:08:40

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

Modified Files:
	oscar.c 
Log Message:
this was a bad hack.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- oscar.c	2001/12/22 03:38:20	1.88
+++ oscar.c	2001/12/22 08:08:36	1.89
@@ -460,7 +460,7 @@
 		gc->password[9] = 0;
 	} else {
 		gc->protocol = PROTO_TOC;
-		gc->flags |= OPT_CONN_HTML | OPT_CONN_SHOW_HTML;
+		gc->flags |= OPT_CONN_HTML;
 	}
 
 	sess = g_new0(aim_session_t, 1);

[Gaim-commits] CVS: gaim/src conversation.c,1.323,1.324 multi.h,1.38,1.39

From: Eric W. <war...@us...> - 2001-12-22 08:08:40

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv11435

Modified Files:
	conversation.c multi.h 
Log Message:
this was a bad hack.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- conversation.c	2001/12/22 03:38:19	1.323
+++ conversation.c	2001/12/22 08:08:36	1.324
@@ -1151,43 +1151,6 @@
 	g_free(s);
 }
 
-static char *escape_html(char *w, int *l)
-{
-	int c = 0;
-	char *r;
-	int i, x = 0;
-	if (*l == -1) {
-		*l = strlen(w);
-		x = 1;
-	}
-	r = g_malloc(*l * 5 + 1);
-
-	for (i = 0; i < *l; i++) {
-		if (w[i] == '<') {
-			r[c++] = '&';
-			r[c++] = 'l';
-			r[c++] = 't';
-			r[c++] = ';';
-		} else if (w[i] == '&') {
-			r[c++] = '&';
-			r[c++] = 'a';
-			r[c++] = 'm';
-			r[c++] = 'p';
-			r[c++] = ';';
-		} else {
-			r[c++] = w[i];
-		}
-	}
-	r[c] = 0;
-
-	r = g_realloc(r, c + 1);
-	if (x)
-		*l = -1;
-	else
-		*l = c;
-	return r;
-}
-
 static char *html_logize(char *p)
 {
 
@@ -1592,10 +1555,6 @@
 		g_snprintf(buf, BUF_LONG, "<B><FONT COLOR=\"#777777\">%s</FONT></B><BR>", what);
 		gtk_imhtml_append_text(GTK_IMHTML(c->text), buf, -1, 0);
 	} else {
-		if (c->gc->flags & OPT_CONN_SHOW_HTML)
-			what = g_memdup(what, length == -1 ? strlen(what) + 1 : length);
-		else
-			what = escape_html(what, &length);
 		if (flags & WFLAG_WHISPER) {
 			/* if we're whispering, it's not an autoresponse */
 			if (meify(what, length)) {
@@ -1702,8 +1661,6 @@
 			g_free(t2);
 			g_free(nm);
 		}
-
-		g_free(what);
 	}
 
 	if ((c->is_chat && (chat_options & OPT_CHAT_POPUP)) ||

Index: multi.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- multi.h	2001/12/22 03:38:19	1.38
+++ multi.h	2001/12/22 08:08:36	1.39
@@ -74,7 +74,6 @@
 };
 
 #define OPT_CONN_HTML		0x00000001
-#define OPT_CONN_SHOW_HTML	0x00000002
 
 struct proto_user_opt {
 	char *label;

[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.26,1.27 ft.c,1.10,1.11 info.c,1.9,1.10

From: Eric W. <war...@us...> - 2001-12-22 04:02:32

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

Modified Files:
	aim.h ft.c info.c 
Log Message:
sync

Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- aim.h	2001/12/10 06:13:18	1.26
+++ aim.h	2001/12/22 04:02:28	1.27
@@ -857,6 +857,7 @@
 
 #define AIM_GETINFO_GENERALINFO 0x00001
 #define AIM_GETINFO_AWAYMESSAGE 0x00003
+#define AIM_GETINFO_CAPABILITIES 0x0004
 
 struct aim_invite_priv {
 	char *sn;

Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ft.c	2001/12/04 08:04:21	1.10
+++ ft.c	2001/12/22 04:02:29	1.11
@@ -4,6 +4,7 @@
  */
 
 #define FAIM_INTERNAL
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- info.c	2001/12/10 00:48:27	1.9
+++ info.c	2001/12/22 04:02:29	1.10
@@ -23,9 +23,6 @@
 	if (!sess || !conn || !sn)
 		return -EINVAL;
 
-	if ((infotype != AIM_GETINFO_GENERALINFO) && (infotype != AIM_GETINFO_AWAYMESSAGE))
-		return -EINVAL;
-
 	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 12+1+strlen(sn))))
 		return -ENOMEM;
 
@@ -601,7 +598,8 @@
 	inforeq = (struct aim_priv_inforeq *)origsnac->data;
 
 	if ((inforeq->infotype != AIM_GETINFO_GENERALINFO) &&
-			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE)) {
+			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE) &&
+			(inforeq->infotype != AIM_GETINFO_CAPABILITIES)) {
 		faimdprintf(sess, 0, "parse_userinfo_middle: unknown infotype in request! (0x%04x)\n", inforeq->infotype);
 		return 0;
 	}
@@ -614,18 +612,30 @@
 	 * Depending on what informational text was requested, different
 	 * TLVs will appear here.
 	 *
-	 * Profile will be 1 and 2, away message will be 3 and 4.
+	 * Profile will be 1 and 2, away message will be 3 and 4, caps
+	 * will be 5.
 	 */
-	if (aim_gettlv(tlvlist, 0x0001, 1)) {
+	if (inforeq->infotype == AIM_GETINFO_GENERALINFO) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0001, 1);
 		text = aim_gettlv_str(tlvlist, 0x0002, 1);
-	} else if (aim_gettlv(tlvlist, 0x0003, 1)) {
+	} else if (inforeq->infotype == AIM_GETINFO_AWAYMESSAGE) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0003, 1);
 		text = aim_gettlv_str(tlvlist, 0x0004, 1);
+	} else if (inforeq->infotype == AIM_GETINFO_CAPABILITIES) {
+		aim_tlv_t *ct;
+
+		if ((ct = aim_gettlv(tlvlist, 0x0005, 1))) {
+			aim_bstream_t cbs;
+
+			aim_bstream_init(&cbs, ct->value, ct->length);
+
+			userinfo.capabilities = aim_getcap(sess, &cbs, ct->length);
+			userinfo.capspresent = 1;
+		}
 	}
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-		ret = userfunc(sess, rx, &userinfo, text_encoding, text, inforeq->infotype);
+		ret = userfunc(sess, rx, &userinfo, inforeq->infotype, text_encoding, text);
 
 	free(text_encoding);
 	free(text);

6 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 825 826 827 828 829 .. 860 > >> (Page 827 of 860)