← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Main/SessionImpl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-07-13 21:56:50 UTC
  • mfrom: (1.1.10 upstream) (0.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20090713215650-4fdh7vdqw1lkc98a
Tags: 3.0.2-dfsg-1ubuntu1
https://launchpad.net/bugs/394188
* Merge from debian unstable (LP: #394188)
* Install virtual network management tool
* Improve apport hook
* Add launchpad integration
* Conflict with virtualbox-3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/SessionImpl.cpp
258
258
 
259
259
STDMETHODIMP Session::GetRemoteConsole (IConsole **aConsole)
260
260
{
 
261
    LogFlowThisFuncEnter();
261
262
    AssertReturn (aConsole, E_POINTER);
262
263
 
263
264
    AutoCaller autoCaller (this);
277
278
 
278
279
    mConsole.queryInterfaceTo (aConsole);
279
280
 
 
281
    LogFlowThisFuncLeave();
 
282
 
280
283
    return S_OK;
281
284
}
282
285
 
642
645
    return mConsole->onUSBDeviceAttach (aDevice, aError, aMaskedIfs);
643
646
}
644
647
 
645
 
STDMETHODIMP Session::OnUSBDeviceDetach (IN_GUID aId,
 
648
STDMETHODIMP Session::OnUSBDeviceDetach (IN_BSTR aId,
646
649
                                         IVirtualBoxErrorInfo *aError)
647
650
{
648
651
    LogFlowThisFunc (("\n"));