isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

theme: Remove outdated assertion

Browse Source 
The theme state used to use GtkStateType, but was ported over to GtkStateFlags,
leaving behind a broken assertion that fails when using certain Metacity
themes, for example Nodoka.

https://bugzilla.gnome.org/show_bug.cgi?id=661286
This commit is contained in:
Sandro Mani 2011-10-08 23:19:04 +02:00 committed by Jasper St. Pierre
parent f82966adb5
commit 28deea44d4
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/theme-private.h
View File

@ -723,8 +723,6 @@ typedef enum
META_FRAME_PIECE_LAST META_FRAME_PIECE_LAST
} MetaFramePiece; } MetaFramePiece;
#define N_GTK_STATES 5
/** /**
* How to draw a frame in a particular state (say, a focussed, non-maximised, * How to draw a frame in a particular state (say, a focussed, non-maximised,
* resizable frame). This corresponds closely to the <frame_style> tag * resizable frame). This corresponds closely to the <frame_style> tag

1
src/ui/theme.c
View File

@ -1339,7 +1339,6 @@ meta_color_spec_new_from_string (const char *str,
spec = meta_color_spec_new (META_COLOR_SPEC_GTK); spec = meta_color_spec_new (META_COLOR_SPEC_GTK);
spec->data.gtk.state = state; spec->data.gtk.state = state;
spec->data.gtk.component = component; spec->data.gtk.component = component;
g_assert (spec->data.gtk.state < N_GTK_STATES);
g_assert (spec->data.gtk.component < META_GTK_COLOR_LAST); g_assert (spec->data.gtk.component < META_GTK_COLOR_LAST);
} }
else if (str[0] == 'b' && str[1] == 'l' && str[2] == 'e' && str[3] == 'n' && else if (str[0] == 'b' && str[1] == 'l' && str[2] == 'e' && str[3] == 'n' &&