From 67ef2443ff55cd22d5135f42a86a45b801d0090d Mon Sep 17 00:00:00 2001
From: Tom Gilbert <gilbertt@users.sourceforge.net>
Date: Mon, 28 Feb 2000 19:42:31 +0000
Subject: [PATCH] Mon Feb 28 19:39:46 GMT 2000 (gilbertt)

64-bit fixes from Bob Arendt <rdarendt@cwcom.net>


SVN revision: 2148
---
 src/ChangeLog |  8 ++++++++
 src/actions.c | 10 +++++-----
 src/comms.c   |  6 ++++--
 src/ipc.c     |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index dce91528..b5d4b7c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4319,3 +4319,11 @@ list options into one winop: "Skip Window Lists", and one remember option.
 The actions are still defined to do stuff individually, but users have no
 need of that sort of granularity. Much nicer now :)
 
+
+-------------------------------------------------------------------------------
+
+Mon Feb 28 19:39:46 GMT 2000
+(gilbertt)
+
+64-bit fixes from Bob Arendt <rdarendt@cwcom.net>
+
diff --git a/src/actions.c b/src/actions.c
index 97c5cd6e..af3fdf1c 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1181,11 +1181,11 @@ doMoveEnd(void *params)
 	     if (gwins[i]->floating)
 		MoveEwinToDesktopAt(gwins[i], d,
 				    gwins[i]->x - (desks.desk[d].x -
-						   desks.
-						   desk[gwins[i]->desktop].x),
+						   desks.desk[gwins[i]->
+							      desktop].x),
 				    gwins[i]->y - (desks.desk[d].y -
-						   desks.
-						   desk[gwins[i]->desktop].y));
+						   desks.desk[gwins[i]->
+							      desktop].y));
 	     else
 		MoveEwinToDesktopAt(gwins[i], d, gwins[i]->x, gwins[i]->y);
 	     gwins[i]->floating = 0;
@@ -2934,7 +2934,7 @@ doFocusPrev(void *params)
 int
 doFocusSet(void *params)
 {
-   Window              win;
+   Window              win = 0;
    EWin               *ewin;
 
    EDBUG(6, "doFocusSet");
diff --git a/src/comms.c b/src/comms.c
index 43fb122b..22583dea 100644
--- a/src/comms.c
+++ b/src/comms.c
@@ -62,6 +62,7 @@ CommsFindCommsWindow()
 			   &ar, &format, &num, &after, &s);
 	if (s)
 	  {
+	     comms_win = 0;
 	     sscanf((char *)s, "%*s %x", (unsigned int *)&comms_win);
 	     XFree(s);
 	  }
@@ -235,7 +236,7 @@ CommsGet(Client ** c, XEvent * ev)
 {
    char                s[13], s2[9], *msg, st[32];
    int                 i;
-   Window              win;
+   Window              win = 0;
    Client             *cl;
    Atom                a = 0;
 
@@ -446,6 +447,7 @@ HandleComms(XEvent * ev)
 	else if (!strcmp(w, "pixmap"))
 	  {
 	     word(s, 3, w);
+	     c->pmap = 0;
 	     sscanf(w, "%x", (int *)&c->pmap);
 	  }
 	else
@@ -1227,7 +1229,7 @@ HandleComms(XEvent * ev)
      }
    else if (!strcmp(w, "draw_bg_to"))
      {
-	Window              win;
+	Window              win = 0;
 	Background         *bg;
 
 	sscanf(s, "%*s %x %1000s", (unsigned int *)&win, w);
diff --git a/src/ipc.c b/src/ipc.c
index d3284e84..3f1ecf8d 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -570,7 +570,7 @@ IPC_Remember(char *params, Client * c)
 
    if (params)
      {
-	Window              win;
+	Window              win = 0;
 	EWin               *ewin;
 
 	sscanf(params, "%8x", (int *)&win);