diff options
| author | Rob Adams <readams@readams.net> | 2004-02-23 01:48:29 +0000 |
|---|---|---|
| committer | Rob Adams <readams@src.gnome.org> | 2004-02-23 01:48:29 +0000 |
| commit | db108c1fc3e4123c5bfad92c657eb2df779a6763 (patch) | |
| tree | 45e62995a48515ea3020a165a1db22cc7b7f61f2 | |
| parent | 5a28c4c423d28551cfdd0341e0f4bc8dc0e515ef (diff) | |
| download | metacity-db108c1fc3e4123c5bfad92c657eb2df779a6763.tar.gz | |
Add my copyright notice to a number of files on which it should already
2004-02-23 Rob Adams <readams@readams.net>
Add my copyright notice to a number of files on which it should
already exist.
* src/window.c (meta_window_notify_focus): modify code to move to
front of MRU list so that we can have an assert that it was there
in the first place. This code may be causing some crashes. See
#131196.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/constraints.c | 1 | ||||
| -rw-r--r-- | src/core.c | 1 | ||||
| -rw-r--r-- | src/display.c | 1 | ||||
| -rw-r--r-- | src/display.h | 1 | ||||
| -rw-r--r-- | src/group.c | 1 | ||||
| -rw-r--r-- | src/keybindings.c | 4 | ||||
| -rw-r--r-- | src/menu.c | 1 | ||||
| -rw-r--r-- | src/window.c | 19 | ||||
| -rw-r--r-- | src/workspace.c | 1 |
10 files changed, 33 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2004-02-23 Rob Adams <readams@readams.net> + + Add my copyright notice to a number of files on which it should + already exist. + + * src/window.c (meta_window_notify_focus): modify code to move to + front of MRU list so that we can have an assert that it was there + in the first place. This code may be causing some crashes. See + #131196. + 2004-02-22 Christian Rose <menthos@menthos.com> * configure.in: Added "en_CA" to ALL_LINGUAS. diff --git a/src/constraints.c b/src/constraints.c index 372a2e45..ca36522d 100644 --- a/src/constraints.c +++ b/src/constraints.c @@ -2,6 +2,7 @@ /* * Copyright (C) 2002, 2003 Red Hat, Inc. + * Copyright (C) 2003, 2004 Rob Adams * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -2,6 +2,7 @@ /* * Copyright (C) 2001 Havoc Pennington + * Copyright (C) 2003 Rob Adams * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/display.c b/src/display.c index fcc51d45..a6cfb81f 100644 --- a/src/display.c +++ b/src/display.c @@ -3,6 +3,7 @@ /* * Copyright (C) 2001 Havoc Pennington * Copyright (C) 2002, 2003 Red Hat, Inc. + * Copyright (C) 2003, 2004 Rob Adams * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/display.h b/src/display.h index 69969317..21636375 100644 --- a/src/display.h +++ b/src/display.h @@ -3,6 +3,7 @@ /* * Copyright (C) 2001 Havoc Pennington * Copyright (C) 2002 Red Hat, Inc. + * Copyright (C) 2003 Rob Adams * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/group.c b/src/group.c index 72dbc930..2d8d69c8 100644 --- a/src/group.c +++ b/src/group.c @@ -2,6 +2,7 @@ /* * Copyright (C) 2002 Red Hat Inc. + * Copyright (C) 2003 Rob Adams * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/keybindings.c b/src/keybindings.c index c0774b04..0c9db78b 100644 --- a/src/keybindings.c +++ b/src/keybindings.c @@ -1,7 +1,9 @@ /* Metacity Keybindings */ /* - * Copyright (C) 2001 Havoc Pennington, 2002 Red Hat Inc. + * Copyright (C) 2001 Havoc Pennington + * Copyright (C) 2002 Red Hat Inc. + * Copyright (C) 2003 Rob Adams * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -2,6 +2,7 @@ /* * Copyright (C) 2001 Havoc Pennington + * Copyright (C) 2004 Rob Adams * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/src/window.c b/src/window.c index da0a0136..a2d0d543 100644 --- a/src/window.c +++ b/src/window.c @@ -4126,15 +4126,22 @@ meta_window_notify_focus (MetaWindow *window, window->display->focus_window = window; window->has_focus = TRUE; - /* Move to the front of the focusing workspace's MRU list - * FIXME is the active workspace guaranteed to be the - * focusing workspace? + /* Move to the front of the focusing workspace's MRU list We + * should only be "removing" it from the MRU list if it's + * not already there. */ if (window->screen->active_workspace) { - window->screen->active_workspace->mru_list = - g_list_remove (window->screen->active_workspace->mru_list, - window); + GList* link; + link = g_list_find (window->screen->active_workspace->mru_list, + window); + g_assert (link); + + window->screen->active_workspace->mru_list = + g_list_remove_link (window->screen->active_workspace->mru_list, + link); + g_list_free (link); + window->screen->active_workspace->mru_list = g_list_prepend (window->screen->active_workspace->mru_list, window); diff --git a/src/workspace.c b/src/workspace.c index e9cacda6..9d69af69 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -2,6 +2,7 @@ /* * Copyright (C) 2001 Havoc Pennington + * Copyright (C) 2003 Rob Adams * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as |