Author: aschnell Date: Tue Jun 9 12:15:35 2009 New Revision: 57510 URL: http://svn.opensuse.org/viewcvs/yast?rev=57510&view=rev Log: - another workaround Modified: trunk/storage/bindings/src/StorageCallbacks.cc trunk/storage/storage/src/modules/StorageClients.ycp Modified: trunk/storage/bindings/src/StorageCallbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/bindings/src/StorageCallbacks.cc?rev=57510&r1=57509&r2=57510&view=diff ============================================================================== --- trunk/storage/bindings/src/StorageCallbacks.cc (original) +++ trunk/storage/bindings/src/StorageCallbacks.cc Tue Jun 9 12:15:35 2009 @@ -280,9 +280,11 @@ password_popup->appendParameter(YCPString(password)); password_popup->finishParameters(); - YCPValue tmp = password_popup->evaluateCall(); - if (tmp->isBoolean()) - ret = tmp->asBoolean()->value(); + YCPValue tmp1 = password_popup->evaluateCall(); + YCPList tmp2 = tmp1->asList(); + + ret = tmp2->value(0)->asBoolean()->value(); + password = tmp2->value(1)->asString()->value(); } return ret; Modified: trunk/storage/storage/src/modules/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageClients.ycp?rev=57510&r1=57509&r2=57510&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageClients.ycp (original) +++ trunk/storage/storage/src/modules/StorageClients.ycp Tue Jun 9 12:15:35 2009 @@ -77,34 +77,38 @@ } - global boolean PasswordPopup(string device, integer attempts, string& password) + global list<any> PasswordPopup(string device, integer attempts, string password) { y2milestone("PasswordPopup device:%1 attempts:%2", device, attempts); + password = ""; + UI::OpenDialog( `opt(`decorated), `VBox( - `Password(`id("pw1"), + `Password(`id(`password), // Label: get password for device // Please use newline if label is longer than 40 characters - sformat(_("&Enter password for device %1:"), device), ""), + sformat(_("&Enter password for device %1:"), device), password), `ButtonBox( // Ok button - `PushButton(`id(`continue), `opt(`default), Label::ContinueButton()), + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), // Cancel button `PushButton(`id(`cancel), Label::CancelButton()) ) ) ); + UI::SetFocus(`id(`password)); + symbol ret = (symbol) UI::UserInput(); - if (ret == `continue) + if (ret == `ok) password = (string) UI::QueryWidget(`id(`password), `Value); UI::CloseDialog(); - return ret == `continue; + return [ ret == `ok, password ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org