1 files changed, 16 insertions, 4 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index c9936c0..35e79cc 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -926,14 +926,26 @@ void MUCController::handleChangeSubjectRequest(const std::string& subject) {
        muc_->changeSubject(subject);
 }
 void MUCController::handleBookmarkRequest() {
        const JID jid = muc_->getJID();
-        MUCBookmark bookmark(jid, jid.toBare().toString());
-        bookmark.setPassword(password_);
+        // Prepare new bookmark for this room.
-        bookmark.setNick(nick_);
+        MUCBookmark roomBookmark(jid, jid.toBare().toString());
-        chatWindow_->showBookmarkWindow(bookmark);
+        roomBookmark.setPassword(password_);
+        roomBookmark.setNick(nick_);
+        // Check for existing bookmark for this room and, if it exists, use it instead.
+        std::vector<MUCBookmark> bookmarks = mucBookmarkManager_->getBookmarks();
+        foreach (const MUCBookmark& bookmark, bookmarks) {
+                if (bookmark.getRoom() == jid.toBare()) {
+                        roomBookmark = bookmark;
+                        break;
+                }
+        }
+        chatWindow_->showBookmarkWindow(roomBookmark);
 }
 void MUCController::handleConfigureRequest(Form::ref form) {
        if (form) {
                muc_->configureRoom(form);

diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index c9936c0..35e79cc 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -926,14 +926,26 @@ void MUCController::handleChangeSubjectRequest(const std::string& subject) {
926	muc_->changeSubject(subject);	926	muc_->changeSubject(subject);
927	}	927	}
928		928
929	void MUCController::handleBookmarkRequest() {	929	void MUCController::handleBookmarkRequest() {
930	const JID jid = muc_->getJID();	930	const JID jid = muc_->getJID();
931	MUCBookmark bookmark(jid, jid.toBare().toString());	931
932	bookmark.setPassword(password_);	932	// Prepare new bookmark for this room.
933	bookmark.setNick(nick_);	933	MUCBookmark roomBookmark(jid, jid.toBare().toString());
934	chatWindow_->showBookmarkWindow(bookmark);	934	roomBookmark.setPassword(password_);
		935	roomBookmark.setNick(nick_);
		936
		937	// Check for existing bookmark for this room and, if it exists, use it instead.
		938	std::vector<MUCBookmark> bookmarks = mucBookmarkManager_->getBookmarks();
		939	foreach (const MUCBookmark& bookmark, bookmarks) {
		940	if (bookmark.getRoom() == jid.toBare()) {
		941	roomBookmark = bookmark;
		942	break;
		943	}
		944	}
		945
		946	chatWindow_->showBookmarkWindow(roomBookmark);
935	}	947	}
936		948
937	void MUCController::handleConfigureRequest(Form::ref form) {	949	void MUCController::handleConfigureRequest(Form::ref form) {
938	if (form) {	950	if (form) {
939	muc_->configureRoom(form);	951	muc_->configureRoom(form);