Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use AddressManager, rather than adding a trampoline to hostname in

Browse source 
AddressBarDialog.
This commit is contained in:
howard-stearns 2016-07-15 14:44:27 -07:00
parent 87e54482dd
commit 562446e7b8
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/AddressBarDialog.qml
View file

@ -305,7 +305,7 @@ Window {
console.log('domain query failed:', error);
return filterChoicesByText();
}
var here = addressBarDialog.getHost(); // don't show where we are now.
var here = AddressManager.hostname; // don't show where we are now.
allDomains = domains.filter(function (domain) { return domain.name !== here; });
allDomains.sort(function (a, b) { return b.online_users - a.online_users; });
// Whittle down suggestions to those that have at least one user, and try to get pictures.

4
interface/src/ui/AddressBarDialog.cpp
View file

@ -40,10 +40,6 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
_forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty());
}
QString AddressBarDialog::getHost() const {
return DependencyManager::get<AddressManager>()->getHost();
}
void AddressBarDialog::loadAddress(const QString& address) {
qDebug() << "Called LoadAddress with address " << address;
if (!address.isEmpty()) {

1
interface/src/ui/AddressBarDialog.h
View file

@ -34,7 +34,6 @@ protected:
void displayAddressOfflineMessage();
void displayAddressNotFoundMessage();
Q_INVOKABLE QString getHost() const;
Q_INVOKABLE void loadAddress(const QString& address);
Q_INVOKABLE void loadHome();
Q_INVOKABLE void loadBack();