Merge commit 'refs/merge-requests/69' of git://gitorious.org/rekonq/mainline into m69

Conflicts:
	src/walletwidget.cpp

2 files changed, 4 insertions, 6 deletions

diff --git a/src/walletwidget.cpp b/src/walletwidget.cpp
index b5b572f7..69b5c497 100644
--- a/src/walletwidget.cpp
+++ b/src/walletwidget.cpp
@@ -36,7 +36,7 @@
 #include <QToolButton>
 #include <QPushButton>
 #include <QHBoxLayout>
-
+#include <QString>
 
 WalletWidget::WalletWidget(QWidget *parent)
     : QWidget(parent)
@@ -97,10 +97,8 @@ void WalletWidget::notNowRememberData()
 
 void WalletWidget::onSaveFormData(const QString &key, const QUrl &url)
 {
-    m_label->setText( i18n("Do you want rekonq to remember the password for \"%1\" on \"%2\"?")
-                        .arg(key)
-                        .arg(url.host())
-                    );
+    m_label->setText( i18n("Do you want rekonq to remember the password for ").append(url.userName()).append(i18n(" on ")).append(url.host()).append(i18n("?")) );
+
     m_key = key;
     m_url = url;
 }
diff --git a/src/webview.cpp b/src/webview.cpp
index be46d601..568c5981 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -60,10 +60,10 @@
 
 WebView::WebView(QWidget* parent, QWidget* messageWidget)
     : KWebView(parent, false)
+    , m_messageWidget(messageWidget)
     , m_page( new WebPage(this) )
     , m_progress(0)
     , m_mousePos(QPoint(0,0))
-    , m_messageWidget(messageWidget)
 {
     setPage(m_page);