← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp
189
189
     * Retrieve version information about Guest Additions and installed files (components).
190
190
     */
191
191
    char *pszAddVer;
192
 
    char *pszAddVerEx;
 
192
    char *pszAddVerExt;
193
193
    char *pszAddRev;
194
 
    rc = VbglR3GetAdditionsVersion(&pszAddVer, &pszAddVerEx, &pszAddRev);
 
194
    rc = VbglR3GetAdditionsVersion(&pszAddVer, &pszAddVerExt, &pszAddRev);
195
195
    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Version",
196
196
                          "%s", RT_FAILURE(rc) ? "" : pszAddVer);
197
 
    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/VersionEx",
198
 
                          "%s", RT_FAILURE(rc) ? "" : pszAddVerEx);
 
197
    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/VersionExt",
 
198
                          "%s", RT_FAILURE(rc) ? "" : pszAddVerExt);
199
199
    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Revision",
200
200
                          "%s", RT_FAILURE(rc) ? "" : pszAddRev);
201
201
    if (RT_SUCCESS(rc))
202
202
    {
203
203
        RTStrFree(pszAddVer);
204
 
        RTStrFree(pszAddVerEx);
 
204
        RTStrFree(pszAddVerExt);
205
205
        RTStrFree(pszAddRev);
206
206
    }
207
207