@@ -18,10 +18,6 @@
|
||||
<label>Show notifications</label>
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="ConfirmLinksAction" type="bool">
|
||||
<label>Confirm link before opening them</label>
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="MergeRoomList" type="bool">
|
||||
<label>Merge Room Lists</label>
|
||||
<default>false</default>
|
||||
|
||||
@@ -164,15 +164,9 @@ void RoomManager::joinRoom(Quotient::Connection *account,
|
||||
|
||||
bool RoomManager::visitNonMatrix(const QUrl &url)
|
||||
{
|
||||
// Return true if the user cancels, treating it as an alternative normal
|
||||
// flow (rather than an abnormal flow when the navigation itself fails).
|
||||
if (NeoChatConfig::self()->confirmLinksAction()) {
|
||||
Q_EMIT openLink(url);
|
||||
} else {
|
||||
if (!QDesktopServices::openUrl(url)) {
|
||||
Q_EMIT warning(i18n("No application for the link"),
|
||||
i18n("Your operating system could not find an application for the link."));
|
||||
}
|
||||
if (!QDesktopServices::openUrl(url)) {
|
||||
Q_EMIT warning(i18n("No application for the link"),
|
||||
i18n("Your operating system could not find an application for the link."));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -95,9 +95,6 @@ Q_SIGNALS:
|
||||
/// Displays warning to the user.
|
||||
void warning(const QString &title, const QString &message);
|
||||
|
||||
/// Ask user to open link and then open it.
|
||||
void openLink(const QUrl &url);
|
||||
|
||||
private:
|
||||
NeoChatRoom *m_currentRoom;
|
||||
NeoChatRoom *m_lastCurrentRoom;
|
||||
|
||||
Reference in New Issue
Block a user