← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.march-merge

« back to all changes in this revision

Viewing changes to services/plugins/desktopEvents/desktopEvents.c

  • Committer: Nate Muench
  • Date: 2012-03-22 17:50:13 UTC
  • mfrom: (1.4.7)
  • Revision ID: nowiwilldestroyabydos@gmail.com-20120322175013-0jh30wfk7ut20rdj
Tags: 2012.03.13-651368-0ubuntu1
* Merge latest upstream git tag.
* debian/rules: Removed glib2.0 compatibility CFLAG.
  - Packaging can now build without it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/plugins/desktopEvents/desktopEvents.c
98
98
   size_t i;
99
99
 
100
100
#if defined(_WIN32)
 
101
   /*
 
102
    * If we aren't running in a VM (e.g., running in bootcamp natively on
 
103
    * a Mac), then return NULL to disable the plugin.
 
104
    */
 
105
   if (!ctx->isVMware) {
 
106
      return NULL;
 
107
   }
 
108
 
101
109
   g_return_val_if_fail(gPluginHandle != NULL, NULL);
102
110
#endif
103
111