← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to services/plugins/vix/foundryToolsDaemon.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/plugins/vix/foundryToolsDaemon.h
29
29
#   define __VIX_TOOLS_DAEMON_H__
30
30
 
31
31
 
32
 
#if defined(VMTOOLS_USE_GLIB)
33
 
 
34
32
#include "vmware/tools/plugin.h"
35
33
 
36
34
void
37
35
FoundryToolsDaemon_Initialize(ToolsAppCtx *ctx);
38
 
 
39
 
#else /* not vix plugin */
40
 
 
41
 
#include "vm_basic_types.h"
42
 
#include "rpcin.h"
43
 
#include "guestApp.h"
44
 
 
45
 
void FoundryToolsDaemon_RegisterRoutines(RpcIn *in, 
46
 
                                         GuestApp_Dict **confDictRef, 
47
 
                                         DblLnkLst_Links *eventQueue,
48
 
                                         const char * const *originalEnvp,
49
 
                                         Bool runAsRoot);
50
 
/* There isn't an _UnregisterRoutines yet. */
51
 
 
52
 
Bool FoundryToolsDaemon_RegisterOpenUrl(RpcIn *in);
53
 
Bool FoundryToolsDaemon_RegisterOpenUrlCapability(void);
54
 
Bool FoundryToolsDaemon_UnregisterOpenUrl(void);
55
 
 
56
 
#endif
 
36
void
 
37
FoundryToolsDaemon_Uninitialize(ToolsAppCtx *ctx);
57
38
 
58
39
#endif /* __VIX_TOOLS_DAEMON_H__ */