Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2013-05-26 17:30:39 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2013-05-26 18:20:23 (GMT) |
| commit | 21089b48324fc48ab13e65bff2918f266d6d5967 (patch) | |
| tree | faeb2e7110e408d171c405f4a3b29c014546c9e2 | |
| parent | a20aeaf659b61d4f9ed6c4d72ee7bcb563c01cba (diff) | |
| download | swift-21089b48324fc48ab13e65bff2918f266d6d5967.zip swift-21089b48324fc48ab13e65bff2918f266d6d5967.tar.bz2 | |
Compile FreeDesktopNotifier again
Change-Id: Iea271740d1f2e0a8a81d9ca5914fe24172a379e4
| -rw-r--r-- | Swift/QtUI/FreeDesktopNotifier.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/QtCachedImageScaler.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Swift/QtUI/FreeDesktopNotifier.cpp b/Swift/QtUI/FreeDesktopNotifier.cpp index a51e482..1f1ccda 100644 --- a/Swift/QtUI/FreeDesktopNotifier.cpp +++ b/Swift/QtUI/FreeDesktopNotifier.cpp @@ -15,6 +15,8 @@ #include <algorithm> #include <Swiften/Base/Path.h> +#include <Swift/QtUI/QtSwiftUtil.h> + namespace Swift { FreeDesktopNotifier::FreeDesktopNotifier(const std::string& name) : applicationName(name) { @@ -44,7 +46,7 @@ void FreeDesktopNotifier::showMessage(Type type, const std::string& subject, con hints["x-canonical-append"] = QString("allowed"); msg << applicationName.c_str(); msg << quint32(0); // ID of previous notification to replace - msg << pathToString(imageScaler.getScaledImage(picture, 48)); // Icon to display + msg << P2QSTRING(pathToString(imageScaler.getScaledImage(picture, 48))); // Icon to display msg << subject.c_str(); // Summary / Header of the message to display msg << body; // Body of the message to display msg << actions; // Actions from which the user may choose diff --git a/Swift/QtUI/QtCachedImageScaler.cpp b/Swift/QtUI/QtCachedImageScaler.cpp index 9b1709b..45375e7 100644 --- a/Swift/QtUI/QtCachedImageScaler.cpp +++ b/Swift/QtUI/QtCachedImageScaler.cpp @@ -18,7 +18,8 @@ QtCachedImageScaler::QtCachedImageScaler() { boost::filesystem::path QtCachedImageScaler::getScaledImage(const boost::filesystem::path& imagePath, int size) { boost::filesystem::path scaledImagePath(imagePath); - scaledImagePath += "." + boost::lexical_cast<std::string>(size); + std::string suffix = "." + boost::lexical_cast<std::string>(size); + scaledImagePath = stringToPath(pathToString(scaledImagePath) + suffix); if (!boost::filesystem::exists(scaledImagePath)) { QImage image(P2QSTRING(pathToString(imagePath))); if (!image.isNull()) { |