Mercurial > pidgin.yaz

changeset 14557:fb67a345056e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17280] Fix a misnamed define. UTF8 is wrong. The actual encoding used is UCS-2BE. No functionality change. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 14 Sep 2006 22:21:52 +0000
parents c46d204d5a30
children 81650a27f253
files libgaim/protocols/oscar/family_locate.c libgaim/protocols/oscar/oscar.c libgaim/protocols/oscar/oscar.h
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/oscar/family_locate.c	Thu Sep 14 21:53:30 2006 +0000
+++ b/libgaim/protocols/oscar/family_locate.c	Thu Sep 14 22:21:52 2006 +0000
@@ -172,11 +172,11 @@
 	 {0x09, 0x46, 0x13, 0x4d, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	{OSCAR_CAPABILITY_ICQUTF8,
+	{OSCAR_CAPABILITY_UNICODE,
 	 {0x09, 0x46, 0x13, 0x4e, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	{OSCAR_CAPABILITY_ICQUTF8OLD,
+	{OSCAR_CAPABILITY_UNICODEOLD,
 	 {0x2e, 0x7a, 0x64, 0x75, 0xfa, 0xdf, 0x4d, 0xc8,
 	  0x88, 0x6f, 0xea, 0x35, 0x95, 0xfd, 0xb6, 0xdf}},
 
--- a/libgaim/protocols/oscar/oscar.c	Thu Sep 14 21:53:30 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.c	Thu Sep 14 22:21:52 2006 +0000
@@ -68,7 +68,7 @@
 #define OSCAR_DEFAULT_WEB_AWARE FALSE
 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
 
-static OscarCapability gaim_caps = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_ICQUTF8 | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
+static OscarCapability gaim_caps = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_UNICODE | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
 
 static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02};
 static guint8 features_icq[] = {0x01, 0x06};
@@ -460,7 +460,7 @@
 	if ((destsn != NULL) && aim_sn_is_icq(destsn))
 		userinfo = aim_locate_finduserinfo(od, destsn);
 
-	if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_ICQUTF8))
+	if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_UNICODE))
 	{
 		GaimBuddy *b;
 		b = gaim_find_buddy(account, destsn);
@@ -639,13 +639,13 @@
 			case OSCAR_CAPABILITY_ICQSERVERRELAY:
 				tmp = _("ICQ Server Relay");
 				break;
-			case OSCAR_CAPABILITY_ICQUTF8OLD:
+			case OSCAR_CAPABILITY_UNICODEOLD:
 				tmp = _("Old ICQ UTF8");
 				break;
 			case OSCAR_CAPABILITY_TRILLIANCRYPT:
 				tmp = _("Trillian Encryption");
 				break;
-			case OSCAR_CAPABILITY_ICQUTF8:
+			case OSCAR_CAPABILITY_UNICODE:
 				tmp = _("ICQ UTF8");
 				break;
 			case OSCAR_CAPABILITY_HIPTOP:
--- a/libgaim/protocols/oscar/oscar.h	Thu Sep 14 21:53:30 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.h	Thu Sep 14 22:21:52 2006 +0000
@@ -315,9 +315,9 @@
 	OSCAR_CAPABILITY_ICQRTF               = 0x00001000,
 	OSCAR_CAPABILITY_EMPTY                = 0x00002000,
 	OSCAR_CAPABILITY_ICQSERVERRELAY       = 0x00004000,
-	OSCAR_CAPABILITY_ICQUTF8OLD           = 0x00008000,
+	OSCAR_CAPABILITY_UNICODEOLD           = 0x00008000,
 	OSCAR_CAPABILITY_TRILLIANCRYPT        = 0x00010000,
-	OSCAR_CAPABILITY_ICQUTF8              = 0x00020000,
+	OSCAR_CAPABILITY_UNICODE              = 0x00020000,
 	OSCAR_CAPABILITY_INTEROPERATE         = 0x00040000,
 	OSCAR_CAPABILITY_ICHAT                = 0x00080000,
 	OSCAR_CAPABILITY_HIPTOP               = 0x00100000,