summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-09-15 13:36:38 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-09-15 13:36:38 (GMT)
commit3c45ed7c3b62609824c0ea50f1ce9c00bbe00849 (patch)
tree9eb43ea5e4700c3058d5f7be162be2ca343fd6ce
parentbe7e9559a3973122649f5d42c25149750314c902 (diff)
downloadswift-3c45ed7c3b62609824c0ea50f1ce9c00bbe00849.zip
swift-3c45ed7c3b62609824c0ea50f1ce9c00bbe00849.tar.bz2
Mark a subscription request as read if you defer it.
Resolves: #505
-rw-r--r--Swift/QtUI/QtSubscriptionRequestWindow.cpp1
-rw-r--r--Swiften/Events/SubscriptionRequestEvent.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/Swift/QtUI/QtSubscriptionRequestWindow.cpp b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
index 59aeaae..e201808 100644
--- a/Swift/QtUI/QtSubscriptionRequestWindow.cpp
+++ b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
@@ -56,6 +56,7 @@ void QtSubscriptionRequestWindow::handleNo() {
}
void QtSubscriptionRequestWindow::handleDefer() {
+ event_->defer();
delete this;
}
diff --git a/Swiften/Events/SubscriptionRequestEvent.h b/Swiften/Events/SubscriptionRequestEvent.h
index ba3522b..4a998d7 100644
--- a/Swiften/Events/SubscriptionRequestEvent.h
+++ b/Swiften/Events/SubscriptionRequestEvent.h
@@ -34,6 +34,10 @@ namespace Swift {
conclude();
};
+ void defer() {
+ conclude();
+ }
+
private:
JID jid_;
String reason_;