Cleanup a bit more of the root level property setting. Now things seem to be properly getting registered for the session.

2 files changed, 2 insertions, 4 deletions

diff --git a/src-qt5/core/libLumina/NativeWindowSystem.cpp b/src-qt5/core/libLumina/NativeWindowSystem.cpp
index 5e119baf..13d6221c 100644
--- a/src-qt5/core/libLumina/NativeWindowSystem.cpp
+++ b/src-qt5/core/libLumina/NativeWindowSystem.cpp
@@ -441,7 +441,7 @@ void NativeWindowSystem::setRoot_supportedActions(){
 		obj->EWMH._NET_WM_WINDOW_TYPE_DROPDOWN_MENU, obj->EWMH._NET_WM_WINDOW_TYPE_POPUP_MENU, obj->EWMH._NET_WM_WINDOW_TYPE_TOOLTIP,
 		obj->EWMH._NET_WM_WINDOW_TYPE_NOTIFICATION, obj->EWMH._NET_WM_WINDOW_TYPE_COMBO, obj->EWMH._NET_WM_WINDOW_TYPE_DND,
 		};
-  xcb_ewmh_set_supported(&obj->EWMH, QX11Info::appScreen(), 0,list);
+  xcb_ewmh_set_supported(&obj->EWMH, QX11Info::appScreen(), 19,list);
 }
 
 void NativeWindowSystem::setRoot_numberOfWorkspaces(QStringList names){
diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index c0a0ac7d..ab117df0 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -17,7 +17,6 @@
 //Initialize all the global objects to null pointers
 NativeWindowSystem* Lumina::NWS = 0;
 NativeEventFilter* Lumina::NEF = 0;
-//EventFilter* Lumina::EFILTER = 0;
 LScreenSaver* Lumina::SS = 0;
 DesktopSettings* Lumina::SETTINGS = 0;
 //Lumina::WM = 0;
@@ -46,10 +45,8 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu
   //Now initialize the global objects (but do not start them yet)
   Lumina::NEF = new NativeEventFilter();
   Lumina::NWS = new NativeWindowSystem();
-  //Lumina::EFILTER = new EventFilter(); //Need the XCB Event filter first
   Lumina::SETTINGS = new DesktopSettings();
   Lumina::SS = new LScreenSaver();
-  //Lumina::WM = new LWindowManager();
   //Now put the Event Filter into it's own thread to keep things snappy
   Lumina::EVThread = new QThread();
     Lumina::NEF->moveToThread(Lumina::EVThread);
@@ -148,6 +145,7 @@ void LSession::setupSession(){
   }
   Lumina::ROOTWIN->start();
   Lumina::NWS->setRoot_numberOfWorkspaces(QStringList() << "one" << "two");
+  Lumina::NWS->setRoot_currentWorkspace(0);
 
   DesktopContextMenu *cmenu = new DesktopContextMenu(Lumina::ROOTWIN);
   connect(cmenu, SIGNAL(showLeaveDialog()), this, SLOT(StartLogout()) );