diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-03-08 17:43:32 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-03-08 17:43:32 +0100 |
| commit | ec328fc04fe6e8d8c3d1ee386d4964963eb2ee17 (patch) | |
| tree | c91070084eee7915dd29453076dc7f30b5b97fa0 /render/theme.c | |
| parent | cfe36a0df2db3e5fd4c52e32093ea095492297cf (diff) | |
| parent | c716d1788bb4f4b9db403617023f06347ba48102 (diff) | |
Merge branch 'backport' into work
Conflicts:
obt/keyboard.c
openbox/actions/cyclewindows.c
openbox/actions/directionalwindows.c
openbox/frame.c
openbox/openbox.c
Diffstat (limited to 'render/theme.c')
| -rw-r--r-- | render/theme.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/render/theme.c b/render/theme.c index ece4037c..47c8a9c9 100644 --- a/render/theme.c +++ b/render/theme.c @@ -577,7 +577,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH; theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; - /* read the decoration textures */ if (!read_appearance(db, inst, "window.active.title.bg", theme->a_focused_title, @@ -1780,7 +1779,6 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, *interlaced = FALSE; } - static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, const gchar *rname, RrAppearance *value, gboolean allow_trans) |