diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-07-06 19:05:37 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-07-06 19:05:37 +0000 |
| commit | a62b3c8b29b09665c5589b168f3bbb9302354f32 (patch) | |
| tree | daa792b9bc49fffa7277cfc26cfd71783b1c8ad9 /src/screen.c | |
| parent | 8c3437fd2754c9aec761545a1a1e668ed6d07ea1 (diff) | |
| download | metacity-a62b3c8b29b09665c5589b168f3bbb9302354f32.tar.gz | |
Apply blackc@speakeasy.net patch, bug #83940, to do mini-workspaces
2002-07-06 Havoc Pennington <hp@pobox.com>
Apply blackc@speakeasy.net patch, bug #83940, to do
mini-workspaces similar to the pager, when switching
spaces.
* src/window.c (update_net_wm_state): actually fill in
wm_state_skip_taskbar, wm_state_skip_pager flags
* src/tabpopup.c: support drawing a mini-workspace similar to the
one the pager draws.
* src/stack.c (meta_stack_list_windows): new function to list
the windows in stacking order
* src/screen.c (meta_screen_ensure_workspace_popup): don't pass in
the ugly default app icon for workspaces
* src/display.c (event_callback): fix from blackc@speakeasy.net
to avoid dereferencing a NULL grab window.
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/screen.c b/src/screen.c index b16f42e3..f0a98b7c 100644 --- a/src/screen.c +++ b/src/screen.c @@ -932,15 +932,12 @@ void meta_screen_ensure_workspace_popup (MetaScreen *screen) { MetaTabEntry *entries; - GdkPixbuf *icon; int len, rows, cols; int i; if (screen->tab_popup) return; - icon = meta_ui_get_default_window_icon (NULL); - len = meta_screen_get_n_workspaces (screen); entries = g_new (MetaTabEntry, len + 1); @@ -968,7 +965,7 @@ meta_screen_ensure_workspace_popup (MetaScreen *screen) entries[i].key = (MetaTabEntryKey) workspace; entries[i].title = workspace->name; - entries[i].icon = icon; + entries[i].icon = NULL; } } } @@ -984,7 +981,7 @@ meta_screen_ensure_workspace_popup (MetaScreen *screen) entries[i].key = (MetaTabEntryKey) workspace; entries[i].title = workspace->name; - entries[i].icon = icon; + entries[i].icon = NULL; } } @@ -996,8 +993,6 @@ meta_screen_ensure_workspace_popup (MetaScreen *screen) g_free (entries); - g_object_unref (G_OBJECT (icon)); - /* don't show tab popup, since proper window isn't selected yet */ } |