[gentoo-commits] gentoo-x86 commit in kde-base/kwin/files: kwin-4.6.3-desktopnames.patch

[gentoo-commits] gentoo-x86 commit in kde-base/kwin/files: kwin-4.6.3-desktopnames.patch

[Andreas HAttel (dilfridge)]

dilfridge    11/05/14 15:49:37

  Added:                kwin-4.6.3-desktopnames.patch
  Log:
  Remember desktop names on logout, bug 366963
  
  (Portage version: 2.1.9.49/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/kwin/files/kwin-4.6.3-desktopnames.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/files/kwin-4.6.3-desktopnames.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/files/kwin-4.6.3-desktopnames.patch?rev=1.1&content-type=text/plain

Index: kwin-4.6.3-desktopnames.patch
===================================================================
commit a2d4c3ebdf7137f3543c88245f0bfd3dba308ebf
Author: Thomas Lübking <thomas.luebking@gmail.com>
Date:   Sun May 8 16:27:31 2011 +0200

    Don't store virtual desktop settings while loading them
    
    BUG: 272666
    FIXED-IN: 4.6.4

diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index 3033e65..f5df9d9 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -1229,8 +1229,10 @@ void Workspace::slotReinitCompositing()
         }
     }
 
+static bool _loading_desktop_settings = false;
 void Workspace::loadDesktopSettings()
     {
+    _loading_desktop_settings = true;
     KSharedConfig::Ptr c = KGlobal::config();
     QString groupname;
     if( screen_number == 0 )
@@ -1246,10 +1248,13 @@ void Workspace::loadDesktopSettings()
         rootInfo->setDesktopName( i, s.toUtf8().data() );
         desktop_focus_chain[i-1] = i;
         }
+    _loading_desktop_settings = false;
     }
 
 void Workspace::saveDesktopSettings()
     {
+    if (_loading_desktop_settings)
+        return;
     KSharedConfig::Ptr c = KGlobal::config();
     QString groupname;
     if (screen_number == 0)