SOURCES: kdelibs-branch.diff - update; xembed fixes

arekm arekm at pld-linux.org
Thu Dec 13 19:58:51 CET 2007 

Author: arekm                        Date: Thu Dec 13 18:58:51 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update; xembed fixes

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.64 SOURCES/kdelibs-branch.diff:1.65
--- SOURCES/kdelibs-branch.diff:1.64	Sun Oct 21 10:37:13 2007
+++ SOURCES/kdelibs-branch.diff	Thu Dec 13 19:58:45 2007
@@ -1,7 +1,20 @@
+Index: mimetypes/multipart/x-mixed-replace.desktop
+===================================================================
+--- mimetypes/multipart/x-mixed-replace.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/multipart/x-mixed-replace.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -18,7 +18,7 @@
+ Comment[de]=Datenstrom (Server Push)
+ Comment[el]=Ροή από δεδομένα (προώθηση εξυπηρετητή)
+ Comment[eo]=Datumfluo (servosendata)
+-Comment[es]=Flujo de datos (envio del servidor)
++Comment[es]=Flujo de datos (envío del servidor)
+ Comment[et]=Andmevoog (server push)
+ Comment[eu]=Datu korrontea (Server push)
+ Comment[fa]=جریان داده( فشار کارساز)
 Index: mimetypes/application/x-tex-pk.desktop
 ===================================================================
---- mimetypes/application/x-tex-pk.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-tex-pk.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-tex-pk.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-tex-pk.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -17,7 +17,7 @@
  Comment[de]=Schriftpaket
  Comment[el]=Packed γραμματοσειρά
@@ -13,8 +26,8 @@
  Comment[fa]=قلم بسته‌ای
 Index: mimetypes/application/x-font-speedo.desktop
 ===================================================================
---- mimetypes/application/x-font-speedo.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-speedo.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-speedo.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-speedo.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -21,7 +21,7 @@
  Comment[de]=Speedo-Schriftart
  Comment[el]=Γραμματοσειρά Speedo
@@ -26,8 +39,8 @@
  Comment[fa]=قلم Speedo
 Index: mimetypes/application/x-font-ghostscript.desktop
 ===================================================================
---- mimetypes/application/x-font-ghostscript.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-ghostscript.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-ghostscript.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-ghostscript.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -21,7 +21,7 @@
  Comment[de]=Ghostscript-Schrift
  Comment[el]=Έγγραφο Ghostscript
@@ -39,8 +52,8 @@
  Comment[fa]=قلم Ghostscript
 Index: mimetypes/application/x-font-otf.desktop
 ===================================================================
---- mimetypes/application/x-font-otf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-otf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-otf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-otf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -17,7 +17,7 @@
  Comment[de]=OpenType-Schrift
  Comment[el]=Γραμματοσειρά OpenType
@@ -52,8 +65,8 @@
  Comment[fa]=قلم نوع باز
 Index: mimetypes/application/x-font-pcf.desktop
 ===================================================================
---- mimetypes/application/x-font-pcf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-pcf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-pcf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-pcf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -21,7 +21,7 @@
  Comment[de]=PCF-Bitmap-Schrift
  Comment[el]=Γραμματοσειρά PCF bitmap
@@ -63,10 +76,23 @@
  Comment[et]=PCF bittrasterfont
  Comment[eu]=PCF bitmap-en letra-tipoa
  Comment[fa]=قلم نگاشت بیت PCF
+Index: mimetypes/application/x-designer.desktop
+===================================================================
+--- mimetypes/application/x-designer.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-designer.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -44,7 +44,7 @@
+ Comment[mn]=Qt-Designer-Файл
+ Comment[ms]=Fail Qt Designer
+ Comment[mt]=Fajl Qt Designer
+-Comment[nb]=QT-designer fil
++Comment[nb]=Qt-designer-fil
+ Comment[nds]="Qt Designer"-Datei
+ Comment[ne]=Qt डिजाइनर फाइल
+ Comment[nl]=Qt Designer-bestand
 Index: mimetypes/application/x-java-applet.desktop
 ===================================================================
---- mimetypes/application/x-java-applet.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-java-applet.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-java-applet.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-java-applet.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -15,7 +15,7 @@
  Comment[cy]=Rhaglennig Java
  Comment[da]=Java-applet
@@ -78,8 +104,8 @@
  Comment[et]=Java aplett
 Index: mimetypes/application/x-font-snf.desktop
 ===================================================================
---- mimetypes/application/x-font-snf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-snf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-snf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-snf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -21,7 +21,7 @@
  Comment[de]=SNF-Bitmap-Schrift
  Comment[el]=Γραμματοσειρά SNF bitmap
@@ -91,8 +117,8 @@
  Comment[fa]=قلم نگاشت بیت SNF
 Index: mimetypes/application/x-font-ttc.desktop
 ===================================================================
---- mimetypes/application/x-font-ttc.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-ttc.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-ttc.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-ttc.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -17,7 +17,7 @@
  Comment[de]=TrueType-Schriftensammlung
  Comment[el]=Συλλογή γραμματοσειρών TrueType
@@ -104,8 +130,8 @@
  Comment[fa]=مجموعۀ قلم حقیقی
 Index: mimetypes/application/x-font-ttf.desktop
 ===================================================================
---- mimetypes/application/x-font-ttf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-ttf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-ttf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-ttf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -17,7 +17,7 @@
  Comment[de]=TrueType-Schrift
  Comment[el]=Γραμματοσειρά TrueType
@@ -117,8 +143,8 @@
  Comment[fa]=قلم حقیقی
 Index: mimetypes/application/x-afm.desktop
 ===================================================================
---- mimetypes/application/x-afm.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-afm.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-afm.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-afm.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -16,7 +16,7 @@
  Comment[de]=Metrische Informationen für PostScript-Schrift
  Comment[el]=Μετρικά γραμματοσειράς PostScript
@@ -128,10 +154,23 @@
  Comment[et]=PostScript fondimeetrika (PFM)
  Comment[eu]=PostScript letra-tipoen metrika
  Comment[fa]=اندازۀ قلم پست‌اسکریپت
+Index: mimetypes/application/x-javascript.desktop
+===================================================================
+--- mimetypes/application/x-javascript.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-javascript.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -17,7 +17,7 @@
+ Comment[de]=JavaScript-Datei
+ Comment[el]=Αρχείο κώδικα JavaScript
+ Comment[eo]=Javskripta dosiero
+-Comment[es]=Archivo JavaScipt
++Comment[es]=Archivo JavaScript
+ Comment[et]=JavaScripti fail
+ Comment[eu]=JavaScript fitxategia
+ Comment[fa]=پروندۀ جاوااسکریپت
 Index: mimetypes/application/x-tex-gf.desktop
 ===================================================================
---- mimetypes/application/x-tex-gf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-tex-gf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-tex-gf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-tex-gf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -17,7 +17,7 @@
  Comment[de]=Generische Schrift
  Comment[el]=Γενική γραμματοσειρά
@@ -143,8 +182,8 @@
  Comment[fa]=قلم عمومی
 Index: mimetypes/application/x-font-bdf.desktop
 ===================================================================
---- mimetypes/application/x-font-bdf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-bdf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-bdf.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-bdf.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -21,7 +21,7 @@
  Comment[de]=BDF-Bitmap-Schrift
  Comment[el]=Γραμματοσειρά BDF bitmap
@@ -156,8 +195,8 @@
  Comment[fa]=قلم نگاشت بیت BDF
 Index: mimetypes/application/x-font-type1.desktop
 ===================================================================
---- mimetypes/application/x-font-type1.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ mimetypes/application/x-font-type1.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- mimetypes/application/x-font-type1.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/application/x-font-type1.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -21,7 +21,7 @@
  Comment[de]=Type1-Schrift
  Comment[el]=Γραμματοσειρά PostScript Type1
@@ -167,10 +206,23 @@
  Comment[et]=PostScript Type1 font
  Comment[eu]=PostScript Type1 letra-tipoa
  Comment[fa]=قلم نوع ۱ پست‌اسکریپت
+Index: mimetypes/text/javascript.desktop
+===================================================================
+--- mimetypes/text/javascript.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ mimetypes/text/javascript.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -16,7 +16,7 @@
+ Comment[de]=JavaScript-Datei
+ Comment[el]=Αρχείο κώδικα JavaScript
+ Comment[eo]=Javskripta dosiero
+-Comment[es]=Archivo JavaScipt
++Comment[es]=Archivo JavaScript
+ Comment[et]=JavaScripti fail
+ Comment[eu]=JavaScript fitxategia
+ Comment[fa]=پروندۀ جاوااسکریپت
 Index: kioslave/http/kcookiejar/kcookiejar.cpp
 ===================================================================
---- kioslave/http/kcookiejar/kcookiejar.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ kioslave/http/kcookiejar/kcookiejar.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- kioslave/http/kcookiejar/kcookiejar.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kioslave/http/kcookiejar/kcookiejar.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -340,7 +340,7 @@
      bool secureRequest = (_url.find( L1("https://"), 0, false) == 0 ||
                            _url.find( L1("webdavs://"), 0, false) == 0);
@@ -200,8 +252,8 @@
      {
 Index: kioslave/http/http.cc
 ===================================================================
---- kioslave/http/http.cc	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ kioslave/http/http.cc	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- kioslave/http/http.cc	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kioslave/http/http.cc	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -3409,10 +3409,6 @@
  
    } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
@@ -239,10 +291,35 @@
          m_request.expireDate = expireDate;
          m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
       }
+Index: kinit/start_kdeinit_wrapper.c
+===================================================================
+--- kinit/start_kdeinit_wrapper.c	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kinit/start_kdeinit_wrapper.c	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -85,7 +85,7 @@
+    if(argc == 0)
+       return 1;
+    argv[0] = "start_kdeinit";
+-   execv("start_kdeinit",argv);
++   execvp("start_kdeinit",argv);
+    perror("start_kdeinit");
+    return 1;
+ }
+Index: kio/kio/karchive.cpp
+===================================================================
+--- kio/kio/karchive.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kio/kio/karchive.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -204,6 +204,7 @@
+     QDir dir( path );
+     if ( !dir.exists() )
+         return false;
++    dir.setFilter(dir.filter() | QDir::Hidden);
+     QStringList files = dir.entryList();
+     for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it )
+     {
 Index: kio/kio/kservice.cpp
 ===================================================================
---- kio/kio/kservice.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 727611)
-+++ kio/kio/kservice.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 727611)
+--- kio/kio/kservice.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kio/kio/kservice.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
 @@ -109,6 +109,7 @@
    entryMap.remove("Hidden");
    if (m_bDeleted)
@@ -287,10 +364,341 @@
       m_mapProps.insert( it.key(), QVariant( it.data()));
    }
  }
+Index: kio/misc/kpac/script.cpp
+===================================================================
+--- kio/misc/kpac/script.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kio/misc/kpac/script.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -64,7 +64,7 @@
+         static Address parse( const UString& ip )
+             { return Address( ip.qstring(), true ); }
+ 
+-        operator const in_addr_t() const {
++        operator in_addr_t() const {
+           const sockaddr_in* sin = m_address;
+           return sin->sin_addr.s_addr;
+         }
+@@ -167,7 +167,7 @@
+         virtual Value call( ExecState* exec, Object&, const List& args )
+         {
+             if ( args.size() != 1 ) return Undefined();
+-            try { Address::resolve( args[ 0 ].toString( exec ) ); }
++            try { ::Address::resolve( args[ 0 ].toString( exec ) ); }
+             catch ( const Address::Error& ) { return Boolean( false ); }
+             return Boolean( true );
+         }
+@@ -202,7 +202,7 @@
+         virtual Value call( ExecState* exec, Object&, const List& args )
+         {
+             if ( args.size() != 1 ) return Undefined();
+-            try { return Address::resolve( args[ 0 ].toString( exec ) ); }
++            try { return String(Address::resolve( args[ 0 ].toString( exec ))); }
+             catch ( const Address::Error& ) { return Undefined(); }
+         }
+     };
+@@ -217,7 +217,7 @@
+             char hostname[ 256 ];
+             gethostname( hostname, 255 );
+             hostname[ 255 ] = 0;
+-            try { return Address::resolve( hostname ); }
++            try { return String(Address::resolve( hostname )); }
+             catch ( const Address::Error& ) { return Undefined(); }
+         }
+     };
+Index: kio/misc/kpac/eventsrc
+===================================================================
+--- kio/misc/kpac/eventsrc	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kio/misc/kpac/eventsrc	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -41,7 +41,7 @@
+ Comment[mk]=Автоматска конфигурација на прокси
+ Comment[mn]=Автомат итгэмжилэгчийн тохиргоо
+ Comment[ms]=Penyelarasan Proksi Automatik
+-Comment[nb]=Automatisk mellomtjenerinstilling
++Comment[nb]=Automatisk mellomtjenerinnstilling
+ Comment[nds]=Proxy automaatsch instellen
+ Comment[ne]=स्वचालित प्रोक्सी कन्फिगरेसन
+ Comment[nl]=Automatische proxyconfiguratie
+Index: kabc/scripts/addressee.src.cpp
+===================================================================
+--- kabc/scripts/addressee.src.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kabc/scripts/addressee.src.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -379,9 +379,11 @@
+     text = e;
+   else {
+     QRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
+-    if ( realName().find( needQuotes ) != -1 )
+-      text = "\"" + realName() + "\" <" + e + ">";
+-    else
++    if ( realName().find( needQuotes ) != -1 ) {
++      QString name = realName();
++      name.replace( "\"", "\\\"" );
++      text = "\"" + name + "\" <" + e + ">";
++    } else
+       text = realName() + " <" + e + ">";
+   }
+ 
+Index: kabc/plugins/net/net.desktop
+===================================================================
+--- kabc/plugins/net/net.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kabc/plugins/net/net.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -37,6 +37,7 @@
+ Name[kk]=Желі
+ Name[km]=បណ្តាញ
+ Name[ko]=네트워크
++Name[ku]=Tor
+ Name[lb]=Netzwierk
+ Name[lt]=Tinklas
+ Name[lv]=Tīkls
+Index: kabc/plugins/dir/dir.desktop
+===================================================================
+--- kabc/plugins/dir/dir.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kabc/plugins/dir/dir.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -38,6 +38,7 @@
+ Name[kk]=Каталог
+ Name[km]=ថត
+ Name[ko]=자료방
++Name[ku]=Peldank
+ Name[lb]=Verzeechnis
+ Name[lt]=Aplankas
+ Name[lv]=Direktorija
+Index: kabc/kabc_manager.desktop
+===================================================================
+--- kabc/kabc_manager.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kabc/kabc_manager.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -34,6 +34,7 @@
+ Name[ja]=コンタクト
+ Name[kk]=Контакттар
+ Name[km]=ទំនាក់ទំនង
++Name[ku]=Tekilî
+ Name[lb]=Kontakter
+ Name[lt]=Kontaktai
+ Name[lv]=Kontakti
+Index: kdecore/kcmdlineargs.cpp
+===================================================================
+--- kdecore/kcmdlineargs.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kdecore/kcmdlineargs.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -396,6 +396,8 @@
+                int p = nextOption.find(' ');
+                if (p > 0)
+                   nextOption = nextOption.left(p);
++               if (nextOption[0] == '!')
++                  nextOption = nextOption.mid(1);
+                if (strncmp(nextOption.data(), "no", 2) == 0)
+                {
+                   nextOption = nextOption.mid(2);
+Index: kdecore/eventsrc
+===================================================================
+--- kdecore/eventsrc	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kdecore/eventsrc	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -614,7 +614,7 @@
+ Comment=There is more than one possible match
+ Comment[af]=Daar is meer as een moontlik ooreenkoms
+ Comment[be]=Знойдзена некалькі варыянтаў заканчэння
+-Comment[bg]=Повече от едно съвпадение са намерени
++Comment[bg]=Намерени са повече от едно съвпадение
+ Comment[bn]=একাধিক সম্ভাব্য পরিপূরক বর্তমান
+ Comment[br]=Tremen ur c'hendoare a zo
+ Comment[bs]=Postoji više od jednog mogućeg pogotka
+@@ -937,7 +937,7 @@
+ Comment=There was a serious error causing the program to exit
+ Comment[af]=Daar was 'n ernstige fout wat veroorsaak het dat die program beïendig is.
+ Comment[be]=Адбылася сур'ёзная памылка, якая прывяла да выхаду з праграмы
+-Comment[bg]=Появи се сериозна грешка, която предизвика прекъсване на програмата
++Comment[bg]=Появи се сериозна грешка, която предизвика спиране на програмата
+ Comment[bn]=একটি গুরুতর ত্রুটির দরুণ প্রোগ্রামটি থেমে গেছে
+ Comment[br]=Ur fazi grevus a voe pennabeg mont er-maez ar goulev.
+ Comment[bs]=Program je morao završiti zbog ozbiljne greške
+@@ -1404,7 +1404,7 @@
+ Comment[ar]=حدث خطأ كبير سيؤدي على الأقل الى ايقاف البرنامج
+ Comment[az]=Çox ciddi bir xəta yarandə və proqramı çıxmağa məcbur etdi
+ Comment[be]=Адбылася вельмі сур'ёзная памылка, якая прывяла да выхаду з праграмы
+-Comment[bg]=Появи се сериозна грешка, която предизвика прекъсване на програмата
++Comment[bg]=Появи се сериозна грешка, която предизвика спиране на програмата
+ Comment[bn]=একটি গম্ভীর ত্রুটির ফলে প্রোগ্রামটি থেমে গেছে
+ Comment[br]=Ur fazi grevus-tre a c'hoarvezas, a lakas d'an nebeutañ ar goulev da vont er-maez
+ Comment[bs]=Došlo je do vrlo ozbiljne greške koja je uzrokovala najmanje prekid programa
+@@ -1514,6 +1514,7 @@
+ Name[kk]=Кіру
+ Name[km]=ចូល
+ Name[ko]=로그인
++Name[ku]=Têketin
+ Name[lb]=Umellen
+ Name[lt]=Registracija
+ Name[lv]=Pieteikties
+@@ -1668,6 +1669,7 @@
+ Name[kk]=Шығу
+ Name[km]=ចេញ
+ Name[ko]=로그아웃
++Name[ku]=Derketin
+ Name[lb]=Ofmellen
+ Name[lt]=Išsiregistravimas
+ Name[lv]=Atteikties
+Index: kdecore/kconfigbase.h
+===================================================================
+--- kdecore/kconfigbase.h	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kdecore/kconfigbase.h	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -2008,6 +2008,12 @@
+ private:
+   class KConfigBasePrivate;
+   KConfigBasePrivate *d;
++
++  void writeEntry( const char *pKey, const QString &rValue,
++    bool bPersistent, bool bGlobal, bool bNLS, bool bExpand );
++  void writeEntry( const char *pKey, const QStringList &rValue,
++    char sep, bool bPersistent, bool bGlobal, bool bNLS, bool bExpand );
++
+ };
+ 
+ class KConfigGroupSaverPrivate;
+Index: kdecore/all_languages.desktop
+===================================================================
+--- kdecore/all_languages.desktop	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kdecore/all_languages.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -1568,7 +1568,7 @@
+ Name[da]=Kirkeslavisk
+ Name[de]=Kirchenslawisch
+ Name[eo]=Eklezia Slava
+-Name[es]=Eslávo eclesiástico
++Name[es]=Eslavo eclesiástico
+ Name[et]=Kirikuslaavi
+ Name[eu]=Church Eslaviera
+ Name[fa]=یوگوسلاویایی
+@@ -5097,6 +5097,7 @@
+ Name[kk]=Курдше
+ Name[km]=ឃឺដ
+ Name[ko]=쿠르드어
++Name[ku]=Kurdî
+ Name[lb]=Kurdesch
+ Name[lt]=Kurdų
+ Name[lv]=Kurdu
+@@ -10132,6 +10133,7 @@
+ Name[kk]=Түрікше
+ Name[km]=ទួរគី
+ Name[ko]=터키어
++Name[ku]=Tirkî
+ Name[lb]=Türkesch
+ Name[lt]=Turkų
+ Name[lv]=Turku
+Index: kdecore/kconfigbase.cpp
+===================================================================
+--- kdecore/kconfigbase.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kdecore/kconfigbase.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -1022,6 +1022,15 @@
+                                  bool bGlobal,
+                                  bool bNLS )
+ {
++   writeEntry(pKey, value, bPersistent,  bGlobal, bNLS, false);
++}
++
++void KConfigBase::writeEntry( const char *pKey, const QString& value,
++                                 bool bPersistent,
++                                 bool bGlobal,
++                                 bool bNLS,
++                                 bool bExpand )
++{
+   // the KConfig object is dirty now
+   // set this before any IO takes place so that if any derivative
+   // classes do caching, they won't try and flush the cache out
+@@ -1040,6 +1049,7 @@
+   aEntryData.mValue = value.utf8();  // set new value
+   aEntryData.bGlobal = bGlobal;
+   aEntryData.bNLS = bNLS;
++  aEntryData.bExpand = bExpand;
+ 
+   if (bPersistent)
+     aEntryData.bDirty = true;
+@@ -1121,7 +1131,7 @@
+                                   bool bPersistent, bool bGlobal,
+                                   bool bNLS)
+ {
+-   writeEntry(pKey, translatePath(path), bPersistent, bGlobal, bNLS);
++   writeEntry(pKey, translatePath(path), bPersistent, bGlobal, bNLS, true);
+ }
+ 
+ void KConfigBase::writePathEntry ( const QString& pKey, const QStringList &list,
+@@ -1147,7 +1157,7 @@
+       QString value = *it;
+       new_list.append( translatePath(value) );
+     }
+-  writeEntry( pKey, new_list, sep, bPersistent, bGlobal, bNLS );
++  writeEntry( pKey, new_list, sep, bPersistent, bGlobal, bNLS, true );
+ }
+ 
+ void KConfigBase::deleteEntry( const QString& pKey,
+@@ -1364,6 +1374,13 @@
+                                char sep , bool bPersistent,
+                                bool bGlobal, bool bNLS )
+ {
++  writeEntry(pKey, list, sep, bPersistent, bGlobal, bNLS, false);
++}
++
++void KConfigBase::writeEntry ( const char *pKey, const QStringList &list,
++                               char sep, bool bPersistent,
++                               bool bGlobal, bool bNLS, bool bExpand )
++{
+   if( list.isEmpty() )
+     {
+       writeEntry( pKey, QString::fromLatin1(""), bPersistent );
+@@ -1387,7 +1404,7 @@
+     }
+   if( str_list.at(str_list.length() - 1) == sep )
+     str_list.truncate( str_list.length() -1 );
+-  writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS );
++  writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand );
+ }
+ 
+ void KConfigBase::writeEntry ( const QString& pKey, const QValueList<int> &list,
+Index: kdecore/tests/kurltest.cpp
+===================================================================
+--- kdecore/tests/kurltest.cpp	(.../tags/KDE/3.5.8/kdelibs)	(wersja 748139)
++++ kdecore/tests/kurltest.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 748139)
+@@ -92,6 +92,7 @@
+   check( "KURL::isValid()", emptyURL.isValid() ? "TRUE":"FALSE", "FALSE");
+   check( "KURL::isEmpty()", emptyURL.isEmpty() ? "TRUE":"FALSE", "TRUE");
+   check( "prettyURL()", emptyURL.prettyURL(), "");
++  check( "isLocalFile()", emptyURL.isLocalFile()?"TRUE":"FALSE", "FALSE" );
+ 
+   emptyURL = "";
+   check( "KURL::isMalformed()", emptyURL.isMalformed() ? "TRUE":"FALSE", "TRUE");
+@@ -159,6 +160,15 @@
+   check("KURL::encodedHtmlRef()", url1.ref(), "%6a");
+   check("KURL::htmlRef()", url1.htmlRef(), "j");
+ 
++  KURL dxOffEagle( KURL("http://something/other.html"), "newpage.html?[{\"foo: bar\"}]" );
++  check("isValid", dxOffEagle.isValid() ? "OK" : "KO", "OK");
++  check("url", dxOffEagle.url(), QString("http://something/newpage.html?[{\"foo:%20bar\"}]") );
++
++  KURL javascript( KURL("javascript:window.location+\"__flashplugin_unique__\"") );
++  check("isValid", javascript.isValid() ? "OK" : "KO", "OK");
++  check("url", javascript.url(), QString("javascript:window.location+\"__flashplugin_unique__\"") );
++
++
+   u1 = "file:///home/dfaure/my#myref";
+   url1 = u1;
+   check("KURL::url()", url1.url(), "file:///home/dfaure/my#myref");
+@@ -288,6 +298,10 @@
+   check("KURL::prettyURL()", url15582.prettyURL(), "http://alain.knaff.linux.lu/bug-reports/kde/percentage%in%url.html");
+   check("KURL::url()", url15582.url(), "http://alain.knaff.linux.lu/bug-reports/kde/percentage%25in%25url.html");
+ 
++  KURL longUserName("http://thisisaverylongusername@foobar.com/");
++  check("KURL::prettyURL()", longUserName.prettyURL(), "http://thisisaverylongusername@foobar.com/");
++  check("KURL(KURL::prettyURL())", KURL(longUserName.prettyURL()).url(), "http://thisisaverylongusername@foobar.com/");
++
+   KURL whitespaceInUser("http://google.com%20%20%20@foobar.com/");
+   check("KURL::prettyURL()", whitespaceInUser.prettyURL(), "http://google.com%20%20%20@foobar.com/");
+ 
+@@ -609,7 +623,7 @@
+          "www.meinestadt.de&url_plain=http");
+   check("http: URL with empty path string", waba1.htmlURL(),
+          "http://www.meinestadt.de&amp;url_plain=http");
+- 
++
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdelibs-branch.diff?r1=1.64&r2=1.65&f=u

More information about the pld-cvs-commit mailing list