← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Additions/x11/vboxmouse/VBoxUtils.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/x11/vboxmouse/VBoxUtils.c
48
48
        return 1;
49
49
    }
50
50
 
51
 
    rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
52
 
    if (RT_SUCCESS(rc))
53
 
        rc = VbglR3SetMouseStatus(  fFeatures
54
 
                                  | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
 
51
    rc = VbglR3SetMouseStatus(VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
55
52
    if (RT_FAILURE(rc))
56
53
    {
57
54
        ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
97
94
 
98
95
int VBoxMouseFini(void)
99
96
{
100
 
    if (gDeviceOpenFailed)
101
 
        return VINF_SUCCESS;
102
 
    uint32_t fFeatures;
103
 
    int rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
104
 
    if (RT_SUCCESS(rc))
105
 
        rc = VbglR3SetMouseStatus(  fFeatures
106
 
                                  & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
107
97
    VbglR3Term();
108
 
    return rc;
 
98
    return VINF_SUCCESS;
109
99
}