Author: kmachalkova Date: Tue Jun 9 16:42:56 2009 New Revision: 57522 URL: http://svn.opensuse.org/viewcvs/yast?rev=57522&view=rev Log: Do not show root-only modules to non-root user (filtering out empty groups still pending) Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp?rev=57522&r1=57521&r2=57522&view=diff ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp Tue Jun 9 16:42:56 2009 @@ -114,10 +114,11 @@ void YQDesktopFilesModel::readDesktopFiles() { - //d->desktop_files.clear(); + //local copy + QStringList desktop_files = d->desktop_files; d->cache.clear(); - QStringListIterator it(d->desktop_files); + QStringListIterator it(desktop_files); int count = 0; int success = 0; @@ -135,6 +136,12 @@ qDebug() << filename << " has index " << count; success++; } + // readDesktopFiles returned empty map - skip those + else + { + qDebug() << "Skipping " << filename << ", read returned no reasonable data"; + d->desktop_files.removeAll( filename ); + } count++; } qDebug() << success << " desktop files read"; Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp?rev=57522&r1=57521&r2=57522&view=diff ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulesmodel.cpp Tue Jun 9 16:42:56 2009 @@ -18,13 +18,16 @@ #include "yqmodulegroupsmodel.h" #include "yccmoduleinfoprovider.h" +#include +#include + class YQModulesModel::Private { public: Private() : groupsModel(new YQModuleGroupsModel) { - + userIsRoot = ( getuid() == 0 ); } ~Private() @@ -36,6 +39,8 @@ QMap groupidCache; QMap groupCache; YCCModuleInfoProvider infoProvider; + + bool userIsRoot; }; @@ -60,9 +65,37 @@ PropertyMap YQModulesModel::readDesktopFile( const QString &path ) { - qDebug() << "Bublincin pisecek" ; PropertyMap data; + const QString rootOnly = "X-SuSE-YaST-RootOnly"; + + QSettings desktopFile( path, QSettings::IniFormat ); + + // check if parsing was correct + if ( desktopFile.status() != QSettings::NoError ) + { + qWarning() << "Error reading desktop file " << path; + return data; + } + + desktopFile.beginGroup( "Desktop Entry" ); + + QStringList keys(desktopFile.allKeys()); + QStringListIterator keyit(keys); + + // X-SuSE-YaST-RootOnly = true + // do not show those to normal user + if ( !priv->userIsRoot && keys.contains( rootOnly ) && + desktopFile.value(rootOnly).toBool() ) + return data; + + while (keyit.hasNext()) + { + QString key(keyit.next()); + data.insert(key, desktopFile.value(key)); + } + qDebug() << path << " read with " << data.size() << " keys"; + return data; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org