Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-10-05 11:11:29 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-10-05 11:11:29 (GMT) |
| commit | 8159071adb232b68c2ce79479145fbcd04979245 (patch) | |
| tree | 9282fc76499719c18fa9c9e892535d2f46030b43 /Swift/Controllers/UnitTest | |
| parent | 4c942cbb0b76383bfad10b3677a75a52f9193cf7 (diff) | |
| download | swift-contrib-8159071adb232b68c2ce79479145fbcd04979245.zip swift-contrib-8159071adb232b68c2ce79479145fbcd04979245.tar.bz2 | |
Don't crash with label item without a label
Diffstat (limited to 'Swift/Controllers/UnitTest')
| -rw-r--r-- | Swift/Controllers/UnitTest/MockChatWindow.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h index 58e8698..7b90a57 100644 --- a/Swift/Controllers/UnitTest/MockChatWindow.h +++ b/Swift/Controllers/UnitTest/MockChatWindow.h @@ -34,7 +34,7 @@ namespace Swift { virtual void setUnreadMessageCount(int /*count*/) {}; virtual void convertToMUC() {}; virtual void setSecurityLabelsError() {}; - virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() {return SecurityLabelsCatalog::Item();}; + virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() {return label_;} virtual void setInputEnabled(bool /*enabled*/) {}; virtual void setRosterModel(Roster* /*roster*/) {}; virtual void setTabComplete(TabComplete*) {}; @@ -50,14 +50,11 @@ namespace Swift { virtual void showRoomConfigurationForm(Form::ref) {} virtual void addMUCInvitation(const JID& /*jid*/, const std::string& /*reason*/, const std::string& /*password*/) {}; - boost::signal<void ()> onClosed; - boost::signal<void ()> onAllMessagesRead; - boost::signal<void (const std::string&, bool isCorrection)> onSendMessageRequest; - std::string name_; std::string lastMessageBody_; std::vector<SecurityLabelsCatalog::Item> labels_; bool labelsEnabled_; + SecurityLabelsCatalog::Item label_; }; } |