diff -Nru itmages-dolphin-extension-1.09.1/debian/bzr-builder.manifest itmages-dolphin-extension-1.10/debian/bzr-builder.manifest --- itmages-dolphin-extension-1.09.1/debian/bzr-builder.manifest 2013-03-13 02:20:33.000000000 +0000 +++ itmages-dolphin-extension-1.10/debian/bzr-builder.manifest 2013-08-22 02:27:59.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~9 -lp:~itmages/itmages/itmages-dolphin-extension revid:git-v1:d5674b1d9cde8ff53379d52f01a6d0e5f102f848 +# bzr-builder format 0.3 deb-version {debupstream}-0~10 +lp:~itmages/itmages/itmages-dolphin-extension revid:git-v1:391f2d0e048915b4d8cf62e3836758f72275ede0 diff -Nru itmages-dolphin-extension-1.09.1/debian/changelog itmages-dolphin-extension-1.10/debian/changelog --- itmages-dolphin-extension-1.09.1/debian/changelog 2013-03-13 02:20:33.000000000 +0000 +++ itmages-dolphin-extension-1.10/debian/changelog 2013-08-22 02:27:59.000000000 +0000 @@ -1,8 +1,14 @@ -itmages-dolphin-extension (1.09.1-0~9~raring1) raring; urgency=low +itmages-dolphin-extension (1.10-0~10~raring1) raring; urgency=low * Auto build. - -- ITmages team Wed, 13 Mar 2013 02:20:34 +0000 + -- ITmages team Thu, 22 Aug 2013 02:27:59 +0000 + +itmages-dolphin-extension (1.10) natty; urgency=low + + * Fixed server answer parsing. + + -- Raizner Evgeniy Wed, 21 Aug 2013 12:00:00 +0200 itmages-dolphin-extension (1.09.1) natty; urgency=low diff -Nru itmages-dolphin-extension-1.09.1/itmages-dolphin-extension.pro itmages-dolphin-extension-1.10/itmages-dolphin-extension.pro --- itmages-dolphin-extension-1.09.1/itmages-dolphin-extension.pro 2013-03-13 02:20:33.000000000 +0000 +++ itmages-dolphin-extension-1.10/itmages-dolphin-extension.pro 2013-08-22 02:27:59.000000000 +0000 @@ -18,17 +18,6 @@ TRANSLATIONS = itmages-dolphin-extension_ru.ts CODECFORSRC = UTF-8 -# generate translations -#isEmpty(QMAKE_LRELEASE) { -# !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } -#} -#updateqm.input = TRANSLATIONS -#updateqm.output = ${QMAKE_FILE_BASE}.qm -#updateqm.commands = $$QMAKE_LRELEASE -silent ${QMAKE_FILE_IN} \ -# -qm ${QMAKE_FILE_BASE}.qm -#updateqm.CONFIG += no_link target_predeps -#QMAKE_EXTRA_COMPILERS += updateqm - unix { isEmpty(PREFIX):PREFIX = /usr diff -Nru itmages-dolphin-extension-1.09.1/src/itmagesuploader.cpp itmages-dolphin-extension-1.10/src/itmagesuploader.cpp --- itmages-dolphin-extension-1.09.1/src/itmagesuploader.cpp 2013-03-13 02:20:33.000000000 +0000 +++ itmages-dolphin-extension-1.10/src/itmagesuploader.cpp 2013-08-22 02:27:59.000000000 +0000 @@ -199,21 +199,29 @@ QStringList args = reply.split(";;"); if (reply.contains(QRegExp("action:upload;;status:True;;full.*filename"))) { for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->imgPath() == args.filter("filename:").first().remove("filename:")){ - if (reply.contains(QRegExp("id|key|server|short|small|full"))) { - itemList.at(i)->createLinks(args.filter("id:").first().remove("id:"), - args.filter("key").first().remove("key:"), - args.filter("server").first().remove("server:"), - args.filter("short").first().remove("short:"), - args.filter("small").first().remove("small:"), - args.filter("full").first().remove("full:")); - } else { - QMessageBox::warning(this,"Warning - ITmages Uploader", - tr("Server returned wrong image info.\n" - "Please, try again."), - QMessageBox::Ok); + bool isInfoError = true; + QString fileName; + if (!args.filter("filename:").isEmpty()) + fileName = args.filter("filename:").first().remove("filename:"); + if (!fileName.isEmpty()) { + if (itemList.at(i)->imgPath() == fileName){ + if (reply.contains(QRegExp("id|key|server|short|small|full"))) { + itemList.at(i)->createLinks(args.filter("id:").first().remove("id:"), + args.filter("key").first().remove("key:"), + args.filter("server").first().remove("server:"), + args.filter("short").first().remove("short:"), + args.filter("small").first().remove("small:"), + args.filter("full").first().remove("full:")); + isInfoError = false; + } } } + if (isInfoError) { + QMessageBox::warning(this,"Warning - ITmages Uploader", + tr("Server returned wrong image info.\n" + "Please, try again."), + QMessageBox::Ok); + } } } else if (reply.contains("action:upload;;status:True;;reason:Done")) {