← 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/include/ApplianceImpl.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/include/ApplianceImpl.h
119
119
    void addWarning(const char* aWarning, ...);
120
120
 
121
121
    void disksWeight();
122
 
    enum SetUpProgressMode { ImportFileWithManifest, ImportFileNoManifest, ImportS3, WriteFile, WriteS3 };
 
122
    enum SetUpProgressMode {
 
123
#if 0 // VBox 3.2.10: disable manifest checking until it's actually usable
 
124
            ImportFileWithManifest,
 
125
#endif
 
126
            ImportFileNoManifest,
 
127
            ImportS3,
 
128
            WriteFile,
 
129
            WriteS3 };
123
130
    HRESULT setUpProgress(ComObjPtr<Progress> &pProgress,
124
131
                          const Bstr &bstrDescription,
125
132
                          SetUpProgressMode mode);
144
151
                                     int32_t &lDevice);
145
152
 
146
153
    HRESULT importImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
 
154
#if 0 // VBox 3.2.10: disable manifest checking until it's actually usable
147
155
    HRESULT manifestVerify(const LocationInfo &locInfo, const ovf::OVFReader &reader, ComObjPtr<Progress> &pProgress);
 
156
#endif
148
157
 
149
158
    HRESULT importFS(const LocationInfo &locInfo, ComObjPtr<Progress> &aProgress);
150
159