summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan Delaney <a.j.delaney@brighton.ac.uk>2005-11-12 00:34:32 +0000
committerElijah Newren <newren@src.gnome.org>2005-11-12 00:34:32 +0000
commit6677b55cd513918b0148dbdc8e9d62cbed526642 (patch)
treec441e0add648df235c4c0588b8b4b8f858a30891
parent7c1aa16c3bbdd3037e248ca00adbede2ae785312 (diff)
downloadmetacity-6677b55cd513918b0148dbdc8e9d62cbed526642.tar.gz
Changed the 'minimized' field of the MetaTabEntry struct to 'hidden'.
2005-11-11 Aidan Delaney <a.j.delaney@brighton.ac.uk> * 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.
-rw-r--r--ChangeLog8
-rw-r--r--src/screen.c4
-rw-r--r--src/tabpopup.c4
-rw-r--r--src/tabpopup.h2
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e04f469..77fd01fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-11 Aidan Delaney <a.j.delaney@brighton.ac.uk>
+
+ * 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 <kmaraas@gnome.org>
* src/eventqueue.c: (meta_event_queue_new): Merge fix
diff --git a/src/screen.c b/src/screen.c
index beb7ad09..c59df378 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 0045122c..427bb7fd 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 c220003c..74c883cf 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;
};