← Back to branch summary

~n-muench/ubuntu/oneiric/open-vm-tools/open-vm-tools.fix-836277

« back to all changes in this revision

Viewing changes to vmware-user/vmware-user.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2008-10-23 15:32:00 UTC
  • mfrom: (1.1.2 upstream) (2.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20081023153200-gc1bfx89hj35c799
Tags: 2008.10.10-123053-2
* Correcting typo in dh_installinit call.
* Downgrading depends on module-assistant to recommends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
vmware-user/vmware-user.c
94
94
                                size_t argsSize, void *clientData);
95
95
void VMwareUserRpcInErrorCB    (void *clientdata, char const *status);
96
96
 
97
 
extern Bool ForeignTools_Initialize(GuestApp_Dict *configDictionaryParam);
 
97
extern Bool ForeignTools_Initialize(GuestApp_Dict *configDictionaryParam,
 
98
                                    DblLnkLst_Links *eventQueue);
98
99
extern void ForeignTools_Shutdown(void);
99
100
 
100
101
static Bool InitGroupLeader(Window *groupLeader, Window *rootWindow);
712
713
   int index;
713
714
   GuestApp_Dict *confDict;
714
715
   const char *pathName;
 
716
#ifdef USE_NOTIFY
715
717
   Bool notifyPresent = TRUE;
 
718
#endif
716
719
 
717
720
   Atomic_Init();
718
721
 
846
849
   }
847
850
 
848
851
   if (runningInForeignVM) {
849
 
      Bool success = ForeignTools_Initialize(confDict);
 
852
      Bool success = ForeignTools_Initialize(confDict, gEventQueue);
850
853
      if (!success) {
851
854
         return EXIT_FAILURE;
852
855
      }
859
862
   GHI_Init(NULL, NULL);
860
863
   Resolution_Init(TOOLS_DND_NAME, gXDisplay);
861
864
 
862
 
   if (!Notify_Init()) {
863
 
#ifdef USE_NOTIFICATION
 
865
#ifdef USE_NOTIFY
 
866
   if (!Notify_Init(confDict)) {
864
867
      Warning("Unable to initialize notification system.\n\n");
865
 
#endif
866
868
      notifyPresent = FALSE;
867
869
   }
868
870
 
 
871
   Modules_Init();
 
872
#endif
 
873
 
869
874
   gRpcIn = RpcIn_Construct(gEventQueue);
870
875
   if (gRpcIn == NULL) {
871
876
      Warning("Unable to create the RpcIn object.\n\n");
947
952
      Debug("vmware-user failed to uninitialize blocking.\n");
948
953
   }
949
954
 
 
955
#ifdef USE_NOTIFY
 
956
   Modules_Cleanup();
 
957
 
950
958
   if (notifyPresent) {
951
959
      Notify_Cleanup();
952
960
   }
 
961
#endif
953
962
 
954
963
   /*
955
964
    * SIGUSR2 sets this to TRUE, indicating that we should relaunch ourselves.