From 6677b55cd513918b0148dbdc8e9d62cbed526642 Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Sat, 12 Nov 2005 00:34:32 +0000 Subject: [PATCH] Changed the 'minimized' field of the MetaTabEntry struct to 'hidden'. 2005-11-11 Aidan Delaney * src/tabpopup.h: (struct _MetaTabEntry): * src/tabpopup.c: (meta_ui_tab_popup_new): * src/screen.c: (meta_screen_ensure_tab_popup): Changed the 'minimized' field of the MetaTabEntry struct to 'hidden'. Fixes reopened bug #168455. --- ChangeLog | 8 ++++++++ src/screen.c | 4 ++-- src/tabpopup.c | 4 ++-- src/tabpopup.h | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e04f4695..77fd01fc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-11-11 Aidan Delaney + + * src/tabpopup.h: (struct _MetaTabEntry): + * src/tabpopup.c: (meta_ui_tab_popup_new): + * src/screen.c: (meta_screen_ensure_tab_popup): + Changed the 'minimized' field of the MetaTabEntry struct to + 'hidden'. Fixes reopened bug #168455. + 2005-10-29 Kjartan Maraas * src/eventqueue.c: (meta_event_queue_new): Merge fix diff --git a/src/screen.c b/src/screen.c index beb7ad093..c59df378f 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1206,7 +1206,7 @@ meta_screen_ensure_tab_popup (MetaScreen *screen, entries[i].title = window->title; entries[i].icon = window->icon; entries[i].blank = FALSE; - entries[i].minimized = !meta_window_showing_on_its_workspace (window); + entries[i].hidden = !meta_window_showing_on_its_workspace (window); entries[i].demands_attention = window->wm_state_demands_attention; if (!window->minimized || !meta_window_get_icon_geometry (window, &r)) @@ -1310,7 +1310,7 @@ meta_screen_ensure_workspace_popup (MetaScreen *screen) entries[i].icon = NULL; entries[i].blank = TRUE; } - entries[i].minimized = FALSE; + entries[i].hidden = FALSE; entries[i].demands_attention = FALSE; ++i; diff --git a/src/tabpopup.c b/src/tabpopup.c index 0045122cd..427bb7fdf 100644 --- a/src/tabpopup.c +++ b/src/tabpopup.c @@ -206,7 +206,7 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, if (entries[i].title) { gchar *tmp; - if (entries[i].minimized) + if (entries[i].hidden) { tmp = g_strdup_printf ("[%s]", entries[i].title); } @@ -235,7 +235,7 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, if (te->icon) { g_object_ref (G_OBJECT (te->icon)); - if (entries[i].minimized) + if (entries[i].hidden) te->dimmed_icon = dimm_icon (entries[i].icon); } diff --git a/src/tabpopup.h b/src/tabpopup.h index c220003c3..74c883cfb 100644 --- a/src/tabpopup.h +++ b/src/tabpopup.h @@ -40,7 +40,7 @@ struct _MetaTabEntry int x, y, width, height; int inner_x, inner_y, inner_width, inner_height; guint blank : 1; - guint minimized : 1; + guint hidden : 1; guint demands_attention : 1; };