[gtk-engines: 62/62] Merge branch 'gnome3'
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-engines: 62/62] Merge branch 'gnome3'
- Date: Thu, 10 Jun 2010 18:36:24 +0000 (UTC)
commit d132bfab825daa1595322e749857e1c40406a09c
Merge: cfbc0a7 aaa9deb
Author: Bastien Nocera <hadess hadess net>
Date: Thu Jun 10 19:33:09 2010 +0100
Merge branch 'gnome3'
Conflicts:
configure.ac
engines/glide/src/glide_gtk2_drawing.c
engines/lua/Makefile.am
engines/lua/src/lua_style.c
engines/redmond/src/redmond_gtk2_drawing.c
configure.ac | 25 +-
engines/clearlooks/Makefile.am | 3 +-
engines/clearlooks/src/clearlooks_draw.c | 2 +-
engines/clearlooks/src/clearlooks_draw.h | 1 +
engines/clearlooks/src/clearlooks_draw_gnome3.c | 626 ++++++++++++++++++++
engines/clearlooks/src/clearlooks_rc_style.c | 16 +-
engines/clearlooks/src/clearlooks_rc_style.h | 4 +-
engines/clearlooks/src/clearlooks_style.c | 49 ++-
engines/clearlooks/src/clearlooks_style.h | 1 +
engines/clearlooks/src/clearlooks_types.h | 13 +-
engines/clearlooks/src/support.c | 26 +-
engines/clearlooks/src/support.h | 7 -
engines/crux/Makefile.am | 2 +-
engines/crux/src/crux-draw.c | 14 +-
engines/glide/Makefile.am | 2 +-
engines/glide/src/glide_gtk2_drawing.c | 97 +---
engines/glide/src/glide_gtk2_support.c | 8 +-
engines/hc/Makefile.am | 2 +-
engines/hc/src/hc-style.c | 6 +-
engines/hc/src/hc_gtk2_support.c | 8 +-
engines/industrial/Makefile.am | 2 +-
engines/mist/Makefile.am | 2 +-
engines/mist/src/mist-style.c | 6 +-
engines/redmond/Makefile.am | 2 +-
engines/redmond/src/redmond_gtk2_drawing.c | 92 +---
engines/redmond/src/redmond_gtk2_misc.c | 8 +-
engines/support/widget-information.h | 2 +-
engines/thinice/Makefile.am | 2 +-
engines/thinice/src/thinice_theme_draw.c | 6 +-
schema/clearlooks.xml.in.in | 9 +
themes/Clearlooks/Makefile.am | 2 +-
themes/Clearlooks/gtk-3.0/Makefile.am | 8 +
themes/Clearlooks/gtk-3.0/gtkrc | 2 +
.../{gtk-2.0/gtkrc => gtk-3.0/gtkrc-common} | 8 +-
themes/Clearlooks/gtk-3.0/gtkrc-dark | 3 +
themes/Clearlooks/gtk-3.0/gtkrc-light | 1 +
themes/Crux/Makefile.am | 2 +-
themes/Crux/{gtk-2.0 => gtk-3.0}/Makefile.am | 2 +-
themes/Crux/{gtk-2.0 => gtk-3.0}/gtkrc | 0
themes/GNOME3/Makefile.am | 4 +
.../gtk-2.0 => GNOME3/gtk-3.0}/Makefile.am | 2 +-
.../{Clearlooks/gtk-2.0 => GNOME3/gtk-3.0}/gtkrc | 235 ++++++--
themes/GNOME3/metacity-1/Makefile.am | 18 +
themes/GNOME3/metacity-1/button_close.png | Bin 0 -> 762 bytes
themes/GNOME3/metacity-1/button_maximize.png | Bin 0 -> 577 bytes
themes/GNOME3/metacity-1/button_minimize.png | Bin 0 -> 456 bytes
themes/GNOME3/metacity-1/left_button_edge.png | Bin 0 -> 393 bytes
themes/GNOME3/metacity-1/menu_button_bg.png | Bin 0 -> 247 bytes
.../GNOME3/metacity-1/menu_button_bg_prelight.png | Bin 0 -> 231 bytes
themes/GNOME3/metacity-1/menu_button_close.png | Bin 0 -> 191 bytes
themes/GNOME3/metacity-1/menu_button_maximize.png | Bin 0 -> 161 bytes
themes/GNOME3/metacity-1/menu_button_minimize.png | Bin 0 -> 139 bytes
themes/GNOME3/metacity-1/metacity-theme-1.xml | 488 +++++++++++++++
themes/Industrial/Makefile.am | 2 +-
themes/Industrial/gtk-2.0/Makefile.am | 8 -
.../gtk-2.0 => Industrial/gtk-3.0}/Makefile.am | 2 +-
themes/Industrial/{gtk-2.0 => gtk-3.0}/gtkrc | 0
themes/Makefile.am | 2 +-
themes/Mist/Makefile.am | 2 +-
themes/Mist/{gtk-2.0 => gtk-3.0}/Makefile.am | 2 +-
themes/Mist/{gtk-2.0 => gtk-3.0}/gtkrc | 0
themes/Redmond/Makefile.am | 2 +-
.../gtk-2.0 => Redmond/gtk-3.0}/Makefile.am | 2 +-
themes/Redmond/{gtk-2.0 => gtk-3.0}/gtkrc | 0
themes/ThinIce/Makefile.am | 2 +-
.../gtk-2.0 => ThinIce/gtk-3.0}/Makefile.am | 2 +-
themes/ThinIce/{gtk-2.0 => gtk-3.0}/gtkrc | 0
67 files changed, 1498 insertions(+), 346 deletions(-)
---
diff --cc configure.ac
index 3cc89e0,8b1a384..936827d
--- a/configure.ac
+++ b/configure.ac
@@@ -114,16 -118,27 +114,16 @@@ if test $thinice = "yes"; the
fi
fi
-if test $lua = "yes"; then
- BUILD_ENGINES="$BUILD_ENGINES lua"
-fi
-
# Don't forget to update the README when changing this.
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0,,
- AC_MSG_ERROR([GTK+-2.12 is required to compile gtk-engines]))
+ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.90.0,,
+ AC_MSG_ERROR([GTK+-3.0 is required to compile gtk-engines]))
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
- GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+ GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
AC_SUBST(GTK_VERSION)
-if test $system_lua = "yes"; then
- PKG_CHECK_MODULES(LUA, lua,,
- AC_MSG_ERROR([--with-system-lua specified but no system liblua found]))
- AC_SUBST(LUA_CFLAGS)
- AC_SUBST(LUA_LIBS)
-fi
-
AC_SUBST(BUILD_ENGINES)
AC_SUBST(BUILD_THEMES)
AC_SUBST(BUILD_SCHEMAS)
@@@ -166,19 -181,23 +166,22 @@@ engines/mist/Makefil
engines/redmond/Makefile
engines/glide/Makefile
engines/thinice/Makefile
-engines/lua/Makefile
themes/Makefile
themes/Clearlooks/Makefile
- themes/Clearlooks/gtk-2.0/Makefile
+ themes/Clearlooks/gtk-3.0/Makefile
+ themes/GNOME3/Makefile
+ themes/GNOME3/gtk-3.0/Makefile
+ themes/GNOME3/metacity-1/Makefile
themes/Crux/Makefile
- themes/Crux/gtk-2.0/Makefile
+ themes/Crux/gtk-3.0/Makefile
themes/Industrial/Makefile
- themes/Industrial/gtk-2.0/Makefile
+ themes/Industrial/gtk-3.0/Makefile
themes/Mist/Makefile
- themes/Mist/gtk-2.0/Makefile
+ themes/Mist/gtk-3.0/Makefile
themes/Redmond/Makefile
- themes/Redmond/gtk-2.0/Makefile
+ themes/Redmond/gtk-3.0/Makefile
themes/ThinIce/Makefile
- themes/ThinIce/gtk-2.0/Makefile
+ themes/ThinIce/gtk-3.0/Makefile
gtk-engines-2.pc
gtk-engines.spec
po/Makefile.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
