[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdebase/kcontrol/kicker
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-02-29 21:17:51
Message-ID: 20040229211751.1E7C6995A () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Don't crash on second screen (BR75072)


  M +2 -0      hidingtab_impl.cpp   1.14.2.1
  M +4 -2      main.cpp   1.50.2.1
  M +2 -0      positiontab_impl.cpp   1.31.2.1


--- kdebase/kcontrol/kicker/hidingtab_impl.cpp  #1.14:1.14.2.1
@@ -108,4 +108,6 @@ void HidingTab::switchPanel(QListViewIte
         m_panelList->setSelected(m_panelList->firstChild(), true);
         listItem = reinterpret_cast<extensionInfoItem*>(m_panelList->firstChild());
+        if (!listItem)
+            return;
     }
 

--- kdebase/kcontrol/kicker/main.cpp  #1.50:1.50.2.1
@@ -109,4 +109,6 @@ void KickerConfig::load()
     QString configname = configName();
     QString configpath = KGlobal::dirs()->findResource("config", configname);
+    if (configpath.isEmpty())
+       configpath = locateLocal("config", configname);
     KSharedConfig::Ptr c = KSharedConfig::openConfig(configname);
 
@@ -272,5 +274,5 @@ void KickerConfig::setupExtensionInfo(KC
         {
             // don't remove the kickerrc!
-            if ((*extIt)->_configPath.right(8) != "kickerrc")
+            if (!(*extIt)->_configPath.endsWith(configName()))
             {
                 hidingtab->removeExtension(*extIt);
@@ -284,5 +286,5 @@ void KickerConfig::setupExtensionInfo(KC
 void KickerConfig::configChanged(const QString& config)
 {
-    if (config.right(8) == "kickerrc")
+    if (config.endsWith(configName()))
     {
         KSharedConfig::Ptr c = KSharedConfig::openConfig(configName());

--- kdebase/kcontrol/kicker/positiontab_impl.cpp  #1.31:1.31.2.1
@@ -440,4 +440,6 @@ void PositionTab::switchPanel(QListViewI
         m_panelList->setSelected(m_panelList->firstChild(), true);
         listItem = reinterpret_cast<extensionInfoItem*>(m_panelList->firstChild());
+        if (!listItem)
+            return;
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]