From bc4201ab4ea627e6d79b4517bf150c9062583378 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 12 Feb 2013 19:14:33 +0000 Subject: fix for settings' table git-svn-id: http://svn.miranda-ng.org/main/trunk@3583 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/src/changeinfo/constants.cpp | 126 ++++++++++------------- protocols/IcqOscarJ/src/fam_15icqserver.cpp | 4 +- 2 files changed, 57 insertions(+), 73 deletions(-) (limited to 'protocols/IcqOscarJ/src') diff --git a/protocols/IcqOscarJ/src/changeinfo/constants.cpp b/protocols/IcqOscarJ/src/changeinfo/constants.cpp index 766a69c49a..394505a519 100644 --- a/protocols/IcqOscarJ/src/changeinfo/constants.cpp +++ b/protocols/IcqOscarJ/src/changeinfo/constants.cpp @@ -107,91 +107,75 @@ const int dayRange[]={1,31}; const SettingItem setting[]={ //personal {LPGEN("Personal"), LI_DIVIDER}, - {LPGEN("Nickname"), LI_STRING, DBVT_UTF8, "Nick"}, - {LPGEN("First name"), LI_STRING, DBVT_UTF8, "FirstName"}, - {LPGEN("Last name"), LI_STRING, DBVT_UTF8, "LastName"}, - {LPGEN("Gender"), LI_LIST, DBVT_BYTE, "Gender", genderField}, - {LPGEN("About"), LI_LONGSTRING, DBVT_UTF8, "About"}, + {LPGEN("Nickname"), LI_STRING, DBVT_UTF8, "Nick"}, + {LPGEN("First name"), LI_STRING, DBVT_UTF8, "FirstName"}, + {LPGEN("Last name"), LI_STRING, DBVT_UTF8, "LastName"}, + {LPGEN("Gender"), LI_LIST, DBVT_BYTE, "Gender", genderField}, + {LPGEN("About"), LI_LONGSTRING, DBVT_UTF8, "About"}, //password {LPGEN("Password"), LI_DIVIDER}, - {LPGEN("Password"), LI_STRING|LIF_PASSWORD,DBVT_ASCIIZ, "Password"}, + {LPGEN("Password"), LI_STRING|LIF_PASSWORD,DBVT_UTF8, "Password"}, //contact {LPGEN("Contact"), LI_DIVIDER}, - {LPGEN("Primary e-mail"), LI_STRING, DBVT_ASCIIZ, "e-mail0"}, - {LPGEN("Secondary e-mail"), LI_STRING, DBVT_ASCIIZ, "e-mail1"}, - {LPGEN("Tertiary e-mail"), LI_STRING, DBVT_ASCIIZ, "e-mail2"}, - {LPGEN("Homepage"), LI_STRING, DBVT_ASCIIZ, "Homepage"}, - {LPGEN("Street"), LI_STRING, DBVT_UTF8, "Street"}, - {LPGEN("City"), LI_STRING, DBVT_UTF8, "City"}, - {LPGEN("State"), LI_STRING, DBVT_UTF8, "State"}, - {LPGEN("ZIP/postcode"), LI_STRING, DBVT_UTF8, "ZIP"}, - {LPGEN("Country"), LI_LIST, DBVT_WORD, "Country", countryField}, - {LPGEN("Phone number"), LI_STRING, DBVT_UTF8, "Phone"}, - {LPGEN("Fax number"), LI_STRING, DBVT_UTF8, "Fax"}, - {LPGEN("Cellular number"),LI_STRING, DBVT_UTF8, "Cellular"}, + {LPGEN("Primary e-mail"), LI_STRING, DBVT_UTF8, "e-mail0"}, + {LPGEN("Secondary e-mail"), LI_STRING, DBVT_UTF8, "e-mail1"}, + {LPGEN("Tertiary e-mail"), LI_STRING, DBVT_UTF8, "e-mail2"}, + {LPGEN("Homepage"), LI_STRING, DBVT_UTF8, "Homepage"}, + {LPGEN("Street"), LI_STRING, DBVT_UTF8, "Street"}, + {LPGEN("City"), LI_STRING, DBVT_UTF8, "City"}, + {LPGEN("State"), LI_STRING, DBVT_UTF8, "State"}, + {LPGEN("ZIP/postcode"), LI_STRING, DBVT_UTF8, "ZIP"}, + {LPGEN("Country"), LI_LIST, DBVT_WORD, "Country", countryField}, + {LPGEN("Phone number"), LI_STRING, DBVT_UTF8, "Phone"}, + {LPGEN("Fax number"), LI_STRING, DBVT_UTF8, "Fax"}, + {LPGEN("Cellular number"),LI_STRING, DBVT_UTF8, "Cellular"}, //more {LPGEN("Personal Detail"),LI_DIVIDER}, - {LPGEN("Timezone"), LI_LIST|LIF_ZEROISVALID|LIF_SIGNED,DBVT_BYTE, "Timezone", timezones}, - {LPGEN("Year of birth"), LI_NUMBER, DBVT_WORD, "BirthYear", yearRange}, - {LPGEN("Month of birth"), LI_LIST, DBVT_BYTE, "BirthMonth", months}, - {LPGEN("Day of birth"), LI_NUMBER, DBVT_BYTE, "BirthDay", dayRange}, - {LPGEN("Marital Status"), LI_LIST, DBVT_BYTE, "MaritalStatus", maritalField}, - {LPGEN("Spoken language 1"), LI_LIST, DBVT_BYTE, "Language1", languageField}, - {LPGEN("Spoken language 2"), LI_LIST, DBVT_BYTE, "Language2", languageField}, - {LPGEN("Spoken language 3"), LI_LIST, DBVT_BYTE, "Language3", languageField}, + {LPGEN("Timezone"), LI_LIST|LIF_ZEROISVALID|LIF_SIGNED,DBVT_BYTE, "Timezone", timezones}, + {LPGEN("Year of birth"), LI_NUMBER, DBVT_WORD, "BirthYear", yearRange}, + {LPGEN("Month of birth"), LI_LIST, DBVT_BYTE, "BirthMonth", months}, + {LPGEN("Day of birth"), LI_NUMBER, DBVT_BYTE, "BirthDay", dayRange}, + {LPGEN("Marital Status"), LI_LIST, DBVT_BYTE, "MaritalStatus", maritalField}, + {LPGEN("Spoken language 1"), LI_LIST, DBVT_BYTE, "Language1", languageField}, + {LPGEN("Spoken language 2"), LI_LIST, DBVT_BYTE, "Language2", languageField}, + {LPGEN("Spoken language 3"), LI_LIST, DBVT_BYTE, "Language3", languageField}, //more {LPGEN("Originally from"),LI_DIVIDER}, - {LPGEN("Street"), LI_STRING, DBVT_UTF8, "OriginStreet"}, - {LPGEN("City"), LI_STRING, DBVT_UTF8, "OriginCity"}, - {LPGEN("State"), LI_STRING, DBVT_UTF8, "OriginState"}, - {LPGEN("Country"), LI_LIST, DBVT_WORD, "OriginCountry", countryField}, + {LPGEN("Street"), LI_STRING, DBVT_UTF8, "OriginStreet"}, + {LPGEN("City"), LI_STRING, DBVT_UTF8, "OriginCity"}, + {LPGEN("State"), LI_STRING, DBVT_UTF8, "OriginState"}, + {LPGEN("Country"), LI_LIST, DBVT_WORD, "OriginCountry", countryField}, //study {LPGEN("Education"), LI_DIVIDER}, - {LPGEN("Level"), LI_LIST, DBVT_WORD, "StudyLevel", studyLevelField}, - {LPGEN("Institute"), LI_STRING, DBVT_UTF8, "StudyInstitute"}, - {LPGEN("Degree"), LI_STRING, DBVT_UTF8, "StudyDegree"}, - {LPGEN("Graduation Year"),LI_NUMBER, DBVT_WORD, "StudyYear", yearRange}, + {LPGEN("Level"), LI_LIST, DBVT_WORD, "StudyLevel", studyLevelField}, + {LPGEN("Institute"), LI_STRING, DBVT_UTF8, "StudyInstitute"}, + {LPGEN("Degree"), LI_STRING, DBVT_UTF8, "StudyDegree"}, + {LPGEN("Graduation Year"),LI_NUMBER, DBVT_WORD, "StudyYear", yearRange}, //work {LPGEN("Work"), LI_DIVIDER}, - {LPGEN("Company name"), LI_STRING, DBVT_UTF8, "Company"}, - {LPGEN("Company homepage"),LI_STRING, DBVT_ASCIIZ, "CompanyHomepage"}, - {LPGEN("Company street"), LI_STRING, DBVT_UTF8, "CompanyStreet"}, - {LPGEN("Company city"), LI_STRING, DBVT_UTF8, "CompanyCity"}, - {LPGEN("Company state"), LI_STRING, DBVT_UTF8, "CompanyState"}, - {LPGEN("Company phone"), LI_STRING, DBVT_ASCIIZ, "CompanyPhone"}, - {LPGEN("Company fax"), LI_STRING, DBVT_ASCIIZ, "CompanyFax"}, - {LPGEN("Company ZIP/postcode"),LI_STRING,DBVT_UTF8, "CompanyZIP"}, - {LPGEN("Company country"),LI_LIST, DBVT_WORD, "CompanyCountry", countryField}, - {LPGEN("Company department"),LI_STRING, DBVT_UTF8, "CompanyDepartment"}, - {LPGEN("Company position"),LI_STRING, DBVT_UTF8, "CompanyPosition"}, - {LPGEN("Company industry"),LI_LIST, DBVT_WORD, "CompanyIndustry", industryField}, -// {LPGEN("Company occupation"),LI_LIST, DBVT_WORD, "CompanyOccupation", occupationField}, + {LPGEN("Company name"), LI_STRING, DBVT_UTF8, "Company"}, + {LPGEN("Company homepage"),LI_STRING, DBVT_UTF8, "CompanyHomepage"}, + {LPGEN("Company street"), LI_STRING, DBVT_UTF8, "CompanyStreet"}, + {LPGEN("Company city"), LI_STRING, DBVT_UTF8, "CompanyCity"}, + {LPGEN("Company state"), LI_STRING, DBVT_UTF8, "CompanyState"}, + {LPGEN("Company phone"), LI_STRING, DBVT_UTF8, "CompanyPhone"}, + {LPGEN("Company fax"), LI_STRING, DBVT_UTF8, "CompanyFax"}, + {LPGEN("Company ZIP/postcode"),LI_STRING,DBVT_UTF8, "CompanyZIP"}, + {LPGEN("Company country"),LI_LIST, DBVT_WORD, "CompanyCountry", countryField}, + {LPGEN("Company department"),LI_STRING, DBVT_UTF8, "CompanyDepartment"}, + {LPGEN("Company position"),LI_STRING, DBVT_UTF8, "CompanyPosition"}, + {LPGEN("Company industry"),LI_LIST, DBVT_WORD, "CompanyIndustry", industryField}, + //interests {LPGEN("Personal Interests"), LI_DIVIDER}, - {LPGEN("Interest category 1"),LI_LIST, DBVT_WORD, "Interest0Cat", interestsField}, - {LPGEN("Interest areas 1"),LI_STRING, DBVT_ASCIIZ, "Interest0Text"}, - {LPGEN("Interest category 2"),LI_LIST, DBVT_WORD, "Interest1Cat", interestsField}, - {LPGEN("Interest areas 2"),LI_STRING, DBVT_ASCIIZ, "Interest1Text"}, - {LPGEN("Interest category 3"),LI_LIST, DBVT_WORD, "Interest2Cat", interestsField}, - {LPGEN("Interest areas 3"),LI_STRING, DBVT_ASCIIZ, "Interest2Text"}, - {LPGEN("Interest category 4"),LI_LIST, DBVT_WORD, "Interest3Cat", interestsField}, - {LPGEN("Interest areas 4"),LI_STRING, DBVT_ASCIIZ, "Interest3Text"}, - //pastbackground -// {LPGEN("Past Background"), LI_DIVIDER}, -// {LPGEN("Category 1"), LI_LIST, DBVT_ASCIIZ, "Past0", pastField}, -// {LPGEN("Past Background 1"),LI_STRING, DBVT_ASCIIZ, "Past0Text"}, -// {LPGEN("Category 2"), LI_LIST, DBVT_ASCIIZ, "Past1", pastField}, -// {LPGEN("Past Background 2"),LI_STRING, DBVT_ASCIIZ, "Past1Text"}, -// {LPGEN("Category 3"), LI_LIST, DBVT_ASCIIZ, "Past2", pastField}, -// {LPGEN("Past Background 3"),LI_STRING, DBVT_ASCIIZ, "Past2Text"}, - //affiliation -// {LPGEN("Affiliations"), LI_DIVIDER}, -// {LPGEN("Affiliation category 1"),LI_LIST,DBVT_ASCIIZ, "Affiliation0", affiliationField}, -// {LPGEN("Affiliation 1"), LI_STRING, DBVT_ASCIIZ, "Affiliation0Text"}, -// {LPGEN("Affiliation category 2"),LI_LIST,DBVT_ASCIIZ, "Affiliation1", affiliationField}, -// {LPGEN("Affiliation 2"), LI_STRING, DBVT_ASCIIZ, "Affiliation1Text"}, -// {LPGEN("Affiliation category 3"),LI_LIST,DBVT_ASCIIZ, "Affiliation2", affiliationField}, -// {LPGEN("Affiliation 3"), LI_STRING, DBVT_ASCIIZ, "Affiliation2Text"} + {LPGEN("Interest category 1"),LI_LIST, DBVT_WORD, "Interest0Cat", interestsField}, + {LPGEN("Interest areas 1"),LI_STRING, DBVT_UTF8, "Interest0Text"}, + {LPGEN("Interest category 2"),LI_LIST, DBVT_WORD, "Interest1Cat", interestsField}, + {LPGEN("Interest areas 2"),LI_STRING, DBVT_UTF8, "Interest1Text"}, + {LPGEN("Interest category 3"),LI_LIST, DBVT_WORD, "Interest2Cat", interestsField}, + {LPGEN("Interest areas 3"),LI_STRING, DBVT_UTF8, "Interest2Text"}, + {LPGEN("Interest category 4"),LI_LIST, DBVT_WORD, "Interest3Cat", interestsField}, + {LPGEN("Interest areas 4"),LI_STRING, DBVT_UTF8, "Interest3Text"}, }; const int settingCount = SIZEOF(setting); diff --git a/protocols/IcqOscarJ/src/fam_15icqserver.cpp b/protocols/IcqOscarJ/src/fam_15icqserver.cpp index a1ff5b7645..8d3fb6b7f9 100644 --- a/protocols/IcqOscarJ/src/fam_15icqserver.cpp +++ b/protocols/IcqOscarJ/src/fam_15icqserver.cpp @@ -534,7 +534,7 @@ void CIcqProto::parseUserInfoUpdateAck(unsigned char *databuf, WORD wPacketLen, UserInfoRecordItem rEmail[] = { - {0x64, DBVT_ASCIIZ, "e-mail%u"} + {0x64, DBVT_UTF8, "e-mail%u"} }; UserInfoRecordItem rAddress[] = { @@ -556,7 +556,7 @@ UserInfoRecordItem rCompany[] = { {0x64, DBVT_UTF8, "CompanyPosition"}, {0x6E, DBVT_UTF8, "Company"}, {0x7D, DBVT_UTF8, "CompanyDepartment"}, - {0x78, DBVT_ASCIIZ, "CompanyHomepage"}, + {0x78, DBVT_UTF8, "CompanyHomepage"}, {0x82, DBVT_WORD, "CompanyIndustry"}, {0xAA, DBVT_UTF8, "CompanyStreet"}, {0xB4, DBVT_UTF8, "CompanyCity"}, -- cgit v1.2.3