Author: kmachalkova Date: Thu Jul 16 16:23:20 2009 New Revision: 58095 URL: http://svn.opensuse.org/viewcvs/yast?rev=58095&view=rev Log: Putting YAST2_DESKTOP_DIR back again Modified: trunk/control-center/src/yqmodulegroupsmodel.cpp trunk/control-center/src/yqmodulesmodel.cpp Modified: trunk/control-center/src/yqmodulegroupsmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulegroupsmodel.cpp?rev=58095&r1=58094&r2=58095&view=diff ============================================================================== --- trunk/control-center/src/yqmodulegroupsmodel.cpp (original) +++ trunk/control-center/src/yqmodulegroupsmodel.cpp Thu Jul 16 16:23:20 2009 @@ -32,7 +32,11 @@ YQModuleGroupsModel::YQModuleGroupsModel( QObject * parent ) : YQDesktopFilesModel(parent) { - addDesktopFilesPath( GROUPS_DESKTOP_DIR ); + + QString default_dir( GROUPS_DESKTOP_DIR ); + QString alt_dir = QString( getenv( "YAST2_DESKTOP_DIR") ); + + addDesktopFilesPath( alt_dir.isEmpty() ? default_dir : alt_dir + "/groups/"); addIconPath( ICON_DIR ); addIconPath( FALLBACK_ICON_DIR ); reindex(); Modified: trunk/control-center/src/yqmodulesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmodel.cpp?rev=58095&r1=58094&r2=58095&view=diff ============================================================================== --- trunk/control-center/src/yqmodulesmodel.cpp (original) +++ trunk/control-center/src/yqmodulesmodel.cpp Thu Jul 16 16:23:20 2009 @@ -49,7 +49,10 @@ : YQDesktopFilesModel(parent) , priv(new Private) { - addDesktopFilesPath( MODULES_DESKTOP_DIR ); + QString default_dir( MODULES_DESKTOP_DIR ); + QString alt_dir = QString( getenv( "YAST2_DESKTOP_DIR") ); + + addDesktopFilesPath( alt_dir.isEmpty() ? default_dir : alt_dir ); addIconPath( ICON_DIR ); addIconPath( FALLBACK_ICON_DIR ); removeEmptyGroups(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org