[PATCH 1 of 7] (issue36) read_and_verify_list expects utf8 filenames

Wald Commits scm-commit at wald.intevation.org
Thu Sep 18 15:47:15 CEST 2014


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1411037620 -7200
# Node ID 0495f9187c4b9905e9629e6c46d17b1c33076bde
# Parent  46f025a1450c15d9615d4c8019e9ad404843a161
(issue36) read_and_verify_list expects utf8 filenames.

diff -r 46f025a1450c -r 0495f9187c4b ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Thu Sep 18 15:44:21 2014 +0200
+++ b/ui/mainwindow.cpp	Thu Sep 18 12:53:40 2014 +0200
@@ -194,7 +194,7 @@
     QString availableFileName = mSettings.value("List/available").toString();
     QString installedFileName = mSettings.value("List/installed").toString();
     if (!availableFileName.isEmpty()) {
-        mListToInstall.readList(availableFileName.toLocal8Bit().constData());
+        mListToInstall.readList(availableFileName.toUtf8().constData());
         if (!mListToInstall.isValid()) {
             mCurState = TransferError;
             // Probably a bug when Qt fileName is encoded and cFileName
@@ -211,7 +211,7 @@
     }
 
     if (!installedFileName.isEmpty()) {
-        mInstalledList.readList(installedFileName.toLocal8Bit().constData());
+        mInstalledList.readList(installedFileName.toUtf8().constData());
         if (!mInstalledList.isValid()) {
             // Probably a bug when Qt fileName is encoded and cFileName
             // fails because of this. This needs a unit test!
@@ -276,6 +276,7 @@
 
         /* Retry the download again in 10 - 20 minutes */
         QTimer::singleShot(600000 + (qrand() % 60000), this, SLOT(checkUpdates()));
+        qDebug() << "Failed to verify list.";
     } else {
     if (mTrayIcon->isAlternative()) {
         mCurMessage = tr("An updated certificate list is available.");


More information about the Trustbridge-commits mailing list