rpms/kdebase/devel kdebase-3.5.4-kde#53642.patch, NONE, 1.1 kdebase.spec, 1.220, 1.221

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17261

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-kde#53642.patch 
Log Message:
fix #53642, Menubar is always visible after coming back from fullscreen


kdebase-3.5.4-kde#53642.patch:
 konq_mainwindow.cc |   13 +++++++++----
 konq_mainwindow.h  |    2 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE kdebase-3.5.4-kde#53642.patch ---
Index: konqueror/konq_mainwindow.h
===================================================================
--- konqueror/konq_mainwindow.h	(Revision 581611)
+++ konqueror/konq_mainwindow.h	(Revision 581612)
@@ -749,6 +749,8 @@
 
   bool m_urlCompletionStarted;
 
+  bool m_prevMenuBarVisible;
+
   static bool s_preloaded;
   static KonqMainWindow* s_preloadedWindow;
   static int s_initialMemoryUsage;
Index: konqueror/konq_mainwindow.cc
===================================================================
--- konqueror/konq_mainwindow.cc	(Revision 581611)
+++ konqueror/konq_mainwindow.cc	(Revision 581612)
@@ -170,6 +170,8 @@
 
   m_bViewModeToggled = false;
 
+  m_prevMenuBarVisible = true;
+
   m_pViewManager = new KonqViewManager( this );
 
   m_toggleViewGUIClient = new ToggleViewGUIClient( this );
@@ -3544,10 +3546,10 @@
         plugActionList( "fullscreen", lst );
     }
 
-
+    m_prevMenuBarVisible = menuBar()->isVisible();
     menuBar()->hide();
     m_paShowMenuBar->setChecked( false );
- 
+
     // Qt bug, the flags are lost. They know about it.
     // happens only with the hackish non-_NET_WM_STATE_FULLSCREEN way
     setWFlags( WDestructiveClose );
@@ -3571,8 +3573,11 @@
 #endif
     unplugActionList( "fullscreen" );
 
-    menuBar()->show(); // maybe we should store this setting instead of forcing it
-    m_paShowMenuBar->setChecked( true );
+    if (m_prevMenuBarVisible)
+    {
+        menuBar()->show();
+        m_paShowMenuBar->setChecked( true );
+    }
 
     // Qt bug, the flags aren't restored. They know about it.
     setWFlags( WType_TopLevel | WDestructiveClose );


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- kdebase.spec	28 Aug 2006 08:41:10 -0000	1.220
+++ kdebase.spec	7 Sep 2006 15:21:00 -0000	1.221
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -62,6 +62,7 @@
 Patch103: kdebase-3.5.4-konsole-bz#203221.patch
 Patch104: kdebase-3.5.4-kde#132873.patch
 Patch105: kdebase-3.5.4-kdm.patch
+Patch106: kdebase-3.5.4-kde#53642.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -178,6 +179,7 @@
 %patch103 -p0 -b .bz#203221
 %patch104 -p0 -b .kde#132873
 %patch105 -p0 -b .kdm-crash
+%patch106 -p0 -b .kde#53642
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -547,6 +549,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Sep 07 2006 Than Ngo <than at redhat.com> 6:3.5.4-7
+- apply upstream patch
+   fix #53642, Menubar is always visible after coming back from fullscreen
+
 * Mon Aug 28 2006 Than Ngo <than at redhat.com> 6:3.5.4-6
 - fix broken deps for s390(x)