SOURCES (djurban-snaphots): kdebase-kcm_background.patch - compile...

[djurban]

Author: djurban                      Date: Sun Sep 25 23:45:30 2005 GMT
Module: SOURCES                       Tag: djurban-snaphots
---- Log message:
- compile now

---- Files affected:
SOURCES:
   kdebase-kcm_background.patch (1.4.2.1 -> 1.4.2.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-kcm_background.patch
diff -u SOURCES/kdebase-kcm_background.patch:1.4.2.1 SOURCES/kdebase-kcm_background.patch:1.4.2.1.4.1
--- SOURCES/kdebase-kcm_background.patch:1.4.2.1	Fri Jan 14 16:48:16 2005
+++ SOURCES/kdebase-kcm_background.patch	Mon Sep 26 01:45:24 2005
@@ -1,18 +1,51 @@
---- 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,44 @@
+--- 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 @@
+    void load();
+    void save();
+    void defaults();
++   void kdmdefaults();
+ 
+    void makeReadOnly();
+                
+--- kdebase-030924/kcontrol/background/main.cpp~	2003-09-23 21:46:09.000000000 +0200
++++ kdebase-030924/kcontrol/background/main.cpp	2003-09-23 21:56:35.000000000 +0200
+@@ -100,4 +100,9 @@
+     m_base->defaults();
+ }
+ 
++void KBackground::kdmdefaults()
++{
++    m_base->kdmdefaults();
++}
++
+ #include "main.moc"
+--- kdebase-030317/kcontrol/background/main.h~	Sat Jan 25 00:35:46 2003
++++ kdebase-030317/kcontrol/background/main.h	Tue Mar 18 18:00:49 2003
+@@ -31,6 +31,7 @@
+     virtual void load();
+     virtual void save();
+     virtual void defaults();
++    virtual void kdmdefaults();
+ 
+     QString quickHelp() const;
+     const KAboutData* aboutData() const;
+--- kdebase/kcontrol/background/bgdialog.cpp.orig	2005-09-25 12:40:31.000000000 +0200
++++ kdebase/kcontrol/background/bgdialog.cpp	2005-09-26 01:45:10.000000000 +0200
+@@ -405,6 +405,45 @@
     emit changed(true);
  }
  
 +void BGDialog::kdmdefaults()
 +{
-+   m_pGlobals->setCommonBackground(_defCommon);
++   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;
 +
-+   KBackgroundRenderer *r = m_Renderer[m_eDesk];
++   KBackgroundRenderer *r = eRenderer();
 +
 +   if (r->isActive())
 +      r->stop();
@@ -45,35 +78,3 @@
  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 @@
-    void load();
-    void save();
-    void defaults();
-+   void kdmdefaults();
- 
-    void makeReadOnly();
-                
---- kdebase-030924/kcontrol/background/main.cpp~	2003-09-23 21:46:09.000000000 +0200
-+++ kdebase-030924/kcontrol/background/main.cpp	2003-09-23 21:56:35.000000000 +0200
-@@ -100,4 +100,9 @@
-     m_base->defaults();
- }
- 
-+void KBackground::kdmdefaults()
-+{
-+    m_base->kdmdefaults();
-+}
-+
- #include "main.moc"
---- kdebase-030317/kcontrol/background/main.h~	Sat Jan 25 00:35:46 2003
-+++ kdebase-030317/kcontrol/background/main.h	Tue Mar 18 18:00:49 2003
-@@ -31,6 +31,7 @@
-     virtual void load();
-     virtual void save();
-     virtual void defaults();
-+    virtual void kdmdefaults();
- 
-     QString quickHelp() const;
-     const KAboutData* aboutData() const;
================================================================

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