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