6 files changed, 7 insertions, 8 deletions
diff --git a/src/events.c b/src/events.c
index 299ad56..a8c8fec 100644
--- a/src/events.c
+++ b/src/events.c
@@ -344,7 +344,7 @@ DispatchEvent(void)
  * handle X events
  */
 void
-HandleEvents(void)
+HandleEvents(XtAppContext appContext)
 {
     while (TRUE) {
         if (enter_flag && !QLength(dpy)) {
diff --git a/src/events.h b/src/events.h
index cbe2d2d..8e3b806 100644
--- a/src/events.h
+++ b/src/events.h
@@ -76,7 +76,7 @@ extern Bool StashEventTime(XEvent *ev);
 extern Window WindowOfEvent(XEvent *e);
 extern Bool DispatchEvent2(void);
 extern Bool DispatchEvent(void);
-extern void HandleEvents(void) _X_NORETURN;
+extern void HandleEvents(XtAppContext) _X_NORETURN;
 extern void HandleColormapNotify(void);
 extern void HandleVisibilityNotify(void);
 extern void HandleKeyPress(void);
diff --git a/src/session.c b/src/session.c
index 94b4d63..2c2787a 100644
--- a/src/session.c
+++ b/src/session.c
@@ -878,7 +878,7 @@ ProcessIceMsgProc(XtPointer client_data, int *source _X_UNUSED,
 }
 
 void
-ConnectToSessionManager(char *previous_id)
+ConnectToSessionManager(char *previous_id, XtAppContext appContext)
 {
     char errorMsg[256];
     unsigned long mask;
diff --git a/src/session.h b/src/session.h
index a76c52f..df91469 100644
--- a/src/session.h
+++ b/src/session.h
@@ -30,7 +30,7 @@
 
 #include <X11/SM/SMlib.h>
 
-extern void ConnectToSessionManager(char *previous_id);
+extern void ConnectToSessionManager(char *previous_id, XtAppContext appContext);
 extern int GetWindowConfig(TwmWindow *theWindow, short *x, short *y,
                            unsigned short *width, unsigned short *height,
                            Bool *iconified, Bool *icon_info_present,
diff --git a/src/twm.c b/src/twm.c
index d397879..5b0c07d 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -90,7 +90,6 @@ in this Software without prior written authorization from The Open Group.
 
 static void InitVariables(void);
 
-XtAppContext appContext;        /* Xt application context */
 XtSignalId si;
 
 Display *dpy = NULL;            /* which display are we talking to */
@@ -219,6 +218,7 @@ main(int argc, char *argv[])
     char *loc;
     int MultiScreen = TRUE;         /* try for more than one screen? */
     char *InitFile = NULL;
+    XtAppContext appContext;        /* Xt application context */
 
     ProgramName = argv[0];
     Argc = argc;
@@ -645,12 +645,12 @@ main(int argc, char *argv[])
         exit(EXIT_FAILURE);
     }
 
-    (void) ConnectToSessionManager(client_id);
+    (void) ConnectToSessionManager(client_id, appContext);
 
     RestartPreviousState = False;
     HandlingEvents = TRUE;
     InitEvents();
-    HandleEvents();
+    HandleEvents(appContext);
     exit(EXIT_SUCCESS);
 }
 
diff --git a/src/twm.h b/src/twm.h
index 2263685..1711eea 100644
--- a/src/twm.h
+++ b/src/twm.h
@@ -343,7 +343,6 @@ extern void
 ComputeWindowTitleOffsets(TwmWindow *tmp_win, int width, Bool squeeze);
 extern char *ProgramName;
 extern Display *dpy;
-extern XtAppContext appContext;
 extern Window ResizeWindow;     /* the window we are resizing */
 extern int HasShape;            /* this server supports Shape extension */
 extern int HasSync;             /* this server supports SYNC extension */