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

List:       kde-commits
Subject:    kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2004-11-30 21:16:52
Message-ID: 20041130211652.7D25C1A36C () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

This should fix the "files are not selected for upload" bug. Unfortunately only for \
3.4 (3.3.2 is already tagged) or 3.3.3 if there will be any 3.3.3. Thanks for the \
report and the testcase!

BUG: 94167


  M +1 -0      ChangeLog   1.328
  M +6 -1      project/project.cpp   1.216
  M +1 -1      project/project.h   1.84
  M +7 -0      src/document.cpp   1.332
  M +1 -1      src/quanta.cpp   1.656


--- kdewebdev/quanta/ChangeLog  #1.327:1.328
@@ -46,4 +46,5 @@
         - parse PHP statements ending with a one-line comment ( //comment ?>)
           correctly [#80289]
+        - correctly select modified files for upload [#94167]
 
 

--- kdewebdev/quanta/project/project.cpp  #1.215:1.216
@@ -828,5 +828,5 @@ bool Project::contains(const KURL& url)
 }
 
-void Project::updateTimeStamp(const KURL& url, int modifiedTime)
+void Project::updateTimeStamp(const KURL& url, int modifiedTime, bool \
modifiedTimeOnly)  {
   ProjectURL *proUrl = d->m_projectFiles.find(url);
@@ -835,4 +835,9 @@ void Project::updateTimeStamp(const KURL
 
   QDomElement itemEl = proUrl->domElement;
+  if (modifiedTimeOnly)
+  {
+    itemEl.setAttribute("modified_time", modifiedTime);
+    return;
+  }
   int origModifTime = itemEl.attribute("modified_time","1").toInt();
   QString qurl = QuantaCommon::qUrl(d->m_projectFiles.toRelative(*proUrl));

--- kdewebdev/quanta/project/project.h  #1.83:1.84
@@ -98,5 +98,5 @@ public:
   QString password(const QString &entry);
   bool passwordSaved(const QString &entry);
-  void updateTimeStamp(const KURL& url, int modifiedTime);
+  void updateTimeStamp(const KURL& url, int modifiedTime, bool modifiedTimeOnly);
   QDomDocument *dom();
   QString debuggerClient();

--- kdewebdev/quanta/src/document.cpp  #1.331:1.332
@@ -581,4 +581,11 @@ int Document::createTempFile(bool dump)
     QExtFileInfo::copy(url(), KURL::fromPathOrURL(m_tempFileName));
  }
+  KIO::UDSEntry entry;
+  if (KIO::NetAccess::stat(url(), entry, this))
+  {
+    KFileItem item(entry, url(), true);
+    int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
+    Project::ref()->updateTimeStamp(url(), modifiedTime, true);
+  }
 // kdDebug(24000) << "Creating tempfile " << m_tempFileName << " for " << url() << \
endl;  return 1;

--- kdewebdev/quanta/src/quanta.cpp  #1.655:1.656
@@ -1452,5 +1452,5 @@ void QuantaApp::restoreFromTempfile(Docu
     KFileItem item(entry, origUrl, true);
     int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
-    Project::ref()->updateTimeStamp(origUrl, modifiedTime);
+    Project::ref()->updateTimeStamp(origUrl, modifiedTime, false);
   }
   if (origUrl.isLocalFile())


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