rpms/kdelibs/devel kdelibs-3.5.3-kde#123315.patch,1.1,1.2

[fedora-cvs-commits redhat com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18705

Modified Files:
	kdelibs-3.5.3-kde#123315.patch 
Log Message:
cleanup kdelibs-3.5.3-kde#123315.patch


kdelibs-3.5.3-kde#123315.patch:
 kdirwatch.cpp |   75 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 52 insertions(+), 23 deletions(-)

Index: kdelibs-3.5.3-kde#123315.patch
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs-3.5.3-kde#123315.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.3-kde#123315.patch	29 Jun 2006 10:01:04 -0000	1.1
+++ kdelibs-3.5.3-kde#123315.patch	3 Jul 2006 06:45:02 -0000	1.2
@@ -1,7 +1,14 @@
-Index: kio/kio/kdirwatch.cpp
-===================================================================
---- kio/kio/kdirwatch.cpp	(Revision 555363)
-+++ kio/kio/kdirwatch.cpp	(Revision 555364)
+--- kio/kio/kdirwatch.cpp.kde#123315	2006-05-22 20:14:17.000000000 +0200
++++ kio/kio/kdirwatch.cpp	2006-07-03 08:40:04.000000000 +0200
+@@ -340,7 +340,7 @@
+   kdDebug(7001) << "Available methods: " << available << endl;
+ }
+ 
+-/* This should never be called, but doesn't harm */
++/* This is called on app exit (KStaticDeleter) */
+ KDirWatchPrivate::~KDirWatchPrivate()
+ {
+   timer->stop();
 @@ -407,9 +407,6 @@
        if ( event->len )
          path = QFile::decodeName( QCString( event->name, event->len ) );
@@ -22,10 +29,10 @@
 +                addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
 +              else
 +                addEntry(0, QFileInfo(e->path).dirPath(true), e, true);
-             }
++            }
 +            if ( event->mask & IN_IGNORED ) {
 +              e->wd = 0;
-+            }
+             }
              if ( event->mask & (IN_CREATE|IN_MOVED_TO) ) {
 -              kdDebug(7001) << "-->got new subfile " << path << " in " << e->path << endl;
 -
@@ -44,20 +51,25 @@
      return true;
    }
  
-@@ -782,6 +785,7 @@
+@@ -782,7 +785,9 @@
         (*it).m_entries.append(sub_entry);
         kdDebug(7001) << "Added already watched Entry " << path
  		     << " (for " << sub_entry->path << ")" << endl;
 +
  #ifdef HAVE_DNOTIFY
++     {
         Entry* e = &(*it);
         if( (e->m_mode == DNotifyMode) && (e->dn_fd > 0) ) {
-@@ -798,6 +802,21 @@
+          int mask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT;
+@@ -797,7 +802,25 @@
+            useStat( e );
           }
         }
- #endif
++     }
++#endif
 +
 +#ifdef HAVE_INOTIFY
++     {
 +       Entry* e = &(*it);
 +       if( (e->m_mode == INotifyMode) && (e->wd > 0) ) {
 +         int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
@@ -69,12 +81,13 @@
 +         inotify_rm_watch (m_inotify_fd, e->wd);
 +         e->wd = inotify_add_watch( m_inotify_fd, QFile::encodeName( e->path ), mask);
 +       }
-+#endif
++    }
+ #endif
 + 
      }
      else {
         (*it).addClient(instance);
-@@ -928,8 +947,12 @@
+@@ -928,8 +951,12 @@
          m_inotify_fd << ", "  << e->wd <<
          ") for " << e->path << endl;
      }
@@ -89,7 +102,7 @@
    }
  #endif
  
-@@ -1167,15 +1190,6 @@
+@@ -1167,15 +1194,6 @@
        return Changed;
      }
  
@@ -105,7 +118,7 @@
      return NoChange;
    }
  
-@@ -1278,7 +1292,7 @@
+@@ -1278,7 +1296,7 @@
    // removeDir(), when called in slotDirty(), can cause a crash otherwise
    delayRemove = true;
  
@@ -114,7 +127,7 @@
    QPtrList<Entry> dList, cList;
  #endif
  
-@@ -1306,6 +1320,16 @@
+@@ -1306,6 +1324,16 @@
  
      int ev = scanEntry( &(*it) );
  
@@ -131,7 +144,7 @@
  #ifdef HAVE_DNOTIFY
      if ((*it).m_mode == DNotifyMode) {
        if ((*it).isDir && (ev == Deleted)) {
-@@ -1337,7 +1361,7 @@
+@@ -1337,7 +1365,7 @@
    }
  
  
@@ -140,7 +153,7 @@
    // Scan parent of deleted directories for new creation
    Entry* e;
    for(e=dList.first();e;e=dList.next())
-@@ -1542,7 +1566,8 @@
+@@ -1542,7 +1570,8 @@
  	kdDebug(7001) << "    dependent entries:" << endl;
  	Entry* d = e->m_entries.first();
  	for(;d; d = e->m_entries.next()) {