Dima/ejabberd
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* src/mod_pubsub/mod_pubsub.erl: Now possible to subscribe to a

Browse Source 
pubsub node with a JID that includes a resource (thanks to Martijn
van Beers)

* src/stringprep/uni_parse2.tcl: Bugfix
* src/stringprep/stringprep_drv.c: Likewise
* src/stringprep/uni_norm.c: Regenerated

SVN Revision: 350
This commit is contained in:
Alexey Shchepin
2005-05-18 23:47:33 +00:00
parent 47b5e514dc
commit 77f681b320
5 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stringprep/stringprep_drv.c
+12 -14
View File
@@ -90,23 +90,21 @@ static int compose(int ch1, int ch2)
}
info1 = GetUniCharCompInfo(ch1);
if (info1 != -1) {
if (info1 & CompSingleMask) {
if (ch2 == compFirstList[info1 & CompMask][0]) {
return compFirstList[info1 & CompMask][1];
} else
return 0;
}
if (info1 != -1 && info1 & CompSingleMask) {
if (!(info1 & CompSecondMask) &&
ch2 == compFirstList[info1 & CompMask][0]) {
return compFirstList[info1 & CompMask][1];
} else
return 0;
}
info2 = GetUniCharCompInfo(ch2);
if (info2 != -1) {
if (info2 & CompSingleMask) {
if (ch1 == compSecondList[info2 & CompMask][0]) {
return compSecondList[info2 & CompMask][1];
} else
return 0;
}
if (info2 != -1 && info2 & CompSingleMask) {
if ((info2 & CompSecondMask) &&
ch1 == compSecondList[info2 & CompMask][0]) {
return compSecondList[info2 & CompMask][1];
} else
return 0;
}
if (info1 != -1 && info2 != -1 &&