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

List:       kde-commits
Subject:    kdebase/kcontrol/kio
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2004-10-30 16:15:57
Message-ID: 20041030161557.CEA0716BC4 () office ! kde ! org
[Download RAW message or body]

CVS commit by adawit: 

When the default button is pressed, only apply the default to the current visible tab.


  M +13 -12    kcookiesmain.cpp   1.21


--- kdebase/kcontrol/kio/kcookiesmain.cpp  #1.20:1.21
@@ -21,15 +21,12 @@ KCookiesMain::KCookiesMain(QWidget *pare
 {
     management = 0;
-
-    bool managerOK = false;
+    bool managerOK = true;
 
     DCOPReply reply = DCOPRef( "kded", "kded" ).call( "loadModule", 
         QCString( "kcookiejar" ) );
 
-    if ( reply.isValid() )
-        managerOK = reply;
-
-    if (!managerOK)
+    if( !reply.isValid() )
     {
+       managerOK = false;
        kdDebug(7103) << "kcm_kio: KDED could not load KCookiejar!" << endl;
        KMessageBox::sorry(0, i18n("Unable to start the cookie handler service.\n"
@@ -37,4 +34,5 @@ KCookiesMain::KCookiesMain(QWidget *pare
                              "are stored on your computer."));
     }
+    
     QVBoxLayout *layout = new QVBoxLayout(this);
     tab = new QTabWidget(this);
@@ -45,5 +43,5 @@ KCookiesMain::KCookiesMain(QWidget *pare
     connect(policies, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
 
-    if(managerOK)
+    if( managerOK )
     {
         management = new KCookiesManagement(this);
@@ -60,5 +58,5 @@ void KCookiesMain::load()
 {
   policies->load();
-  if(management)
+  if( management )
       management->load();
 }
@@ -67,5 +65,5 @@ void KCookiesMain::save()
 {
   policies->save();
-  if(management)
+  if ( management )
       management->save();
 }
@@ -73,6 +71,9 @@ void KCookiesMain::save()
 void KCookiesMain::defaults()
 {
+  KCModule* module = static_cast<KCModule*>(tab->currentPage());
+  
+  if ( module == policies )
   policies->defaults();
-  if(management)
+  else if( management )
       management->defaults();
 }


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