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

List:       kde-commits
Subject:    extragear/network/kmldonkey
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2012-03-25 15:52:10
Message-ID: 20120325155210.EC001AC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1287106 by sebsauer:

Fix two serious issues and release 2.1.3

 M  +1 -0      ChangeLog  
 M  +6 -2      libkmldonkey/donkeyprotocol.cpp  
 M  +2 -0      qml/FilesModel.cpp  
 M  +1 -1      qml/KMLDonkey.pro.user  
 M  +1 -1      qml/qml/KMLDonkey/AboutDialog.qml  
 M  +2 -2      qml/qml/KMLDonkey/ConsolePage.qml  
 M  +7 -0      qml/qtc_packaging/debian_harmattan/changelog  


--- trunk/extragear/network/kmldonkey/ChangeLog #1287105:1287106
@@ -1,3 +1,4 @@
+2012-03-25 KMLDonkey 2.1.3 relased - fix segfault and made new downloads show up \
instantly.  2012-03-25 KMLDonkey 2.1.2 relased - various bugfixes and optimizations \
for the QML-based version.  2012-03-24 KMLDonkey 2.1.1 relased - various bugfixes and \
some more features for the QML-based version.  2012-03-19 KMLDonkey 2.1.0 released \
with tons of bugfixes, performance-improvements and a QML-based version for the \
                MeeGo-Harmattan Nokia N9 device.
--- trunk/extragear/network/kmldonkey/libkmldonkey/donkeyprotocol.cpp \
#1287105:1287106 @@ -743,9 +743,13 @@
             int i, j = msg->readInt16();
             for (i=0; i<j; i++) {
                 QString name = msg->readString();
-                if(i==0) defSearch = name; // first item is always the default one
-                defSearches.insert(name, SearchQuery::getQuery(msg));
+                SearchQuery *sq = SearchQuery::getQuery(msg);
+                if (sq) {
+                    if (defSearch.isEmpty()) defSearch = name; // first item is \
always the default one +                    sq->setParent(this);
+                    defSearches.insert(name, sq);
             }
+            }
             emit definedSearchesUpdated();
         } break;
 
--- trunk/extragear/network/kmldonkey/qml/FilesModel.cpp #1287105:1287106
@@ -354,8 +354,10 @@
         updatedFile(fileNo, DonkeyProtocol::File_info);
     } else {
         qDebug() << "FilesModel::addedFile(" << fileNo << ")";
+        beginResetModel();
         QByteArray identifier = QByteArray::number(fileNo);
         d->addIdentifier(identifier);
+        endResetModel();
         emit fileChanged(identifier);
     }
 }
--- trunk/extragear/network/kmldonkey/qml/KMLDonkey.pro.user #1287105:1287106
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2012-03-25T09:26:15. -->
+<!-- Written by Qt Creator 2.4.1, 2012-03-25T16:44:46. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
--- trunk/extragear/network/kmldonkey/qml/qml/KMLDonkey/AboutDialog.qml \
#1287105:1287106 @@ -14,7 +14,7 @@
             anchors.horizontalCenter: parent.horizontalCenter
             font.pixelSize: 28
             color: "#c0c0ff"
-            text: "KMLDonkey 2.1.2"
+            text: "KMLDonkey 2.1.3"
         }
         Text {
             anchors.horizontalCenter: parent.horizontalCenter
--- trunk/extragear/network/kmldonkey/qml/qml/KMLDonkey/ConsolePage.qml \
#1287105:1287106 @@ -12,7 +12,7 @@
             right: parent.right
             top: parent.top
         }
-        placeholderText: "Command, '?' for help"
+        placeholderText: qsTr("Command, '?' for help")
         onAccepted: {
             var command = text.trim()
             if (command.length < 1)
@@ -21,7 +21,7 @@
                 Manager.sendConsoleMessage(command);
                 text = "";
             } else {
-                consoleOutput.text = "Cannot send console command '" + command + "' \
cause you are not connected to a host\n"; +                consoleOutput.text = \
qsTr("Disconnected");  }
         }
     }
--- trunk/extragear/network/kmldonkey/qml/qtc_packaging/debian_harmattan/changelog \
#1287105:1287106 @@ -1,3 +1,10 @@
+kmldonkey (2.1.3) unstable; urgency=low
+
+  * Fix segfault caused by wrong object-ownership of search-queries
+  * Fix new downloads did not show up instantly on the transfer-page
+
+ -- Sebastian Sauer <mail@dipe.org>  Mon, 25 Mar 2012 21:44:31 +0100
+
 kmldonkey (2.1.2) unstable; urgency=low
 
   * Fix query-string sometimes not proper displayed on Search-page for new searches


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