Author: aschnell Date: Tue Jun 2 16:01:11 2009 New Revision: 57396 URL: http://svn.opensuse.org/viewcvs/yast?rev=57396&view=rev Log: - implemented other workaround for broken ycp bindings Modified: trunk/storage/libstorage/src/StorageCallbacks.cc trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageClients.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/libstorage/src/StorageCallbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageCallbacks.cc?rev=57396&r1=57395&r2=57396&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageCallbacks.cc (original) +++ trunk/storage/libstorage/src/StorageCallbacks.cc Tue Jun 2 16:01:11 2009 @@ -40,6 +40,15 @@ #include +namespace storage +{ + // workaround for broken YCP bindings + extern CallbackProgressBar progress_bar_cb_ycp; + extern CallbackShowInstallInfo install_info_cb_ycp; + extern CallbackInfoPopup info_popup_cb_ycp; + extern CallbackYesNoPopup yesno_popup_cb_ycp; +} + using namespace storage; class Y2StorageCallbackFunction : public Y2Function @@ -298,7 +307,7 @@ return YCPVoid (); } - Storage::setCallbackProgressBarYcp (progress_bar_callback); + storage::progress_bar_cb_ycp = progress_bar_callback; return YCPVoid (); } @@ -344,7 +353,7 @@ return YCPVoid (); } - Storage::setCallbackShowInstallInfoYcp (show_install_info_callback); + storage::install_info_cb_ycp = show_install_info_callback; return YCPVoid (); } @@ -390,7 +399,7 @@ return YCPVoid (); } - Storage::setCallbackInfoPopupYcp (info_popup_callback); + storage::info_popup_cb_ycp = info_popup_callback; return YCPVoid (); } @@ -436,7 +445,7 @@ return YCPVoid (); } - Storage::setCallbackYesNoPopupYcp (yesno_popup_callback); + storage::yesno_popup_cb_ycp = yesno_popup_callback; return YCPVoid (); } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=57396&r1=57395&r2=57396&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Jun 2 16:01:11 2009 @@ -333,11 +333,14 @@ y2milestone("InitLibstorage"); sint = CreateInterface(readonly); - if (sint == nil) { + if (sint == nil) + { y2error("Storage::CreateInterface failed"); return false; } + StorageClients::InstallCallbacks(sint); + if (Stage::initial()) { LibStorage::StorageInterface::setDetectMountedVolumes(sint, false); @@ -1966,12 +1969,6 @@ } -global define void InstallCallbacks() - { - StorageClients::InstallCallbacks(); - } - - // Constructor global define void Storage() ``{ @@ -1994,7 +1991,6 @@ Storage::SetPartMode( "CUSTOM" ); Storage::SetPartProposalActive( false ); } - InstallCallbacks(); m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" ); y2milestone( "constructor Storage() end time:%1", m["stdout"]:"" ); } Modified: trunk/storage/storage/src/modules/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageClients.ycp?rev=57396&r1=57395&r2=57396&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageClients.ycp (original) +++ trunk/storage/storage/src/modules/StorageClients.ycp Tue Jun 2 16:01:11 2009 @@ -5,10 +5,7 @@ * Arvin Schnell * * Purpose: Define callbacks for libstorage. - * - * $Id$ */ - { module "StorageClients"; @@ -79,7 +76,7 @@ `yes ); } -global define void InstallCallbacks() +global void InstallCallbacks(any sint) { y2milestone( "InstallCallbacks" ); StorageCallbacks::ProgressBar ("StorageClients::ProgressBar"); @@ -88,5 +85,4 @@ StorageCallbacks::YesNoPopup ("StorageClients::YesNoPopup"); } -} // module StorageClients - +} Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?rev=57396&r1=57395&r2=57396&view=diff ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Tue Jun 2 16:01:11 2009 @@ -2,8 +2,8 @@ @HEADER@ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel libstorage-devel -BuildRequires: update-desktop-files yast2 >= 2.18.16 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files +BuildRequires: libstorage-devel >= 2.18.13 yast2 >= 2.18.16 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.16 yast2-libyui >= 2.18.7 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org