summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren gmail com>2007-04-03 22:26:47 +0000
committerElijah Newren <newren@src.gnome.org>2007-04-03 22:26:47 +0000
commit9cae11fd9eab822b97842a01b3e802971bee70e9 (patch)
tree16cbf7c691f09ee9a8e6f3e386005b05115c6fb8
parentda7d198757e0451aaa1e44119adad92dd4869618 (diff)
downloadmetacity-9cae11fd9eab822b97842a01b3e802971bee70e9.tar.gz
_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
-rw-r--r--ChangeLog5
-rw-r--r--src/display.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 51354f73..82d61b46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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
to prevent focus issues with the run application dialog. Fixes
#374752.
diff --git a/src/display.c b/src/display.c
index 22619616..1a646d0e 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;