2 files changed, 13 insertions, 16 deletions
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index 325edef..fbe85de 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -106,87 +106,80 @@ void QtTreeWidget::handleClicked(const QModelIndex& index) {
 
 QModelIndexList QtTreeWidget::getSelectedIndexes() const {
 	// Not using selectedIndexes(), because this seems to cause a crash in Qt (4.7.0) in the
 	// QModelIndexList destructor.
 	// This is a workaround posted in http://www.qtcentre.org/threads/16933 (although this case
 	// was resolved by linking against the debug libs, ours isn't, and we're not alone)
 	QItemSelection ranges = selectionModel()->selection();
 	QModelIndexList selectedIndexList;
 	for (int i = 0; i < ranges.count(); ++i) {
 		QModelIndex parent = ranges.at(i).parent();
 		int right = ranges.at(i).model()->columnCount(parent) - 1;
 		if (ranges.at(i).left() == 0 && ranges.at(i).right() == right) {
 			for (int r = ranges.at(i).top(); r <= ranges.at(i).bottom(); ++r) {
 				selectedIndexList.append(ranges.at(i).model()->index(r, 0, parent));
 			}
 		}
 	}
 	return selectedIndexList;
 }
 
 void QtTreeWidget::currentChanged(const QModelIndex& current, const QModelIndex& previous) {
 	RosterItem* item = NULL;
 	QModelIndexList selectedIndexList = getSelectedIndexes();
 	if (selectedIndexList.empty() || !selectedIndexList[0].isValid()) {
 		/* I didn't quite understand why using current didn't seem to work here.*/
 	}
 	else if (current.isValid()) {
 		item = static_cast<RosterItem*>(current.internalPointer());
 		item = dynamic_cast<ContactRosterItem*>(item);
 	}
 	onSomethingSelectedChanged(item);
 	QTreeView::currentChanged(current, previous);
 }
 
 void QtTreeWidget::handleItemActivated(const QModelIndex& index) {
-	switch (messageTarget_) {
-	case MessageDisplayJID: {
-		QString indexJID = index.data(DisplayJIDRole).toString();
-		if (!indexJID.isEmpty()) {
-			JID target = JID(Q2PSTRING(indexJID)).toBare();
-			eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(target)));
-			break;
-		}
+	JID target;
+	if (messageTarget_ == MessageDisplayJID) {
+		target = JID(Q2PSTRING(index.data(DisplayJIDRole).toString()));
+		target = target.toBare();
 	}
-	case MessageDefaultJID: {
-		QString indexJID = index.data(JIDRole).toString();
-		if (!indexJID.isEmpty()) {
-			JID target = JID(Q2PSTRING(indexJID));
-			eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(target)));
-		}
-		break;
+	if (!target.isValid()) {
+		target = JID(Q2PSTRING(index.data(JIDRole).toString()));
 	}
+	if (target.isValid()) {
+		eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(target)));
 	}
 }
 
 void QtTreeWidget::dragEnterEvent(QDragEnterEvent *event) {
 	if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1) {
 		event->acceptProposedAction();
 	}
 }
 
 void QtTreeWidget::dropEvent(QDropEvent *event) {
 	QModelIndex index = indexAt(event->pos());
 	if (index.isValid()) {
 		RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
 		if (ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item)) {
 			if (contact->supportsFeature(ContactRosterItem::FileTransferFeature)) {
 				QString filename = event->mimeData()->urls().at(0).toLocalFile();
 				if (!filename.isEmpty()) {
 					eventStream_->send(boost::make_shared<SendFileUIEvent>(contact->getJID(), Q2PSTRING(filename)));
 				}
 			}
 		}
 	}
 }
 
 void QtTreeWidget::dragMoveEvent(QDragMoveEvent* event) {
 	QModelIndex index = indexAt(event->pos());
 	if (index.isValid()) {
 		RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
 		if (ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item)) {
 			if (contact->supportsFeature(ContactRosterItem::FileTransferFeature)) {
 				event->accept();
 				return;
 			}
 		}
 	}
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index d8108ba..730ffbb 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -158,71 +158,75 @@ QColor RosterModel::getTextColor(RosterItem* item) const {
 
 QColor RosterModel::getBackgroundColor(RosterItem* item) const {
 	return dynamic_cast<ContactRosterItem*>(item) ? intToColor(0xFFFFFF) : intToColor(0x969696);
 }
 
 QString RosterModel::getToolTip(RosterItem* item) const {
 	QString tip(P2QSTRING(item->getDisplayName()));
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (contact) {
 		return RosterTooltip::buildDetailedTooltip(contact, cachedImageScaler_);
 	}
 	return tip;
 }
 
 QString RosterModel::getAvatar(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (!contact) {
 		return "";
 	}
 	return P2QSTRING(pathToString(contact->getAvatarPath()));
 }
 
 QString RosterModel::getStatusText(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (!contact) return "";
 	return P2QSTRING(contact->getStatusText());
 }
 
 QString RosterModel::getJID(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	return contact ? P2QSTRING(contact->getJID().toString()) : QString();
 }
 
 QString RosterModel::getDisplayJID(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
-	return contact ? P2QSTRING(contact->getDisplayJID().toString()) : QString();
+	QString result = contact ? P2QSTRING(contact->getDisplayJID().toString()) : QString();
+	if (result.isEmpty()) {
+		result = getJID(item);
+	}
+	return result;
 }
 
 QIcon RosterModel::getPresenceIcon(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (!contact) return QIcon();
 	if (contact->blockState() == ContactRosterItem::IsBlocked ||
 		contact->blockState() == ContactRosterItem::IsDomainBlocked) {
 		return QIcon(":/icons/stop.png");
 	}
 
 	return QIcon(statusShowTypeToIconPath(contact->getStatusShow()));
 }
 
 
 QModelIndex RosterModel::index(int row, int column, const QModelIndex& parent) const {
 	if (!roster_) {
 		return QModelIndex();
 	}
 	GroupRosterItem* parentItem;
 	if (!parent.isValid()) {
 		//top level
 		parentItem = roster_->getRoot();
 	} else {
 		parentItem = dynamic_cast<GroupRosterItem*>(getItem(parent));
 		if (!parentItem) return QModelIndex();
 	}
 	return static_cast<size_t>(row) < parentItem->getDisplayedChildren().size() ? createIndex(row, column, parentItem->getDisplayedChildren()[row]) : QModelIndex();
 }
 
 QModelIndex RosterModel::index(RosterItem* item) const {
 	GroupRosterItem* parent = item->getParent();
 	/* Recursive check that it's ok to create such an item 
 		Assuming there are more contacts in a group than groups in a 
 		group, this could save a decent chunk of search time at startup.*/
 	if (parent == NULL || roster_ == NULL || (parent != roster_->getRoot() && !index(parent).isValid())) {