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

List:       kde-commits
Subject:    KDE/kdebase/workspace/systemsettings
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2008-12-06 23:15:07
Message-ID: 1228605307.816077.32546.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 893596 by sebsauer:

better solution then r893594

 M  +1 -4      kcmultiwidget.cpp  
 M  +0 -1      kcmultiwidget.h  


--- trunk/KDE/kdebase/workspace/systemsettings/kcmultiwidget.cpp #893595:893596
@@ -190,9 +190,6 @@
     cm.service = moduleinfo.service();
     cm.adminmode = false;
 
-    // don't use module->buttons() here since it would load the real kcmodule plugin.
-    cm.buttons = KCModule::Buttons( KCModule::Help | KCModule::Default | KCModule::Apply );
-
     // "root KCMs are gone" says KControl
     //	if ( moduleinfo.needsRootPrivileges() && !d->hasRootKCM &&
     //			!KUser().isSuperUser() ) {/* If we're embedded, it's true */
@@ -264,7 +261,7 @@
     foreach( const CreatedModule &it, m_modules ) {
         if( it.kcm==module) {
             showButton(User2, it.adminmode);
-            buttons = it.buttons;
+            buttons = it.kcm->buttons();
             found = true;
         }
     }
--- trunk/KDE/kdebase/workspace/systemsettings/kcmultiwidget.h #893595:893596
@@ -196,7 +196,6 @@
         KCModuleProxy * kcm;
         KService::Ptr service;
         bool adminmode;
-        int buttons;
     };
     typedef QList<CreatedModule> ModuleList;
     ModuleList m_modules;
[prev in list] [next in list] [prev in thread] [next in thread]