From f95f7af6656326bc8947a0cb9e5895c6b36f67f2 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Thu, 9 Jul 2015 15:22:42 -0400
Subject: Remove the old "forcing" of a panel with particular settings on the
 default/first screen. This is no longer used/needed because of the
 luminaDesktop.conf settings file.

---
 lumina-desktop/LDesktop.cpp | 2 +-
 lumina-desktop/LPanel.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lumina-desktop')

diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp
index e244e4b1..80e28e59 100644
--- a/lumina-desktop/LDesktop.cpp
+++ b/lumina-desktop/LDesktop.cpp
@@ -576,7 +576,7 @@ void LDesktop::DesktopPluginRemoved(QString ID, bool internal){
 void LDesktop::UpdatePanels(){
   if(DEBUG){ qDebug() << " - Update Panels For Screen:" << desktopnumber; }
   int panels = settings->value(DPREFIX+"panels", -1).toInt();
-  if(panels==-1 && defaultdesktop){ panels=1; } //need at least 1 panel on the primary desktop
+  //if(panels==-1 && defaultdesktop){ panels=1; } //need at least 1 panel on the primary desktop
   //Remove all extra panels
   for(int i=0; i<PANELS.length(); i++){
     if(panels <= PANELS[i]->number()){
diff --git a/lumina-desktop/LPanel.cpp b/lumina-desktop/LPanel.cpp
index 7531d53e..11a5a988 100644
--- a/lumina-desktop/LPanel.cpp
+++ b/lumina-desktop/LPanel.cpp
@@ -207,9 +207,9 @@ void LPanel::UpdatePanel(){
   
   //Then go through the plugins and create them as necessary
   QStringList plugins = settings->value(PPREFIX+"pluginlist", QStringList()).toStringList();
-  if(defaultpanel && plugins.isEmpty()){
+  /*if(defaultpanel && plugins.isEmpty()){
     plugins << "userbutton" << "taskmanager" << "spacer" << "systemtray" << "clock" << "systemdashboard";
-  }
+  }*/
   if(DEBUG){ qDebug() << " - Initialize Plugins: " << plugins; }
   for(int i=0; i<plugins.length(); i++){
     //Ensure this plugin has a unique ID (NOTE: this numbering does not persist between sessions)
-- 
cgit