Author: jkupec Date: Wed Mar 12 11:34:13 2008 New Revision: 9100 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9100&view=rev Log: - label string added to the request media callback Modified: trunk/libzypp/zypp/MediaSetAccess.cc trunk/libzypp/zypp/ZYppCallbacks.h Modified: trunk/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?rev=9100&r1=9099&r2=9100&view=diff ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.cc (original) +++ trunk/libzypp/zypp/MediaSetAccess.cc Wed Mar 12 11:34:13 2008 @@ -147,6 +147,7 @@ user = report->requestMedia ( _url, media_nr, + string(), //! \todo label reason, excp.asUserString(), excp.devices(), @@ -261,6 +262,7 @@ report->requestMedia ( _url, media_nr, + string(), //! \todo label reason, excp.asUserString(), excp.devices(), @@ -397,6 +399,7 @@ user = report->requestMedia(_url, media_nr, + string(), //! \todo label reason, excp.asUserString(), excp.devices(), Modified: trunk/libzypp/zypp/ZYppCallbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppCallbacks.h?rev=9100&r1=9099&r2=9100&view=diff ============================================================================== --- trunk/libzypp/zypp/ZYppCallbacks.h (original) +++ trunk/libzypp/zypp/ZYppCallbacks.h Wed Mar 12 11:34:13 2008 @@ -300,8 +300,9 @@ * \param url in: url for which the media is requested, * out: url to use instead of the original one * \param mediumNr requested medium number + * \param label label of requested medium * \param error type of error from \ref Error enum - * \param description + * \param description error message (media not desired or error foo occured) * \param devices list of the available devices (for eject) * \param dev_current in: index of the currently used device in the \a devices list * out: index of the devices to be ejected in the \a devices list @@ -310,6 +311,7 @@ virtual Action requestMedia( Url & /* url (I/O parameter) */ , unsigned /*mediumNr*/ + , const std::string & /* label */ , Error /*error*/ , const std::string & /*description*/ , const std::vectorstd::string & /* devices */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org