summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2005-02-20 07:31:46 +0000
committerElijah Newren <newren@src.gnome.org>2005-02-20 07:31:46 +0000
commit53f77c312dd814655dd31f058b2d25c88f175071 (patch)
tree860e89b305dcb9172fb7d4f916e1f3d6834232c4
parent490b59642f4ffde96a8d8b06339d88c8b85780d9 (diff)
downloadlibwnck-53f77c312dd814655dd31f058b2d25c88f175071.tar.gz
Backport of fix in the development branch; patch from Juerg Billeter to
2005-02-20 Elijah Newren <newren@gmail.com> Backport of fix in the development branch; patch from Juerg Billeter to fix #163343. * libwnck/tasklist.c (wnck_tasklist_window_changed_geometry): If there's only one monitor then skip the monitor-change checking code to avoid use of uninitialized variables causing craziness.
-rw-r--r--ChangeLog9
-rw-r--r--libwnck/tasklist.c3
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 50b540c..8099d0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
2005-02-20 Elijah Newren <newren@gmail.com>
Backport of fix in the development branch; patch from Juerg
+ Billeter to fix #163343.
+
+ * libwnck/tasklist.c (wnck_tasklist_window_changed_geometry): If
+ there's only one monitor then skip the monitor-change checking
+ code to avoid use of uninitialized variables causing craziness.
+
+2005-02-20 Elijah Newren <newren@gmail.com>
+
+ Backport of fix in the development branch; patch from Juerg
Billeter to fix windows from all screen being shown when tasklist
is first created.
diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
index 4e464fb..8316953 100644
--- a/libwnck/tasklist.c
+++ b/libwnck/tasklist.c
@@ -1790,7 +1790,8 @@ wnck_tasklist_window_changed_geometry (WnckWindow *window,
* the tasklist itself possibly changed monitor.
*/
monitor_changed = FALSE;
- if (wnck_window_get_state (window) & WNCK_WINDOW_STATE_SKIP_TASKLIST &&
+ if (tasklist->priv->monitor_num != -1 &&
+ (wnck_window_get_state (window) & WNCK_WINDOW_STATE_SKIP_TASKLIST) &&
GTK_WIDGET (tasklist)->window != NULL)
{
/* Do the extra check only if there is a suspect of a monitor change (= this window is off monitor) */