January 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63255 - in /trunk/ldap-client: ./ agents/ package/ src/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 16:23:42 2011 New Revision: 63255 URL: http://svn.opensuse.org/viewcvs/yast?rev=63255&view=rev Log: - if sssd is active, ask for basic Kerberos settings (fate#308902) - 2.20.9 Modified: trunk/ldap-client/VERSION trunk/ldap-client/agents/Makefile.am trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/testsuite/tests/Export.out trunk/ldap-client/testsuite/tests/Export.ycp trunk/ldap-client/testsuite/tests/Read.out trunk/ldap-client/testsuite/tests/Read.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63255&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Fri Jan 21 16:23:42 2011 @@ -1 +1 @@ -2.20.8 +2.20.9 Modified: trunk/ldap-client/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/agents/Makefile.am?r… ============================================================================== --- trunk/ldap-client/agents/Makefile.am (original) +++ trunk/ldap-client/agents/Makefile.am Fri Jan 21 16:23:42 2011 @@ -5,8 +5,7 @@ # scrconf_DATA = ldap_conf.scr \ - cfg_ldap.scr \ - etc_sssd_conf.scr + cfg_ldap.scr fillup_DATA = sysconfig.ldap Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jan 21 16:23:42 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 21 14:40:48 CET 2011 - jsuchome(a)suse.cz + +- if sssd is active, ask for basic Kerberos settings (fate#308902) +- 2.20.9 + +------------------------------------------------------------------- Fri Jan 21 12:27:22 CET 2011 - jsuchome(a)suse.cz - agent for sssd.conf moved to yast2-pam to be accessible for Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=632… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Fri Jan 21 16:23:42 2011 @@ -306,6 +306,12 @@ // enable/disable offline authentication ('cache_credentials' key) global boolean sssd_cache_credentials = false; + // Kerberos default realm (for sssd) + global string krb5_realm = ""; + + // adress of KDC (key distribution centre) server for default realm + global string krb5_kdcip = ""; + //---------------------------------------------------------------- /** @@ -415,6 +421,8 @@ tls_checkpeer = settings ["tls_checkpeer"]:"yes"; mkhomedir = settings ["mkhomedir"]:mkhomedir; sssd = settings ["sssd"]:sssd; + krb5_realm = settings ["krb5_realm"]:krb5_realm; + krb5_kdcip = settings ["krb5_kdcip"]:krb5_kdcip; if (_start_autofs) required_packages = (list<string>) union (required_packages, ["autofs"]); @@ -457,7 +465,7 @@ "create_ldap" : create_ldap, "login_enabled" : login_enabled, "mkhomedir" : mkhomedir, - "sssd" : sssd + "sssd" : sssd, ]; if (tls_checkpeer != "yes") e["tls_checkpeer"] = tls_checkpeer; @@ -473,6 +481,10 @@ e["nss_base_group"] = nss_base_group; if (_autofs_allowed) e["start_autofs"] = _start_autofs; + if (krb5_realm != "") + e["krb5_realm"] = krb5_realm; + if (krb5_kdcip != "") + e["krb5_kdcip"] = krb5_kdcip; return e; } @@ -543,6 +555,26 @@ /* ------------- read/write functions ------------------------------- */ /** + * For sssd, some kerberos values are needed + */ + global boolean ReadKrb5Conf () + { + + list<string> realm = (list<string>) SCR::Read (.etc.krb5_conf.v.libdefaults.default_realm); + if (realm == nil) + realm = []; + krb5_realm = realm[0]:""; + + list<string> kdcs = (list<string>) SCR::Read (add (add (.etc.krb5_conf.v, krb5_realm), "kdc")); + if (kdcs == nil) + kdcs = []; + krb5_kdcip = mergestring (kdcs, " "); + + return true; + } + + + /** * Read single entry from /etc/ldap.conf file * @param entry entry name * @param defvalue default value if entry is not present @@ -844,6 +876,21 @@ Autologin::Read (); + if (true || Pam::Enabled("krb5")) + { + ReadKrb5Conf (); + } + if (FileUtils::Exists ("/etc/sssd/sssd.conf")) + { + // read realm and kdc from sssd.conf if available + path domain = add (.etc.sssd_conf.v, "domain/default"); + string realm = (string) SCR::Read (add (domain, "krb5_realm")); + if (realm != nil) + krb5_realm = realm; + string kdc = (string) SCR::Read (add (domain, "krb5_kdcip")); + if (kdc != nil) + krb5_kdcip = kdc; + } // Now check if previous configuration of LDAP server didn't proposed // some better values: @@ -2047,31 +2094,13 @@ } // In a mixed Kerberos/LDAP setup the following changes are needed in the [domain/default] section: - if (Pam::Enabled("krb5")) + if (krb5_realm != "" && krb5_kdcip != "") { -// FIXME: do not test for pam, it may be already off... SCR::Write (add (domain, "auth_provider"), "krb5"); SCR::Write (add (domain, "chpass_provider"), "krb5"); - /* - FIXME how to read krb settings: - a) use agent directly (moved out from yast2-kerberos-client) - b) use Read + Export of Kerberos.ycp - - * Set "krb5_kdcip" to the hostname of the kerberos kdc - * Set "krb5_realm" to kerberos realm - */ - if (Package::Installed ("yast2-kerberos-client")) - { - WFM::CallFunction ("kerberos-client_auto", ["Read"]); - any e = WFM::CallFunction ("kerberos-client_auto",["Export"]); - if (is (e,map) && e != $[]) - { - map kerberos = (map) e; - SCR::Write (add (domain, "krb5_realm"), kerberos["kerberos_client","default_realm"]:nil); - SCR::Write (add (domain, "krb5_kdcip"), kerberos["kerberos_client","kdc_server"]:nil); - } - } + SCR::Write (add (domain, "krb5_realm"), krb5_realm); + SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); } else { Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=63255… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Fri Jan 21 16:23:42 2011 @@ -715,6 +715,8 @@ string tls_cacertdir = Ldap::tls_cacertdir; string tls_cacertfile = Ldap::tls_cacertfile; boolean sssd = Ldap::sssd; + string krb5_realm = Ldap::krb5_realm; + string krb5_kdcip = Ldap::krb5_kdcip; list<term>member_attributes = [ `item (`id("member"), "member", member_attribute == "member"), @@ -833,12 +835,8 @@ ); } - define void set_client_term () { - - term cont = `Top (`HBox(`HSpacing (5), `VBox( - `VSpacing(0.4), - `Left (`CheckBox (`id (`sssd), `opt (`notify), _("Use S&ystem Security Services Daemon (SSSD)"), sssd)), - `VSpacing(0.4), + term get_frame_nss () { + return // frame label `Frame (_("Naming Contexts"), `HBox( `HSpacing (1), `VBox( @@ -876,7 +874,28 @@ `VSpacing(0.4) ), `HSpacing (1) - )), + )); + } + + term get_frame_krb () { + return + // frame label + `Frame (_("Basic Kerberos Settings"), `HBox (`HSpacing (1), `VBox ( + // textentry label + `TextEntry (`id (`krb5_realm), _("Default Real&m"), krb5_realm), + // textentry label + `TextEntry (`id (`krb5_kdcip), _("&KDC Server Address"), krb5_kdcip), + `VSpacing (0.4) + ), `HSpacing (1))); + } + + define void set_client_term () { + + term cont = `Top (`HBox(`HSpacing (5), `VBox( + `VSpacing(0.4), + `Left (`CheckBox (`id (`sssd), `opt (`notify), _("Use S&ystem Security Services Daemon (SSSD)"), sssd)), + `VSpacing(0.4), + `ReplacePoint (`id (`rp_frame), `VBox (sssd ? get_frame_krb () : get_frame_nss ())), `VSpacing (0.4), `ComboBox (`id (`pam_password), `opt(`notify,`hstretch,`editable), // combobox label @@ -915,10 +934,6 @@ UI::ReplaceWidget (`tabContents, cont); if (has_tabs) UI::ChangeWidget (`id (`tabs), `CurrentItem, `client); - - foreach (symbol ui, [ `nss_base_passwd, `nss_base_group, `nss_base_shadow, `br_passwd, `br_shadow, `br_group ], { - UI::ChangeWidget (`id (ui), `Enabled, UI::QueryWidget (`id (`sssd), `Value) == false); - }); } define void set_admin_term () { @@ -1014,12 +1029,23 @@ if (current == `client) { member_attribute =(string)UI::QueryWidget(`id(`group_style),`Value); - nss_base_passwd = (string) - UI::QueryWidget(`id(`nss_base_passwd),`Value); - nss_base_shadow = (string) - UI::QueryWidget(`id(`nss_base_shadow),`Value); - nss_base_group = (string) - UI::QueryWidget(`id(`nss_base_group),`Value); + + if (sssd) + { + krb5_realm = (string) + UI::QueryWidget (`id (`krb5_realm), `Value); + krb5_kdcip = (string) + UI::QueryWidget (`id (`krb5_kdcip), `Value); + } + else + { + nss_base_passwd = (string) + UI::QueryWidget(`id(`nss_base_passwd),`Value); + nss_base_shadow = (string) + UI::QueryWidget(`id(`nss_base_shadow),`Value); + nss_base_group = (string) + UI::QueryWidget(`id(`nss_base_group),`Value); + } pam_password = (string) UI::QueryWidget(`id(`pam_password), `Value); tls_cacertfile = (string) UI::QueryWidget(`id(`tls_cacertfile), `Value); @@ -1079,9 +1105,7 @@ if (result == `sssd) { sssd = (boolean) UI::QueryWidget (`id (`sssd), `Value); - foreach (symbol ui, [ `nss_base_passwd, `nss_base_group, `nss_base_shadow, `br_passwd, `br_shadow, `br_group ], { - UI::ChangeWidget (`id (ui), `Enabled, !sssd); - }); + UI::ReplaceWidget (`id (`rp_frame), sssd ? get_frame_krb () : get_frame_nss ()); } if (result == `br_tls_cacertdir) { @@ -1270,7 +1294,9 @@ Ldap::ldap_v2 != ldap_v2 || Ldap::tls_cacertdir != tls_cacertdir || Ldap::tls_cacertfile != tls_cacertfile || - Ldap::sssd != sssd + Ldap::sssd != sssd || + Ldap::krb5_realm != krb5_realm || + Ldap::krb5_kdcip != krb5_kdcip ) { Ldap::bind_dn = bind_dn; @@ -1286,6 +1312,8 @@ Ldap::tls_cacertdir = tls_cacertdir; Ldap::tls_cacertfile = tls_cacertfile; Ldap::sssd = sssd; + Ldap::krb5_realm = krb5_realm; + Ldap::krb5_kdcip = krb5_kdcip; Ldap::modified = true; } break; Modified: trunk/ldap-client/testsuite/tests/Export.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.out (original) +++ trunk/ldap-client/testsuite/tests/Export.out Fri Jan 21 16:23:42 2011 @@ -17,6 +17,8 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_map_attribute" 0 Execute .passwd.init $["base_directory":"/etc"] true Read .passwd.passwd.pluslines ["+"] +Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] +Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/Export.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.ycp (original) +++ trunk/ldap-client/testsuite/tests/Export.ycp Fri Jan 21 16:23:42 2011 @@ -36,6 +36,16 @@ ] ] ], + "krb5_conf" : $[ + "v" : $[ + "libdefaults": $[ + "default_realm": ["SUSE.CZ"], + ], + "SUSE.CZ": $[ + "kdc": ["kdc.suse.cz"], + ], + ], + ], // /etc/security/pam_* "security": $[ "section": $[ Modified: trunk/ldap-client/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.out (original) +++ trunk/ldap-client/testsuite/tests/Read.out Fri Jan 21 16:23:42 2011 @@ -16,6 +16,8 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_map_attribute" 0 Execute .passwd.init $["base_directory":"/etc"] true Read .passwd.passwd.pluslines ["+"] +Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] +Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ Dump ldap used: -true- Modified: trunk/ldap-client/testsuite/tests/Read.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.ycp (original) +++ trunk/ldap-client/testsuite/tests/Read.ycp Fri Jan 21 16:23:42 2011 @@ -36,6 +36,16 @@ ] ] ], + "krb5_conf" : $[ + "v" : $[ + "libdefaults": $[ + "default_realm": ["SUSE.CZ"], + ], + "SUSE.CZ": $[ + "kdc": ["kdc.suse.cz"], + ], + ], + ], // /etc/security/pam_* "security": $[ "section": $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63254 - in /trunk/ldap-client: agents/etc_sssd_conf.scr package/yast2-ldap-client.changes yast2-ldap-client.spec.in
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:16:20 2011 New Revision: 63254 URL: http://svn.opensuse.org/viewcvs/yast?rev=63254&view=rev Log: - agent for sssd.conf moved to yast2-pam to be accessible for kerberos-client Removed: trunk/ldap-client/agents/etc_sssd_conf.scr Modified: trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/yast2-ldap-client.spec.in Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jan 21 13:16:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 21 12:27:22 CET 2011 - jsuchome(a)suse.cz + +- agent for sssd.conf moved to yast2-pam to be accessible for + kerberos-client + +------------------------------------------------------------------- Thu Jan 20 16:41:00 CET 2011 - jsuchome(a)suse.cz - write default_realm as realm Modified: trunk/ldap-client/yast2-ldap-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/yast2-ldap-client.sp… ============================================================================== --- trunk/ldap-client/yast2-ldap-client.spec.in (original) +++ trunk/ldap-client/yast2-ldap-client.spec.in Fri Jan 21 13:16:20 2011 @@ -16,8 +16,9 @@ # removed lowercasing of LDAP object names Requires: yast2-ldap >= 2.17.1 -# new API of Pam.ycp -Requires: yast2-pam >= 2.14.0 +# etc_sssd_conf.scr +Requires: yast2-pam >= 2.20.0 + Provides: yast2-config-ldap_client Obsoletes: yast2-config-ldap_client Provides: yast2-trans-ldap_client -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63253 - /tags/stable-2_20_2/kerberos-client/
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:04:49 2011 New Revision: 63253 URL: http://svn.opensuse.org/viewcvs/yast?rev=63253&view=rev Log: Created tag stable-2_20_2 for kerberos-client Added: tags/stable-2_20_2/kerberos-client/ - copied from r63252, trunk/kerberos-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63252 - in /trunk/kerberos-client: VERSION agents/etc_krb5_conf.scr package/yast2-kerberos-client.changes src/Kerberos.ycp yast2-kerberos-client.spec.in
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:03:18 2011 New Revision: 63252 URL: http://svn.opensuse.org/viewcvs/yast?rev=63252&view=rev Log: - when sssd is configured, update sssd.conf's kerberos values - agent for krb5.conf moved to yast2-pam to be usable by ldap-client - 2.20.2 Removed: trunk/kerberos-client/agents/etc_krb5_conf.scr Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/yast2-kerberos-client.spec.in Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=6325… ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Fri Jan 21 13:03:18 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Fri Jan 21 13:03:18 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 21 12:26:47 CET 2011 - jsuchome(a)suse.cz + +- when sssd is configured, update sssd.conf's kerberos values +- agent for krb5.conf moved to yast2-pam to be usable by ldap-client +- 2.20.2 + +------------------------------------------------------------------- Thu Jan 20 16:12:22 CET 2011 - jsuchome(a)suse.cz - do not use pam_krb5 when sssd is configured Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp… ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Fri Jan 21 13:03:18 2011 @@ -482,10 +482,24 @@ // -- pam settings if (pam_modified || write_only) { + // whem sssd is configured, do not use pam_krb5 and update sssd.conf + // fate#308902 if (Pam::Enabled ("sss")) { y2milestone ("not using pam_krb5 because sssd is configured"); Pam::Remove ("krb5"); + + y2milestone ("updating sssd.conf with new kerberos values"); + + path domain = add (.etc.sssd_conf.v, "domain/default"); + SCR::Write (add (domain, "auth_provider"), "krb5"); + SCR::Write (add (domain, "chpass_provider"), "krb5"); + SCR::Write (add (domain, "krb5_realm"), default_realm); + SCR::Write (add (domain, "krb5_kdcip"), kdc); + if (!SCR::Write(.etc.sssd_conf, nil)) + { + y2error ("error writing ldap.conf file"); + } } else if (use_pam_krb) { Modified: trunk/kerberos-client/yast2-kerberos-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/yast2-kerberos-c… ============================================================================== --- trunk/kerberos-client/yast2-kerberos-client.spec.in (original) +++ trunk/kerberos-client/yast2-kerberos-client.spec.in Fri Jan 21 13:03:18 2011 @@ -5,8 +5,8 @@ License: GPL v2 or later BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite -# new Pam.ycp API -Requires: yast2-pam >= 2.14.0 +# etc_krb5_conf.scr +Requires: yast2-pam >= 2.20.0 # Hostname::CurrentDomain, CurrentHostname Requires: yast2 >= 2.16.48 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63251 - /tags/stable-2_20_0/pam/
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:02:45 2011 New Revision: 63251 URL: http://svn.opensuse.org/viewcvs/yast?rev=63251&view=rev Log: Created tag stable-2_20_0 for pam Added: tags/stable-2_20_0/pam/ - copied from r63250, trunk/pam/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63250 - in /trunk/pam: VERSION agents/etc_krb5_conf.scr agents/etc_sssd_conf.scr package/yast2-pam.changes
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:02:34 2011 New Revision: 63250 URL: http://svn.opensuse.org/viewcvs/yast?rev=63250&view=rev Log: - agents for accessing krb5.conf and sssd.conf moved here, so they are available in more modules - 2.20.0 Added: trunk/pam/agents/etc_krb5_conf.scr - copied unchanged from r63014, trunk/kerberos-client/agents/etc_krb5_conf.scr trunk/pam/agents/etc_sssd_conf.scr - copied unchanged from r63165, trunk/ldap-client/agents/etc_sssd_conf.scr Modified: trunk/pam/VERSION trunk/pam/package/yast2-pam.changes Modified: trunk/pam/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/VERSION?rev=63250&r1=63249&r… ============================================================================== --- trunk/pam/VERSION (original) +++ trunk/pam/VERSION Fri Jan 21 13:02:34 2011 @@ -1 +1 @@ -2.19.2 +2.20.0 Modified: trunk/pam/package/yast2-pam.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/package/yast2-pam.changes?re… ============================================================================== --- trunk/pam/package/yast2-pam.changes (original) +++ trunk/pam/package/yast2-pam.changes Fri Jan 21 13:02:34 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 21 12:21:29 CET 2011 - jsuchome(a)suse.cz + +- agents for accessing krb5.conf and sssd.conf moved here, + so they are available in more modules +- 2.20.0 + +------------------------------------------------------------------- Thu Jul 15 13:30:24 CEST 2010 - jsuchome(a)suse.cz - use full path for pam-config -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63249 - /tags/stable-2_21_88/gtk/
by rpmcruz＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: rpmcruz Date: Thu Jan 20 21:28:07 2011 New Revision: 63249 URL: http://svn.opensuse.org/viewcvs/yast?rev=63249&view=rev Log: Created tag stable-2_21_88 for gtk Added: tags/stable-2_21_88/gtk/ - copied from r63248, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63248 - /tags/stable-2_21_88/
by rpmcruz＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: rpmcruz Date: Thu Jan 20 21:27:58 2011 New Revision: 63248 URL: http://svn.opensuse.org/viewcvs/yast?rev=63248&view=rev Log: Created tag stable-2_21_88 Added: tags/stable-2_21_88/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63247 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: rpmcruz Date: Thu Jan 20 21:27:52 2011 New Revision: 63247 URL: http://svn.opensuse.org/viewcvs/yast?rev=63247&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=63247&r1=63246&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Thu Jan 20 21:27:52 2011 @@ -1 +1 @@ -2.21.87 +2.21.88 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=63247&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Thu Jan 20 21:27:52 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "87") +SET(VERSION_PATCH "88") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Thu Jan 20 21:27:52 2011 @@ -1,8 +1,10 @@ ------------------------------------------------------------------- - +Thu Jan 20 20:22:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.88 -- feature: move window by dragging the header. +- sw_single: using buttons instead of radios for the +versions-box. +- allow moving window by dragging the header. ------------------------------------------------------------------- Wed Jan 05 23:00:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63246 - in /trunk/gtk/src/pkg: ygtkpkgdetailview.cc yzyppwrapper.cc
by rpmcruz＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: rpmcruz Date: Thu Jan 20 21:22:05 2011 New Revision: 63246 URL: http://svn.opensuse.org/viewcvs/yast?rev=63246&view=rev Log: * improved Atri versions-box style. * got rid of radio style: Atri style is now the default. Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/yzyppwrapper.cc Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Thu Jan 20 21:22:05 2011 @@ -21,8 +21,6 @@ #include "ygtkpkglistview.h" #include <YStringTree.h> -//#define ATRI_BUTTONS - #define BROWSER_BIN "/usr/bin/firefox" #define GNOME_OPEN_BIN "/usr/bin/gnome-open" @@ -33,12 +31,7 @@ return s; } -#if 0 -static const char *keywordOpenTag = ""; -static const char *keywordCloseTag = ""; -#else static const char *keywordOpenTag = "<keyword>", *keywordCloseTag = "</keyword>"; -#endif struct BusyOp { BusyOp() { @@ -365,142 +358,52 @@ { return zyppPool().byKindEnd<zypp::SrcPackage>(); } struct VersionExpander : public DetailExpander { - GtkWidget *box, *versions_box, *button, *undo_button; + GtkWidget *versions_box; std::list <Ypp::Version> versions; VersionExpander() : DetailExpander (_("Versions"), false) { - button = gtk_button_new_with_label (""); - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (button_clicked_cb), this); - - GtkSettings *settings = gtk_settings_get_default(); - gboolean show_button_images; - g_object_get (settings, "gtk-button-images", &show_button_images, NULL); - if (show_button_images) { - undo_button = gtk_button_new_with_label (""); - gtk_button_set_image (GTK_BUTTON (undo_button), - gtk_image_new_from_stock (GTK_STOCK_UNDO, GTK_ICON_SIZE_BUTTON)); - gtk_widget_set_tooltip_text (undo_button, _("Undo")); - } - else - undo_button = gtk_button_new_with_label (_("Undo")); - g_signal_connect (G_OBJECT (undo_button), "clicked", - G_CALLBACK (undo_clicked_cb), this); - versions_box = gtk_vbox_new (FALSE, 2); - GtkWidget *button_box = gtk_hbox_new (FALSE, 6); - gtk_box_pack_end (GTK_BOX (button_box), undo_button, FALSE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (button_box), button, FALSE, TRUE, 0); - - box = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (box), versions_box, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), button_box, FALSE, TRUE, 0); - -#if 1 // draw border all around + // draw border GtkWidget *frame = gtk_frame_new (NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 2); - gtk_container_add (GTK_CONTAINER (frame), box); - box = frame; -#endif -#if 0 // draw border only to the left - GtkWidget *frame_box = gtk_hbox_new (FALSE, 2); - gtk_box_pack_start (GTK_BOX (frame_box), gtk_vseparator_new(), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (frame_box), box, TRUE, TRUE, 0); - box = frame_box; -#endif -#if 0 // colored background - GtkWidget *back = gtk_event_box_new(); - GdkColor color = { 0, 230 << 8, 230 << 8, 230 << 8 }; - gtk_widget_modify_bg (back, GTK_STATE_NORMAL, &color); - gtk_container_add (GTK_CONTAINER (back), box); - box = back; -#endif - - setChild (box); + gtk_container_add (GTK_CONTAINER (frame), versions_box); + setChild (frame); } - void clearVersions() - { - GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); - for (GList *i = children; i; i = i->next) - gtk_container_remove (GTK_CONTAINER (versions_box), (GtkWidget *) i->data); - g_list_free (children); - versions.clear(); - } - -#ifdef ATRI_BUTTONS -static void atri_button_clicked_cb (GtkToggleButton *button, VersionExpander *pThis) -{ - BusyOp op; - Ypp::Selectable sel = pThis->list.get (0); - - if (!gtk_toggle_button_get_active (button)) { /* was active before pressing? */ - sel.undo(); - return; - } - - int nb = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "nb")); - std::list <Ypp::Version>::iterator it = pThis->versions.begin(); - for (int i = 0; i < nb; i++) it++; - - // guard with startTransaction() ... - - if (sel.toModify()) - sel.undo(); - - Ypp::Version &version = *it; - if (version.isInstalled()) - sel.remove(); - else { - sel.setCandidate (version); - sel.install(); - } -} -#endif - GtkWidget *addVersion (Ypp::Selectable &sel, Ypp::Version version, GtkWidget *group) { - GtkWidget *widget; -#ifdef ATRI_BUTTONS - GtkWidget *hbox = gtk_hbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); GtkWidget *button = gtk_toggle_button_new(); gtk_container_add (GTK_CONTAINER (button), gtk_image_new()); + GtkWidget *label = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + + GtkWidget *hbox = gtk_hbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0); - updateRadio (hbox, sel, version); - widget = hbox; + gtk_widget_show_all (hbox); + g_object_set_data (G_OBJECT (button), "nb", GINT_TO_POINTER (versions.size())); - g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (atri_button_clicked_cb), this); -#else - GtkWidget *radio = gtk_radio_button_new_with_label_from_widget - (GTK_RADIO_BUTTON (group), ""); - updateRadio (radio, sel, version); - - if (version.toModify()) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - g_signal_connect (G_OBJECT (radio), "toggled", - G_CALLBACK (version_toggled_cb), this); - widget = radio; -#endif + updateVersionWidget (hbox, sel, version); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (button_clicked_cb), this); + + GtkWidget *widget = hbox; if ((versions.size() % 2) == 1) g_signal_connect (G_OBJECT (widget), "expose-event", G_CALLBACK (draw_gray_cb), NULL); versions.push_back (version); gtk_box_pack_start (GTK_BOX (versions_box), widget, FALSE, TRUE, 0); - return widget; } - void updateRadio (GtkWidget *radio, Ypp::Selectable &sel, Ypp::Version &version) + void updateVersionLabel (GtkWidget *label, Ypp::Selectable &sel, Ypp::Version &version) { - bool modified; - std::string repo; + std::string repo; bool modified; if (version.isInstalled()) { repo = _("Installed"); modified = sel.toRemove(); @@ -511,93 +414,154 @@ } modified = modified && version.toModify(); - std::string number (version.number()); - std::string arch (version.arch()); + std::string number (version.number()), arch (version.arch()); char *tooltip = g_strdup_printf ("%s (%s)\n%s", number.c_str(), arch.c_str(), repo.c_str()); number = YGUtils::truncate (number, 20, 0); - char *label = g_strdup_printf ("%s%s (%s)\n%s%s", + char *str = g_strdup_printf ("%s%s (%s)\n%s%s", modified ? "" : "", number.c_str(), arch.c_str(), repo.c_str(), modified ? "" : ""); -#ifdef ATRI_BUTTONS - GList *children = gtk_container_get_children (GTK_CONTAINER (radio)); - GtkWidget *_label = (GtkWidget *) children->data; - GtkWidget *_button = (GtkWidget *) children->next->data; - gtk_label_set_markup (GTK_LABEL (_label), label); + gtk_label_set_markup (GTK_LABEL (label), str); if (number.size() > 20) - gtk_widget_set_tooltip_markup (_label, tooltip); - g_list_free (children); + gtk_widget_set_tooltip_markup (label, tooltip); + g_free (tooltip); g_free (str); + } - const gchar *stock, *l; - bool can_never_modify; + void updateVersionButton (GtkWidget *button, Ypp::Selectable &sel, Ypp::Version &version) + { + const char *stock, *tooltip; + bool modified, can_modify = true; if (version.isInstalled()) { - l = _("Remove"); + tooltip = _("Remove"); stock = GTK_STOCK_DELETE; - can_never_modify = !sel.canRemove(); + can_modify = sel.canRemove(); modified = sel.toRemove(); } else { if (sel.hasInstalledVersion()) { Ypp::Version installed = sel.installed(); if (installed < version) { - l = _("Upgrade"); + tooltip = _("Upgrade"); stock = GTK_STOCK_GO_UP; } else if (installed > version) { - l = _("Downgrade"); + tooltip = _("Downgrade"); stock = GTK_STOCK_GO_DOWN; } else { - l = _("Re-install"); + tooltip = _("Re-install"); stock = GTK_STOCK_REFRESH; } } else { - l = _("Install"); + tooltip = _("Install"); stock = GTK_STOCK_SAVE; } modified = sel.toInstall(); } if (modified) - l = _("Undo"); - bool can_modify = !sel.isLocked(); - modified = modified && version.toModify(); + tooltip = _("Undo"); -g_signal_handlers_block_by_func (_button, (gpointer) atri_button_clicked_cb, this); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_button), modified); -g_signal_handlers_unblock_by_func (_button, (gpointer) atri_button_clicked_cb, this); - gtk_widget_set_sensitive (_button, can_modify); -/* if (can_never_modify) - gtk_widget_hide (_button); - else - gtk_widget_show (_button); -*/ - // stock is never changed -- could be set previously... - gtk_widget_set_tooltip_text (_button, l); - gtk_image_set_from_stock (GTK_IMAGE (GTK_BIN(_button)->child), stock, GTK_ICON_SIZE_BUTTON); + g_signal_handlers_block_by_func (button, (gpointer) button_clicked_cb, this); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), modified); + g_signal_handlers_unblock_by_func (button, (gpointer) button_clicked_cb, this); + can_modify ? gtk_widget_show (button) : gtk_widget_hide (button); + gtk_widget_set_tooltip_text (button, tooltip); + gtk_image_set_from_stock (GTK_IMAGE (gtk_bin_get_child (GTK_BIN(button))), + stock, GTK_ICON_SIZE_BUTTON); + } + + void updateVersionWidget (GtkWidget *widget, Ypp::Selectable &sel, Ypp::Version &version) + { + GList *children = gtk_container_get_children (GTK_CONTAINER (widget)); + GtkWidget *label = (GtkWidget *) children->data; + GtkWidget *button = (GtkWidget *) children->next->data; + g_list_free (children); -#else - gtk_label_set_markup (GTK_LABEL (GTK_BIN (radio)->child), label); - if (number.size() > 20) - gtk_widget_set_tooltip_markup (radio, tooltip); -#endif + updateVersionLabel (label, sel, version); + updateVersionButton (button, sel, version); + } + + void updateMultiselectionButton (GtkWidget *button) + { + Ypp::ListProps props (list); + + const char *stock, *tooltip; + bool modified, hide = false; + if (props.isInstalled()) { + tooltip = _("Remove"); + stock = GTK_STOCK_DELETE; + } + else if (props.isNotInstalled()) { + tooltip = _("Install"); + stock = GTK_STOCK_SAVE; + } + else + hide = true; + modified = props.toModify(); + if (modified) + tooltip = _("Undo"); - g_free (tooltip); - g_free (label); + g_signal_handlers_block_by_func (button, (gpointer) button_clicked_cb, this); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), modified); + g_signal_handlers_unblock_by_func (button, (gpointer) button_clicked_cb, this); + hide ? gtk_widget_hide (button) : gtk_widget_show (button); + gtk_widget_set_tooltip_text (button, tooltip); + gtk_image_set_from_stock (GTK_IMAGE (gtk_bin_get_child (GTK_BIN(button))), + stock, GTK_ICON_SIZE_BUTTON); } - Ypp::Version &getSelected() + void clearVersions() { - std::list <Ypp::Version>::iterator it = versions.begin(); GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); - for (GList *i = children; i; i = i->next, it++) - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (i->data))) - break; + for (GList *i = children; i; i = i->next) + gtk_container_remove (GTK_CONTAINER (versions_box), (GtkWidget *) i->data); g_list_free (children); + versions.clear(); + } + + Ypp::Version &getVersion (GtkToggleButton *button) + { + int nb = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "nb")); + std::list <Ypp::Version>::iterator it = versions.begin(); + for (int i = 0; i < nb; i++) it++; return *it; } + static void button_clicked_cb (GtkToggleButton *button, VersionExpander *pThis) + { + BusyOp op; + if (gtk_toggle_button_get_active (button)) { // was un-pressed + if (pThis->list.size() > 1) { + Ypp::ListProps props (pThis->list); + if (props.hasUpgrade()) + pThis->list.install(); + else if (props.isInstalled()) + pThis->list.remove(); + else if (props.isNotInstalled()) + pThis->list.install(); + else if (props.toModify()) + pThis->list.undo(); + } + else { + Ypp::Selectable sel = pThis->list.get (0); + Ypp::Version &version = pThis->getVersion (button); + + if (sel.toModify()) + sel.undo(); + if (version.isInstalled()) + sel.remove(); + else { + sel.setCandidate (version); + sel.install(); + } + } + } + else // button was pressed + pThis->list.undo(); + } + virtual bool onlySingleList() { return false; } virtual void showList (Ypp::List list) @@ -610,169 +574,46 @@ GtkWidget *radio = 0; for (int i = 0; i < sel.totalVersions(); i++) radio = addVersion (sel, sel.version (i), radio); - gtk_widget_show_all (versions_box); } + else { + GtkWidget *button = gtk_toggle_button_new(); + gtk_container_add (GTK_CONTAINER (button), gtk_image_new()); - // is locked - if (props.isLocked() || props.isUnlocked()) - gtk_widget_set_sensitive (button, !props.isLocked()); - else - gtk_widget_set_sensitive (button, TRUE); + GtkWidget *label = gtk_label_new (_("Several selected")); + GtkWidget *hbox = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (versions_box), hbox, FALSE, TRUE, 0); + gtk_widget_show_all (hbox); + + updateMultiselectionButton (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (button_clicked_cb), this); + } - updateButton(); + gtk_widget_set_sensitive (versions_box, !props.isLocked()); } virtual void showRefreshList (Ypp::List list) { - updateButton(); - // update radios + GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); if (list.size() == 1) { Ypp::Selectable &sel = list.get (0); std::list <Ypp::Version>::iterator it = versions.begin(); - GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); for (GList *i = children; i; i = i->next, it++) - updateRadio ((GtkWidget *) i->data, sel, *it); - g_list_free (children); - } - } - - void updateButton() - { -#ifdef ATRI_BUTTONS -if (list.size() == 1) { gtk_widget_hide (button); gtk_widget_hide (undo_button); return; } -#endif - - const char *label = 0, *stock = 0; - bool modified = false, can_modify = true, can_never_modify = false; - if (list.size() == 1) { - Ypp::Selectable sel = list.get (0); - Ypp::Version &version = getSelected(); - - if (version.isInstalled()) { - label = _("Remove"); - stock = GTK_STOCK_DELETE; - can_never_modify = !sel.canRemove(); - modified = sel.toRemove(); - } - else { - if (sel.hasInstalledVersion()) { - Ypp::Version installed = sel.installed(); - if (installed < version) { - label = _("Upgrade"); - stock = GTK_STOCK_GO_UP; - } - else if (installed > version) { - label = _("Downgrade"); - stock = GTK_STOCK_GO_DOWN; - } - else { - label = _("Re-install"); - stock = GTK_STOCK_REFRESH; - } - } - else { - label = _("Install"); - stock = GTK_STOCK_SAVE; - } - modified = sel.toInstall(); - } - can_modify = !sel.isLocked(); - modified = modified && version.toModify(); - } - else { - Ypp::ListProps props (list); - modified = props.toModify(); - if (props.hasUpgrade()) { - label = _("Upgrade"); - stock = GTK_STOCK_GO_UP; - } - else if (props.isInstalled()) { - label = _("Remove"); - stock = GTK_STOCK_DELETE; - can_never_modify = !props.canRemove(); - } - else if (props.isNotInstalled()) { - label = _("Install"); - stock = GTK_STOCK_SAVE; - } - else if (props.toModify()) { - label = _("Undo"); - stock = GTK_STOCK_UNDO; - modified = false; // don't show another undo button - } - can_modify = props.isUnlocked(); - } - - if (label) { - gtk_button_set_label (GTK_BUTTON (button), label); - GtkWidget *image = gtk_image_new_from_stock ( - stock, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); - gtk_widget_show (button); - } - else - gtk_widget_hide (button); - gtk_widget_set_sensitive (button, !modified && can_modify); - if (can_modify) - gtk_widget_set_tooltip_text (button, NULL); - else - gtk_widget_set_tooltip_text (button, _("Package is locked")); - !can_never_modify ? gtk_widget_show (button) : gtk_widget_hide (button); - modified ? gtk_widget_show (undo_button) : gtk_widget_hide (undo_button); - } - - static void version_toggled_cb (GtkToggleButton *button, VersionExpander *pThis) - { - if (gtk_toggle_button_get_active (button)) { - Ypp::Selectable sel = pThis->list.get (0); - Ypp::Version &version = pThis->getSelected(); - - // enclosing this within startTransactions() so the button is updated - // before signaling any change, for a snappy feel - Ypp::startTransactions(); - if (!sel.toInstall()) - sel.setCandidate (version); - - pThis->updateButton(); - while (g_main_context_iteration (NULL, FALSE)) ; - Ypp::finishTransactions(); - } - } - - static void button_clicked_cb (GtkButton *button, VersionExpander *pThis) - { - BusyOp op; - if (pThis->list.size() == 1) { - Ypp::Selectable sel = pThis->list.get (0); - Ypp::Version &version = pThis->getSelected(); - - if (version.isInstalled()) - sel.remove(); - else { - sel.setCandidate (version); - sel.install(); - } + updateVersionWidget ((GtkWidget *) i->data, sel, *it); } else { - Ypp::ListProps props (pThis->list); - if (props.hasUpgrade()) - pThis->list.install(); - else if (props.isInstalled()) - pThis->list.remove(); - else if (props.isNotInstalled()) - pThis->list.install(); - else if (props.toModify()) - pThis->list.undo(); + GtkWidget *hbox = (GtkWidget *) children->data; + GList *l = gtk_container_get_children (GTK_CONTAINER (hbox)); + GtkWidget *button = (GtkWidget *) l->next->data; + g_list_free (l); + updateMultiselectionButton (button); } + g_list_free (children); } - static void undo_clicked_cb (GtkButton *button, VersionExpander *pThis) - { BusyOp op; pThis->list.undo(); } - - static gboolean sel_modified_idle_cb (gpointer data) - { Ypp::runSolver(); return FALSE; } - static gboolean draw_gray_cb (GtkWidget *widget, GdkEventExpose *event) { GtkAllocation *alloc = &widget->allocation; Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Thu Jan 20 21:22:05 2011 @@ -487,9 +487,7 @@ bool Ypp::Selectable::canRemove() { switch (m_type) { - case PACKAGE: - case LANGUAGE: - return true; + case PACKAGE: case LANGUAGE: return true; default: break; } return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0