diff options
author | Remko Tronçon <git@el-tramo.be> | 2010-09-15 16:40:20 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2010-09-15 16:41:16 (GMT) |
commit | c0ea59aed73b5425ad78e6bdb6f8f12e2b44567e (patch) | |
tree | bc111c071c92911d7e9745c86c8cdfac69cd64e7 /Swift/Controllers | |
parent | 3c45ed7c3b62609824c0ea50f1ce9c00bbe00849 (diff) | |
download | swift-c0ea59aed73b5425ad78e6bdb6f8f12e2b44567e.zip swift-c0ea59aed73b5425ad78e6bdb6f8f12e2b44567e.tar.bz2 |
Added Snarl notification support
Diffstat (limited to 'Swift/Controllers')
-rw-r--r-- | Swift/Controllers/PresenceNotifier.cpp | 2 | ||||
-rw-r--r-- | Swift/Controllers/UnitTest/PresenceNotifierTest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/PresenceNotifier.cpp b/Swift/Controllers/PresenceNotifier.cpp index ce7ae40..0c46f9b 100644 --- a/Swift/Controllers/PresenceNotifier.cpp +++ b/Swift/Controllers/PresenceNotifier.cpp @@ -90,7 +90,7 @@ void PresenceNotifier::showNotification(const JID& jid, Notifier::Type type) { } String title = name + " (" + getStatusType(jid) + ")"; String message = getStatusMessage(jid); - notifier->showMessage(type, title, message, avatarManager->getAvatar(jid), boost::bind(&PresenceNotifier::handleNotificationActivated, this, jid)); + notifier->showMessage(type, title, message, avatarManager->getAvatarPath(jid), boost::bind(&PresenceNotifier::handleNotificationActivated, this, jid)); } void PresenceNotifier::handleNotificationActivated(JID jid) { diff --git a/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp b/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp index 85433f3..a410665 100644 --- a/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp +++ b/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp @@ -145,7 +145,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture { sendPresence(user1, StatusShow::Online); CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(notifier->notifications.size())); - CPPUNIT_ASSERT_EQUAL(ByteArray("abcdef"), notifier->notifications[0].picture); + CPPUNIT_ASSERT_EQUAL(boost::filesystem::path("/avatars/user1@bar.com/bla"), notifier->notifications[0].picture); } void testNotificationActivationEmitsSignal() { |