SOURCES: kdelibs-branch.diff - updated

arekm arekm at pld-linux.org
Fri Aug 26 11:38:32 CEST 2005 

Author: arekm                        Date: Fri Aug 26 09:38:32 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.16 SOURCES/kdelibs-branch.diff:1.17
--- SOURCES/kdelibs-branch.diff:1.16	Tue Aug  2 08:02:29 2005
+++ SOURCES/kdelibs-branch.diff	Fri Aug 26 11:38:27 2005
@@ -1,7 +1,7 @@
 Index: libkscreensaver/kscreensaver.cpp
 ===================================================================
---- libkscreensaver/kscreensaver.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ libkscreensaver/kscreensaver.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- libkscreensaver/kscreensaver.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ libkscreensaver/kscreensaver.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -65,6 +65,7 @@
      if ( w == 0 ) w = 600;
      if ( h == 0 ) h = 420;
@@ -26,8 +26,8 @@
  bool KScreenSaver::eventFilter( QObject *o, QEvent *e )
 Index: kate/part/katesearch.cpp
 ===================================================================
---- kate/part/katesearch.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ kate/part/katesearch.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- kate/part/katesearch.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kate/part/katesearch.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -130,6 +130,7 @@
    searchFlags.replace = false;
    searchFlags.finished = false;
@@ -44,10 +44,23 @@
  
    searchFlags.backward = searchFlags.backward != back;
    searchFlags.fromBeginning = false;
+Index: mimetypes/audio/x-scpls.desktop
+===================================================================
+--- mimetypes/audio/x-scpls.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ mimetypes/audio/x-scpls.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -31,7 +31,7 @@
+ Comment[hu]=MP3 ShoutCast-lejĂĄtszĂĄsi lista
+ Comment[id]=Playlist MP3 ShoutCast
+ Comment[is]=Mp3 ShoutCast lagalisti
+-Comment[it]=Playlist MP3 ShoutCast
++Comment[it]=Scaletta MP3 ShoutCast
+ Comment[ja]=MP3 ShoutCast ăƒ—ăƒŹă‚¤ăƒŞă‚šăƒˆ
+ Comment[ko]=MP3 ěƒ¤ěš°íŠ¸ěşěŠ¤íŠ¸ 연죟 목록
+ Comment[lt]=MP3 ShoutCast gaidaraĹĄtis
 Index: mimetypes/application/x-gettext.desktop
 ===================================================================
---- mimetypes/application/x-gettext.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ mimetypes/application/x-gettext.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- mimetypes/application/x-gettext.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ mimetypes/application/x-gettext.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -6,6 +6,7 @@
  Comment[az]=GNU Gettext Ä°smarÄąĹŸ Kataloqu
  Comment[bg]=ĐĄŃŠĐžĐąŃ‰ĐľĐ˝Đ¸Ń Са провОд (GNU Gettext)
@@ -56,10 +69,130 @@
  Comment[bs]=GNU Gettext katalog poruka
  Comment[ca]=CatĂ leg de missatges Gettext de GNU
  Comment[cs]=Katalog zprĂĄv (Gettext)
+Index: mimetypes/application/xsd.desktop
+===================================================================
+--- mimetypes/application/xsd.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ mimetypes/application/xsd.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -3,6 +3,7 @@
+ Comment=W3C XML Schema
+ Comment[af]=W3C XML Skema
+ Comment[bg]=ĐĄŃ
оПа W3C XML
++Comment[br]=SteuĂąv XML W3C
+ Comment[bs]=W3C XML ĹĄema
+ Comment[ca]=Esquema XML W3C
+ Comment[cs]=W3C XML schĂŠma
+Index: mimetypes/application/x-executable.desktop
+===================================================================
+--- mimetypes/application/x-executable.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ mimetypes/application/x-executable.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -6,6 +6,7 @@
+ Comment[az]=İcraçĹ Fayl
+ Comment[bg]=Đ˜ĐˇĐżŃŠĐťĐ˝Đ¸Đź фаКН
+ Comment[bn]=ŕŚŕŚ•ŕ§ŕŚ¸ŕŚżŕŚ•ŕŚżŕŚ‰ŕŚŸŕ§‡ŕŚŹŕŚ˛ ŕŚŤŕŚžŕŚ‡ŕŚ˛
++Comment[br]=Restr sevenadus
+ Comment[bs]=IzvrĹĄna datoteka
+ Comment[ca]=Fitxer executable
+ Comment[cs]=SpustitelnĂ˝ soubor
+Index: mimetypes/application/x-executable-script.desktop
+===================================================================
+--- mimetypes/application/x-executable-script.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ mimetypes/application/x-executable-script.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -4,6 +4,7 @@
+ Comment[af]=Skrip (moontlik uitvoerbaar)
+ Comment[bg]=Хкрипт (Đ˛ĐľŃ€ĐžŃŃ‚Đ˝Đž иСпъНниП)
+ Comment[bn]=ŕŚ¸ŕ§ŕŚ•ŕ§ŕŚ°ŕŚżŕŚŞŕ§ŕŚŸ (সম্ভবত ŕŚŕŚ•ŕ§ŕŚ¸ŕŚżŕŚ•ŕŚżŕŚ‰ŕŚŸŕ§‡ŕŚŹŕŚ˛)
++Comment[br]=Urzhiaoueg (marteze ur sevenadus)
+ Comment[bs]=Skripta (moĹžda izvrĹĄiva)
+ Comment[ca]=GuiĂł (possiblement executable)
+ Comment[cs]=Pravděpodobně spustitelný skript
+Index: mimetypes/application/vnd.stardivision.writer-global.desktop
+===================================================================
+--- mimetypes/application/vnd.stardivision.writer-global.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ mimetypes/application/vnd.stardivision.writer-global.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -8,6 +8,7 @@
+ Comment[af]=StarOffice skrywer Meester Dokument
+ Comment[bg]=ГНавон Đ´ĐžĐşŃƒĐźĐľĐ˝Ń‚ на StarOffice Writer
+ Comment[bn]=ŕŚ¸ŕ§ŕŚŸŕŚžŕŚ°-ŕŚ
ফিস ŕŚ°ŕŚžŕŚ‡ŕŚŸŕŚžŕŚ° ŕŚŽŕŚžŕŚ¸ŕ§ŕŚŸŕŚžŕŚ° ŕŚ¨ŕŚĽŕ§€
++Comment[br]=Teul mestr StarOffice Writer
+ Comment[bs]=StarOffice Writer glavni dokument
+ Comment[ca]=Document mestre de l'StarOffice Writer
+ Comment[cs]=HlavnĂ­ dokument aplikace StarOffice Writer
+Index: mimetypes/application/vnd.stardivision.draw.desktop
+===================================================================
+--- mimetypes/application/vnd.stardivision.draw.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ mimetypes/application/vnd.stardivision.draw.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -9,6 +9,7 @@
+ Comment[be]=ĐœĐ°ĐťŃŽĐ˝Đ°Đş StarOffice
+ Comment[bg]=Đ˜ĐˇĐžĐąŃ€Đ°ĐśĐľĐ˝Đ¸Đľ на StarOffice Drawing
+ Comment[bn]=ŕŚ¸ŕ§ŕŚŸŕŚžŕŚ°-ŕŚ
ফিস ŕŚĄŕ§ŕŚ°ŕ§ŸŕŚżŕŚ‚
++Comment[br]=Tresaner StarOffice
+ Comment[bs]=StarOffice crteĹž
+ Comment[ca]=Dibuix de StarOffice
+ Comment[cs]=KreslenĂ­ aplikace StarOffice Draw
+Index: kioslave/file/file.cc
+===================================================================
+--- kioslave/file/file.cc	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kioslave/file/file.cc	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -1445,7 +1445,7 @@
+     QString pmountProg = KGlobal::dirs()->findExe("pmount", path);
+ 
+     if (pmountProg.isEmpty())
+-        pmountProg = "pmount";
++        return false;
+ 
+     QCString buffer;
+     buffer.sprintf( "%s %s", QFile::encodeName(pmountProg).data(),
+Index: kioslave/http/kcookiejar/kcookiejar.cpp
+===================================================================
+--- kioslave/http/kcookiejar/kcookiejar.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kioslave/http/kcookiejar/kcookiejar.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -773,14 +773,24 @@
+         while ((*cookieStr == ';') || (*cookieStr == ' '))
+         {
+             cookieStr++;
+-            
++
+             // Name-Value pair follows
+             cookieStr = parseNameValue(cookieStr, Name, Value);
+ 
+             QCString cName = Name.lower().latin1();
+             if (cName == "domain")
+             {
+-                lastCookie->mDomain = Value.lower();
++                QString dom = Value.lower();
++                // RFC2965 3.2.2: If an explicitly specified value does not
++                // start with a dot, the user agent supplies a leading dot
++                if(dom.length() && dom[0] != '.')
++                    dom.prepend(".");
++                // remove a trailing dot
++                if(dom.length() > 2 && dom[dom.length()-1] == '.')
++                    dom = dom.left(dom.length()-1);
++
++                if(dom.contains('.') > 1 || dom == ".local")
++                    lastCookie->mDomain = dom;
+             }
+             else if (cName == "max-age")
+             {
+Index: kioslave/http/kcookiejar/tests/cookie_rfc.test
+===================================================================
+--- kioslave/http/kcookiejar/tests/cookie_rfc.test	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kioslave/http/kcookiejar/tests/cookie_rfc.test	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -38,6 +38,11 @@
+ COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=; Version=1; Path="/"; Max-Age=0
+ CHECK http://w.y.z/ Cookie: $Version=1; some_value2=foobar; $Path="/"
+ CLEAR COOKIES
++## Check if we prepend domain with a dot
++COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value2; Version=1; Path="/"; Domain=.y.z; Max-Age=3600
++COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value3; Version=1; Path="/"; Domain=y.z.; Max-Age=3600
++CHECK http://w.y.z/ Cookie: $Version=1; some_value=value3; $Path="/"; $Domain=".y.z"
++CLEAR COOKIES
+ ## Check if multiple cookies on a single line work
+ ## FIXME
+ #COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value3; Version=1; Path="/"; Max-Age=3600, some_value2=foobar; Version=1; Path="/"; Max-Age=3600
 Index: kioslave/ftp/ftp.protocol
 ===================================================================
---- kioslave/ftp/ftp.protocol	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ kioslave/ftp/ftp.protocol	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- kioslave/ftp/ftp.protocol	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kioslave/ftp/ftp.protocol	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -10,6 +10,7 @@
  writing=true
  makedir=true
@@ -68,10 +201,45 @@
  ProxiedBy=http
  Icon=ftp
  maxInstances=2
+Index: kimgio/psd.h
+===================================================================
+--- kimgio/psd.h	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kimgio/psd.h	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -10,11 +10,13 @@
+ #ifndef KIMG_PSD_H
+ #define KIMG_PSD_H
+ 
++#include <kdemacros.h>
++
+ class QImageIO;
+ 
+ extern "C" {
+-void kimgio_psd_read( QImageIO * );
+-void kimgio_psd_write( QImageIO * );
++KDE_EXPORT void kimgio_psd_read( QImageIO * );
++KDE_EXPORT void kimgio_psd_write( QImageIO * );
+ }
+ 
+ #endif
+Index: kio/kio/connection.cpp
+===================================================================
+--- kio/kio/connection.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kio/kio/connection.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -252,6 +252,10 @@
+ 		kdError(7017) << "Data read failed, errno=" << errno << endl;
+ 		return -1;
+ 	    }
++	    if ( !n ) { // 0 indicates end of file
++        	kdError(7017) << "Connection ended unexpectedly (" << n << "/" << bytesToGo << ")" << endl;
++      		return -1;
++    	    }
+ 
+ 	    bytesRead += n;
+ 	    bytesToGo -= n;
 Index: kio/kio/kmimemagic.cpp
 ===================================================================
---- kio/kio/kmimemagic.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ kio/kio/kmimemagic.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- kio/kio/kmimemagic.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kio/kio/kmimemagic.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -2262,6 +2262,15 @@
  			tmp += "src";
  		r->setMimeType(tmp);
@@ -90,8 +258,8 @@
  KMimeMagicResult *
 Index: kio/misc/kpac/eventsrc
 ===================================================================
---- kio/misc/kpac/eventsrc	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ kio/misc/kpac/eventsrc	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- kio/misc/kpac/eventsrc	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kio/misc/kpac/eventsrc	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -77,7 +77,7 @@
  Name[cy]=Sgript dirprwy annilys
  Name[da]=Ugyldigt proxy-script
@@ -110,10 +278,254 @@
  Comment[eo]=La ŝarĝita prokuragordoskript estas nevalida
  Comment[es]=El procedimiento descargado para la configuraciĂłn del proxy es invĂĄlido
  Comment[et]=Alla laaditud proxy seadistuse skript on vigane
+Index: kstyles/themes/light-v2.themerc
+===================================================================
+--- kstyles/themes/light-v2.themerc	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kstyles/themes/light-v2.themerc	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -4,6 +4,7 @@
+ Name[ar]=نŮ
ء ŘŽŮŮŠŮŘŒ التنقيح ال؍اني
+ Name[az]=YĂźngĂźl TÉ™rz, 2-ci buraxÄąlÄąĹŸ
+ Name[bn]=ŕŚ˛ŕŚžŕŚ‡ŕŚŸ ŕŚ¸ŕ§ŕŚŸŕŚžŕŚ‡ŕŚ˛, ŕŚŚŕ§ŕŚŹŕŚżŕŚ¤ŕ§€ŕ§Ÿ ŕŚ¸ŕŚ‚ŕŚ¸ŕ§ŕŚ•ŕŚ°ŕŚŁ
++Name[br]=Giz sklerijenn, eil stumm
+ Name[bs]=Light stil, druga revizija
+ Name[ca]=Estil Light, 2ona revisiĂł
+ Name[cs]=Light Style, druhĂĄ verze
+Index: kstyles/themes/light-v3.themerc
+===================================================================
+--- kstyles/themes/light-v3.themerc	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kstyles/themes/light-v3.themerc	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -4,6 +4,7 @@
+ Name[ar]=نŮ
ء ŘŽŮŮŠŮŘŒ التنقيح ال؍ال؍
+ Name[az]=YĂźngĂźl TÉ™rz, 3-cĂź buraxÄąlÄąĹŸ
+ Name[bn]=ŕŚ˛ŕŚžŕŚ‡ŕŚŸ ŕŚ¸ŕ§ŕŚŸŕŚžŕŚ‡ŕŚ˛, ŕŚ¤ŕ§ƒŕŚ¤ŕ§€ŕ§Ÿ ŕŚ¸ŕŚ‚ŕŚ¸ŕ§ŕŚ•ŕŚ°ŕŚŁ
++Name[br]=Giz sklerijenn, trede stumm
+ Name[bs]=Light stil, treća revizija
+ Name[ca]=Estil Light, 3era revisiĂł
+ Name[cs]=Light Style, třetí verze
+Index: kstyles/themes/highcolor.themerc
+===================================================================
+--- kstyles/themes/highcolor.themerc	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kstyles/themes/highcolor.themerc	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -62,6 +62,7 @@
+ Comment[az]=Klassik tÉ™rzin zÉ™ngin rÉ™ngli buraxÄąlÄąĹŸÄą
+ Comment[bg]=КНасичоски стиН на КДЕ с висОкО качоствО на цвотОвото
+ Comment[bn]=ŕŚ•ŕ§ŕŚ˛ŕŚžŕŚ¸ŕŚżŕŚ• ŕŚ¸ŕ§ŕŚŸŕŚžŕŚ‡ŕŚ˛ŕ§‡ŕŚ° ŕŚšŕŚžŕŚ‡-ŕŚ•ŕŚžŕŚ˛ŕŚžŕŚ° ŕŚ¸ŕŚ‚ŕŚ¸ŕ§ŕŚ•ŕŚ°ŕŚŁ
++Comment[br]=Stumm livioĂš uhel ar c'hiz da gustum
+ Comment[bs]=Highcolor verzija klasičnog stila
+ Comment[ca]=VersiĂł Highcolor de l'estil clĂ ssic
+ Comment[cs]=MnohobarevnĂĄ verze klasickĂŠho stylu
+Index: kstyles/themes/beos.themerc
+===================================================================
+--- kstyles/themes/beos.themerc	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kstyles/themes/beos.themerc	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -9,6 +9,7 @@
+ Comment[az]=Örtßksßz BeOS bənzəri tərz
+ Comment[be]=ĐĄŃ‚Ń‹ĐťŃŒ падОйны на BeOS (бяз Ń‚ŃĐź)
+ Comment[bg]=ХтиН йоС тоПа, пОдОйон на BeOS
++Comment[br]=Giz evel BeOS anwisket
+ Comment[bs]=Stil bez teme, sličan Beos-u
+ Comment[ca]=Estil del tipus BeOS sense temes
+ Comment[cs]=Styl podobnĂ˝ BeOS (bez motivu)
+Index: kstyles/web/web.themerc
+===================================================================
+--- kstyles/web/web.themerc	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kstyles/web/web.themerc	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -73,6 +73,7 @@
+ Comment[az]=Veb pəncərəcik tərzi
+ Comment[bg]=ХтиН, приНичащ на ŃƒĐľĐą графични Ойокти
+ Comment[bn]=ŕŚ“ŕ§Ÿŕ§‡ŕŚŹ ŕŚ‰ŕŚ‡ŕŚœŕ§‡ŕŚŸ ŕŚ¸ŕ§ŕŚŸŕŚžŕŚ‡ŕŚ˛
++Comment[br]=Giz widget gwiad
+ Comment[bs]=Stil ukrasa na webu
+ Comment[ca]=Estil d'objectes web
+ Comment[cs]=Styl prvkĹŻ webu
+Index: kabc/formats/binaryformat.cpp
+===================================================================
+--- kabc/formats/binaryformat.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kabc/formats/binaryformat.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -38,7 +38,7 @@
+ 
+ extern "C"
+ {
+-  FormatPlugin *format()
++  KDE_EXPORT FormatPlugin *format()
+   {
+     return new BinaryFormat;
+   }
+Index: knewstuff/downloaddialog.cpp
+===================================================================
+--- knewstuff/downloaddialog.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ knewstuff/downloaddialog.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -50,6 +50,7 @@
+ {
+     QString m_providerlist;
+     QWidget *m_page;
++    KListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l;
+ };
+ 
+ class NumSortListViewItem : public KListViewItem
+@@ -206,7 +207,6 @@
+   KTabCtl *ctl;
+   QWidget *w_d, *w_r, *w_l;
+   QWidget *w2;
+-  KListView *lvtmp_r, *lvtmp_d, *lvtmp_l;
+   QTextBrowser *rt;
+   QString tmp;
+   int ret;
+@@ -244,27 +244,27 @@
+   QHBoxLayout *box = new QHBoxLayout(frame);
+   box->add(ctl);
+ 
+-  lvtmp_r = new KListView(w_r);
+-  lvtmp_r->addColumn(i18n("Name"));
+-  lvtmp_r->addColumn(i18n("Version"));
+-  lvtmp_r->addColumn(i18n("Rating"));
+-  lvtmp_r->setSorting(2, false);
++  d->m_lvtmp_r = new KListView(w_r);
++  d->m_lvtmp_r->addColumn(i18n("Name"));
++  d->m_lvtmp_r->addColumn(i18n("Version"));
++  d->m_lvtmp_r->addColumn(i18n("Rating"));
++  d->m_lvtmp_r->setSorting(2, false);
+ 
+-  lvtmp_d = new KListView(w_d);
+-  lvtmp_d->addColumn(i18n("Name"));
+-  lvtmp_d->addColumn(i18n("Version"));
+-  lvtmp_d->addColumn(i18n("Downloads"));
+-  lvtmp_d->setSorting(2, false);
++  d->m_lvtmp_d = new KListView(w_d);
++  d->m_lvtmp_d->addColumn(i18n("Name"));
++  d->m_lvtmp_d->addColumn(i18n("Version"));
++  d->m_lvtmp_d->addColumn(i18n("Downloads"));
++  d->m_lvtmp_d->setSorting(2, false);
+ 
+-  lvtmp_l = new KListView(w_l);
+-  lvtmp_l->addColumn(i18n("Name"));
+-  lvtmp_l->addColumn(i18n("Version"));
+-  lvtmp_l->addColumn(i18n("Release Date"));
+-  lvtmp_l->setSorting(2, false);
++  d->m_lvtmp_l = new KListView(w_l);
++  d->m_lvtmp_l->addColumn(i18n("Name"));
++  d->m_lvtmp_l->addColumn(i18n("Version"));
++  d->m_lvtmp_l->addColumn(i18n("Release Date"));
++  d->m_lvtmp_l->setSorting(2, false);
+ 
+-  connect(lvtmp_r, SIGNAL(selectionChanged()), SLOT(slotSelected()));
+-  connect(lvtmp_d, SIGNAL(selectionChanged()), SLOT(slotSelected()));
+-  connect(lvtmp_l, SIGNAL(selectionChanged()), SLOT(slotSelected()));
++  connect(d->m_lvtmp_r, SIGNAL(selectionChanged()), SLOT(slotSelected()));
++  connect(d->m_lvtmp_d, SIGNAL(selectionChanged()), SLOT(slotSelected()));
++  connect(d->m_lvtmp_l, SIGNAL(selectionChanged()), SLOT(slotSelected()));
+ 
+   rt = new QTextBrowser(frame);
+   rt->setMinimumWidth(150);
+@@ -285,14 +285,14 @@
+   connect(de, SIGNAL(clicked()), SLOT(slotDetails()));
+ 
+   QVBoxLayout *box2 = new QVBoxLayout(w_r);
+-  box2->add(lvtmp_r);
++  box2->add(d->m_lvtmp_r);
+   QVBoxLayout *box3 = new QVBoxLayout(w_d);
+-  box3->add(lvtmp_d);
++  box3->add(d->m_lvtmp_d);
+   QVBoxLayout *box4 = new QVBoxLayout(w_l);
+-  box4->add(lvtmp_l);
++  box4->add(d->m_lvtmp_l);
+ 
+   QValueList<KListView*> *v = new QValueList<KListView*>;
+-  *v << lvtmp_r << lvtmp_d << lvtmp_l;
++  *v << d->m_lvtmp_r << d->m_lvtmp_d << d->m_lvtmp_l;
+   m_map[frame] = v;
+   m_rts[frame] = rt;
+   QValueList<QPushButton*> *vb = new QValueList<QPushButton*>;
+@@ -300,7 +300,7 @@
+   m_buttons[frame] = vb;
+   m_providers[frame] = p;
+ 
+-  kdDebug() << "addProvider()/end; lvtmp_r = " << lvtmp_r << endl;
++  kdDebug() << "addProvider()/end; d->m_lvtmp_r = " << d->m_lvtmp_r << endl;
+ 
+   if(m_engine) slotPage(frame);
+ 
+@@ -353,7 +353,7 @@
+   QDate date;
+   QString datestring;
+   int installed;
+- 
++
+   kapp->config()->setGroup("KNewStuffStatus");
+   datestring = kapp->config()->readEntry(entry->name());
+   if(datestring.isNull()) installed = 0;
+@@ -456,6 +456,9 @@
+ {
+   Entry *e = getEntry();
+   if(!e) return;
++  d->m_lvtmp_r->setEnabled( false );
++  d->m_lvtmp_l->setEnabled( false );
++  d->m_lvtmp_d->setEnabled( false );
+ 
+   kdDebug() << "download entry now" << endl;
+ 
+@@ -467,9 +470,7 @@
+   else
+   {
+     m_s = new KNewStuffGeneric(e->type(), this);
+-
+     m_entry = e;
+-
+     KURL source = e->payload();
+     KURL dest = KURL(m_s->downloadDestination(e));
+ 
+@@ -492,7 +493,7 @@
+   m_entryitem = lv_l->findItem(m_entryname, 0);
+   if(m_entryitem) m_entryitem->setPixmap(0, pix);
+ 
+- 
++
+   QPushButton *in;
+   in = *(m_buttons[d->m_page]->at(0));
+   if(in) in->setEnabled(false);
+@@ -502,7 +503,6 @@
+ {
+   bool ret = (job->error() == 0);
+   KIO::FileCopyJob *cjob;
+-
+   if(ret)
+   {
+     cjob = static_cast<KIO::FileCopyJob*>(job);
+@@ -520,6 +520,9 @@
+     KMessageBox::information(this, i18n("Installation successful."), i18n("Installation"));
+   }
+   else KMessageBox::error(this, i18n("Installation failed."), i18n("Installation"));
++  d->m_lvtmp_r->setEnabled( true );
++  d->m_lvtmp_l->setEnabled( true );
++  d->m_lvtmp_d->setEnabled( true );
+ 
+   delete m_s;
+ }
+Index: kdecore/eventsrc
+===================================================================
+--- kdecore/eventsrc	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kdecore/eventsrc	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -625,7 +625,7 @@
+ Comment[cy]=Methu agor y ffeil penodol i'w ddarllen neu i'w ysgrifennu.
+ Comment[da]=Den valgte fil kan ikke ĂĽbnes til lĂŚsning eller skrivning
+ Comment[de]=Die gewählte Datei kann nicht zum Lesen oder Schreiben geÜffnet werden.
+-Comment[el]=Το ξπΚΝξγΟένο ιρχξίο δξ Οπορξί νι ινοΚχθξί γΚι ξγγριφΎ ÎŽ ÎąÎ˝ÎŹÎłÎ˝Ď‰ĎƒÎˇ
++Comment[el]=Το ξπΚΝξγΟένο ιρχξίο δξν Οπορξί νι ινοΚχθξί γΚι ξγγριφΎ ÎŽ ÎąÎ˝ÎŹÎłÎ˝Ď‰ĎƒÎˇ
+ Comment[eo]=La elektita dosiero ne estas malfermebla por legado aĹ­ skribado
+ Comment[es]=El archivo seleccionado no se puede abrir para leer o escribir.
+ Comment[et]=Valitud faili pole vĂľimalik avada lugemiseks vĂľi kirjutamiseks.
+@@ -1605,6 +1605,7 @@
+ Name[be]=ІнфарПацыКнао ĐżĐ°Đ˛ĐľĐ´Đ°ĐźĐťĐľĐ˝ŃŒĐ˝Đľ
+ Name[bg]=Đ˜Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Đ¸Ń
+ Name[bn]=তথ্যবার্তা
++Name[br]=Kemennad a titouroĂš
+ Name[bs]=Informativna poruka
+ Name[ca]=Missatge informatiu
+ Name[cs]=Informační zpráva
 Index: khtml/khtmlview.cpp
 ===================================================================
---- khtml/khtmlview.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ khtml/khtmlview.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- khtml/khtmlview.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ khtml/khtmlview.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -2238,7 +2238,9 @@
              guard = node;
  	}
@@ -126,8 +538,8 @@
          emit m_part->nodeActivated(Node(node));
 Index: khtml/html/html_formimpl.cpp
 ===================================================================
---- khtml/html/html_formimpl.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ khtml/html/html_formimpl.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- khtml/html/html_formimpl.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ khtml/html/html_formimpl.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -954,16 +954,15 @@
  
  	if (!evt->defaultHandled() && m_render && m_render->isWidget()) {
@@ -151,8 +563,8 @@
              }
 Index: khtml/ecma/kjs_events.cpp
 ===================================================================
---- khtml/ecma/kjs_events.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ khtml/ecma/kjs_events.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- khtml/ecma/kjs_events.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ khtml/ecma/kjs_events.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -635,6 +635,9 @@
      return Boolean(static_cast<DOM::MouseEvent>(event).metaKey());
    case Button:
@@ -165,8 +577,8 @@
      int domButton = static_cast<DOM::MouseEvent>(event).button();
 Index: khtml/rendering/render_list.cpp
 ===================================================================
---- khtml/rendering/render_list.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ khtml/rendering/render_list.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- khtml/rendering/render_list.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ khtml/rendering/render_list.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -402,7 +402,7 @@
  
      m_markerWidth = m_width = 0;
@@ -178,8 +590,8 @@
              m_width = m_markerWidth;
 Index: khtml/rendering/render_object.cpp
 ===================================================================
---- khtml/rendering/render_object.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ khtml/rendering/render_object.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- khtml/rendering/render_object.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ khtml/rendering/render_object.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -1697,21 +1697,22 @@
  {
      // vertical align for table cells has a different meaning
@@ -209,8 +621,8 @@
              int fontheight = ref->lineHeight( firstLine );
 Index: khtml/rendering/render_replaced.cpp
 ===================================================================
---- khtml/rendering/render_replaced.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ khtml/rendering/render_replaced.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- khtml/rendering/render_replaced.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ khtml/rendering/render_replaced.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -513,7 +513,7 @@
              QWidget* const w = ::qt_cast<QWidget *>(it.current());
  	    if ( w && !w->isTopLevel() && !w->isHidden()) {
@@ -226,8 +638,8 @@
 svn:mime-type = application/x-jar
 Index: kresources/kresources.desktop
 ===================================================================
---- kresources/kresources.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 442272)
-+++ kresources/kresources.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 442272)
+--- kresources/kresources.desktop	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ kresources/kresources.desktop	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
 @@ -14,6 +14,7 @@
  Name[af]=KDE Hulpbronne
  Name[bg]=ХистоПни Ń€ĐľŃŃƒŃ€ŃĐ¸
@@ -244,10 +656,201 @@
  Comment[bs]=Podesite KDE resurse
  Comment[ca]=Configura els recursos KDE
  Comment[cs]=NastavenĂ­ zdrojĹŻ KDE
+Index: dcop/dcopsignals.cpp
+===================================================================
+--- dcop/dcopsignals.cpp	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
++++ dcop/dcopsignals.cpp	(.../branches/KDE/3.4/kdelibs)	(revision 453462)
+@@ -154,7 +154,7 @@
+ 
+    list->append( current );
+    conn->signalConnectionList()->append(current);
+-   if (senderConn)
++   if (senderConn && senderConn != conn)
+       senderConn->signalConnectionList()->append(current);
+    return true;
+ #else //!Q_OS_UNIX
+Index: pics/crystalsvg/cr64-action-player_play.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = image/png
+
+Property changes on: pics/crystalsvg/cr64-action-player_play.png
+___________________________________________________________________
+Name: svn:mime-type
+   + image/png
+
+Index: kdoctools/customization/pl/user.entities
+===================================================================
+--- kdoctools/customization/pl/user.entities	(.../tags/KDE/3.4.2/kdelibs)	(revision 453462)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.16&r2=1.17&f=u

More information about the pld-cvs-commit mailing list