From kde-commits Thu Jul 01 13:27:32 2010 From: Peter Simonsson Date: Thu, 01 Jul 2010 13:27:32 +0000 To: kde-commits Subject: [Konversation] 2459153: * Fix handling http://user@domain.com/ urls * Message-Id: <20100701132732.E3F0BBB563A () projects ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=127800225225870 commit 24591530d089d871f4a887683dcea6b4c37c9987 Author: Peter Simonsson Date: Fri Jun 18 10:20:18 2004 +0000 * Fix handling http://user@domain.com/ urls * Update TODO svn path=/trunk/kdeextragear-2/konversation/; revision=321667 diff --git a/TODO b/TODO index 9918b23..5b491fa 100644 --- a/TODO +++ b/TODO @@ -8,7 +8,6 @@ TODO-list for Konversation SHORT-TERM (URGENT): - Limit backlog to x lines or KB -- Make URLs like http://user@somedomain.com/ work - /WHOWAS after /WHOIS if /WHOIS returns unknown nickname - Add ETA counter for DCC transfers - Show / Hide tab types (status tabs ect.) @@ -65,7 +64,6 @@ DISCUSSING: - Session management - Make font for quick buttons configurable - cycle command -- Nick button in status pane does nothing - privmsg (/msg) should be logged to the specific log file (if i do "/msg foo bar" i want to have this in konversation-foo.log) - Mark the last point where the panel was active diff --git a/konversation/ircview.cpp b/konversation/ircview.cpp index 6759bde..a83f291 100644 --- a/konversation/ircview.cpp +++ b/konversation/ircview.cpp @@ -104,14 +104,13 @@ IRCView::IRCView(QWidget* parent,Server* newServer) : KTextBrowser(parent) setWrapPolicy(QTextEdit::AtWordOrDocumentBoundary); #endif - // Use default KDE web browser or custom command? - setNotifyClick(!KonversationApplication::preferences.getWebBrowserUseKdeDefault()); + setNotifyClick(true); #ifndef TABLE_VERSION setText("\n"); #endif connect(this,SIGNAL (highlighted(const QString&)),this,SLOT (highlightedSlot(const QString&))); - connect(this,SIGNAL (urlClick (const QString&)),this,SLOT(urlClickSlot(const QString&))); + connect(this,SIGNAL (linkClicked(const QString&)),this,SLOT(urlClickSlot(const QString&))); } IRCView::~IRCView() @@ -194,8 +193,9 @@ void IRCView::urlClickSlot(const QString &url) { if (!url.isEmpty()) { + kdDebug() << "URL: " << url << endl; // Always use KDE default mailer. - if (url.lower().startsWith("mailto:")) + if (KonversationApplication::preferences.getWebBrowserUseKdeDefault() || url.lower().startsWith("mailto:")) { new KRun(KURL(url)); }