diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-18 20:43:18 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-18 20:43:18 -0500 |
| commit | 3263845459d15da683b7cab92fb856acbdf2800e (patch) | |
| tree | 15bc390602a83a0f919e8a1faa7f8a20c8a4f542 /render | |
| parent | 9e05faf3d6ac1c527032efb7210de8bbfeb2212c (diff) | |
| parent | 041d17373e046b5ee6667b10c1492bb518bac097 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/grab.c
openbox/keyboard.c
Diffstat (limited to 'render')
| -rw-r--r-- | render/theme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/render/theme.c b/render/theme.c index ec12dafb..1dad8e4c 100644 --- a/render/theme.c +++ b/render/theme.c @@ -220,7 +220,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, "border.color", &theme->frame_focused_border_color)) theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0); - /* title separator focused color inherits from focused boder color */ + /* title separator focused color inherits from focused border color */ if (!read_color(db, inst, "window.active.title.separator.color", &theme->title_separator_focused_color)) @@ -237,7 +237,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrColorNew(inst, theme->frame_focused_border_color->r, theme->frame_focused_border_color->g, theme->frame_focused_border_color->b); - /* title separator unfocused color inherits from unfocused boder color */ + /* title separator unfocused color inherits from unfocused border color */ if (!read_color(db, inst, "window.inactive.title.separator.color", &theme->title_separator_unfocused_color)) |