[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kdelibs
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2010-09-07 20:10:09
Message-ID: 20100907201009.296A1AC769 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1172682 by tpearson:

* Imported all kdelibs bugfix patches from Chakra project


 M  +1 -0      kdeprint/kdeprintrc  
 M  +8 -8      khtml/ecma/kjs_dom.cpp  
 M  +0 -3      kio/kio/configure.in.in  
 M  +6 -4      kio/kio/kdirlister.cpp  
 M  +18 -0     kio/kio/kdirwatch.cpp  
 M  +1 -0      kioslave/http/http.cc  


--- branches/trinity/kdelibs/kdeprint/kdeprintrc #1172681:1172682
@@ -1,4 +1,5 @@
 [General]
+PrintSystem=cups
 Orientation=1
 ViewType=1
 ViewToolBar=false
--- branches/trinity/kdelibs/khtml/ecma/kjs_dom.cpp #1172681:1172682
@@ -335,26 +335,26 @@
 
     switch (token) {
     case OffsetLeft:
-      return rend ? static_cast<Value>( Number( rend->offsetLeft() ) ) : Undefined();
+      return rend ? static_cast<Value>( Number( rend->offsetLeft() ) ) : Number(0);
     case OffsetTop:
-      return rend ? static_cast<Value>(  Number( rend->offsetTop() ) ) : Undefined();
+      return rend ? static_cast<Value>(  Number( rend->offsetTop() ) ) : Number(0);
     case OffsetWidth:
-      return rend ? static_cast<Value>(  Number( rend->offsetWidth() ) ) : Undefined();
+      return rend ? static_cast<Value>(  Number( rend->offsetWidth() ) ) : Number(0);
     case OffsetHeight:
-      return rend ? static_cast<Value>(  Number( rend->offsetHeight() ) ) : Undefined();
+      return rend ? static_cast<Value>(  Number( rend->offsetHeight() ) ) : Number(0);
     case OffsetParent:
     {
       khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
       return getDOMNode( exec, par ? par->element() : 0 );
     }
     case ClientWidth:
-      return rend ? static_cast<Value>( Number( rend->clientWidth() ) ) : Undefined();
+      return rend ? static_cast<Value>( Number( rend->clientWidth() ) ) : Number(0);
     case ClientHeight:
-      return rend ? static_cast<Value>( Number( rend->clientHeight() ) ) : Undefined();
+      return rend ? static_cast<Value>( Number( rend->clientHeight() ) ) : Number(0);
     case ScrollWidth:
-      return rend ? static_cast<Value>( Number(rend->scrollWidth()) ) : Undefined();
+      return rend ? static_cast<Value>( Number(rend->scrollWidth()) ) : Number(0);
     case ScrollHeight:
-      return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Undefined();
+      return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Number(0);
     case ScrollLeft:
       if (rend && rend->layer()) {
           if (rend->isRoot() && !rend->style()->hidesOverflow())
--- branches/trinity/kdelibs/kio/kio/configure.in.in #1172681:1172682
@@ -130,9 +130,6 @@
 #ifndef IN_ALL_EVENTS
 #error no inotify notification
 #endif
-#ifndef __NR_inotify_init
-#error no __NR_inotify_init
-#endif
 
   ],kde_cv_have_inotify=yes,kde_cv_have_inotify=no)
 
--- branches/trinity/kdelibs/kio/kio/kdirlister.cpp #1172681:1172682
@@ -447,8 +447,11 @@
   url.adjustPath( -1 );
   TQString urlStr = url.url();
   TQPtrList<KDirLister> *holders = urlsCurrentlyHeld[urlStr];
-  Q_ASSERT( holders );
+  //Q_ASSERT( holders );
+  if ( holders )
+  {
   holders->removeRef( lister );
+  }
 
   // remove the dir from lister->d->lstDirs so that it doesn't contain things
   // that itemsInUse doesn't. When emitting the canceled signals lstDirs must
@@ -457,9 +460,8 @@
   lister->d->lstDirs.remove( lister->d->lstDirs.find( url ) );
 
   DirItem *item = itemsInUse[urlStr];
-  Q_ASSERT( item );
 
-  if ( holders->isEmpty() )
+  if ( holders && holders->isEmpty() )
   {
     urlsCurrentlyHeld.remove( urlStr ); // this deletes the (empty) holders list
     if ( !urlsCurrentlyListed[urlStr] )
@@ -486,7 +488,7 @@
       if ( notify )
         emit lister->clear( url );
 
-      if ( item->complete )
+      if ( item && item->complete )
       {
         kdDebug(7004) << k_funcinfo << lister << " item moved into cache: " << url << endl;
         itemsCached.insert( urlStr, item ); // TODO: may return false!!
--- branches/trinity/kdelibs/kio/kio/kdirwatch.cpp #1172681:1172682
@@ -73,6 +73,24 @@
 #define _S390_BITOPS_H
 #include <sys/inotify.h>
 
+#ifndef __NR_inotify_init
+#if defined(__i386__)
+#define __NR_inotify_init       291
+#define __NR_inotify_add_watch  292
+#define __NR_inotify_rm_watch   293
+#endif
+#if defined(__PPC__)
+#define __NR_inotify_init       275
+#define __NR_inotify_add_watch  276
+#define __NR_inotify_rm_watch   277
+#endif
+#if defined(__x86_64__)
+#define __NR_inotify_init       253
+#define __NR_inotify_add_watch  254
+#define __NR_inotify_rm_watch   255
+#endif
+#endif
+
 #ifndef  IN_ONLYDIR
 #define  IN_ONLYDIR 0x01000000
 #endif
--- branches/trinity/kdelibs/kioslave/http/http.cc #1172681:1172682
@@ -2850,6 +2850,7 @@
     m_responseHeader << TQString::fromLatin1(buf);
 
     if ((strncasecmp(buf, "HTTP", 4) == 0) ||
+    if ((strncasecmp(buf, "HTTP/", 5) == 0) ||
         (strncasecmp(buf, "ICY ", 4) == 0)) // Shoutcast support
     {
       if (strncasecmp(buf, "ICY ", 4) == 0)
[prev in list] [next in list] [prev in thread] [next in thread]