summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren gmail com>2006-01-18 00:38:38 +0000
committerElijah Newren <newren@src.gnome.org>2006-01-18 00:38:38 +0000
commit08eed7f036678df9db469735d36905e675886555 (patch)
tree63147b9973006d644b5156f0e735e145db9018e8
parent5960a84e001a05bf4b51e29cd49cd6ee8f2e3416 (diff)
downloadlibwnck-08eed7f036678df9db469735d36905e675886555.tar.gz
Thanks to Bart Vanbrabant for lots of debugging and testing work.
2006-01-17 Elijah Newren <newren gmail com> Thanks to Bart Vanbrabant for lots of debugging and testing work. * libwnck/selector.c (wnck_selector_activate_window): Make sure return value of wnck_window_get_workspace() is a valid workspace before trying to activate it. Fixes #327435. * libwnck/tasklist.c (wnck_tasklist_active_window_changed): Fix coding style violation -- space before parens. :)
-rw-r--r--ChangeLog11
-rw-r--r--libwnck/selector.c3
-rw-r--r--libwnck/tasklist.c2
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 61f1f5e..8e6eb4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-17 Elijah Newren <newren gmail com>
+
+ Thanks to Bart Vanbrabant for lots of debugging and testing work.
+
+ * libwnck/selector.c (wnck_selector_activate_window): Make sure
+ return value of wnck_window_get_workspace() is a valid workspace
+ before trying to activate it. Fixes #327435.
+
+ * libwnck/tasklist.c (wnck_tasklist_active_window_changed): Fix
+ coding style violation -- space before parens. :)
+
2006-01-16 Vincent Untz <vuntz@gnome.org>
* configure.in: post-release bump to 2.13.90
diff --git a/libwnck/selector.c b/libwnck/selector.c
index a530dac..e9a8a9c 100644
--- a/libwnck/selector.c
+++ b/libwnck/selector.c
@@ -369,7 +369,8 @@ wnck_selector_activate_window (WnckWindow *window)
* There should only be *one* activate call.
*/
workspace = wnck_window_get_workspace (window);
- wnck_workspace_activate (workspace, timestamp);
+ if (workspace)
+ wnck_workspace_activate (workspace, timestamp);
wnck_window_activate (window, timestamp);
}
diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
index 8299114..b7a72d5 100644
--- a/libwnck/tasklist.c
+++ b/libwnck/tasklist.c
@@ -2095,7 +2095,7 @@ wnck_tasklist_active_window_changed (WnckScreen *screen,
/* FIXME: check for group modal window */
for (active_window = wnck_screen_get_active_window (screen);
active_window && !active_task;
- active_window = wnck_window_get_transient(active_window))
+ active_window = wnck_window_get_transient (active_window))
active_task = g_hash_table_lookup (tasklist->priv->win_hash,
active_window);