SOURCES: kdebase-kcm_background.patch - update

[arekm]

Author: arekm                        Date: Sun Nov 13 20:46:45 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update

---- Files affected:
SOURCES:
   kdebase-kcm_background.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-kcm_background.patch
diff -u SOURCES/kdebase-kcm_background.patch:1.6 SOURCES/kdebase-kcm_background.patch:1.7
--- SOURCES/kdebase-kcm_background.patch:1.6	Sun Nov 13 20:49:11 2005
+++ SOURCES/kdebase-kcm_background.patch	Sun Nov 13 21:46:40 2005
@@ -1,19 +1,23 @@
 --- kdebase-031021/kcontrol/background/bgdialog.cpp.orig	2003-10-21 00:24:03.000000000 +0200
 +++ kdebase-031021/kcontrol/background/bgdialog.cpp	2003-10-21 16:56:06.000000000 +0200
-@@ -248,6 +248,45 @@
+@@ -405,6 +405,49 @@
     emit changed(true);
  }
  
 +void BGDialog::kdmdefaults()
 +{
-+   m_pGlobals->setCommonBackground(_defCommonScreen);
++   m_pGlobals->setCommonScreenBackground(_defCommonScreen);
 +   m_pGlobals->setCommonDeskBackground(_defCommonDesk);
 +   m_pGlobals->setLimitCache(_defLimitCache);
 +   m_pGlobals->setCacheSize(_defCacheSize);
 +   m_comboWallpaperPos->setCurrentItem( 0 );
-+   m_eDesk = _defCommon ? 0 : m_Desk;
++   m_eDesk = _defCommonDesk ? 0 : m_desk;
++   getEScreen();
 +
-+   KBackgroundRenderer *r = m_Renderer[m_eDesk];
++   for ( unsigned i = 0; i < m_numDesks; ++i )
++      m_pGlobals->setDrawBackgroundPerScreen( i, false );
++
++   KBackgroundRenderer *r = eRenderer();
 +
 +   if (r->isActive())
 +      r->stop();
@@ -46,6 +50,7 @@
  QString BGDialog::quickHelp() const
  {
     return i18n("<h1>Background</h1> This module allows you to control the"
+
 --- kdebase-030317/kcontrol/background/bgdialog.h~	Thu Feb  6 00:35:39 2003
 +++ kdebase-030317/kcontrol/background/bgdialog.h	Tue Mar 18 18:12:35 2003
 @@ -41,6 +41,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdebase-kcm_background.patch?r1=1.6&r2=1.7&f=u