rpms/kdelibs/F-9 kdelibs-4.1.1-kde#856379-cookiejar.patch, NONE, 1.1 kdelibs-4.1.1-kde#856403-urlnav.patch, NONE, 1.1 kdelibs.spec, 1.346, 1.347
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Sep 3 10:51:23 UTC 2008
Author: ltinkl
Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14782
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.1.1-kde#856379-cookiejar.patch
kdelibs-4.1.1-kde#856403-urlnav.patch
Log Message:
some post-4.1.1 fixes
kdelibs-4.1.1-kde#856379-cookiejar.patch:
--- NEW FILE kdelibs-4.1.1-kde#856379-cookiejar.patch ---
Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
--- kioslave/http/kcookiejar/kcookiejar.cpp (revision 856378)
+++ kioslave/http/kcookiejar/kcookiejar.cpp (revision 856379)
@@ -516,8 +516,10 @@
extractDomains(_fqdn, domains);
if (domains.count() > 3)
_domain = domains[3];
+ else if ( domains.count() > 0 )
+ _domain = domains[0];
else
- _domain = domains[0];
+ _domain = L1("");
}
QString KCookieJar::stripDomain(const KHttpCookie& cookie)
kdelibs-4.1.1-kde#856403-urlnav.patch:
--- NEW FILE kdelibs-4.1.1-kde#856403-urlnav.patch ---
Index: kfile/kurlnavigator.cpp
===================================================================
--- kfile/kurlnavigator.cpp (revision 856402)
+++ kfile/kurlnavigator.cpp (revision 856403)
@@ -344,6 +344,7 @@
// initialize the path box of the traditional view
m_pathBox = new KUrlComboBox(KUrlComboBox::Both, true, q);
m_pathBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+ m_pathBox->installEventFilter(q);
KUrlCompletion* kurlCompletion = new KUrlCompletion(KUrlCompletion::DirCompletion);
m_pathBox->setCompletionObject(kurlCompletion);
@@ -1122,6 +1123,16 @@
QWidget::resizeEvent(event);
}
+bool KUrlNavigator::eventFilter(QObject* watched, QEvent* event)
+{
+ if ((watched == d->m_pathBox) && (event->type() == QEvent::FocusIn)) {
+ requestActivation();
+ setFocus();
+ }
+
+ return QWidget::eventFilter(watched, event);
+}
+
int KUrlNavigator::historySize() const
{
return d->m_history.count();
Index: kfile/kurlnavigator.h
===================================================================
--- kfile/kurlnavigator.h (revision 856402)
+++ kfile/kurlnavigator.h (revision 856403)
@@ -312,6 +312,8 @@
/* @see QWidget::resizeEvent() */
virtual void resizeEvent(QResizeEvent* event);
+ virtual bool eventFilter(QObject* watched, QEvent* event);
+
private:
Q_PRIVATE_SLOT(d, void slotReturnPressed(const QString& text))
Q_PRIVATE_SLOT(d, void slotReturnPressed())
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- kdelibs.spec 2 Sep 2008 10:14:44 -0000 1.346
+++ kdelibs.spec 3 Sep 2008 10:51:21 -0000 1.347
@@ -2,7 +2,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -82,6 +82,8 @@
## upstream patches
Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
+Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
+Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
@@ -209,6 +211,8 @@
## upstream patches
%patch100 -p0 -b .kde#169447-khtml-regression
+%patch101 -p0 -b .kde#856379-cookiejar
+%patch102 -p0 -b .kde#856403-urlnav
%build
@@ -369,6 +373,11 @@
%changelog
+* Wed Sep 03 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.1-5
+- fixed crash on setting cookies on empty domains (like the file
+ system), KDE bug #170147
+- fix URL navigator focus in file dialogs, KDE bug #169497, #170211
+
* Tue Sep 02 2008 Than Ngo <than at redhat.com> 4.1.1-4
- apply patch to fix regression in khtml
More information about the fedora-extras-commits
mailing list