Attachment #56514 for bug #89415

View | Details | Raw Unified | Return to bug 89415
Collapse All | Expand All

Lines 937-943 Link Here

(-)kdepim-3.4.0/knode/knconfig.cpp (-1 / +1 lines)
937	c_omposerCharsets=QStringList::split(',',"us-ascii,utf-8,iso-8859-1,iso-8859-2,"	937	c_omposerCharsets=QStringList::split(',',"us-ascii,utf-8,iso-8859-1,iso-8859-2,"
938	"iso-8859-3,iso-8859-4,iso-8859-5,iso-8859-6,iso-8859-7,iso-8859-8,"	938	"iso-8859-3,iso-8859-4,iso-8859-5,iso-8859-6,iso-8859-7,iso-8859-8,"
939	"iso-8859-9,iso-8859-10,iso-8859-13,iso-8859-14,iso-8859-15,koi8-r,koi8-u,"	939	"iso-8859-9,iso-8859-10,iso-8859-13,iso-8859-14,iso-8859-15,koi8-r,koi8-u,"
940	"iso-2022-jp,iso-2022-jp-2,iso-2022-kr,euc-jp,euc-kr,Big5,gb2312");	940	"iso-2022-jp,iso-2022-jp-2,iso-2022-kr,euc-jp,euc-kr,Big5,gb2312,gbk,gb18030");
941		941
942	c_harset=conf->readEntry("Charset").latin1();	942	c_harset=conf->readEntry("Charset").latin1();
943	if (c_harset.isEmpty()) {	943	if (c_harset.isEmpty()) {

Lines 40-46 Link Here

(-)kdepim-3.4.0/knode/kngroup.cpp (-2 / +2 lines)
40	KNGroup::KNGroup(KNCollection *p)	40	KNGroup::KNGroup(KNCollection *p)
41	: KNArticleCollection(p), n_ewCount(0), l_astFetchCount(0), r_eadCount(0), i_gnoreCount(0),	41	: KNArticleCollection(p), n_ewCount(0), l_astFetchCount(0), r_eadCount(0), i_gnoreCount(0),
42	l_astNr(0), m_axFetch(0), d_ynDataFormat(1), f_irstNew(-1), l_ocked(false),	42	l_astNr(0), m_axFetch(0), d_ynDataFormat(1), f_irstNew(-1), l_ocked(false),
43	u_seCharset(false), s_tatus(unknown), i_dentity(0)	43	u_seCharset(true), s_tatus(unknown), i_dentity(0)
44	{	44	{
45	mCleanupConf = new KNConfig::Cleanup( false );	45	mCleanupConf = new KNConfig::Cleanup( false );
46	}	46	}
Lines 90-96 Link Here
90	f_irstNr = info.readNumEntry("firstMsg",0);	90	f_irstNr = info.readNumEntry("firstMsg",0);
91	l_astNr = info.readNumEntry("lastMsg",0);	91	l_astNr = info.readNumEntry("lastMsg",0);
92	d_ynDataFormat = info.readNumEntry("dynDataFormat",0);	92	d_ynDataFormat = info.readNumEntry("dynDataFormat",0);
93	u_seCharset = info.readBoolEntry("useCharset", false);	93	u_seCharset = info.readBoolEntry("useCharset", true);
94	d_efaultChSet = info.readEntry("defaultChSet").latin1();	94	d_efaultChSet = info.readEntry("defaultChSet").latin1();
95	QString s = info.readEntry("status","unknown");	95	QString s = info.readEntry("status","unknown");
96	if (s=="readOnly")	96	if (s=="readOnly")




      sepPos1 = line.find(' ');

      if (sepPos1==-1) {        // no description
        name = QString::fromLocal8Bit(line);
        description = QString::null;
        status = KNGroup::unknown;
      } else {
        name = QString::fromLocal8Bit(line.left(sepPos1));

        sepPos2 = line.find(' ',sepPos1+1);
        if (sepPos2==-1) {        // no status
          description = QString::fromLocal8Bit(line.right(line.length()-sepPos1-1));
          status = KNGroup::unknown;
        } else {
          description = QString::fromLocal8Bit(line.right(line.length()-sepPos2-1));
          switch (line[sepPos1+1]) {
            case 'u':   status = KNGroup::unknown;
                        break;


  if(f.open(IO_WriteOnly)) {
    for (KNGroupInfo *i=groups->first(); i; i=groups->next()) {
      temp = i->name.local8Bit();
      switch (i->status) {
        case KNGroup::unknown: temp += " u ";
                               break;




    } else {
      s[0] = 0;    // cut string

      name = QString::fromLocal8Bit(line);

      if (target->subscribed.contains(name)) {
        target->subscribed.remove(name);    // group names are unique, we wont find it again anyway...

          s++;
          while (*s == ' ' || *s == '\t') s++;    // go on to the description

          name = QString::fromLocal8Bit(line);
          if (target->codecForDescriptions)          // some countries use local 8 bit characters in the tag line
            description = target->codecForDescriptions->toUnicode(s);
          else

#endif
    } else {
      s[0] = 0;    // cut string
      name = QString::fromLocal8Bit(line);

      while (s[1]!=0) s++;   // the last character determines the moderation status
      switch (s[0]) {

    int rep;

    for (KNGroupInfo *group=tmpList.first(); group; group=tmpList.next()) {
      if (!sendCommand(cmd+group->name.local8Bit(),rep))
        return;
      if (rep != 215)        // 215 informations follows
        break;

              .arg(account.server()).arg(target->groupname());

  cmd="GROUP ";
  cmd+=target->groupname().local8Bit();
  if (!sendCommandWCheck(cmd,211)) {       // 211 n f l s group selected
    return;
  }

    QString groupName = static_cast<KNGroup*>(target->collection())->groupname();
    if (currentGroup != groupName) {
      cmd="GROUP ";
      cmd+=groupName.local8Bit();
      if (!sendCommandWCheck(cmd,211))       // 211 n f l s group selected
        return;
      currentGroup = groupName;





void Newsgroups::fromUnicodeString(const QString &s, const QCString&)
{
  g_roups=s.local8Bit();
  e_ncCS=cachedCharset("UTF-8");
}


QString Newsgroups::asUnicodeString()
{
  return QString::fromLocal8Bit(g_roups);
}



Return to bug 89415

Lines 114-131 Link Here

(-)kdepim-3.4.0/knode/kngroupmanager.cpp (-5 / +5 lines)
114	sepPos1 = line.find(' ');	114	sepPos1 = line.find(' ');
115		115
116	if (sepPos1==-1) { // no description	116	if (sepPos1==-1) { // no description
117	name = QString::fromUtf8(line);	117	name = QString::fromLocal8Bit(line);
118	description = QString::null;	118	description = QString::null;
119	status = KNGroup::unknown;	119	status = KNGroup::unknown;
120	} else {	120	} else {
121	name = QString::fromUtf8(line.left(sepPos1));	121	name = QString::fromLocal8Bit(line.left(sepPos1));
122		122
123	sepPos2 = line.find(' ',sepPos1+1);	123	sepPos2 = line.find(' ',sepPos1+1);
124	if (sepPos2==-1) { // no status	124	if (sepPos2==-1) { // no status
125	description = QString::fromUtf8(line.right(line.length()-sepPos1-1));	125	description = QString::fromLocal8Bit(line.right(line.length()-sepPos1-1));
126	status = KNGroup::unknown;	126	status = KNGroup::unknown;
127	} else {	127	} else {
128	description = QString::fromUtf8(line.right(line.length()-sepPos2-1));	128	description = QString::fromLocal8Bit(line.right(line.length()-sepPos2-1));
129	switch (line[sepPos1+1]) {	129	switch (line[sepPos1+1]) {
130	case 'u': status = KNGroup::unknown;	130	case 'u': status = KNGroup::unknown;
131	break;	131	break;
Lines 170-176 Link Here
170		170
171	if(f.open(IO_WriteOnly)) {	171	if(f.open(IO_WriteOnly)) {
172	for (KNGroupInfo *i=groups->first(); i; i=groups->next()) {	172	for (KNGroupInfo *i=groups->first(); i; i=groups->next()) {
173	temp = i->name.utf8();	173	temp = i->name.local8Bit();
174	switch (i->status) {	174	switch (i->status) {
175	case KNGroup::unknown: temp += " u ";	175	case KNGroup::unknown: temp += " u ";
176	break;	176	break;

Lines 113-119 Link Here

(-)kdepim-3.4.0/knode/knnntpclient.cpp (-6 / +6 lines)
113	} else {	113	} else {
114	s[0] = 0; // cut string	114	s[0] = 0; // cut string
115		115
116	name = QString::fromUtf8(line);	116	name = QString::fromLocal8Bit(line);
117		117
118	if (target->subscribed.contains(name)) {	118	if (target->subscribed.contains(name)) {
119	target->subscribed.remove(name); // group names are unique, we wont find it again anyway...	119	target->subscribed.remove(name); // group names are unique, we wont find it again anyway...
Lines 182-188 Link Here
182	s++;	182	s++;
183	while (s == ' ' \|\| s == '\t') s++; // go on to the description	183	while (s == ' ' \|\| s == '\t') s++; // go on to the description
184		184
185	name = QString::fromUtf8(line);	185	name = QString::fromLocal8Bit(line);
186	if (target->codecForDescriptions) // some countries use local 8 bit characters in the tag line	186	if (target->codecForDescriptions) // some countries use local 8 bit characters in the tag line
187	description = target->codecForDescriptions->toUnicode(s);	187	description = target->codecForDescriptions->toUnicode(s);
188	else	188	else
Lines 248-254 Link Here
248	#endif	248	#endif
249	} else {	249	} else {
250	s[0] = 0; // cut string	250	s[0] = 0; // cut string
251	name = QString::fromUtf8(line);	251	name = QString::fromLocal8Bit(line);
252		252
253	while (s[1]!=0) s++; // the last character determines the moderation status	253	while (s[1]!=0) s++; // the last character determines the moderation status
254	switch (s[0]) {	254	switch (s[0]) {
Lines 284-290 Link Here
284	int rep;	284	int rep;
285		285
286	for (KNGroupInfo *group=tmpList.first(); group; group=tmpList.next()) {	286	for (KNGroupInfo *group=tmpList.first(); group; group=tmpList.next()) {
287	if (!sendCommand(cmd+group->name.utf8(),rep))	287	if (!sendCommand(cmd+group->name.local8Bit(),rep))
288	return;	288	return;
289	if (rep != 215) // 215 informations follows	289	if (rep != 215) // 215 informations follows
290	break;	290	break;
Lines 339-345 Link Here
339	.arg(account.server()).arg(target->groupname());	339	.arg(account.server()).arg(target->groupname());
340		340
341	cmd="GROUP ";	341	cmd="GROUP ";
342	cmd+=target->groupname().utf8();	342	cmd+=target->groupname().local8Bit();
343	if (!sendCommandWCheck(cmd,211)) { // 211 n f l s group selected	343	if (!sendCommandWCheck(cmd,211)) { // 211 n f l s group selected
344	return;	344	return;
345	}	345	}
Lines 458-464 Link Here
458	QString groupName = static_cast<KNGroup*>(target->collection())->groupname();	458	QString groupName = static_cast<KNGroup*>(target->collection())->groupname();
459	if (currentGroup != groupName) {	459	if (currentGroup != groupName) {
460	cmd="GROUP ";	460	cmd="GROUP ";
461	cmd+=groupName.utf8();	461	cmd+=groupName.local8Bit();
462	if (!sendCommandWCheck(cmd,211)) // 211 n f l s group selected	462	if (!sendCommandWCheck(cmd,211)) // 211 n f l s group selected
463	return;	463	return;
464	currentGroup = groupName;	464	currentGroup = groupName;

Lines 946-959 Link Here

(-)kdepim-3.4.0/libkmime/kmime_headers.cpp (-2 / +2 lines)
946		946
947	void Newsgroups::fromUnicodeString(const QString &s, const QCString&)	947	void Newsgroups::fromUnicodeString(const QString &s, const QCString&)
948	{	948	{
949	g_roups=s.utf8();	949	g_roups=s.local8Bit();
950	e_ncCS=cachedCharset("UTF-8");	950	e_ncCS=cachedCharset("UTF-8");
951	}	951	}
952		952
953		953
954	QString Newsgroups::asUnicodeString()	954	QString Newsgroups::asUnicodeString()
955	{	955	{
956	return QString::fromUtf8(g_roups);	956	return QString::fromLocal8Bit(g_roups);
957	}	957	}
958		958
959		959