[yast-commit] r48153 - in /trunk/samba-client: VERSION package/yast2-samba-client.changes src/Samba.ycp src/dialogs.ycp src/routines.ycp

Author: jsuchome Date: Mon Jun 9 07:53:13 2008 New Revision: 48153 URL: http://svn.opensuse.org/viewcvs/yast?rev=48153&view=rev Log: - check for KDE4's kdm when saving DISPLAYMANAGER_AD_INTEGRATION (bnc#392122) - 2.17.0 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/Samba.ycp trunk/samba-client/src/dialogs.ycp trunk/samba-client/src/routines.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=48153&r1=48152&r2=48153&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Mon Jun 9 07:53:13 2008 @@ -1 +1 @@ -2.16.9 +2.17.0 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba-client.changes?rev=48153&r1=48152&r2=48153&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Mon Jun 9 07:53:13 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 6 13:01:47 CEST 2008 - jsuchome@suse.cz + +- check for KDE4's kdm when saving DISPLAYMANAGER_AD_INTEGRATION + (bnc#392122) +- 2.17.0 + +------------------------------------------------------------------- Tue Jun 3 16:15:22 CEST 2008 - jsuchome@suse.cz - correctly quote the 'net join' command (bnc#396070) Modified: trunk/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/Samba.ycp?rev=48153&r1=48152&r2=48153&view=diff ============================================================================== --- trunk/samba-client/src/Samba.ycp (original) +++ trunk/samba-client/src/Samba.ycp Mon Jun 9 07:53:13 2008 @@ -32,6 +32,7 @@ import "SambaNmbLookup"; import "String"; import "Summary"; +import "SuSEFirewall"; /** @@ -478,7 +479,7 @@ if (enable) { - if (!Package::InstalledAny (["kdebase3-kdm", "gdm"])) + if (!Package::InstalledAny (["kdebase3-kdm", "kde4-kdm", "gdm"])) return false; if (SCR::Read (.sysconfig.displaymanager.DISPLAYMANAGER_AD_INTEGRATION) == "yes") return true; @@ -490,10 +491,9 @@ string dm = (string) SCR::Read (.sysconfig.displaymanager.DISPLAYMANAGER); - if (!write_only && (dm == "kdm" || dm == "gdm")) + if (!write_only && dm == "gdm") { - SCR::Execute (.target.bash, - "/sbin/SuSEconfig --module " + (dm == "gdm" ? dm : "kdm3")); + SCR::Execute (.target.bash, "/sbin/SuSEconfig --module gdm"); } return true; } @@ -553,6 +553,8 @@ NetworkConfig::Read (); network_setup = NetworkConfig::Export (); + SuSEFirewall::Read (); + // finished Progress::NextStage(); globals_configured = true; @@ -718,6 +720,11 @@ WriteSSHSupport (ssh_support); + SuSEFirewall::WriteOnly (); + if (!write_only) + SuSEFirewall::ActivateConfiguration (); + + // finished Progress::NextStage(); modified = false; Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev=48153&r1=48152&r2=48153&view=diff ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Mon Jun 9 07:53:13 2008 @@ -11,6 +11,7 @@ textdomain "samba-client"; import "Autologin"; +import "CWMFirewallInterfaces"; import "Directory"; import "Label"; import "Message"; @@ -176,7 +177,7 @@ boolean was_winbind = Samba::GetWinbind(); term winbind_term = Stage::cont() ? `Empty () : `VBox ( - `VSpacing (0.5), + `VSpacing (0.4), `Left(`CheckBox(`id(`winbind), `opt (`notify), // translators: checkbox label to enable winbind _("Also &Use SMB Information for Linux Authentication"), @@ -207,7 +208,7 @@ ) : `Empty (); term ntp_term = Mode::config () ? `Empty () : `VBox ( - `VSpacing (0.5), + `VSpacing (0.4), // button label (run YaST client for NTP) `Right (`PushButton (`id(`ntp), _("&NTP Configuration..."))) ); @@ -217,14 +218,20 @@ // checkbox label string text_fam = _("Start File Alteration Monitor"); + map firewall_widget = + CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ + "services" : [ "samba-server" ], + "display_details" : true, + ]); + term firewall_layout = firewall_widget["custom_widget"]:`VBox (); + Wizard::SetContentsButtons( caption, `HVSquash( `VBox( // translators: frame label `Frame (_("Membership"), `VBox ( `HBox( `HSpacing (0.2), -// `InputField (`id(`workgroup), `opt (`hstretch), - `TextEntry (`id(`workgroup), `opt (`hstretch), + `InputField (`id(`workgroup), `opt (`hstretch), (Stage::cont() ? _("&Domain") : // translators: text entry label @@ -252,7 +259,7 @@ ) ) ), - `VSpacing (0.5), + `VSpacing (0.4), // button label `Right (`PushButton (`id(`expert), _("&Expert Settings..."))), SharesTerm ($[ @@ -272,6 +279,7 @@ HELPS["MembershipDialog_NTP"]:""), Label::BackButton(), Stage::cont() ? Label::NextButton() : Label::FinishButton() ); +// CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, ""); foreach (symbol t, [`mkhomedir, `caching, `ssh], { UI::ChangeWidget (`id(t), `Enabled, Samba::GetWinbind() || Stage::cont()); }); @@ -287,7 +295,10 @@ any ret = nil; while(true) { - ret = UI::UserInput(); + map event = UI::WaitForEvent (); + ret = (symbol) event["ID"]:nil; +// CWMFirewallInterfaces::OpenFirewallHandle(firewall_widget,"",event); + boolean use_winbind = Stage::cont() ? true : (boolean)UI::QueryWidget(`id(`winbind), `Value); @@ -475,6 +486,7 @@ the machine to enable it for all services. ")); } +// CWMFirewallInterfaces::OpenFirewallStore (firewall_widget,"",event); break; } else if (ret == `back ) { break; Modified: trunk/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/routines.ycp?rev=48153&r1=48152&r2=48153&view=diff ============================================================================== --- trunk/samba-client/src/routines.ycp (original) +++ trunk/samba-client/src/routines.ycp Mon Jun 9 07:53:13 2008 @@ -344,7 +344,7 @@ // frame label _("Sharing"); return `VBox ( - `VSpacing (), + `VSpacing (0.4), // frame label `Frame (label, `VBox ( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org