summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaakov Selkowitz <[email protected]>2015-07-17 13:14:35 -0500
committerinfirit <[email protected]>2015-08-20 14:29:12 +0200
commitae7d0154803e6ff34379ca914d2177c4c6bb32aa (patch)
tree4a1d32e2a77fff277f261ca3c71f1b473b76caf9
parentfea3311a440a92cd85c4bb63184d88e5f59a5943 (diff)
downloadmarco-ae7d0154803e6ff34379ca914d2177c4c6bb32aa.tar.bz2
marco-ae7d0154803e6ff34379ca914d2177c4c6bb32aa.tar.xz
theme: Remove outdated assertion
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 https://git.gnome.org/browse/mutter/commit/?id=28deea4 https://git.gnome.org/browse/metacity/commit/?id=c9099b4 https://github.com/mate-desktop/marco/issues/205
-rw-r--r--src/ui/theme.c1
-rw-r--r--src/ui/theme.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/ui/theme.c b/src/ui/theme.c
index a7dc8d08..173c58f0 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -1312,7 +1312,6 @@ meta_color_spec_new_from_string (const char *str,
spec = meta_color_spec_new (META_COLOR_SPEC_GTK);
spec->data.gtk.state = state;
spec->data.gtk.component = component;
- g_assert (spec->data.gtk.state < N_GTK_STATES);
g_assert (spec->data.gtk.component < META_GTK_COLOR_LAST);
}
else if (str[0] == 'b' && str[1] == 'l' && str[2] == 'e' && str[3] == 'n' &&
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 66996d89..742d01fe 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -694,8 +694,6 @@ typedef enum
META_FRAME_PIECE_LAST
} MetaFramePiece;
-#define N_GTK_STATES 5
-
/**
* How to draw a frame in a particular state (say, a focussed, non-maximised,
* resizable frame). This corresponds closely to the <frame_style> tag