[Pkg-kde-talk] for kdepim (Fwd: forms patch)
Pierre Habouzit
pierre.habouzit@m4x.org
Mon, 14 Mar 2005 18:13:14 +0100
--nextPart2332995.BATa2O6d5E
Content-Type: multipart/mixed;
boundary="Boundary-01=_qYcNC5xrQg0k0BI"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
--Boundary-01=_qYcNC5xrQg0k0BI
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
there is a couple of things to do before release :
* I noticed yesteardy a glitch with /usr/lib/libkmailprivate.la that
should be in kdepim-dev and that is now in kmail package
* there is a patch from Till Adam that fix some problems with kolab
ressource (and I've experienced the bug it fixes, it's quite
annoying)
* and attached is a bug for akregator, that I get from upstream, that
fix a problem with form posts in the built in browser. the bug make
it forget all the data you typed, and all the data you submited, in
fact it acts like a refresh without memorizing informations. I think
this worth a patch
=2D--------- Message transmis ----------
Subject: forms patch
Date: Lundi 14 Mars 2005 18:06
=46rom: Frank Osterfeld <frank.osterfeld@gmx.de>
To: pierre.habouzit@m4x.org
=2D------------------------------------------------------
=2D-=20
=B7O=B7 Pierre Habouzit
=B7=B7O
OOO http://www.madism.org
--Boundary-01=_qYcNC5xrQg0k0BI
Content-Type: text/x-diff;
charset="us-ascii";
name="forms-fix.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="forms-fix.diff"
Index: src/pageviewer.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdepim/akregator/src/pageviewer.cpp,v
retrieving revision 1.35
diff -u -p -r1.35 pageviewer.cpp
=2D-- src/pageviewer.cpp 2 Mar 2005 21:57:55 -0000 1.35
+++ src/pageviewer.cpp 11 Mar 2005 02:37:48 -0000
@@ -84,7 +84,7 @@ PageViewer::PageViewer(QWidget *parent,=20
m_stopAction =3D new KAction(i18n("Stop"), "stop", 0,
this, SLOT(slotStop()),
actionCollection(), "pageviewer_stop");
=2D
+=20
//connect( this, SIGNAL(popupMenu(const QString &, const QPoint &)), t=
his, SLOT(slotPopupMenu(const QString &, const QPoint &)));
=20
m_backAction->setEnabled(false);
@@ -95,11 +95,6 @@ PageViewer::PageViewer(QWidget *parent,=20
connect(this, SIGNAL(completed()), this, SLOT(slotCompleted()));
connect(this, SIGNAL(canceled(const QString &)), this, SLOT(slotCancel=
led(const QString &)));
=20
=2D connect(browserExtension(),
=2D SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
=2D this,
=2D SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
=2D =20
m_current =3D m_history.end();
m_restoring =3D false;
// uncomment this to load konq plugins (doesn't work properly and clut=
ters the GUI)
@@ -220,10 +215,14 @@ bool PageViewer::openURL(const KURL &url
=20
void PageViewer::slotOpenURLRequest(const KURL& url, const KParts::URLArgs=
& args)
{
+
if (args.frameName =3D=3D "_blank") // apparently this indicates that =
the MMB was pressed...
Viewer::slotOpenURLRequest(url, args);
else
+ {
+ browserExtension()->setURLArgs(args);
openURL(url);
+ }
}
=20
void PageViewer::slotPopupActivated( int id )
@@ -410,13 +409,5 @@ void PageViewer::slotPopupMenu(KXMLGUICl
}
}
=20
=2Dvoid PageViewer::formClicked(const KURL& url, const KParts::URLArgs& arg=
s)
=2D{
=2D if (args.doPost()) {
=2D browserExtension()->setURLArgs(args);
=2D openURL(url);
=2D }
=2D}
=2D
#include "pageviewer.moc"
// vim: ts=3D4 sw=3D4 et
Index: src/pageviewer.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdepim/akregator/src/pageviewer.h,v
retrieving revision 1.23
diff -u -p -r1.23 pageviewer.h
=2D-- src/pageviewer.h 2 Mar 2005 21:57:55 -0000 1.23
+++ src/pageviewer.h 11 Mar 2005 02:37:48 -0000
@@ -86,8 +86,7 @@ namespace Akregator
virtual void slotPopupMenu(KXMLGUIClient*, const QPoint&, cons=
t KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode=
_t);
=20
void slotGlobalBookmarkArticle();
=2D void formClicked(const KURL& url, const KParts::URLArgs& arg=
s);
=2D
+ =20
virtual void slotOpenURLRequest(const KURL& url, const KParts:=
:URLArgs& args);
=20
signals:
Index: src/viewer.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdepim/akregator/src/viewer.cpp,v
retrieving revision 1.42
diff -u -p -r1.42 viewer.cpp
=2D-- src/viewer.cpp 2 Mar 2005 21:57:55 -0000 1.42
+++ src/viewer.cpp 11 Mar 2005 02:37:48 -0000
@@ -89,7 +89,7 @@ Viewer::~Viewer()
=20
bool Viewer::openURL(const KURL &url)
{
=2D new Akregator::BrowserRun(this, (QWidget*)parent(), this, url, KPart=
s::URLArgs());
+ new Akregator::BrowserRun(this, (QWidget*)parent(), this, url, browser=
Extension()->urlArgs());
emit started(0);
return true;
}
@@ -135,6 +135,7 @@ void Viewer::displayInExternalBrowser(co
void Viewer::slotOpenURLRequest(const KURL& url, const KParts::URLArgs& ar=
gs)
{
m_url =3D url;
+ browserExtension()->setURLArgs(args);
if (args.frameName =3D=3D "_blank") // apparently this indicates that =
the MMB was pressed...
{
switch (Settings::mMBBehaviour())
--Boundary-01=_qYcNC5xrQg0k0BI--
--nextPart2332995.BATa2O6d5E
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Signed by Pierre Habouzit <pierre.habouzit@m4x.org>
iD8DBQBCNcYrvGr7W6HudhwRAiB7AJwLjITAeR131bKvAi3z7aE2CrZ42wCcCoG5
7UiwGuZQp+2o0z9YBn0JOoo=
=CsDu
-----END PGP SIGNATURE-----
--nextPart2332995.BATa2O6d5E--