From 9cae11fd9eab822b97842a01b3e802971bee70e9 Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren gmail com>
Date: Tue, 3 Apr 2007 22:26:47 +0000
Subject: [PATCH] _NET_ACTIVE_WINDOW is a single xwindow id, not two.

2007-04-03  Elijah Newren  <newren gmail com>

	* src/display.c (meta_display_update_active_window_hint):
	_NET_ACTIVE_WINDOW is a single xwindow id, not two.

svn path=/trunk/; revision=3152
---
 ChangeLog     | 5 +++++
 src/display.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 51354f739..82d61b460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-03  Elijah Newren  <newren gmail com>
+
+	* src/display.c (meta_display_update_active_window_hint):
+	_NET_ACTIVE_WINDOW is a single xwindow id, not two.
+
 2007-04-03  Elijah Newren  <newren gmail com>
 
 	* src/keybindings.c (handle_panel_keybinding): turn mouse_mode off
diff --git a/src/display.c b/src/display.c
index 22619616e..1a646d0e7 100644
--- a/src/display.c
+++ b/src/display.c
@@ -3959,13 +3959,12 @@ meta_display_update_active_window_hint (MetaDisplay *display)
 {
   GSList *tmp;
   
-  unsigned long data[2];
+  gulong data[1];
 
   if (display->focus_window)
     data[0] = display->focus_window->xwindow;
   else
     data[0] = None;
-  data[1] = None;
   
   tmp = display->screens;
   while (tmp != NULL)
@@ -3976,7 +3975,8 @@ meta_display_update_active_window_hint (MetaDisplay *display)
       XChangeProperty (display->xdisplay, screen->xroot,
                        display->atom_net_active_window,
                        XA_WINDOW,
-                       32, PropModeReplace, (guchar*) data, 2);
+                       32, PropModeReplace, (guchar*) data, 1);
+
       meta_error_trap_pop (display, FALSE);
 
       tmp = tmp->next;