Author: lslezak Date: Tue Apr 15 11:36:20 2008 New Revision: 46651 URL: http://svn.opensuse.org/viewcvs/yast?rev=46651&view=rev Log: - disable the callbacks when downloading slideshow (bnc#377919) - 2.16.34 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=46651&r1=46650&r2=46651&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Apr 15 11:36:20 2008 @@ -1 +1 @@ -2.16.33 +2.16.34 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=46651&r1=46650&r2=46651&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 15 11:36:20 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 15 11:24:33 CEST 2008 - lslezak@suse.cz + +- disable the callbacks when downloading slideshow (bnc#377919) +- 2.16.34 + +------------------------------------------------------------------- Mon Apr 14 16:43:55 CEST 2008 - lslezak@suse.cz - 2.16.33 Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=46651&r1=46650&r2=46651&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Tue Apr 15 11:36:20 2008 @@ -952,6 +952,20 @@ return true; } +boolean FindAndCopySlideDirWithoutCallbacks(string our_slidedir, integer source, string search_for_dir, + string lang_long, string lang_short, string fallback_lang) +{ + // disable callbacks + PackageCallbacks::RegisterEmptyProgressCallbacks(); + + boolean ret = FindAndCopySlideDir (our_slidedir, source, search_for_dir, lang_long, lang_short, fallback_lang); + + // restore callbacks + PackageCallbacks::RestorePreviousProgressCallbacks(); + + return ret; +} + global void SlideShowSetUp (string wanted_language) { integer source = base_source_id; @@ -996,7 +1010,7 @@ // try to download only slides that are needed (by selected language) // no images are cached string search_for_dir = sformat ("/%1/setup/slide/", datadir); - boolean success = FindAndCopySlideDir (our_slidedir, source, search_for_dir, lang_long, lang_short, SlideShow::fallback_lang); + FindAndCopySlideDirWithoutCallbacks(our_slidedir, source, search_for_dir, lang_long, lang_short, SlideShow::fallback_lang); // fallback solution disabled /* Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=46651&r1=46650&r2=46651&view=diff ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Tue Apr 15 11:36:20 2008 @@ -4,8 +4,8 @@ @HEADER@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp -# package callbacks -BuildRequires: yast2 >= 2.16.42 +# empty package callbacks +BuildRequires: yast2 >= 2.16.52 # new registration of callbacks BuildRequires: yast2-pkg-bindings >= 2.16.23 @@ -20,8 +20,8 @@ # new registration of callbacks Requires: yast2-pkg-bindings >= 2.16.23 -# package callbacks -Requires: yast2 >= 2.16.42 +# empty package callbacks +Requires: yast2 >= 2.16.52 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org