Hello community, here is the log from the commit of package kdenetwork3 checked in at Wed Apr 26 18:00:09 CEST 2006. -------- --- KDE/kdenetwork3/kdenetwork3.changes 2006-04-07 15:57:05.000000000 +0200 +++ STABLE/kdenetwork3/kdenetwork3.changes 2006-04-26 17:32:31.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 26 17:30:46 CEST 2006 - wstephenson@suse.de + +- Fix overriding others' RTF in messages (#160555) + +------------------------------------------------------------------- New: ---- kopete_groupwise_richtext_disable.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork3.spec ++++++ --- /var/tmp/diff_new_pack.32KvMp/_old 2006-04-26 18:00:00.000000000 +0200 +++ /var/tmp/diff_new_pack.32KvMp/_new 2006-04-26 18:00:00.000000000 +0200 @@ -17,7 +17,7 @@ Summary: KDE Network Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.5.1 -Release: 22 +Release: 27 Provides: kdenetwork3-lan:/opt/kde3/bin/kpf Source0: kdenetwork-%{version}.tar.bz2 Source1: init.lisa @@ -46,6 +46,7 @@ Patch22: kopete-icq-connect.diff Patch23: kopete-gw-endian.patch Patch24: kopete-gw-fix-global-busy.diff +Patch25: kopete_groupwise_richtext_disable.diff Patch100: knewsticker_sources.patch Url: http://www.kde.org Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -268,6 +269,7 @@ %patch22 %patch23 %patch24 +%patch25 %patch100 # remove ktalkd for security reasons rm -rf ktalkd doc/ktalkd doc/kcontrol/kcmktalkd @@ -603,6 +605,8 @@ %endif %changelog -n kdenetwork3 +* Wed Apr 26 2006 - wstephenson@suse.de +- Fix overriding others' RTF in messages (#160555) * Fri Apr 07 2006 - wstephenson@suse.de - Fix serious bug where Idle status was set instead of Busy * Mon Apr 03 2006 - wstephenson@suse.de ++++++ kopete_groupwise_richtext_disable.diff ++++++ Index: kopete/libkopete/kopetemessage.cpp =================================================================== --- kopete/libkopete/kopetemessage.cpp (revision 527253) +++ kopete/libkopete/kopetemessage.cpp (working copy) @@ -671,26 +671,35 @@ if( !d->bgOverride && d->bgColor.isValid() ) bodyNode.setAttribute( QString::fromLatin1("bgcolor"), d->bgColor.name() ); - if( !d->rtfOverride && d->font!=QFont() ) - { - QString fontstr; - if(!d->font.family().isNull()) - fontstr+=QString::fromLatin1("font-family: ")+d->font.family()+QString::fromLatin1("; "); - if(d->font.italic()) - fontstr+=QString::fromLatin1("font-style: italic; "); - if(d->font.strikeOut()) - fontstr+=QString::fromLatin1("text-decoration: line-through; "); - if(d->font.underline()) - fontstr+=QString::fromLatin1("text-decoration: underline; "); - if(d->font.bold()) - fontstr+=QString::fromLatin1("font-weight: bold;"); + QString messagePb = parsedBody(); - bodyNode.setAttribute( QString::fromLatin1("font"), fontstr ); + if( !d->rtfOverride ) { + if ( d->font!=QFont() ) + { + QString fontstr; + if(!d->font.family().isNull()) + fontstr+=QString::fromLatin1("font-family: ")+d->font.family()+QString::fromLatin1("; "); + if(d->font.italic()) + fontstr+=QString::fromLatin1("font-style: italic; "); + if(d->font.strikeOut()) + fontstr+=QString::fromLatin1("text-decoration: line-through; "); + if(d->font.underline()) + fontstr+=QString::fromLatin1("text-decoration: underline; "); + if(d->font.bold()) + fontstr+=QString::fromLatin1("font-weight: bold;"); + + bodyNode.setAttribute( QString::fromLatin1("font"), fontstr ); + } } - + else + { + // remove style tags from message's parsedBody + messagePb.replace( QRegExp( QString::fromLatin1("style=\"[^\"]*\"") ), QString::fromLatin1("") ); + + } bodyNode.setAttribute( QString::fromLatin1("dir"), plainBody().isRightToLeft() ? QString::fromLatin1("rtl") : QString::fromLatin1("ltr") ); - QDomCDATASection bodyText = doc.createCDATASection( parsedBody() ); + QDomCDATASection bodyText = doc.createCDATASection( messagePb ); bodyNode.appendChild( bodyText ); messageNode.appendChild( bodyNode ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de