4.1.3
This commit is contained in:
parent
fd9a71eecb
commit
61549b46e2
|
@ -1,45 +0,0 @@
|
||||||
Index: khtml/ecma/kjs_dom.cpp
|
|
||||||
===================================================================
|
|
||||||
--- khtml/ecma/kjs_dom.cpp (Revision 869317)
|
|
||||||
+++ khtml/ecma/kjs_dom.cpp (Revision 869318)
|
|
||||||
@@ -362,30 +362,30 @@
|
|
||||||
|
|
||||||
switch (token) {
|
|
||||||
case OffsetLeft:
|
|
||||||
- return rend ? jsNumber( rend->offsetLeft() ) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber( rend->offsetLeft() ) : jsNumber(0);
|
|
||||||
case OffsetTop:
|
|
||||||
- return rend ? jsNumber( rend->offsetTop() ) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber( rend->offsetTop() ) : jsNumber(0);
|
|
||||||
case OffsetWidth:
|
|
||||||
- return rend ? jsNumber( rend->offsetWidth() ) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber( rend->offsetWidth() ) : jsNumber(0);
|
|
||||||
case OffsetHeight:
|
|
||||||
- return rend ? jsNumber( rend->offsetHeight() ) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber( rend->offsetHeight() ) : jsNumber(0);
|
|
||||||
case OffsetParent:
|
|
||||||
{
|
|
||||||
khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
|
|
||||||
return getDOMNode( exec, par ? par->element() : 0 );
|
|
||||||
}
|
|
||||||
case ClientWidth:
|
|
||||||
- return rend ? jsNumber( rend->clientWidth() ) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber( rend->clientWidth() ) : jsNumber(0);
|
|
||||||
case ClientHeight:
|
|
||||||
- return rend ? jsNumber( rend->clientHeight() ) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber( rend->clientHeight() ) : jsNumber(0);
|
|
||||||
case ClientLeft:
|
|
||||||
- return rend ? jsNumber( rend->clientLeft() ) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber( rend->clientLeft() ) : jsNumber(0);
|
|
||||||
case ClientTop:
|
|
||||||
- return rend ? jsNumber( rend->clientTop() ) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber( rend->clientTop() ) : jsNumber(0);
|
|
||||||
case ScrollWidth:
|
|
||||||
- return rend ? jsNumber(rend->scrollWidth()) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber(rend->scrollWidth()) : jsNumber(0);
|
|
||||||
case ScrollHeight:
|
|
||||||
- return rend ? jsNumber(rend->scrollHeight()) : jsUndefined();
|
|
||||||
+ return rend ? jsNumber(rend->scrollHeight()) : jsNumber(0);
|
|
||||||
case ScrollLeft:
|
|
||||||
if (rend && rend->layer()) {
|
|
||||||
if (rend->isRoot() && !rend->hasOverflowClip())
|
|
|
@ -1,31 +0,0 @@
|
||||||
Index: kdeui/shortcuts/kdedglobalaccel.cpp
|
|
||||||
===================================================================
|
|
||||||
--- kdeui/shortcuts/kdedglobalaccel.cpp (Revision 870758)
|
|
||||||
+++ kdeui/shortcuts/kdedglobalaccel.cpp (Revision 870759)
|
|
||||||
@@ -361,8 +361,9 @@
|
|
||||||
|
|
||||||
void KdedGlobalAccel::unRegister(const QStringList &actionId)
|
|
||||||
{
|
|
||||||
+ kDebug(125) << actionId;
|
|
||||||
+
|
|
||||||
Q_ASSERT(actionId.size()==4);
|
|
||||||
-
|
|
||||||
if (actionId.size() < 4) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
@@ -586,7 +587,14 @@
|
|
||||||
|
|
||||||
foreach (int key, ad->keys) {
|
|
||||||
if (key != 0) {
|
|
||||||
- d->keyToAction.insert(key, ad);
|
|
||||||
+ if (d->keyToAction.contains(key)) {
|
|
||||||
+ // The shortcut is already used. The config file is
|
|
||||||
+ // broken. Ignore the request.
|
|
||||||
+ ad->keys.removeAll(key);
|
|
||||||
+ kWarning() << "Shortcut found twice in kglobalshortcutsrc.";
|
|
||||||
+ } else {
|
|
||||||
+ d->keyToAction.insert(key, ad);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,55 +0,0 @@
|
||||||
Index: kdeui/widgets/kmainwindow_p.h
|
|
||||||
===================================================================
|
|
||||||
--- kdeui/widgets/kmainwindow_p.h (revision 871464)
|
|
||||||
+++ kdeui/widgets/kmainwindow_p.h (revision 871465)
|
|
||||||
@@ -44,6 +44,7 @@
|
|
||||||
bool settingsDirty:1;
|
|
||||||
bool autoSaveWindowSize:1;
|
|
||||||
bool care_about_geometry:1;
|
|
||||||
+ bool sizeApplied:1;
|
|
||||||
bool shuttingDown:1;
|
|
||||||
KConfigGroup autoSaveGroup;
|
|
||||||
QTimer* settingsTimer;
|
|
||||||
Index: kdeui/widgets/kmainwindow.cpp
|
|
||||||
===================================================================
|
|
||||||
--- kdeui/widgets/kmainwindow.cpp (revision 871464)
|
|
||||||
+++ kdeui/widgets/kmainwindow.cpp (revision 871465)
|
|
||||||
@@ -284,6 +284,8 @@
|
|
||||||
|
|
||||||
dockResizeListener = new DockResizeListener(_q);
|
|
||||||
letDirtySettings = true;
|
|
||||||
+
|
|
||||||
+ sizeApplied = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool endsWithHashNumber( const QString& s )
|
|
||||||
@@ -677,6 +679,8 @@
|
|
||||||
|
|
||||||
bool KMainWindow::readPropertiesInternal( KConfig *config, int number )
|
|
||||||
{
|
|
||||||
+ K_D(KMainWindow);
|
|
||||||
+
|
|
||||||
if ( number == 1 )
|
|
||||||
readGlobalProperties( config );
|
|
||||||
|
|
||||||
@@ -691,6 +695,8 @@
|
|
||||||
if ( cg.hasKey(QLatin1String("ObjectName" )) )
|
|
||||||
setObjectName( cg.readEntry("ObjectName").toLatin1()); // latin1 is right here
|
|
||||||
|
|
||||||
+ d->sizeApplied = false; // since we are changing config file, reload the size of the window
|
|
||||||
+ // if necessary. Do it before the call to applyMainWindowSettings.
|
|
||||||
applyMainWindowSettings(cg); // Menubar, statusbar and toolbar settings.
|
|
||||||
|
|
||||||
s.setNum(number);
|
|
||||||
@@ -708,7 +714,10 @@
|
|
||||||
|
|
||||||
d->letDirtySettings = false;
|
|
||||||
|
|
||||||
- restoreWindowSize(cg);
|
|
||||||
+ if (!d->sizeApplied) {
|
|
||||||
+ restoreWindowSize(cg);
|
|
||||||
+ d->sizeApplied = true;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
QStatusBar* sb = internalStatusBar(this);
|
|
||||||
if (sb) {
|
|
17
kdelibs.spec
17
kdelibs.spec
|
@ -1,8 +1,8 @@
|
||||||
%define _default_patch_fuzz 2
|
%define _default_patch_fuzz 2
|
||||||
|
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
Summary: K Desktop Environment 4 - Libraries
|
||||||
Version: 4.1.2
|
Version: 4.1.3
|
||||||
Release: 6%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
|
@ -78,9 +78,6 @@ Patch18: kdelibs-4.1.0-kstandarddirs.patch
|
||||||
Patch20: kdelibs-4.1.1-cmake.patch
|
Patch20: kdelibs-4.1.1-cmake.patch
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
Patch100: kdelibs-4.1.2-googlemaps.patch
|
|
||||||
Patch101: kdelibs-4.1.2-kde#171870-kded-crash.patch
|
|
||||||
Patch102: kdelibs-4.1.3-kde#172042-windowsize.patch
|
|
||||||
Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch
|
Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch
|
||||||
|
|
||||||
BuildRequires: qt4-devel >= 4.4.0
|
BuildRequires: qt4-devel >= 4.4.0
|
||||||
|
@ -207,13 +204,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||||
%patch20 -p1 -b .cmake
|
%patch20 -p1 -b .cmake
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
%patch100 -p0 -b .googlemaps
|
|
||||||
%patch101 -p0 -b .kde#171870-kded-crash
|
|
||||||
%patch102 -p0 -b .kde#172042-windowsize
|
|
||||||
%patch103 -p1 -b .kde#172182-http_cache_cleaner
|
%patch103 -p1 -b .kde#172182-http_cache_cleaner
|
||||||
|
|
||||||
%build
|
|
||||||
|
|
||||||
|
%build
|
||||||
mkdir -p %{_target_platform}
|
mkdir -p %{_target_platform}
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
|
%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
|
||||||
|
@ -371,9 +365,12 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Nov 07 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-6
|
* Fri Nov 07 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.3-2
|
||||||
- backport http_cache_cleaner fix (kdebug:172182)
|
- backport http_cache_cleaner fix (kdebug:172182)
|
||||||
|
|
||||||
|
* Tue Nov 4 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.3-1
|
||||||
|
- KDE 4.1.3
|
||||||
|
|
||||||
* Wed Oct 15 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.2-5
|
* Wed Oct 15 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.2-5
|
||||||
- backport fix for faulty window resizing (kdebug:172042)
|
- backport fix for faulty window resizing (kdebug:172042)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue