← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to services/vmtoolsd/serviceObj.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/vmtoolsd/serviceObj.h
31
31
#include <glib-object.h>
32
32
 
33
33
#define TOOLSCORE_TYPE_SERVICE   ToolsCore_Service_get_type()
 
34
#define TOOLSCORESERVICE_GET_CLASS(object) \
 
35
   (G_TYPE_INSTANCE_GET_CLASS((object), TOOLSCORE_TYPE_SERVICE, ToolsCoreServiceClass))
 
36
#define TOOLSCORE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),                   \
 
37
                                                           TOOLSCORE_TYPE_SERVICE,  \
 
38
                                                           ToolsCoreService))
34
39
 
35
40
typedef struct ToolsCoreService {
36
41
   GObject        parent;
 
42
   GMutex        *lock;
 
43
   GArray        *props;
37
44
} ToolsCoreService;
38
45
 
39
46
typedef struct ToolsCoreServiceClass {
43
50
GType
44
51
ToolsCore_Service_get_type(void);
45
52
 
 
53
void
 
54
ToolsCoreService_RegisterProperty(ToolsCoreService *obj,
 
55
                                  ToolsServiceProperty *prop);
 
56
 
 
57
 
46
58
#endif /* _SERVICEOBJ_H_ */
47
59