Mercurial > pidgin

changeset 6871:714fc8f45cf2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7417] I think the only thing I really changed was added a thing to the mouse over for aim people using the official encryption. The rest is just code cleanup. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 17 Sep 2003 03:22:44 +0000
parents c069548b501e
children dd0eecfbe413
files src/protocols/oscar/aim.h src/protocols/oscar/im.c src/protocols/oscar/info.c src/protocols/oscar/msgcookie.c src/protocols/oscar/oscar.c src/protocols/oscar/ssi.c
diffstat 6 files changed, 42 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/oscar/aim.h	Wed Sep 17 03:10:49 2003 +0000
+++ b/src/protocols/oscar/aim.h	Wed Sep 17 03:22:44 2003 +0000
@@ -1001,7 +1001,7 @@
 
 #define AIM_CAPS_BUDDYICON	0x00000001
 #define AIM_CAPS_VOICE		0x00000002
-#define AIM_CAPS_IMIMAGE	0x00000004
+#define AIM_CAPS_DIRECTIM	0x00000004
 #define AIM_CAPS_CHAT		0x00000008
 #define AIM_CAPS_GETFILE	0x00000010
 #define AIM_CAPS_SENDFILE	0x00000020
@@ -1014,13 +1014,14 @@
 #define AIM_CAPS_ICQRTF		0x00001000
 #define AIM_CAPS_EMPTY		0x00002000
 #define AIM_CAPS_ICQSERVERRELAY	0x00004000
-#define AIM_CAPS_ICQUNKNOWN	0x00008000
+#define AIM_CAPS_ICQUTF8OLD	0x00008000
 #define AIM_CAPS_TRILLIANCRYPT	0x00010000
 #define AIM_CAPS_ICQUTF8	0x00020000
 #define AIM_CAPS_INTEROPERATE	0x00040000
 #define AIM_CAPS_ICHAT		0x00080000
 #define AIM_CAPS_HIPTOP		0x00100000
-#define AIM_CAPS_LAST		0x00200000
+#define AIM_CAPS_SECUREIM	0x00200000
+#define AIM_CAPS_LAST		0x00400000
 
 faim_export int aim_0002_000b(aim_session_t *sess, aim_conn_t *conn, const char *sn);
 
--- a/src/protocols/oscar/im.c	Wed Sep 17 03:10:49 2003 +0000
+++ b/src/protocols/oscar/im.c	Wed Sep 17 03:22:44 2003 +0000
@@ -640,7 +640,7 @@
 
 	aimbs_put16(&hdrbs, 0x0000);
 	aimbs_putraw(&hdrbs, ck, 8);
-	aim_putcap(&hdrbs, AIM_CAPS_IMIMAGE);
+	aim_putcap(&hdrbs, AIM_CAPS_DIRECTIM);
 
 	aim_addtlvtochain16(&itl, 0x000a, 0x0001);
 	aim_addtlvtochain_raw(&itl, 0x0003, 4, ip);
--- a/src/protocols/oscar/info.c	Wed Sep 17 03:10:49 2003 +0000
+++ b/src/protocols/oscar/info.c	Wed Sep 17 03:22:44 2003 +0000
@@ -248,6 +248,10 @@
 	 {0x09, 0x46, 0x00, 0x00, 0x4c, 0x7f, 0x11, 0xd1, 
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
+	{AIM_CAPS_SECUREIM,
+	 {0x09, 0x46, 0x00, 0x01, 0x4c, 0x7f, 0x11, 0xd1, 
+	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+
 	{AIM_CAPS_HIPTOP,
 	 {0x09, 0x46, 0x13, 0x23, 0x4c, 0x7f, 0x11, 0xd1, 
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
@@ -267,7 +271,7 @@
 	 {0x09, 0x46, 0x13, 0x44, 0x4c, 0x7f, 0x11, 0xd1, 
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	{AIM_CAPS_IMIMAGE,
+	{AIM_CAPS_DIRECTIM,
 	 {0x09, 0x46, 0x13, 0x45, 0x4c, 0x7f, 0x11, 0xd1, 
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
@@ -324,7 +328,7 @@
 	 {0x09, 0x46, 0x13, 0x4e, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	{AIM_CAPS_ICQUNKNOWN,
+	{AIM_CAPS_ICQUTF8OLD,
 	 {0x2e, 0x7a, 0x64, 0x75, 0xfa, 0xdf, 0x4d, 0xc8,
 	  0x88, 0x6f, 0xea, 0x35, 0x95, 0xfd, 0xb6, 0xdf}},
 
--- a/src/protocols/oscar/msgcookie.c	Wed Sep 17 03:10:49 2003 +0000
+++ b/src/protocols/oscar/msgcookie.c	Wed Sep 17 03:22:44 2003 +0000
@@ -184,7 +184,7 @@
 	switch(reqclass) {
 	case AIM_CAPS_BUDDYICON: return AIM_COOKIETYPE_OFTICON;
 	case AIM_CAPS_VOICE: return AIM_COOKIETYPE_OFTVOICE;
-	case AIM_CAPS_IMIMAGE: return AIM_COOKIETYPE_OFTIMAGE;
+	case AIM_CAPS_DIRECTIM: return AIM_COOKIETYPE_OFTIMAGE;
 	case AIM_CAPS_CHAT: return AIM_COOKIETYPE_CHAT;
 	case AIM_CAPS_GETFILE: return AIM_COOKIETYPE_OFTGET;
 	case AIM_CAPS_SENDFILE: return AIM_COOKIETYPE_OFTSEND;
--- a/src/protocols/oscar/oscar.c	Wed Sep 17 03:10:49 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Sep 17 03:22:44 2003 +0000
@@ -61,8 +61,8 @@
 
 static GaimPlugin *my_protocol = NULL;
 
-static int caps_aim = AIM_CAPS_CHAT | AIM_CAPS_BUDDYICON | AIM_CAPS_IMIMAGE | AIM_CAPS_SENDFILE | AIM_CAPS_INTEROPERATE;
-static int caps_icq = AIM_CAPS_BUDDYICON | AIM_CAPS_IMIMAGE | AIM_CAPS_SENDFILE | AIM_CAPS_ICQUTF8 | AIM_CAPS_INTEROPERATE;
+static int caps_aim = AIM_CAPS_CHAT | AIM_CAPS_BUDDYICON | AIM_CAPS_DIRECTIM | AIM_CAPS_SENDFILE | AIM_CAPS_INTEROPERATE;
+static int caps_icq = AIM_CAPS_BUDDYICON | AIM_CAPS_DIRECTIM | AIM_CAPS_SENDFILE | AIM_CAPS_ICQUTF8 | AIM_CAPS_INTEROPERATE;
 
 static fu8_t features_aim[] = {0x01, 0x01, 0x01, 0x02};
 static fu8_t features_icq[] = {0x01, 0x06};
@@ -2395,7 +2395,7 @@
 		gaim_buddy_icons_set_for_user(gaim_connection_get_account(gc),
 									  userinfo->sn, args->info.icon.icon,
 									  args->info.icon.length);
-	} else if (args->reqclass & AIM_CAPS_IMIMAGE) {
+	} else if (args->reqclass & AIM_CAPS_DIRECTIM) {
 		struct ask_direct *d = g_new0(struct ask_direct, 1);
 		char buf[256];
 
@@ -3087,61 +3087,64 @@
 	} else while (bit <= AIM_CAPS_LAST) {
 		if (bit & caps) {
 			switch (bit) {
-			case 0x1:
+			case AIM_CAPS_BUDDYICON:
 				tmp = _("Buddy Icon");
 				break;
-			case 0x2:
+			case AIM_CAPS_VOICE:
 				tmp = _("Voice");
 				break;
-			case 0x4:
+			case AIM_CAPS_DIRECTIM:
 				tmp = _("Direct IM");
 				break;
-			case 0x8:
+			case AIM_CAPS_CHAT:
 				tmp = _("Chat");
 				break;
-			case 0x10:
+			case AIM_CAPS_GETFILE:
 				tmp = _("Get File");
 				break;
-			case 0x20:
+			case AIM_CAPS_SENDFILE:
 				tmp = _("Send File");
 				break;
-			case 0x40:
-			case 0x200:
+			case AIM_CAPS_GAMES:
+			case AIM_CAPS_GAMES2:
 				tmp = _("Games");
 				break;
-			case 0x80:
+			case AIM_CAPS_SAVESTOCKS:
 				tmp = _("Add-Ins");
 				break;
-			case 0x100:
+			case AIM_CAPS_SENDBUDDYLIST:
 				tmp = _("Send Buddy List");
 				break;
-			case 0x400:
+			case AIM_CAPS_ICQ:
 				tmp = _("EveryBuddy Bug");
 				break;
-			case 0x800:
+			case AIM_CAPS_APINFO:
 				tmp = _("AP User");
 				break;
-			case 0x1000:
+			case AIM_CAPS_ICQRTF:
 				tmp = _("ICQ RTF");
 				break;
-			case 0x2000:
+			case AIM_CAPS_EMPTY:
 				tmp = _("Nihilist");
 				break;
-			case 0x4000:
+			case AIM_CAPS_ICQSERVERRELAY:
 				tmp = _("ICQ Server Relay");
 				break;
-			case 0x8000:
-				tmp = _("ICQ Unknown");
+			case AIM_CAPS_ICQUTF8OLD:
+				tmp = _("Old ICQ UTF8");
 				break;
-			case 0x10000:
+			case AIM_CAPS_TRILLIANCRYPT:
 				tmp = _("Trillian Encryption");
 				break;
-			case 0x20000:
+			case AIM_CAPS_ICQUTF8:
 				tmp = _("ICQ UTF8");
 				break;
 			case AIM_CAPS_HIPTOP:
 				tmp = _("Hiptop");
 				break;
+			case AIM_CAPS_SECUREIM:
+				tmp = _("Secure IM");
+				break;
 			default:
 				tmp = NULL;
 				break;
@@ -5927,7 +5930,7 @@
 			bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name));
 
 		if (b && bi && aim_sncmp(gaim_account_get_username(gaim_connection_get_account(gc)), who) && GAIM_BUDDY_IS_ONLINE(b)) {
-			if (bi->caps & AIM_CAPS_IMIMAGE) {
+			if (bi->caps & AIM_CAPS_DIRECTIM) {
 				pbm = g_new0(struct proto_buddy_menu, 1);
 				pbm->label = _("Direct IM");
 				pbm->callback = oscar_ask_direct_im;
--- a/src/protocols/oscar/ssi.c	Wed Sep 17 03:10:49 2003 +0000
+++ b/src/protocols/oscar/ssi.c	Wed Sep 17 03:22:44 2003 +0000
@@ -1,9 +1,9 @@
 /*
  * Family 0x0013 - Server-Side/Stored Information.
  *
- * Relatively new facility that allows storing of certain types of information,
- * such as a users buddy list, permit/deny list, and permit/deny preferences, 
- * to be stored on the server, so that they can be accessed from any client.
+ * Relatively new facility that allows certain types of information, such as 
+ * a user's buddy list, permit/deny list, and permit/deny preferences, to be 
+ * stored on the server, so that they can be accessed from any client.
  *
  * We keep 2 copies of SSI data:
  * 1) An exact copy of what is stored on the AIM servers.
@@ -11,7 +11,7 @@
  *    between this and the exact copy to keep them in sync.
  *
  * All the "aim_ssi_itemlist_bleh" functions near the top just modify the list 
- * that is given to them (eg. they don't send SNACs).
+ * that is given to them (i.e. they don't send SNACs).
  *
  * The SNAC sending and receiving functions are lower down in the file, and 
  * they're simpler.  They are in the order of the subtypes they deal with,