Author: locilka Date: Fri Jun 22 15:13:46 2007 New Revision: 38962 URL: http://svn.opensuse.org/viewcvs/yast?rev=38962&view=rev Log: - Added a code checking for open/closed dialogs after Pkg bindings were called to use a new Add-On product. - 2.15.10 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=38962&r1=38961&r2=38962&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Fri Jun 22 15:13:46 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=38962&r1=38961&r2=38962&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Jun 22 15:13:46 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 22 15:11:59 CEST 2007 - locilka@suse.cz + +- Added a code checking for open/closed dialogs after Pkg bindings + were called to use a new Add-On product. +- 2.15.10 + +------------------------------------------------------------------- Fri Jun 1 15:35:46 CEST 2007 - locilka@suse.cz - Fixed Add-On client to provide command-line again. Providing Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?rev=38962&r1=38961&r2=38962&view=diff ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Jun 22 15:13:46 2007 @@ -338,7 +338,7 @@ } // busy message - UI::OpenDialog(`Label(_("Initializing new source..."))); + UI::OpenDialog(`Label(`id (`add_on_popup_id), _("Initializing new source..."))); integer src_id = SourceManager::newSources[0]:0; map data = Pkg::SourceGeneralData (src_id); y2milestone("Adding product: %1", data); @@ -348,7 +348,20 @@ Pkg::SourceDelete (src_id); src_id = Pkg::SourceCreate (url, product_dir); SourceManager::newSources = [src_id]; - UI::CloseDialog(); + + // a little hack because of packager leaving + // windows open... + if (UI::WidgetExists(`add_on_popup_id)) { + UI::CloseDialog(); + } else if (UI::WidgetExists(`contents)) { + y2warning ("Already in base dialog!"); + } else { + y2error ("Error in packager, closing current dialog!"); + while (! UI::WidgetExists(`contents)) { + y2milestone ("Calling UI::CloseDialog"); + UI::CloseDialog(); + } + } if (src_id == -1) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org