From d2665f9dd6da7fc40f86a14751ecfe08feb88bae Mon Sep 17 00:00:00 2001
From: dondiimperial <unknown@unknown.com>
Date: Sat, 28 Nov 2009 17:52:17 +0000
Subject: [PATCH] Fix for ticket #68

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/chat/PopupChatDialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
index cc1916de5..069d9df10 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@@ -246,8 +246,8 @@ void PopupChatDialog::addChatMsg(ChatInfo *ci)
         QString name = QString::fromStdString(ci ->name);        
         QString message = QString::fromStdWString(ci -> msg);
 
-	//replace http:// and www. with <a href> links
-	QRegExp rx("(http://[^ <>]*)|(www\\.[^ <>]*)");
+	//replace http://, https:// and www. with <a href> links
+	QRegExp rx("(https?://[^ <>]*)|(www\\.[^ <>]*)");
 	int count = 0;
 	int pos = 100; //ignor the first 100 charater because of the standard DTD ref
 	while ( (pos = rx.indexIn(message, pos)) != -1 ) {