Author: locilka Date: Mon Apr 28 10:42:03 2008 New Revision: 47092 URL: http://svn.opensuse.org/viewcvs/yast?rev=47092&view=rev Log: - Selecting Xfce will set DEFAULT_WM to 'startxfce4' (bnc #298558). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/DefaultDesktop.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=47092&r1=47091&r2=47092&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Apr 28 10:42:03 2008 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Mon Apr 28 09:51:02 CEST 2008 - locilka@suse.cz -- Fixed KDE 3.5 description. +- Fixed KDE 3.5 description (bnc #379157). +- Selecting Xfce will set DEFAULT_WM to 'startxfce4' (bnc #298558). ------------------------------------------------------------------- Fri Apr 25 18:16:07 CEST 2008 - locilka@suse.cz Modified: trunk/packager/src/modules/DefaultDesktop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/DefaultDesktop.ycp?rev=47092&r1=47091&r2=47092&view=diff ============================================================================== --- trunk/packager/src/modules/DefaultDesktop.ycp (original) +++ trunk/packager/src/modules/DefaultDesktop.ycp Mon Apr 28 10:42:03 2008 @@ -80,7 +80,7 @@ * "label" : _("Desktop Name Visible in Dialog"), * "description" : _("Description text of the desktop"), * "patterns" : ["list", "of", "related", "patterns"], - * "icon" : "some-icon", // filename from the 32x32 directory of the current theme (without .png suffix) + * "icon" : "some-icon", // filename from the 64x64 directory of the current theme (without .png suffix) * ], * ] */ @@ -131,7 +131,7 @@ /** * Desktop which was selected in the desktop selection dialog - * "kde", "gnome", "min_x11", "text" + * "kde", "kde3", "gnome", "xfce", "min_x", "textmode", nil */ string desktop = nil; @@ -141,14 +141,16 @@ map desktop2wm = $[ "gnome" : "gnome", "kde" : "kde", - "xfce" : "twm", + "kde3" : "kde", + // bnc #298558 + "xfce" : "startxfce4", "min_x" : "twm", "textmode" : "twm", ]; /** * Get the currently set default desktop, nil if none set - * @return string "kde", "gnome", "xfce", "min_x", "textmode", nil + * @return string "kde", "kde3", "gnome", "xfce", "min_x", "textmode", nil */ global string Desktop () { return desktop; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org