← 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 lib/rpcIn/rpcin.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2008-11-20 21:56:00 UTC
  • mfrom: (1.1.3 upstream) (2.2.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20081120215600-0jujiv17a2ja92xu
Tags: 2008.11.18-130226-1
* Replacing obsolete dh_clean -k with dh_prep.
* Merging upstream version 2008.11.18-130226.
* Updating debian directory for addition of pvscsi and vmxnet3 modules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/rpcIn/rpcin.c
55
55
#define RPCIN_SCHED_EVENT(in, src) do {                                       \
56
56
   (in)->nextEvent = src;                                                     \
57
57
   g_source_set_callback((in)->nextEvent, RpcInLoop, (in), NULL);             \
58
 
   g_source_attach((in)->nextEvent, g_main_loop_get_context((in)->mainLoop)); \
 
58
   g_source_attach((in)->nextEvent, (in)->mainCtx);                           \
59
59
} while (0)
60
60
 
61
61
#else /* VMTOOLS_USE_GLIB */
93
93
struct RpcIn {
94
94
#if defined(VMTOOLS_USE_GLIB)
95
95
   GSource *nextEvent;
96
 
   GMainLoop *mainLoop;
 
96
   GMainContext *mainCtx;
97
97
   RpcIn_Callback dispatch;
98
98
   gpointer clientData;
99
99
#else
391
391
 */
392
392
 
393
393
RpcIn *
394
 
RpcIn_Construct(GMainLoop *mainLoop,      // IN
 
394
RpcIn_Construct(GMainContext *mainCtx,    // IN
395
395
                RpcIn_Callback dispatch,  // IN
396
396
                gpointer clientData)      // IN
397
397
{
398
398
   RpcIn *result;
399
399
 
400
 
   ASSERT(mainLoop != NULL);
 
400
   ASSERT(mainCtx != NULL);
401
401
   ASSERT(dispatch != NULL);
402
402
 
403
403
   result = calloc(1, sizeof *result);
404
404
   if (result != NULL) {
405
 
      result->mainLoop = mainLoop;
 
405
      result->mainCtx = mainCtx;
406
406
      result->clientData = clientData;
407
407
      result->dispatch = dispatch;
408
408
   }