summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/bookmarks.cpp2
-rw-r--r--src/cookiejar.cpp2
-rw-r--r--src/lineedit.cpp1
-rw-r--r--src/main.cpp2
-rw-r--r--src/networkaccessmanager.cpp17
-rw-r--r--src/networkaccessmanager.h6
-rw-r--r--src/webview.cpp4
8 files changed, 31 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a783bf27..cad2063e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ PROJECT( rekonq )
# rekonq info
SET(REKONQ_MAJOR_VERSION "0")
SET(REKONQ_MINOR_VERSION "1")
-SET(REKONQ_PATCH_VERSION "97")
+SET(REKONQ_PATCH_VERSION "98")
SET(REKONQ_VERSION_STR
"${REKONQ_MAJOR_VERSION}.${REKONQ_MINOR_VERSION}.${REKONQ_PATCH_VERSION}"
diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp
index c9db4a9b..a1f0e441 100644
--- a/src/bookmarks.cpp
+++ b/src/bookmarks.cpp
@@ -261,6 +261,8 @@ void BookmarkProvider::contextMenu(const QPoint &point)
if (!action)
return;
KMenu *menu = m_bookmarkMenu->viewContextMenu(action);
+ if (!menu)
+ return;
menu->popup(m_bookmarkToolBar->mapToGlobal(point));
}
diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp
index bef1c51c..5160d6ed 100644
--- a/src/cookiejar.cpp
+++ b/src/cookiejar.cpp
@@ -68,7 +68,6 @@ QList<QNetworkCookie> CookieJar::cookiesForUrl(const QUrl & url) const
if (reply.isValid())
{
cookieList << reply.value().toUtf8();
- //kDebug() << reply.value();
}
else
{
@@ -87,7 +86,6 @@ bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> & cookieList, cons
cookieHeader = "Set-Cookie: ";
cookieHeader += cookie.toRawForm();
m_kcookiejar->call("addCookies", url.toString(), cookieHeader, m_windowId);
- //kDebug() << "url: " << url.host() << ", cookie: " << cookieHeader;
}
return !m_kcookiejar->lastError().isValid();
diff --git a/src/lineedit.cpp b/src/lineedit.cpp
index 186ac143..b691e090 100644
--- a/src/lineedit.cpp
+++ b/src/lineedit.cpp
@@ -45,6 +45,7 @@ LineEdit::LineEdit(QWidget* parent)
setMinimumWidth(200);
setFocusPolicy(Qt::WheelFocus);
setHandleSignals(true);
+ setClearButtonShown(true);
}
diff --git a/src/main.cpp b/src/main.cpp
index 092c03c8..7840fa9c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,7 +37,7 @@ static const char description[] =
I18N_NOOP("WebKit based Web Browser for KDE");
-static const char version[] = "0.1.97";
+static const char version[] = "0.1.98";
int main(int argc, char **argv)
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 32bc15b5..a06b20aa 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -202,3 +202,20 @@ void NetworkAccessManager::slotSSLErrors(QNetworkReply *reply, const QList<QSslE
reply->ignoreSslErrors();
}
#endif
+
+
+KIO::MetaData& NetworkAccessManager::metaData()
+{
+ return m_metaData;
+};
+
+
+QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData)
+{
+ // FIXME: rude hack. Waiting for a real POST behaviour fix ;)
+ if(op == PostOperation)
+ {
+ return QNetworkAccessManager::createRequest(op,req,outgoingData);
+ }
+ return AccessManager::createRequest(op,req,outgoingData);
+}
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 1eea9a0d..a6c264f2 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -48,12 +48,15 @@ class NetworkAccessManager : public RekonqAccessManager
public:
NetworkAccessManager(QObject *parent = 0);
-
+ KIO::MetaData& metaData();
void resetDiskCache();
public slots:
void loadSettings();
+protected:
+ virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0);
+
private slots:
void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
@@ -64,6 +67,7 @@ private slots:
private:
QNetworkDiskCache *m_diskCache;
+ KIO::MetaData m_metaData;
};
#endif // NETWORKACCESSMANAGER_H
diff --git a/src/webview.cpp b/src/webview.cpp
index dca8b6fb..1bf04885 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -66,6 +66,10 @@ WebView::WebView(QWidget* parent)
setPage(m_page);
connect(page(), SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&)));
+
+ const qlonglong winId = window()->winId();
+ Application::cookieJar()->setWindowId(winId);
+ Application::networkAccessManager()->metaData().insert("window-id", QString::number(winId));
}