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

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2008-01-04 15:17:42
Message-ID: 1199459862.922020.3873.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 757250 by amantia:

Do not keep an empty, Untitled document opened when opening new files.

BUG: 151682


 M  +1 -0      ChangeLog  
 M  +2 -1      components/debugger/dbgp/dbgpnetwork.cpp  
 M  +7 -2      components/debugger/dbgp/quantadebuggerdbgp.cpp  
 M  +4 -0      src/quantadoc.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/ChangeLog #757249:757250
@@ -3,6 +3,7 @@
 Version 3.5.8+:
  - bugfixes:
       - fix crashes when using XDebug
+      - do not keep an empty, Untitled document opened when opening new files [#151682]
 
 Version 3.5.8 (Release date: 07-10-2006)
  - bugfixes:
--- branches/KDE/3.5/kdewebdev/quanta/components/debugger/dbgp/dbgpnetwork.cpp #757249:757250
@@ -91,7 +91,8 @@
   if(m_socket)
   {
     m_socket->flush();
-    m_socket->close();
+    if (m_socket)
+      m_socket->close();
     delete m_socket;
   }
 
--- branches/KDE/3.5/kdewebdev/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp #757249:757250
@@ -277,6 +277,7 @@
          || command == "step_into" 
          || command == "step_out")
     {
+      handleError(response);
       // If this is the acknoledge of a step command, request the call stack 
       m_network.sendCommand("stack_get");
       setExecutionState(attribute(response, "status"));
@@ -346,8 +347,12 @@
     endSession();
     return;
   }
-
-  debuggerInterface()->setActiveLine(mapServerPathToLocal(attribute(initpacket, "fileuri")), 0);
+  QString path = attribute(initpacket, "fileuri");
+  if (path.startsWith("file://"))
+  {
+    path.remove(0, 7);
+  }
+  debuggerInterface()->setActiveLine(mapServerPathToLocal(path), 0);
   
   // Store some vars
   m_initialscript = attribute(initpacket, "fileuri");
--- branches/KDE/3.5/kdewebdev/quanta/src/quantadoc.cpp #757249:757250
@@ -99,6 +99,10 @@
   QuantaView *view = ViewManager::ref()->isOpened(url);
   if (!view || newfile)
   {
+    w = ViewManager::ref()->activeDocument();
+    if (w && !newfile && !w->isModified() && w->isUntitled() && !w->busy)
+         ViewManager::ref()->removeActiveView(false);
+
 /*    
     // no modi and new -> we can remove                           !!!!
     w = ViewManager::ref()->activeDocument();
[prev in list] [next in list] [prev in thread] [next in thread]