Author: locilka
Date: Mon Apr 28 11:45:45 2008
New Revision: 47093
URL: http://svn.opensuse.org/viewcvs/yast?rev=47093&view=rev
Log:
- Handling KDE3 vs KDE4 in default logon and window managers
(bnc #381821).
Modified:
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/desktop_finish.ycp
trunk/installation/yast2-installation.spec.in
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=47093&r1=47092&r2=47093&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Apr 28 11:45:45 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Apr 28 11:42:21 CEST 2008 - locilka@suse.cz
+
+- Handling KDE3 vs KDE4 in default logon and window managers
+ (bnc #381821).
+
+-------------------------------------------------------------------
Fri Apr 25 18:15:09 CEST 2008 - locilka@suse.cz
- New desktop selection dialog (bnc #379157).
Modified: trunk/installation/src/clients/desktop_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/desktop_finish.ycp?rev=47093&r1=47092&r2=47093&view=diff
==============================================================================
--- trunk/installation/src/clients/desktop_finish.ycp (original)
+++ trunk/installation/src/clients/desktop_finish.ycp Mon Apr 28 11:45:45 2008
@@ -71,35 +71,32 @@
map > desktop_data = $[
"gnome" : $[
"package" : ["gdm"],
- "wm" : "gnome",
- "dm" : "gdm",
- "cursor" : "DMZ",
],
"kde" : $[
"package" : ["kde4-kdm"],
- "wm" : "kde",
- "dm" : "kdm",
- "cursor" : "DMZ",
],
"kde3" : $[
"package" : ["kdebase3-kdm"],
- "wm" : "kde",
- "dm" : "kdm",
- "cursor" : "DMZ",
+
+ ],
+ "xfce" : $[
+ "package" : ["xfce"],
+
],
"twm" : $[
"package" : ["xorg-x11"],
- "wm" : "",
- "dm" : "xdm",
- "cursor" : "DMZ",
],
];
- string default_wm = "gnome";
- string default_dm = "gdm";
- string default_cursor = "DMZ";
+ map dd_map = DefaultDesktop::GetAllDesktopsMap ();
- string selected_desktop = DefaultDesktop::Desktop ();
+ string selected_desktop = DefaultDesktop::Desktop();
+ if (selected_desktop == nil || selected_desktop == "")
+ selected_desktop = "gnome";
+
+ string default_dm = dd_map[selected_desktop, "logon"]:"";
+ string default_wm = dd_map[selected_desktop, "desktop"]:"";
+ string default_cursor = dd_map[selected_desktop, "cursor"]:"";
list <string> selected_desktops = DefaultDesktop::SelectedDesktops();
@@ -133,11 +130,14 @@
if (Pkg::IsProvided (package) && (Pkg::PkgInstalled (package) || Pkg::IsSelected (package))) {
y2milestone ("package %1 selected or installed", package);
desktop_found = true;
- default_dm = desktop_data[d, "dm"]:"";
+
+ default_dm = dd_map[d, "logon"]:"";
y2milestone ("Setting logon manager %1 - package selected", default_dm);
- default_wm = desktop_data[d, "wm"]:"";
+
+ default_wm = dd_map[d, "desktop"]:"";
y2milestone ("Setting window manager %1 - package selected", default_wm);
- default_cursor = desktop_data[d, "cursor"]:default_cursor;
+
+ default_cursor = dd_map[d, "cursor"]:default_cursor;
y2milestone ("Setting cursor theme %1 - package selected", default_cursor);
}
Modified: trunk/installation/yast2-installation.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=47093&r1=47092&r2=47093&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Mon Apr 28 11:45:45 2008
@@ -25,7 +25,8 @@
Requires: yast2-country-data >= 2.16.11
# DefaultDesktop::SelectedDesktops
-Requires: yast2-packager >= 2.16.37
+# ... + newly added data into desktops map
+Requires: yast2-packager >= 2.16.41
# Only in inst-sys
# Requires: yast2-runlevel
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org