rpms/kdelibs4/F-8 kdelibs-4.1.3-kde#172042-windowsize.patch, NONE, 1.1 kdelibs4.spec, 1.39, 1.40

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18927/F-8

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-4.1.3-kde#172042-windowsize.patch 
Log Message:
Sync from kdelibs/F-9:

* Wed Oct 15 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.2-5
- backport fix for faulty window resizing (kdebug:172042)

kdelibs-4.1.3-kde#172042-windowsize.patch:

--- NEW FILE kdelibs-4.1.3-kde#172042-windowsize.patch ---
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) {


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdelibs4.spec	13 Oct 2008 15:48:48 -0000	1.39
+++ kdelibs4.spec	15 Oct 2008 15:29:17 -0000	1.40
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,6 +80,7 @@
 ## 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
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -207,6 +208,7 @@
 ## upstream patches
 %patch100 -p0 -b .googlemaps
 %patch101 -p0 -b .kde#171870-kded-crash
+%patch102 -p0 -b .kde#172042-windowsize
 
 %build
 
@@ -367,6 +369,9 @@
 
 
 %changelog
+* Wed Oct 15 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.2-5
+- backport fix for faulty window resizing (kdebug:172042)
+
 * Mon Oct 13 2008 Than Ngo <than at redhat.com> 4.1.2-4
 - backport patch to fix crash kded startup crash