summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Lavergne <gilir@ubuntu.com>2013-09-12 19:30:32 +0200
committerJulien Lavergne <gilir@ubuntu.com>2013-09-12 19:30:32 +0200
commitc8f0cd4270c140ad2b458b45df42ed44f08241ff (patch)
tree792132b8e1acf59157ec3dfe316b25160a9da479
parent910db85287e72d4c71a53960c330693f71a054c7 (diff)
Fix building with openbox 3.5.2, and increase the depends (fix 3614951)
-rw-r--r--configure.ac2
-rw-r--r--src/preview.c20
2 files changed, 11 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 98b4dbc..3b0d615 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_HELP_STRING([--enable-gtk3],[enable to use gtk-3.0 instead of gtk-2.0]),
*) AC_MSG_ERROR([bad value "${enableval}" for --enable-gtk3, use "yes" (default) or "no".]) ;;
esac],[])
-PKG_CHECK_MODULES(OPENBOX, [obrender-3.5 >= 3.5 obt-3.5 >= 3.5])
+PKG_CHECK_MODULES(OPENBOX, [obrender-3.5 >= 3.5.2 obt-3.5 >= 3.5.2])
AC_SUBST(OPENBOX_CFLAGS)
AC_SUBST(OPENBOX_LIBS)
diff --git a/src/preview.c b/src/preview.c
index 72e3cbf..fd3a965 100644
--- a/src/preview.c
+++ b/src/preview.c
@@ -549,28 +549,28 @@ static GdkPixbuf* preview_window(RrTheme *theme, const gchar *titlelayout,
switch (*layout) {
case 'D':
a = focus ?
- theme->a_focused_unpressed_desk :
- theme->a_unfocused_unpressed_desk;
+ theme->btn_desk->a_focused_unpressed :
+ theme->btn_desk->a_unfocused_unpressed;
break;
case 'S':
a = focus ?
- theme->a_focused_unpressed_shade :
- theme->a_unfocused_unpressed_shade;
+ theme->btn_shade->a_focused_unpressed :
+ theme->btn_shade->a_unfocused_unpressed;
break;
case 'I':
a = focus ?
- theme->a_focused_unpressed_iconify :
- theme->a_unfocused_unpressed_iconify;
+ theme->btn_iconify->a_focused_unpressed :
+ theme->btn_iconify->a_unfocused_unpressed;
break;
case 'M':
a = focus ?
- theme->a_focused_unpressed_max :
- theme->a_unfocused_unpressed_max;
+ theme->btn_max->a_focused_unpressed :
+ theme->btn_max->a_unfocused_unpressed;
break;
case 'C':
a = focus ?
- theme->a_focused_unpressed_close :
- theme->a_unfocused_unpressed_close;
+ theme->btn_close->a_focused_unpressed :
+ theme->btn_close->a_unfocused_unpressed;
break;
default:
continue;