diff options
| author | Benjamin Berg <benjamin@sipsolutions.net> | 2008-03-24 22:56:17 (GMT) |
|---|---|---|
| committer | Benjamin Berg <benjamin@sipsolutions.net> | 2008-03-24 22:56:17 (GMT) |
| commit | a4b7d70d1ee5d380b44092cb6fef08edb0678fab (patch) | |
| tree | 1ef45988c9d7eb7d9221724546ee80b71be64c59 | |
| parent | 365bff7f81d7145d8dea4fb1274d4ebf7511e5b9 (diff) | |
The last commit was a bit rushed. This should work better.
| -rw-r--r-- | gtk/engine/sugar-rc-style.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/engine/sugar-rc-style.c b/gtk/engine/sugar-rc-style.c index 3d2fd13..0e25172 100644 --- a/gtk/engine/sugar-rc-style.c +++ b/gtk/engine/sugar-rc-style.c @@ -355,27 +355,23 @@ sugar_rc_style_merge (GtkRcStyle *dest, for (i = 0; i < 5; i++) { if ((sugar_dest->color_mapping.bg[i] == SUGAR_COLOR_ORIGINAL) && - !(dest->color_flags[i] & GTK_RC_BG) && src->color_flags[i] & GTK_RC_BG) { + !(dest->color_flags[i] & GTK_RC_BG)) { sugar_dest->color_mapping.bg[i] = sugar_src->color_mapping.bg[i]; - dest->color_flags[i] |= GTK_RC_BG; } if ((sugar_dest->color_mapping.fg[i] == SUGAR_COLOR_ORIGINAL) && - !(dest->color_flags[i] & GTK_RC_FG) && src->color_flags[i] & GTK_RC_FG) { + !(dest->color_flags[i] & GTK_RC_FG)) { sugar_dest->color_mapping.fg[i] = sugar_src->color_mapping.fg[i]; - dest->color_flags[i] |= GTK_RC_FG; } if ((sugar_dest->color_mapping.base[i] == SUGAR_COLOR_ORIGINAL) && - !(dest->color_flags[i] & GTK_RC_BASE) && src->color_flags[i] & GTK_RC_BASE) { + !(dest->color_flags[i] & GTK_RC_BASE)) { sugar_dest->color_mapping.base[i] = sugar_src->color_mapping.base[i]; - dest->color_flags[i] |= GTK_RC_BASE; } if ((sugar_dest->color_mapping.text[i] == SUGAR_COLOR_ORIGINAL) && - !(dest->color_flags[i] & GTK_RC_TEXT) && src->color_flags[i] & GTK_RC_TEXT) { + !(dest->color_flags[i] & GTK_RC_TEXT)) { sugar_dest->color_mapping.text[i] = sugar_src->color_mapping.text[i]; - dest->color_flags[i] |= GTK_RC_TEXT; } } } |