diff -Nru gnome-themes-standard-3.3.3/aclocal.m4 gnome-themes-standard-3.3.4/aclocal.m4 --- gnome-themes-standard-3.3.3/aclocal.m4 2011-12-19 11:24:30.000000000 +0000 +++ gnome-themes-standard-3.3.4/aclocal.m4 2012-01-17 02:13:45.000000000 +0000 @@ -1004,8 +1004,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -1014,8 +1014,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -1149,6 +1149,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -1634,7 +1636,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1798,6 +1800,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1819,6 +1822,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1849,6 +1875,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1951,7 +1981,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1959,6 +1995,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1970,6 +2007,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1987,7 +2025,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -2032,8 +2072,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -2044,6 +2084,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -2327,14 +2369,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -2411,13 +2466,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2597,6 +2652,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -2636,7 +2696,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -3182,7 +3242,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -3191,7 +3251,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -3256,7 +3316,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -3395,7 +3455,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -3403,10 +3463,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -3414,7 +3470,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3432,7 +3488,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3452,17 +3508,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -3523,7 +3580,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -3539,7 +3596,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3576,9 +3633,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3645,7 +3702,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3714,7 +3771,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3739,7 +3796,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3763,7 +3820,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -3794,7 +3851,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3804,7 +3861,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -4226,7 +4283,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4646,6 +4703,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -5230,7 +5288,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -5322,18 +5382,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -5493,7 +5568,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -5518,7 +5595,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5769,8 +5845,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -6065,6 +6140,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -6111,10 +6187,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -6127,7 +6199,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -6166,7 +6238,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -6608,9 +6679,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -6764,7 +6832,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -7134,7 +7201,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -7895,12 +7962,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -8097,7 +8170,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -8230,7 +8302,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -8413,6 +8484,73 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -8482,6 +8620,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -9146,9 +9291,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -9320,15 +9480,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -9689,6 +9849,7 @@ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` @@ -9825,6 +9986,7 @@ GLIB_GENMARSHAL="" GOBJECT_QUERY="" GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" ifelse([$3], , :, [$3]) fi AC_SUBST(GLIB_CFLAGS) @@ -9832,6 +9994,7 @@ AC_SUBST(GLIB_GENMARSHAL) AC_SUBST(GOBJECT_QUERY) AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) rm -f conf.glibtest ]) diff -Nru gnome-themes-standard-3.3.3/ChangeLog gnome-themes-standard-3.3.4/ChangeLog --- gnome-themes-standard-3.3.3/ChangeLog 2011-12-19 11:33:06.000000000 +0000 +++ gnome-themes-standard-3.3.4/ChangeLog 2012-01-17 02:15:04.000000000 +0000 @@ -1,5 +1,849 @@ # Generated by Makefile. Do not edit. +commit f8fe17e112e7ba0bbc27a1c99c58042243fb4353 +Author: Cosimo Cecchi +Date: Mon Jan 16 21:13:30 2012 -0500 + + release: prepare for 3.3.4 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletions(-) + +commit 4893faebcdd115253745171535a5274ced4524ca +Author: Cosimo Cecchi +Date: Mon Jan 16 21:12:47 2012 -0500 + + build: require GTK 3.3.7 + + Don't pretend to work with non-master GTK. + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d49171fe8b58225e5c48c530703886d016034e76 +Author: Lapo Calamandrei +Date: Tue Jan 17 01:41:52 2012 +0100 + + Widgets: fix insensitive pushed toggle text color for the dark variation. + + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +commit 9f3a1b7f95b16eb7296ae3a899f47fb59d6150c7 +Author: Lapo Calamandrei +Date: Tue Jan 17 01:28:44 2012 +0100 + + Widgets: do not use a border image for button borders on infobars + on unfocused windows. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 27 +++++++++++++++++++++++++++ + 1 files changed, 27 insertions(+), 0 deletions(-) + +commit ddeaa5ad1a1f7ee10007ca171a32d489a6ddfa5b +Author: Lapo Calamandrei +Date: Tue Jan 17 01:14:42 2012 +0100 + + Widget: Ephy menu button styling and selected menubar item tweaks. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 8 +++++--- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 +- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 32dd2805819907c68ac75c2fd2e521ea6f78b5e6 +Author: Lapo Calamandrei +Date: Tue Jan 17 00:39:19 2012 +0100 + + Widgets: fixed backdrop entry selected text color, reverted toolbar buttons padding change. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 21 +++++++++++++++++++++ + themes/Adwaita/gtk-3.0/gtk-widgets.css | 10 +++++----- + 2 files changed, 26 insertions(+), 5 deletions(-) + +commit ecc340846701f4b46c2f9441175b80c2df5459bd +Author: Cosimo Cecchi +Date: Mon Jan 16 18:32:31 2012 -0500 + + menus: make sure menubar style doesn't override real menuitems + + Since we now in GTK propagate the style from the triggering element to + the generated menu, we have to make sure .menubar .menuitem { } + selectors don't override the actual menuitem style. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 24 ++++++++++++++---------- + 1 files changed, 14 insertions(+), 10 deletions(-) + +commit 72df8b95e61fb5c8f6ef89934a1f0d7db8efaf93 +Author: Lapo Calamandrei +Date: Mon Jan 16 20:47:28 2012 +0100 + + Widgets: toolbar button padding fix and some more Ephy tweaks. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 3 ++- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 6 +++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit cab52f4c42f6990d06c47fe37804b05575f68664 +Author: Lapo Calamandrei +Date: Mon Jan 16 20:19:19 2012 +0100 + + Widgets: Ephy unfocused window style fixes. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 23 +++++++++++++++---- + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 3 +- + 2 files changed, 20 insertions(+), 6 deletions(-) + +commit 45bd71b417be6c930a05b164d1b9ebcb520388c5 +Author: Lapo Calamandrei +Date: Mon Jan 16 19:29:28 2012 +0100 + + Widget: some more custom Ephy styling. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 35 ++++++++++++++++++++---- + 1 files changed, 29 insertions(+), 6 deletions(-) + +commit 7b2a9588971efb1db9242ddf0bd09aecb7b01d42 +Author: Lapo Calamandrei +Date: Mon Jan 16 18:44:52 2012 +0100 + + Widgets: fixed linked button styling, some initial Ephy custom style. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 32 +++++++++++ + themes/Adwaita/gtk-3.0/gtk-widgets.css | 72 ++++++++++++------------ + 2 files changed, 68 insertions(+), 36 deletions(-) + +commit 1c27c59b0f0fabb8df92721f77f7cda8aa6135cb +Author: Rui Matos +Date: Mon Jan 16 15:53:41 2012 +0000 + + Revert "widgets: Use transparent as background-color for GtkPaned and its separator" + + This reverts commit b4c1a15233b66a31a315df33f99f8c2d67fe2c57. + + It's causing a rendering bug in, at least, epiphany. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 25 ++++++++++++++++++++----- + 1 files changed, 20 insertions(+), 5 deletions(-) + +commit 0c0948fb40f1dde1343bb4712d4b61780679a5a5 +Author: Cosimo Cecchi +Date: Fri Jan 13 17:23:47 2012 -0500 + + infobars: fix infobar theming of previous commit + + Some selectors were using the wrong color definition; also some + selectors were not necessary. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 47 +----------------------- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 13 ++----- + 2 files changed, 6 insertions(+), 54 deletions(-) + +commit 57e44bf1a3e1853a8b7317066296b3cd1fa99c28 +Author: Lapo Calamandrei +Date: Fri Jan 13 20:09:53 2012 +0100 + + Widgets: some initial infobars work. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 48 ++++++++++++++++++++++-- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 46 +++++++++++++++++++++++ + 2 files changed, 90 insertions(+), 4 deletions(-) + +commit db2f9bba9fd9043b302d9c269f79b31e29b5557a +Author: Cosimo Cecchi +Date: Fri Jan 13 12:30:35 2012 -0500 + + dark: fix icon-shadow selectors for dark toolbar buttons + + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 34 +++++++------------ + 1 files changed, 13 insertions(+), 21 deletions(-) + +commit 1fcf3584753acf9330c437e4a8a1bdd3a4ddd81c +Author: Cosimo Cecchi +Date: Fri Jan 13 12:20:40 2012 -0500 + + dark: sync the cleaned up selectors from the light theme + + .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 73 ++++++++------------ + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 2 - + 2 files changed, 28 insertions(+), 47 deletions(-) + +commit 80b23098e053fc1c6682340633607ceb401ac58e +Author: Cosimo Cecchi +Date: Fri Jan 13 12:08:11 2012 -0500 + + buttons: remove commented out selectors + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 50 ++----------------------------- + 1 files changed, 4 insertions(+), 46 deletions(-) + +commit ada96c00a1e6becd7e83dcacec0003d3329acba7 +Author: Cosimo Cecchi +Date: Fri Jan 13 12:07:13 2012 -0500 + + buttons: add selectors for toolbar backdrop buttons + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 22 ++++++++++++++++++---- + 1 files changed, 18 insertions(+), 4 deletions(-) + +commit 8ad4babe95bc7a776775a7c5daf37a8070666598 +Author: Cosimo Cecchi +Date: Fri Jan 13 11:50:45 2012 -0500 + + buttons: cleanup useless selectors + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 14 -------------- + 1 files changed, 0 insertions(+), 14 deletions(-) + +commit 500c889a726f8ac0a0d948da4b3d10b1217fb33f +Author: Cosimo Cecchi +Date: Fri Jan 13 11:48:02 2012 -0500 + + buttons: fixup borders for insensitive inline toolbar buttons + + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 34685815824bc6ea657522cb69ad44154cfe5510 +Author: Lapo Calamandrei +Date: Fri Jan 13 15:27:22 2012 +0100 + + Widgets: fixed spinbutton button insensitive background on unfocused windows. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 3f40343ab17aae42976abb7273cbd57875d521d0 +Author: Lapo Calamandrei +Date: Fri Jan 13 15:15:55 2012 +0100 + + Widget theme: nautilus floating bar for unfocused windows. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +commit 7953d9e833203bab710424f4b65bd7cf2d0abca1 +Author: Lapo Calamandrei +Date: Fri Jan 13 15:03:46 2012 +0100 + + Widget theme: fix selections on nautilus icon view. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +commit 6d70ed8184909088b3b7768a19b66cb534a78235 +Author: Lapo Calamandrei +Date: Fri Jan 13 14:58:41 2012 +0100 + + Widget theme: fixed active hover toggles on toolbars. + + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 24 +++++++------------ + 1 files changed, 9 insertions(+), 15 deletions(-) + +commit d8ebddc4a79c3663349239c5b5e9eeeedbce8d31 +Author: Cosimo Cecchi +Date: Thu Jan 12 18:08:28 2012 -0500 + + buttons: fixup colors and text/icon-shadow for toolbar buttons + + Fixup some regressions in color and text-icon shadow for the backdrop + state. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 81 ++++++++++++++------------------ + 1 files changed, 35 insertions(+), 46 deletions(-) + +commit 729b415de5c606f0a7ab324bd931208e21ac2da0 +Author: Cosimo Cecchi +Date: Thu Jan 12 17:36:22 2012 -0500 + + buttons: cleanup commented selectors + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 12 ++---------- + 1 files changed, 2 insertions(+), 10 deletions(-) + +commit a45f76837dc50c3214811860abe0c62680b18287 +Author: Lapo Calamandrei +Date: Wed Jan 11 23:43:56 2012 +0100 + + Widget theme: yet more fixes. + + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 9 +-- + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 2 +- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 93 +++++++++----------- + 3 files changed, 46 insertions(+), 58 deletions(-) + +commit b4c1a15233b66a31a315df33f99f8c2d67fe2c57 +Author: Rui Matos +Date: Wed Jan 11 19:28:58 2012 +0000 + + widgets: Use transparent as background-color for GtkPaned and its separator + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 25 +++++-------------------- + 1 files changed, 5 insertions(+), 20 deletions(-) + +commit c46333674ecebb070a67bc302c8d17d231c1f242 +Author: Lapo Calamandrei +Date: Wed Jan 11 20:57:00 2012 +0100 + + Widget theme: some more fixes... + + themes/Adwaita/gtk-3.0/gtk-dark.css | 1 + + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 38 ++++------ + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 81 +++++++++++++------- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 67 ++++++++-------- + themes/Adwaita/gtk-3.0/gtk.css | 1 + + 5 files changed, 104 insertions(+), 84 deletions(-) + +commit 434fc3f2f832c6bbc5c01c130355d3de40e6acbc +Author: Lapo Calamandrei +Date: Wed Jan 11 18:38:13 2012 +0100 + + Widget theme: some Company related styling. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 66 ++++++++++++++++++++++++++++++++ + 1 files changed, 66 insertions(+), 0 deletions(-) + +commit 33f0911b3e776b6b2b2c6768a609cb972239cff4 +Author: Lapo Calamandrei +Date: Wed Jan 11 18:09:36 2012 +0100 + + Widget theme: comboboxentry fixes. + + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 17 +---- + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 17 +----- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 66 +++----------------- + 3 files changed, 15 insertions(+), 85 deletions(-) + +commit be009acca76d75edcc3a710fa3313ff7318e086d +Author: Lapo Calamandrei +Date: Wed Jan 11 16:59:43 2012 +0100 + + Widget theme: fixed column-headers. + + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 45 +++++++---------------- + 1 files changed, 14 insertions(+), 31 deletions(-) + +commit c210f617dcc6ced2b806d2fe0244611e8005a943 +Author: Lapo Calamandrei +Date: Wed Jan 11 16:50:50 2012 +0100 + + Widget theme: fixed primary toolbar buttons pushed state. + + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +commit bd51a7c0b0ce7110b7ddd2448022ceb0ce38a6da +Author: Cosimo Cecchi +Date: Wed Jan 11 09:57:51 2012 -0500 + + Revert "widgets: remove generic universal selector" + + Pushed this by accident. + + This reverts commit f0c9c463682565b3fd15dd452a937d79bcc5198e. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +commit f0c9c463682565b3fd15dd452a937d79bcc5198e +Author: Cosimo Cecchi +Date: Wed Jan 11 09:40:52 2012 -0500 + + widgets: remove generic universal selector + + We can fold the background into GtkWindow and completely remove the + color: inherit from the universal selector, rendering it empty. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 7 +------ + 1 files changed, 1 insertions(+), 6 deletions(-) + +commit 878c14c15cd22da5c910fec0251b1038084c2827 +Author: Cosimo Cecchi +Date: Tue Jan 10 17:42:48 2012 -0500 + + widgets: inherit color from parent by default + + This also fixes the dark theme with master GTK. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 068acf65272ff3726bd49b20e7fa004dfe7be47a +Author: Lapo Calamandrei +Date: Tue Jan 10 18:21:17 2012 +0100 + + Widget theme: some more fixes for latest gtk+ changes, not there yet. + + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 38 +++++++----------- + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 16 ++++---- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 42 ++++---------------- + 3 files changed, 30 insertions(+), 66 deletions(-) + +commit a52880dfc11500d2024114eb589855c5802c12b0 +Author: Lapo Calamandrei +Date: Tue Jan 10 16:23:50 2012 +0100 + + Widget theme: fixed text-shadow on insensitive buttons on primary toolbars. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d21f399c78b44555f99c96bf3d48569d868bb3e4 +Author: Matthias Clasen +Date: Mon Jan 9 15:46:02 2012 -0500 + + Fix theme syntax for gtk master + + We no longer accept 'none' as a color name, its 'transparent' now. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 7c347493dbee49531536207cdfab9e29633abbc6 +Author: Rui Matos +Date: Thu Jan 5 17:00:33 2012 +0000 + + Widget theme: rename 'window-unfocused' to 'backdrop' as in the gtk+ change + + themes/Adwaita/gtk-3.0/gnome-applications.css | 4 +- + themes/Adwaita/gtk-3.0/gtk-backgrounds.css | 2 +- + themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 76 ++-- + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 38 +- + .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 30 +- + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 32 +- + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 2 +- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 356 ++++++++++---------- + 8 files changed, 270 insertions(+), 270 deletions(-) + +commit c1239b059824c37ecbc4652e33e83a9d5e17a6a0 +Author: Jakub Steiner +Date: Fri Jan 6 14:19:26 2012 +0100 + + scrollbars: disable border for now. + + - makes things look uncentered now. Needs to be a proper border. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +commit e9c8c3919063503bd13593112e2bf4efdb0d7939 +Author: Lapo Calamandrei +Date: Fri Dec 30 15:02:39 2011 +0100 + + Widget theme: fixed borders for focused pushed buttons on primary toolbars. + + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit a6531d67b6f440ca070bcfe123fc1a621fe77002 +Author: Lapo Calamandrei +Date: Fri Dec 30 14:55:39 2011 +0100 + + Widget theme: fixed background of pushed entry style buttons. + + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 3 ++- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 166e4b0cfe8bd6922b6ba4bf1dfa6d320469a04b +Author: Lapo Calamandrei +Date: Wed Dec 28 14:18:43 2011 +0100 + + Widget theme: toned down text entries background gradient. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 7 +++++++ + themes/Adwaita/gtk-3.0/gtk-dark.css | 9 +++++---- + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 12 ++++++++++-- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 ++ + themes/Adwaita/gtk-3.0/gtk.css | 8 ++++---- + 5 files changed, 28 insertions(+), 10 deletions(-) + +commit 8adf00e48904cbdda5d9408d66eb0662557b0e52 +Author: Lapo Calamandrei +Date: Fri Dec 23 20:12:45 2011 +0100 + + Widget theme: gedit styling, some nautilus and infobars tweaks. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 75 +++++++++++++++++++++++-- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 54 ++++++++++++++++++ + 2 files changed, 124 insertions(+), 5 deletions(-) + +commit c483bf5b74201a6c0bea69c57fc82e73b721e15c +Author: Lapo Calamandrei +Date: Thu Dec 22 20:01:08 2011 +0100 + + Widget theme: notebook non active tabs tweakings. + + themes/Adwaita/gtk-3.0/gtk-dark.css | 1 + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 14 +++++++++++++- + themes/Adwaita/gtk-3.0/gtk.css | 5 +++-- + 3 files changed, 17 insertions(+), 3 deletions(-) + +commit 30737523847b0eea94e93592f6502149e5b3f205 +Author: Benjamin Otte +Date: Fri Dec 23 17:59:37 2011 +0100 + + adwaita: Check the pattern isn't NULL before using it + + Otherwise we'll error the cairo context, and that looks really not very + nice. + + src/adwaita_engine.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 2d9bc00bc29dd993760d7536855a4e6399582a50 +Author: Lapo Calamandrei +Date: Thu Dec 22 16:32:29 2011 +0100 + + Widget theme: some more button gradients tweakings. + + themes/Adwaita/gtk-3.0/gtk-dark.css | 7 ++++--- + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 3 ++- + themes/Adwaita/gtk-3.0/gtk.css | 3 ++- + 3 files changed, 8 insertions(+), 5 deletions(-) + +commit 7d3057504a858afd9154b7d9837f5c4e2bfa85ed +Author: Lapo Calamandrei +Date: Thu Dec 22 16:01:30 2011 +0100 + + Widget theme: some initial gradients refresh. + + themes/Adwaita/gtk-3.0/gtk-dark.css | 13 +++--- + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 41 +++++++++++--------- + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 5 ++ + themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 + + themes/Adwaita/gtk-3.0/gtk.css | 23 ++++++++--- + 5 files changed, 54 insertions(+), 30 deletions(-) + +commit d4d515a5be6b0e8c3a439cca7026c6361fc8f472 +Author: Lapo Calamandrei +Date: Thu Dec 22 14:16:39 2011 +0100 + + Dark theme: fix column-hedaers last child for window unfocused, some scrollbars tweakings. + + themes/Adwaita/gtk-3.0/gtk-dark.css | 4 ++-- + .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 4 +++- + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 7 +++++++ + themes/Adwaita/gtk-3.0/gtk-widgets.css | 14 ++++++++++++-- + themes/Adwaita/gtk-3.0/gtk.css | 4 ++-- + 5 files changed, 26 insertions(+), 7 deletions(-) + +commit 6a3a6cfbf1e563364a56fc1e4785e4cac052fce0 +Author: Lapo Calamandrei +Date: Thu Dec 22 12:35:24 2011 +0100 + + Widget theme: sidebar scrollbars styling and unfocused window sidebar. + + themes/Adwaita/gtk-3.0/gnome-applications.css | 17 +++++++++--- + themes/Adwaita/gtk-3.0/gtk-dark.css | 2 +- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 34 +++++++++++++++++++++++- + themes/Adwaita/gtk-3.0/gtk.css | 3 +- + 4 files changed, 48 insertions(+), 8 deletions(-) + +commit 25dc3a47d638e3fc82c3da22f7391c772477f1bc +Author: Rui Matos +Date: Thu Dec 22 03:23:23 2011 +0000 + + Widget theme: fix calendar buttons + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +commit 622a4279fdbdc30cd577ce5fe194e41aca38f6ab +Author: Rui Matos +Date: Thu Dec 22 03:20:55 2011 +0000 + + Widget theme: fix typos in column header buttons' selectors + + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit a649f1bd5001751367b3349c76c607a309746784 +Author: Lapo Calamandrei +Date: Thu Dec 22 02:31:58 2011 +0100 + + Widget theme: added ver subtle borders to scrollbar trough. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +commit 3597401e734933a9f6ad6a7533b26260fda4dc6a +Author: Lapo Calamandrei +Date: Thu Dec 22 01:31:41 2011 +0100 + + Widget theme: fixed insensitive scale slider with marks below. + + themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit e19d577a8bad27b6005966bbf531e50d966258de +Author: Lapo Calamandrei +Date: Thu Dec 22 01:11:39 2011 +0100 + + Dark theme: fix spinbuttons wrt latest gtk+ changes. + + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 13 ++++++++----- + 1 files changed, 8 insertions(+), 5 deletions(-) + +commit 093547ab1d4631d19c1e6b3a49f3f8a07b9d1ff5 +Author: Lapo Calamandrei +Date: Thu Dec 22 01:05:10 2011 +0100 + + Widget theme: fix wrong color name definition making unfocused window switch text and separators pink. + + themes/Adwaita/gtk-3.0/gtk.css | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 1a6f2999f1a6e18b72a4c8fefe5ac4274ca43527 +Author: Lapo Calamandrei +Date: Thu Dec 22 01:01:03 2011 +0100 + + Widget theme: fix spinbuttons insensitive button background. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 18 +++++++++++------- + themes/Adwaita/gtk-3.0/gtk.css | 3 ++- + 2 files changed, 13 insertions(+), 8 deletions(-) + +commit c8e8bb96c2fb8a5c7bf3b2957a8329b4ec3d9a75 +Author: Lapo Calamandrei +Date: Thu Dec 22 00:28:34 2011 +0100 + + Widget theme: fix spinbuttons wrt latest gtk+ changes. + + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 1 + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 46 +++++++++----------- + 2 files changed, 21 insertions(+), 26 deletions(-) + +commit 1c237835a9d08c469c43262e12e8fe83cde48898 +Author: Lapo Calamandrei +Date: Wed Dec 21 17:59:09 2011 +0100 + + Widget theme: unfocused windows new style scrollbars. + + themes/Adwaita/gtk-3.0/gtk-dark.css | 2 + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 34 +++++++++++++++++++++++-------- + themes/Adwaita/gtk-3.0/gtk.css | 4 ++- + 3 files changed, 30 insertions(+), 10 deletions(-) + +commit 50ce5dc511fe4eaf59dbfc7f705ef5ca491174b8 +Author: Lapo Calamandrei +Date: Wed Dec 21 17:39:35 2011 +0100 + + Widget theme: more scrollbar iterations. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 4 ++-- + themes/Adwaita/gtk-3.0/gtk.css | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit e2d9d101a9c8bda8f55ceed9fde3a97c9d18e8c2 +Author: Lapo Calamandrei +Date: Wed Dec 21 17:14:31 2011 +0100 + + Widget theme: some more iterations on the scrollbars. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit d670483cf01391b027d52d522fcfcee4b55b924a +Author: Lapo Calamandrei +Date: Wed Dec 21 16:48:34 2011 +0100 + + Widget theme: fix active flat buttons on primary toolbars. + + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit f3be0d86611e0cdf1d1c640a74f2828034856dbe +Author: Lapo Calamandrei +Date: Wed Dec 21 16:01:55 2011 +0100 + + Widget theme: correct selected fg color for unfocused windows. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 10 ++++++---- + themes/Adwaita/gtk-3.0/gtk.css | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit 8c525f6887b26dc19a0793ebae262337c5a5d4fb +Author: Lapo Calamandrei +Date: Wed Dec 21 15:58:28 2011 +0100 + + Widget theme: scrollbar tweaks. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 15 ++++++++------- + 1 files changed, 8 insertions(+), 7 deletions(-) + +commit 9b60594e41516850583c57cb0a37a5c28d20a1a7 +Author: Lapo Calamandrei +Date: Wed Dec 21 15:40:22 2011 +0100 + + Widget theme: new scrollbar design. + + themes/Adwaita/gtk-3.0/Makefile.am | 1 - + themes/Adwaita/gtk-3.0/gtk-dark.css | 7 +- + .../Adwaita/gtk-3.0/gtk-scrollbar-experiments.css | 46 --------- + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 6 - + themes/Adwaita/gtk-3.0/gtk-widgets.css | 103 ++++++------------- + themes/Adwaita/gtk-3.0/gtk.css | 8 +- + 6 files changed, 45 insertions(+), 126 deletions(-) + +commit 312fecb00e07149e8ee480c56f66fbdc9e8b0a9b +Author: Lapo Calamandrei +Date: Wed Dec 21 15:07:00 2011 +0100 + + Widget theme: tiny css cleanup. + + themes/Adwaita/gtk-3.0/gtk-dark.css | 6 +++--- + themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 1 - + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 4 ++++ + themes/Adwaita/gtk-3.0/gtk-widgets.css | 20 ++++++++++---------- + themes/Adwaita/gtk-3.0/gtk.css | 4 ++-- + 5 files changed, 19 insertions(+), 16 deletions(-) + +commit bb108d679322691cc5115972403a8a1af2e4972b +Author: Jakub Steiner +Date: Tue Dec 20 19:11:10 2011 +0100 + + background: nighttime variant darker. + + themes/Adwaita/backgrounds/good-night.jpg | Bin 117329 -> 517632 bytes + 1 files changed, 0 insertions(+), 0 deletions(-) + +commit 0a6528f142d56c03d6133f8c8d692905053957f4 +Author: Lapo Calamandrei +Date: Wed Dec 21 04:16:32 2011 +0100 + + Widget theme: add a 2px transparent border to primary toolbar buttons (fixes jumpy toolbars), properly center combobox-entry button decoration. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 26 +++++++++++++++++++++++--- + 1 files changed, 23 insertions(+), 3 deletions(-) + +commit 8c9dae0296275c9feeaefdc42bf0f6dd3dddbea0 +Author: Lapo Calamandrei +Date: Wed Dec 21 02:03:07 2011 +0100 + + Widget theme: fixed combobox-entry button borders and background, trimmed some unneded selectors. + + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 2 +- + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 5 ++++ + themes/Adwaita/gtk-3.0/gtk-widgets.css | 25 ++++++------------- + 3 files changed, 14 insertions(+), 18 deletions(-) + +commit d09321336a646677a537d9b315ab6cc22ceda43f +Author: Lapo Calamandrei +Date: Wed Dec 21 00:32:20 2011 +0100 + + Widget theme: really fix comboxbox entry buttons borders. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +commit 4be513af3bfc17d113a1794dea17935037d3780a +Author: Lapo Calamandrei +Date: Wed Dec 21 00:20:34 2011 +0100 + + Widget theme: fix comboxbox entry buttons borders. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 4a0a03187539b824fe203b4c2d218056990f86b3 +Author: Lapo Calamandrei +Date: Wed Dec 21 00:09:29 2011 +0100 + + Widget theme: add back separations to column-headers. + + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 89eaef3935f78f84caac5a014510d75a45ace186 +Author: Lapo Calamandrei +Date: Tue Dec 20 23:47:15 2011 +0100 + + Dark theme: unfocused windows tweakings. + + themes/Adwaita/gtk-3.0/gtk-dark.css | 6 +++--- + .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 3fa80d856be72e9e0baeadd472cb72f46f5cecb8 +Author: Lapo Calamandrei +Date: Tue Dec 20 19:15:59 2011 +0100 + + Widget theme: some defined colors cleanup and some initial dark theme unfocused window work. + + .../borders/generic-border-unfocused-dark.svg | 8 +- + ...imary-toolbar-generic-border-unfocused-dark.svg | 8 +- + themes/Adwaita/gtk-3.0/gtk-dark.css | 13 ++-- + themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 14 ++-- + .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 2 +- + themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 2 +- + .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 4 +- + themes/Adwaita/gtk-3.0/gtk-widgets.css | 66 ++++++++++++-------- + themes/Adwaita/gtk-3.0/gtk.css | 12 +--- + 9 files changed, 68 insertions(+), 61 deletions(-) + +commit 7b3eca93afb2300601518d655f5101f606232d21 +Author: Cosimo Cecchi +Date: Tue Dec 20 19:08:51 2011 +0100 + + button: adapt to GTK master changes in button border allocations + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit e6ef5888c5cbb4d65391b4604ad12a404e07c66f +Author: Cosimo Cecchi +Date: Tue Dec 20 17:38:19 2011 +0100 + + button: focus-line-width cleanups + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +commit 90e272109ed4672d94afe4bc837ef961e6a9f2ae +Author: Lapo Calamandrei +Date: Tue Dec 20 16:42:06 2011 +0100 + + Widget theme: fixed insensitive linked buttons. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +commit 614bead96d11c3ebda0142468e51c6967be35109 +Author: Lapo Calamandrei +Date: Tue Dec 20 16:24:19 2011 +0100 + + Widget theme: toned down insensitive color of primary toolbar text for unfocused windows. + + themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit aba07a7460644da9386916e10daab42afcb604da +Author: Lapo Calamandrei +Date: Tue Dec 20 16:08:57 2011 +0100 + + Widget theme: insensitive radios assets for unfocused window. + + themes/Adwaita/gtk-3.0/assets/Makefile.am | 3 + + .../assets/radio-mixed-insensitive-unfocused.svg | 115 +++++++++++++++++++ + .../radio-selected-insensitive-unfocused.svg | 116 ++++++++++++++++++++ + .../gtk-3.0/assets/radio-selected-insensitive.svg | 6 +- + .../radio-unselected-insensitive-unfocused.svg | 106 ++++++++++++++++++ + themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 17 +++ + 6 files changed, 360 insertions(+), 3 deletions(-) + +commit 42847db21015445cbb1e3b6b1fd8f1d80c6a0196 +Author: Lapo Calamandrei +Date: Tue Dec 20 15:26:26 2011 +0100 + + Widget theme: insensitive checks assets for unfocused window. + + themes/Adwaita/gtk-3.0/assets/Makefile.am | 3 + + .../checkbox-checked-insensitive-unfocused.svg | 83 +++++++++++++++++ + .../checkbox-mixed-insensitive-unfocused.svg | 97 ++++++++++++++++++++ + .../checkbox-unchecked-insensitive-unfocused.svg | 76 +++++++++++++++ + themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 20 ++++- + 5 files changed, 277 insertions(+), 2 deletions(-) + commit 0620c46e4ad9d4e385b4b64afc32ac9f74ccd4b1 Author: Cosimo Cecchi Date: Mon Dec 19 12:25:40 2011 +0100 diff -Nru gnome-themes-standard-3.3.3/configure gnome-themes-standard-3.3.4/configure --- gnome-themes-standard-3.3.3/configure 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/configure 2012-01-17 02:13:46.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gnome-themes-standard 3.3.3. +# Generated by GNU Autoconf 2.68 for gnome-themes-standard 3.3.4. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='gnome-themes-standard' PACKAGE_TARNAME='gnome-themes-standard' -PACKAGE_VERSION='3.3.3' -PACKAGE_STRING='gnome-themes-standard 3.3.3' +PACKAGE_VERSION='3.3.4' +PACKAGE_STRING='gnome-themes-standard 3.3.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard' PACKAGE_URL='' @@ -694,6 +694,7 @@ build_vendor build_cpu build +GLIB_COMPILE_RESOURCES GLIB_MKENUMS GOBJECT_QUERY GLIB_GENMARSHAL @@ -1351,7 +1352,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-themes-standard 3.3.3 to adapt to many kinds of systems. +\`configure' configures gnome-themes-standard 3.3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1423,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-themes-standard 3.3.3:";; + short | recursive ) echo "Configuration of gnome-themes-standard 3.3.4:";; esac cat <<\_ACEOF @@ -1444,7 +1445,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1535,7 +1536,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-themes-standard configure 3.3.3 +gnome-themes-standard configure 3.3.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1904,7 +1905,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-themes-standard $as_me 3.3.3, which was +It was created by gnome-themes-standard $as_me 3.3.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2720,7 +2721,7 @@ # Define the identity of the package. PACKAGE='gnome-themes-standard' - VERSION='3.3.3' + VERSION='3.3.4' cat >>confdefs.h <<_ACEOF @@ -4348,6 +4349,7 @@ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` @@ -4512,6 +4514,7 @@ GLIB_GENMARSHAL="" GOBJECT_QUERY="" GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" : fi @@ -4519,6 +4522,7 @@ + rm -f conf.glibtest @@ -4935,8 +4939,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5710,6 +5714,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5749,7 +5758,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -6175,7 +6184,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6812,13 +6821,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6965,6 +6974,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7353,7 +7363,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -7364,7 +7374,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -8004,7 +8027,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8015,6 +8044,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -8047,6 +8077,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -8068,7 +8099,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8441,7 +8474,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8519,6 +8567,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8974,7 +9026,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -9065,18 +9119,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -9438,7 +9507,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9688,8 +9756,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -10068,6 +10135,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -10113,6 +10181,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -10141,10 +10210,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10157,7 +10222,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10196,7 +10261,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10820,11 +10884,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10914,7 +10973,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10923,7 +10982,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10988,7 +11047,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11127,7 +11186,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -11135,10 +11194,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11146,7 +11201,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11164,7 +11219,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11184,17 +11239,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -11255,7 +11311,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11271,7 +11327,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11308,9 +11364,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11396,7 +11452,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11465,7 +11521,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11490,7 +11546,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11514,7 +11570,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11545,7 +11601,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11555,7 +11611,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12337,6 +12393,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -13621,7 +13679,7 @@ < $srcdir/po/POTFILES.in > po/POTFILES -GTK_VERSION_REQUIRED=3.3.3 +GTK_VERSION_REQUIRED=3.3.7 pkg_failed=no @@ -14323,7 +14381,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-themes-standard $as_me 3.3.3, which was +This file was extended by gnome-themes-standard $as_me 3.3.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14380,7 +14438,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-themes-standard config.status 3.3.3 +gnome-themes-standard config.status 3.3.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -14509,6 +14567,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -14589,7 +14648,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -14648,6 +14706,7 @@ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -14696,7 +14755,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -15381,8 +15439,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -15445,6 +15503,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -15740,10 +15801,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator diff -Nru gnome-themes-standard-3.3.3/configure.ac gnome-themes-standard-3.3.4/configure.ac --- gnome-themes-standard-3.3.3/configure.ac 2011-12-19 11:19:27.000000000 +0000 +++ gnome-themes-standard-3.3.4/configure.ac 2012-01-17 02:05:30.000000000 +0000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT([gnome-themes-standard], [3.3.3], +AC_INIT([gnome-themes-standard], [3.3.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard]) AM_INIT_AUTOMAKE([1.9 tar-ustar foreign dist-xz no-dist-gzip]) @@ -28,7 +28,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) AM_GLIB_GNU_GETTEXT -GTK_VERSION_REQUIRED=3.3.3 +GTK_VERSION_REQUIRED=3.3.7 PKG_CHECK_MODULES([DEPENDENCIES], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0]) diff -Nru gnome-themes-standard-3.3.3/debian/changelog gnome-themes-standard-3.3.4/debian/changelog --- gnome-themes-standard-3.3.3/debian/changelog 2011-12-20 16:51:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/debian/changelog 2012-01-17 19:43:45.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-themes-standard (3.3.4-0ubuntu1) precise; urgency=low + + * New upstream release. + * debian/control.in: Bump minimum GTK to 3.3.7 + + -- Jeremy Bicha Tue, 17 Jan 2012 14:41:32 -0500 + gnome-themes-standard (3.3.3-0ubuntu3) precise; urgency=low * debian/patches/01_keep-nautilus-3.2.patch: diff -Nru gnome-themes-standard-3.3.3/debian/control gnome-themes-standard-3.3.4/debian/control --- gnome-themes-standard-3.3.3/debian/control 2011-12-20 16:51:35.000000000 +0000 +++ gnome-themes-standard-3.3.4/debian/control 2012-01-17 19:43:48.000000000 +0000 @@ -15,7 +15,7 @@ cdbs (>= 0.4.41), intltool (>= 0.40.0), librsvg2-dev, - libgtk-3-dev (>= 3.1.18) + libgtk-3-dev (>= 3.3.7) Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-themes-standard/ubuntu Package: gnome-themes-standard diff -Nru gnome-themes-standard-3.3.3/debian/control.in gnome-themes-standard-3.3.4/debian/control.in --- gnome-themes-standard-3.3.3/debian/control.in 2011-12-20 16:51:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/debian/control.in 2012-01-17 19:43:45.000000000 +0000 @@ -10,7 +10,7 @@ cdbs (>= 0.4.41), intltool (>= 0.40.0), librsvg2-dev, - libgtk-3-dev (>= 3.1.18) + libgtk-3-dev (>= 3.3.7) Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-themes-standard/ubuntu Package: gnome-themes-standard diff -Nru gnome-themes-standard-3.3.3/ltmain.sh gnome-themes-standard-3.3.4/ltmain.sh --- gnome-themes-standard-3.3.3/ltmain.sh 2011-12-19 09:57:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/ltmain.sh 2012-01-16 20:35:27.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru gnome-themes-standard-3.3.3/Makefile.in gnome-themes-standard-3.3.4/Makefile.in --- gnome-themes-standard-3.3.3/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/Makefile.in 2012-01-17 02:13:50.000000000 +0000 @@ -134,6 +134,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/NEWS gnome-themes-standard-3.3.4/NEWS --- gnome-themes-standard-3.3.3/NEWS 2011-12-19 11:24:11.000000000 +0000 +++ gnome-themes-standard-3.3.4/NEWS 2012-01-17 02:12:30.000000000 +0000 @@ -1,3 +1,15 @@ +3.3.4 +===== + +Implement support for the backdrop state +New scrollbar design +Improved support for Epiphany, Nautilus and GEdit +Improve nighttime background +Many smaller detail tweaks and fixes +Adapt to GTK+ master changes for + - button border allocations + - new CSS parser stricter spec-compliant syntax + 3.3.3 ===== diff -Nru gnome-themes-standard-3.3.3/src/adwaita_engine.c gnome-themes-standard-3.3.4/src/adwaita_engine.c --- gnome-themes-standard-3.3.3/src/adwaita_engine.c 2011-12-05 20:28:54.000000000 +0000 +++ gnome-themes-standard-3.3.4/src/adwaita_engine.c 2012-01-10 16:25:09.000000000 +0000 @@ -293,7 +293,7 @@ draw_tab_shape_active (cr, tab_curvature, 0, 0, width, height); - if (state & GTK_STATE_FLAG_ACTIVE) + if (pattern && (state & GTK_STATE_FLAG_ACTIVE)) { cairo_scale (cr, width, height - 6.0); cairo_set_source (cr, pattern); diff -Nru gnome-themes-standard-3.3.3/src/Makefile.in gnome-themes-standard-3.3.4/src/Makefile.in --- gnome-themes-standard-3.3.3/src/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/src/Makefile.in 2012-01-17 02:13:46.000000000 +0000 @@ -125,6 +125,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ Binary files /tmp/TU4B6fvygZ/gnome-themes-standard-3.3.3/themes/Adwaita/backgrounds/good-night.jpg and /tmp/ajtKN8Dw6m/gnome-themes-standard-3.3.4/themes/Adwaita/backgrounds/good-night.jpg differ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/backgrounds/Makefile.in gnome-themes-standard-3.3.4/themes/Adwaita/backgrounds/Makefile.in --- gnome-themes-standard-3.3.3/themes/Adwaita/backgrounds/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/backgrounds/Makefile.in 2012-01-17 02:13:46.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/cursors/Makefile.in gnome-themes-standard-3.3.4/themes/Adwaita/cursors/Makefile.in --- gnome-themes-standard-3.3.3/themes/Adwaita/cursors/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/cursors/Makefile.in 2012-01-17 02:13:46.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-2.0/Makefile.in gnome-themes-standard-3.3.4/themes/Adwaita/gtk-2.0/Makefile.in --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-2.0/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-2.0/Makefile.in 2012-01-17 02:13:46.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/checkbox-checked-insensitive-unfocused.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/checkbox-checked-insensitive-unfocused.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/checkbox-checked-insensitive-unfocused.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/checkbox-checked-insensitive-unfocused.svg 2011-12-20 18:06:39.000000000 +0000 @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/checkbox-mixed-insensitive-unfocused.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/checkbox-mixed-insensitive-unfocused.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/checkbox-mixed-insensitive-unfocused.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/checkbox-mixed-insensitive-unfocused.svg 2011-12-20 18:06:39.000000000 +0000 @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/checkbox-unchecked-insensitive-unfocused.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/checkbox-unchecked-insensitive-unfocused.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/checkbox-unchecked-insensitive-unfocused.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/checkbox-unchecked-insensitive-unfocused.svg 2011-12-20 18:06:39.000000000 +0000 @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/Makefile.am gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/Makefile.am --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/Makefile.am 2011-12-19 09:57:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/Makefile.am 2011-12-20 18:06:39.000000000 +0000 @@ -4,18 +4,21 @@ checkbox-checked-dark.svg \ checkbox-checked-insensitive.svg \ checkbox-checked-insensitive-dark.svg \ + checkbox-checked-insensitive-unfocused.svg \ checkbox-checked-no-hilight.svg \ checkbox-checked-unfocused.svg \ checkbox-unchecked.svg \ checkbox-unchecked-dark.svg \ checkbox-unchecked-insensitive.svg \ checkbox-unchecked-insensitive-dark.svg \ + checkbox-unchecked-insensitive-unfocused.svg \ checkbox-unchecked-no-hilight.svg \ checkbox-unchecked-unfocused.svg \ checkbox-mixed.svg \ checkbox-mixed-dark.svg \ checkbox-mixed-insensitive.svg \ checkbox-mixed-insensitive-dark.svg \ + checkbox-mixed-insensitive-unfocused.svg \ checkbox-mixed-no-hilight.svg \ checkbox-mixed-unfocused.svg \ checkbox-menuitem-checked.svg \ @@ -27,18 +30,21 @@ radio-selected-dark.svg \ radio-selected-insensitive.svg \ radio-selected-insensitive-dark.svg \ + radio-selected-insensitive-unfocused.svg \ radio-selected-no-hilight.svg \ radio-selected-unfocused.svg \ radio-unselected.svg \ radio-unselected-dark.svg \ radio-unselected-insensitive.svg \ radio-unselected-insensitive-dark.svg \ + radio-unselected-insensitive-unfocused.svg \ radio-unselected-no-hilight.svg \ radio-unselected-unfocused.svg \ radio-mixed.svg \ radio-mixed-dark.svg \ radio-mixed-insensitive.svg \ radio-mixed-insensitive-dark.svg \ + radio-mixed-insensitive-unfocused.svg \ radio-mixed-no-hilight.svg \ radio-mixed-unfocused.svg \ radio-menuitem-checked.svg \ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/Makefile.in gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/Makefile.in --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -224,18 +225,21 @@ checkbox-checked-dark.svg \ checkbox-checked-insensitive.svg \ checkbox-checked-insensitive-dark.svg \ + checkbox-checked-insensitive-unfocused.svg \ checkbox-checked-no-hilight.svg \ checkbox-checked-unfocused.svg \ checkbox-unchecked.svg \ checkbox-unchecked-dark.svg \ checkbox-unchecked-insensitive.svg \ checkbox-unchecked-insensitive-dark.svg \ + checkbox-unchecked-insensitive-unfocused.svg \ checkbox-unchecked-no-hilight.svg \ checkbox-unchecked-unfocused.svg \ checkbox-mixed.svg \ checkbox-mixed-dark.svg \ checkbox-mixed-insensitive.svg \ checkbox-mixed-insensitive-dark.svg \ + checkbox-mixed-insensitive-unfocused.svg \ checkbox-mixed-no-hilight.svg \ checkbox-mixed-unfocused.svg \ checkbox-menuitem-checked.svg \ @@ -247,18 +251,21 @@ radio-selected-dark.svg \ radio-selected-insensitive.svg \ radio-selected-insensitive-dark.svg \ + radio-selected-insensitive-unfocused.svg \ radio-selected-no-hilight.svg \ radio-selected-unfocused.svg \ radio-unselected.svg \ radio-unselected-dark.svg \ radio-unselected-insensitive.svg \ radio-unselected-insensitive-dark.svg \ + radio-unselected-insensitive-unfocused.svg \ radio-unselected-no-hilight.svg \ radio-unselected-unfocused.svg \ radio-mixed.svg \ radio-mixed-dark.svg \ radio-mixed-insensitive.svg \ radio-mixed-insensitive-dark.svg \ + radio-mixed-insensitive-unfocused.svg \ radio-mixed-no-hilight.svg \ radio-mixed-unfocused.svg \ radio-menuitem-checked.svg \ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/radio-mixed-insensitive-unfocused.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/radio-mixed-insensitive-unfocused.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/radio-mixed-insensitive-unfocused.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/radio-mixed-insensitive-unfocused.svg 2011-12-20 18:06:39.000000000 +0000 @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/radio-selected-insensitive.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/radio-selected-insensitive.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/radio-selected-insensitive.svg 2011-12-01 02:28:10.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/radio-selected-insensitive.svg 2011-12-20 18:06:39.000000000 +0000 @@ -56,9 +56,9 @@ borderlayer="true" inkscape:showpageshadow="false" inkscape:window-width="1180" - inkscape:window-height="950" - inkscape:window-x="1600" - inkscape:window-y="0" + inkscape:window-height="708" + inkscape:window-x="82" + inkscape:window-y="26" inkscape:window-maximized="0" inkscape:snap-nodes="false" inkscape:snap-bbox="true"> diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/radio-selected-insensitive-unfocused.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/radio-selected-insensitive-unfocused.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/radio-selected-insensitive-unfocused.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/radio-selected-insensitive-unfocused.svg 2011-12-20 18:06:39.000000000 +0000 @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/radio-unselected-insensitive-unfocused.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/radio-unselected-insensitive-unfocused.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/assets/radio-unselected-insensitive-unfocused.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/assets/radio-unselected-insensitive-unfocused.svg 2011-12-20 18:06:39.000000000 +0000 @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg 2011-12-19 11:06:51.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg 2011-12-21 17:37:50.000000000 +0000 @@ -14,7 +14,7 @@ id="svg33222" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="generic-border-unfocused.svg"> + sodipodi:docname="generic-border-unfocused-dark.svg"> image/svg+xml - + @@ -72,6 +72,6 @@ height="13.999999" width="15" id="rect17861" - style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" /> + style="color:#000000;fill:none;stroke:#545959;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" /> diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/borders/Makefile.in gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/borders/Makefile.in --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/borders/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/borders/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg 2011-12-19 11:06:51.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg 2011-12-21 17:37:50.000000000 +0000 @@ -68,9 +68,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="22.627417" - inkscape:cx="6.284171" - inkscape:cy="9.0507553" + inkscape:zoom="16" + inkscape:cx="11.653849" + inkscape:cy="8.8456424" inkscape:current-layer="layer1" showgrid="false" inkscape:grid-bbox="true" @@ -116,6 +116,6 @@ height="13" width="13" id="rect17861" - style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:none;stroke:#545959;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" /> diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gnome-applications.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gnome-applications.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gnome-applications.css 2011-12-19 11:06:51.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gnome-applications.css 2012-01-17 00:23:11.000000000 +0000 @@ -68,37 +68,64 @@ NautilusSearchBar.info, NautilusQueryEditor.info { background-color: @nautilus_cluebar_color; - border-color: darker (@nautilus_cluebar_color); + color: @theme_base_color; - border-radius: 0; - border-width: 1 0; - border-style: solid; + border-color: shade(@nautilus_cluebar_color, 0.85); +} + +.nautilus-cluebar-label { + font: bold; + color: @theme_base_color; + text-shadow: 0 1 alpha(black, 0.15); +} + +.nautilus-cluebar-label:backdrop { + font: bold; + color: @theme_unfocused_fg_color; + text-shadow: none; +} + +/* This will make the location entry tall as buttons. + Buttons are too tall btw, then it's ugly */ +/*NautilusLocationEntry.entry { + -GtkEntry-inner-border: 9; +}*/ + +NautilusLocationEntry.entry { + padding-left: 4; + padding-right: 4; } + NautilusSearchBar .entry, NautilusSearchBar .entry:focus { border-image: none; border-color: darker(@nautilus_cluebar_color); border-style: solid; border-width: 1; + padding-left: 4; + padding-right: 4; -GtkEntry-inner-border: 3; } -NautilusSearchBar .entry.image { +/*NautilusSearchBar .entry.image { color: @nautilus_cluebar_color; -} +}*/ -.nautilus-cluebar-label { - font: bold; - color: @theme_base_color; -} -#nautilus-search-button *:active, +/*NautilusPlacesSidebar .cell:selected { FUNGE, ci vuole una border image qui + border-radius: 0 100 100 0; + box-shadow: 0 1 inset alpha(black, 0.2), 0 -1 inset alpha(white, 0.5); +}*/ + +/*#nautilus-search-button *:active, #nautilus-search-button *:active:prelight { color: darker (@nautilus_cluebar_color); -} +}*/ + +/* FIXME - will be `.floating-bar` in gtk-widgets.css for the next release*/ NautilusFloatingBar { background-color: @info_bg_color; border-color: darker(@info_bg_color); @@ -108,6 +135,11 @@ border-style: solid; } +NautilusFloatingBar:backdrop { + background-color: @theme_unfocused_base_color; + border-color: shade(@theme_unfocused_base_color, 0.9); +} + NautilusFloatingBar .button { background-color: alpha (@theme_base_color, 0.0); background-image: none; @@ -122,25 +154,78 @@ NautilusWindow .sidebar .frame { border-width: 1 0 0 0; border-style: solid; - border-color: shade (@theme_bg_color, 0.66); + border-color: @borders; border-radius: 0; } NautilusWindow > GtkGrid > .pane-separator { border-width: 1 1 0 0; border-style: solid; - border-color: shade (@theme_bg_color, 0.66); + border-color: @borders; } NautilusWindow > GtkGrid > .pane-separator, NautilusWindow > GtkGrid > .pane-separator:hover { border-width: 1 1 0 0; border-style: solid; - border-color: shade (@theme_bg_color, 0.66); - background-color: @sidebar_bg_color; + border-color: @borders; + background-color: @sidebar_bg; + color: shade (@theme_bg_color, 0.9); +} + +NautilusWindow > GtkGrid > .pane-separator:backdrop, +NautilusWindow > GtkGrid > .pane-separator:hover:backdrop { + border-width: 1 1 0 0; + border-style: solid; + border-color: @unfocused_borders; + background-color: @sidebar_bg_unfocused; color: shade (@theme_bg_color, 0.9); } +/* gedit */ + +GeditWindow .pane-separator, +GeditWindow .pane-separator:hover { + border-width: 0 1 1 1; + border-style: solid; + border-color: @borders; + background-color: shade(@theme_bg_color, 0.95); + color: @borders; +} + +GeditPanel { + background-color: red; +} + +GeditPanel .toolbar { + border-style: none; + background-color: transparent; +} + +GeditWindow .sidebar { + background-color: @theme_base_color; + border-width: 0 0 1 0; + border-style: solid; + border-color: @borders; + +} + +GeditPanel .notebook { + padding: 2; + border-width: 1 0; +} + +GeditWindow .notebook { + border-width: 1 0 1 0; +} + +GeditStatusbar { + padding: 1 0 0 0; + border-width: 1 0 0 0; + border-style: solid; + border-color: @borders; +} + /* gnome-documents */ .documents-dropdown, .documents-dropdown .view { @@ -382,3 +467,93 @@ color: shade(@documents_emblem_bg, 2.10); } +/* epiphany */ + +/* EphyToolbar.toolbar { + border-bottom: 1 solid @borders; +} + +EphyToolbar.toolbar:backdrop { + border-bottom: 1 solid @unfocused_borders; +} +*/ + +EphyToolbar .entry, +EphyToolbar .entry:focus, +EphyToolbar .entry:backdrop { + border-image-width: 3 0 4 3; + border-width: 1 0 2 1; + border-bottom-right-radius: 0; + border-top-right-radius: 0; + padding-left: 4; + padding-right: 4; +} + +EphyToolbar .location-entry .button { + color: @internal_element_color; + -GtkButton-child-displacement-y: 0; +} + +EphyToolbar .location-entry .button:last-child { + border-image: url("borders/generic-border.svg") 3 3 4 3 / 3 3 4 0 stretch; + border-width: 1 1 2 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + padding-left: 4; + padding-right: 2; +} + +EphyToolbar .location-entry .button, +EphyToolbar .location-entry .button:hover, +EphyToolbar .location-entry .button:focus { + icon-shadow: none; + background-image: -gtk-gradient(linear, + left top, left bottom, + from(@entry_background_a), + to(@entry_background_b)); + box-shadow: 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4), 1 0 inset @inset_dark_color; +} + +EphyToolbar .location-entry .button:active, +EphyToolbar .location-entry .button:active:hover { + background-image: -gtk-gradient(linear, + left top, left bottom, + from(shade(@entry_background_a, 0.9)), + to(@entry_background_b)); + box-shadow: 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4), 1 0 inset @inset_dark_color; +} + +EphyToolbar .location-entry .button:hover, +EphyToolbar .location-entry .button:focus, +EphyToolbar .location-entry .button:active { + color: @theme_text_color; +} + +EphyToolbar .location-entry .button:backdrop, +EphyToolbar .location-entry .button:hover:backdrop { + background-image: none; + background-color: @theme_unfocused_base_color; + box-shadow: none; + border-image: url("borders/generic-border-unfocused.svg") 3 3 4 3 / 3 3 4 0 stretch; + border-radius: 3; + border-width: 1 1 2 0; +} + +EphyNotebook.notebook { + border-width: 1 0 1 0; +} + +EphyToolbar.toolbar .button { + padding-left: 4; + padding-right: 4; +} + +#ephy-page-menu-button.active-menu { + background-image: none; + background-color: @menu_bg_color; + + border-image: none; + border-color: @menu_bg_color; + border-radius: 4 4 0 0; +} + diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk.css 2011-12-19 11:06:51.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk.css 2012-01-12 20:40:24.000000000 +0000 @@ -27,13 +27,13 @@ @define-color theme_unfocused_fg_color #a7aba7; @define-color theme_unfocused_bg_color @theme_bg_color; /* FIXME */ @define-color theme_unfocused_selected_bg_color darker(@theme_selected_bg_color); -@define-color theme_unfocused_selected_fg_color @theme_selected_fg_color; /* FIXME */ +@define-color theme_unfocused_selected_fg_color @theme_unfocused_base_color; /* FIXME */ @define-color unfocused_button_background @theme_unfocused_bg_color; -@define-color unfocused_borders_color #a7aba7; -@define-color unfocused_insensitive_borders_color mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5); +@define-color unfocused_borders @borders; +@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5); @define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5); @define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5); -@define-color unfocused_toolbar mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5); +@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5); @define-color menu_bg_color shade (@theme_bg_color, 1.1); @define-color menu_fg_color @theme_fg_color; @@ -63,7 +63,8 @@ @define-color keyboard_focus_border_b #6794cf; /* @define-color sidebar_bg_color shade (@theme_bg_color, 1.02); */ -@define-color sidebar_bg_color shade (@theme_bg_color, 1.025); +@define-color sidebar_bg shade (@theme_bg_color, 1.025); +@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5); @define-color os_chrome_bg_color black; @define-color os_chrome_fg_color #ccc; @@ -76,12 +77,14 @@ @define-color focused_entry_border #579eea; @define-color focused_entry_inset alpha (#d7e4f1, 0.50); -@define-color button_gradient_color_a #f4f6f4; -@define-color button_gradient_color_b #d7dad7; -@define-color button_border #a7aba7; +@define-color button_gradient_color_a shade(@theme_bg_color, 1.05); +@define-color button_gradient_color_b @theme_bg_color; +@define-color button_gradient_color_c shade(@theme_bg_color, 0.92); +@define-color borders #a7aba7; @define-color button_active_gradient_color_a #a2a9a2; @define-color button_active_gradient_color_b shade (@button_active_gradient_color_a, 0.83); +@define-color button_active_text darker(@theme_selected_bg_color); @define-color button_active_text_shadow alpha(white, 0.3); @define-color button_text_shadow alpha(white, 0.4); @define-color primary_toolbar_button_text_shadow alpha(black, 0.1); @@ -98,12 +101,19 @@ @define-color insensitive_bg_color #f4f4f2; @define-color insensitive_fg_color #a7aba7; -@define-color insensitive_border_color shade (@internal_element_color, 1.37); +@define-color insensitive_borders shade (@internal_element_color, 1.37); @define-color trough_bg_color_a #bcbcb7; @define-color trough_bg_color_b #e0e0dd; -@define-color scrollbar_trough_color shade(@theme_bg_color, 0.882); +@define-color scrollbar_trough shade(@theme_bg_color, 0.9); +@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 0.9); +@define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9); +@define-color scrollbar_slider mix(@scrollbar_trough, @theme_fg_color, 0.35); +@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5); +@define-color scrollbar_slider_active @theme_selected_bg_color; +@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */ +@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color; @define-color switch_slider_color #eeeeec; @define-color switch_slider_active_border #2a79cb; @@ -120,16 +130,17 @@ @define-color entry_text_color @theme_text_color; -@define-color entry_background_a #e1e1e1; -@define-color entry_background_b #f8f8f8; -@define-color entry_background_c #fafafa; -@define-color entry_background_d @theme_base_color; +@define-color entry_background_a shade(@theme_base_color, 0.94); +@define-color entry_background_b @theme_base_color; + +@define-color entry_inset alpha(black, 0.1); @define-color internal_element_color #888a85; @define-color internal_element_prelight @theme_text_color; -@define-color internal_element_insensitive shade (@internal_element_color, 1.7); +/*@define-color internal_element_insensitive shade (@internal_element_color, 1.7);*/ +@define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7); -@define-color scale_fill @insensitive_border_color; +@define-color scale_fill @insensitive_borders; @define-color scale_border_a @internal_element_color; @define-color scale_border_b shade (@internal_element_color, 1.25); @define-color scale_progress_fill #2c85e2; @@ -138,23 +149,31 @@ @define-color highlighted_border #8a8f8a; -@define-color notebook_border #a6a6a6; @define-color notebook_active_tab_border #1372d3; @define-color notebook_selected_tab_color #8dc0f3; -@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.05); -@define-color notebook_tab_gradient_b @theme_bg_color; +@define-color notebook_tab_gradient_a shade(@theme_bg_color, 0.98); +@define-color notebook_tab_gradient_b shade(@theme_bg_color, 0.93); +@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02); -@define-color toolbar_gradient_base #aaaa9e; +/*@define-color toolbar_gradient_base #aaaa9e; @define-color toolbar_gradient_step1 #bcbcb4; @define-color toolbar_gradient_step2 #d9d9d7; -@define-color toolbar_gradient_final #e5e5e2; +@define-color toolbar_gradient_final #e5e5e2;*/ + +/*@define-color toolbar_gradient_base shade(@toolbar_gradient_step2, 0.9); +@define-color toolbar_gradient_step1 shade(@toolbar_gradient_step2, 0.95); +@define-color toolbar_gradient_step2 #babdb6; +@define-color toolbar_gradient_final shade(@toolbar_gradient_step2, 1.15);*/ + +@define-color toolbar_gradient_a shade(@borders, 1.15); +@define-color toolbar_gradient_b shade(@borders, 1.25); +@define-color toolbar_gradient_c shade(@borders, 1.3); -@define-color theme_unfocused_toolbar_color shade(@theme_unfocused_bg_color, 0.9); -@define-color theme_unfocused_border_color shade(@theme_unfocused_bg_color, 0.9); +@define-color toolbar_border_top shade(@borders, 0.9); /*shade (@theme_bg_color, 0.7);*/ +@define-color toolbar_border_bottom shade(@borders, 1.1); /*shade (@theme_bg_color, 0.7);*/ -@define-color toolbar_border_top shade (@theme_bg_color, 0.56); -@define-color toolbar_border_bottom shade (@theme_bg_color, 0.83); +@define-color toolbar_button_prelight alpha(white, 0.4); @define-color toolbar_active_button_color #909081; @@ -193,4 +212,3 @@ @import url("gtk-widgets-assets.css"); @import url("gtk-widgets.css"); @import url("gnome-applications.css"); -/* @import url("gtk-scrollbar-experiments.css"); */ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-dark.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-dark.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-dark.css 2011-12-19 11:06:51.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-dark.css 2012-01-12 20:40:24.000000000 +0000 @@ -9,18 +9,18 @@ @define-color placeholder_text_color shade(@theme_text_color, 0.4); -@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.05); +@define-color theme_unfocused_base_color @theme_base_color; @define-color theme_unfocused_text_color mix(@theme_unfocused_base_color, @theme_text_color, 0.8); @define-color theme_unfocused_fg_color mix(@theme_unfocused_bg_color, @theme_text_color, 0.3); @define-color theme_unfocused_bg_color @theme_bg_color; -@define-color theme_unfocused_selected_bg_color shade (@theme_selected_bg_color, 0.75); /* FIXME */ +@define-color theme_unfocused_selected_bg_color shade (@theme_selected_bg_color, 0.9); /* FIXME */ @define-color theme_unfocused_selected_fg_color @theme_selected_fg_color; /* FIXME */ @define-color unfocused_button_background @theme_unfocused_bg_color; -@define-color unfocused_borders_color @button_border; -@define-color unfocused_insensitive_borders_color mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5); -@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5); -@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5); -@define-color unfocused_toolbar mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5); +@define-color unfocused_borders mix(@theme_unfocused_bg_color, @theme_text_color, 0.15); +@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5); +@define-color unfocused_insensitive_fg_color mix(@insensitive_fg_color, @insensitive_bg_color, 0.3); +@define-color unfocused_insensitive_bg_color @insensitive_bg_color; +@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @borders, 0.5); @define-color menu_bg_color #555753; @define-color menu_fg_color @theme_text_color; @@ -34,11 +34,13 @@ @define-color theme_tooltip_fg_color #eeeeee; @define-color button_gradient_color_a shade (@theme_bg_color, 1.15); -@define-color button_gradient_color_b shade (@theme_bg_color, 0.8); -@define-color button_border #24282a; - -@define-color button_active_text_shadow black; -@define-color button_text_shadow black; +@define-color button_gradient_color_b @theme_bg_color; +@define-color button_gradient_color_c shade (@theme_bg_color, 0.8); +@define-color borders #24282a; + +@define-color button_active_text @theme_selected_bg_color; +@define-color button_active_text_shadow alpha(black, 0.45); +@define-color button_text_shadow alpha(black, 0.7); @define-color primary_toolbar_button_text_shadow alpha(black, 0.1); @define-color button_active_gradient_color_a shade (@button_gradient_color_b, 0.7); @@ -56,16 +58,16 @@ @define-color insensitive_fg_color #535555; @define-color insensitive_bg_color mix(@theme_bg_color, @theme_base_color, 0.6); -@define-color insensitive_border_color #535555; +@define-color insensitive_borders #535555; @define-color inactive_frame_color shade (@theme_bg_color, 0.8); -@define-color notebook_border @button_border; @define-color notebook_active_tab_border shade (@theme_selected_bg_color, 0.5); @define-color notebook_selected_tab_color alpha (@theme_selected_bg_color, 0.75); @define-color notebook_tab_gradient_a shade(@theme_bg_color, 0.8); @define-color notebook_tab_gradient_b shade(@theme_bg_color, 0.75); +@define-color notebook_tab_hilight shade(@theme_bg_color, 0.9); @define-color switch_slider_color shade(@theme_bg_color, 0.9); @define-color switch_slider_active_border shade(@switch_trough_active_bg_a, 0.60); @@ -75,7 +77,7 @@ @define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.6); @define-color switch_trough_active_bg_b @theme_selected_bg_color; -@define-color highlighted_border @button_border; +@define-color highlighted_border @borders; @define-color internal_element_color #595959; @define-color internal_element_prelight #eeeeee; @define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.65); @@ -86,24 +88,26 @@ @define-color progressbar_border @switch_slider_active_border; @define-color entry_text_color #ffffff; -@define-color entry_background_a #2d2d2d; -@define-color entry_background_b #333333; -@define-color entry_background_c #343434; -@define-color entry_background_d #373737; +@define-color entry_background_a shade(@theme_base_color, 0.85); +@define-color entry_background_b @theme_base_color; + +@define-color entry_inset alpha(black, 0.15); + @define-color frame_color #707070; @define-color focused_entry_border @theme_selected_bg_color; @define-color focused_entry_inset alpha (@theme_selected_bg_color, 0.50); -@define-color toolbar_gradient_base #252624; -@define-color toolbar_gradient_step1 #323331; -@define-color toolbar_gradient_step2 #444642; -@define-color toolbar_gradient_final #51534f; +@define-color toolbar_gradient_a shade(@theme_bg_color, 0.75); +@define-color toolbar_gradient_b shade(@theme_bg_color, 0.8); +@define-color toolbar_gradient_c shade(@theme_bg_color, 0.9); @define-color toolbar_active_button_color #222222; -@define-color toolbar_border_top #2e3436; -@define-color toolbar_border_bottom #5e605b; +@define-color toolbar_border_top shade(@borders, 0.7); +@define-color toolbar_border_bottom shade(@borders, 1.05); + +@define-color toolbar_button_prelight alpha(black, 0.3); @define-color primary_toolbar_entry_bg #ffffff; @define-color primary_toolbar_entry_fg #2e3436; @@ -116,16 +120,23 @@ @define-color keyboard_focus_border_a alpha (@theme_fg_color, 0.30); @define-color keyboard_focus_border_b alpha (@theme_fg_color, 0.10); -@define-color sidebar_bg_color shade (@theme_bg_color, 1.02); +@define-color sidebar_bg shade (@theme_bg_color, 1.02); @define-color trough_bg_color_a #30312f; @define-color trough_bg_color_b #41433f; -@define-color scrollbar_trough_color #414141; +@define-color scrollbar_trough shade(@theme_bg_color, 1.2); +@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.05); /* FIXME */ +@define-color scrollbar_trough shade(@theme_unfocused_bg_color, 1.2); +@define-color scrollbar_slider mix(@scrollbar_trough, @theme_fg_color, 0.15); +@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.3); +@define-color scrollbar_slider_active @theme_selected_bg_color; +@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */ +@define-color scrollbar_slider_unfocused shade(@theme_unfocused_base_color, 0.8); @define-color treeview_focus_border shade (@theme_selected_bg_color, 1.20); -@define-color scale_fill shade (@insensitive_border_color, 0.90); +@define-color scale_fill shade (@insensitive_borders, 0.90); @define-color scale_border_a shade (@internal_element_color, 0.90); @define-color scale_border_b shade (@internal_element_color, 0.65); diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-scrollbar-experiments.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-scrollbar-experiments.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-scrollbar-experiments.css 2011-12-01 02:28:10.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-scrollbar-experiments.css 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -.scrollbar { - background-image: none; - border-style: solid; - -GtkRange-trough-border: 2; - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; - -GtkRange-slider-width: 7; - -GtkScrollbar-min-slider-length: 30; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ - - -GtkRange-stepper-spacing: 1; - -GtkRange-trough-under-steppers: 1; -} - -.scrollbar.trough { - background-image: none; - background-color: shade (@theme_bg_color, 0.882); - border-width: 0; - border-radius: 0; - border-image: none; -} - -.scrollbar.slider { - background-image: none; - background-color: alpha(@theme_text_color, 0.3); - border-radius: 3; - border-style: none; - border-image: none; -} - -.scrollbar.slider:prelight { - background-image: none; - background-color: alpha(@theme_text_color, 0.4); -} - -.scrollbar.slider:prelight:active { - background-image: none; - background-color: @theme_selected_bg_color; -} - -.scrollbar.slider:insensitive { - background-color: alpha(@theme_base_color, 0.2) -} - -.scrollbar.trough:insensitive { - background-color: shade (@theme_bg_color, 0.882); -} diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css 2011-12-19 09:57:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css 2012-01-10 16:25:09.000000000 +0000 @@ -18,11 +18,17 @@ background-image: url("assets/checkbox-unchecked-insensitive.svg"); } -.check:window-unfocused, -.check row:selected:window-unfocused { +.check:backdrop, +.check row:selected:backdrop { background-image: url("assets/checkbox-unchecked-unfocused.svg"); } +.check:insensitive:backdrop, +.check row:selected:insensitive:backdrop { + background-image: url("assets/checkbox-unchecked-insensitive-unfocused.svg"); +} + + .check:active { background-image: url("assets/checkbox-checked.svg"); } @@ -32,18 +38,23 @@ background-image: url("assets/checkbox-checked-no-hilight.svg"); } -.check:active:window-unfocused, -.check row:selected:active:window-unfocused { +.check:active:backdrop, +.check row:selected:active:backdrop { background-image: url("assets/checkbox-checked-unfocused.svg"); } .check:active:insensitive, .check row:selected:active:insensitive, -.check row:selected:focus:active:insensitive -{ +.check row:selected:focus:active:insensitive { background-image: url("assets/checkbox-checked-insensitive.svg"); } +.check:active:insensitive:backdrop, +.check row:selected:active:insensitive:backdrop { + background-image: url("assets/checkbox-checked-insensitive-unfocused.svg"); +} + + .check:inconsistent { background-image: url("assets/checkbox-mixed.svg"); } @@ -53,8 +64,8 @@ background-image: url("assets/checkbox-mixed-no-hilight.svg"); } -.check:inconsistent:window-unfocused, -.check row:selected:inconsistent:window-unfocused { +.check:inconsistent:backdrop, +.check row:selected:inconsistent:backdrop { background-image: url("assets/checkbox-mixed-unfocused.svg"); } @@ -64,6 +75,11 @@ background-image: url("assets/checkbox-mixed-insensitive.svg"); } +.check:inconsistent:insensitive:backdrop, +.check row:selected:inconsistent:insensitive:backdrop { + background-image: url("assets/checkbox-mixed-insensitive-unfocused.svg"); +} + .radio { background-image: url("assets/radio-unselected.svg"); } @@ -73,8 +89,8 @@ background-image: url("assets/radio-unselected-no-hilight.svg"); } -.radio:window-unfocused, -.radio row:selected:window-unfocused { +.radio:backdrop, +.radio row:selected:backdrop { background-image: url("assets/radio-unselected-unfocused.svg"); } @@ -84,6 +100,12 @@ background-image: url("assets/radio-unselected-insensitive.svg"); } +.radio:insensitive:backdrop, +.radio row:selected:insensitive:backdrop { + background-image: url("assets/radio-unselected-insensitive-unfocused.svg"); +} + + .radio:active { background-image: url("assets/radio-selected.svg"); } @@ -93,8 +115,8 @@ background-image: url("assets/radio-selected-no-hilight.svg"); } -.radio:active:window-unfocused, -.radio row:selected:active:window-unfocused { +.radio:active:backdrop, +.radio row:selected:active:backdrop { background-image: url("assets/radio-selected-unfocused.svg"); } @@ -105,6 +127,12 @@ background-image: url("assets/radio-selected-insensitive.svg"); } +.radio:active:insensitive:backdrop, +.radio row:selected:active:insensitive:backdrop { + background-image: url("assets/radio-selected-insensitive-unfocused.svg"); +} + + .radio:inconsistent { background-image: url("assets/radio-mixed.svg"); } @@ -114,8 +142,8 @@ background-image: url("assets/radio-mixed-no-hilight.svg"); } -.radio:inconsistent:window-unfocused, -.radio row:selected:inconsistent:window-unfocused { +.radio:inconsistent:backdrop, +.radio row:selected:inconsistent:backdrop { background-image: url("assets/radio-mixed-unfocused.svg"); } @@ -126,6 +154,11 @@ background-image: url("assets/radio-mixed-insensitive.svg"); } +.radio:inconsistent:insensitive:backdrop, +.radio row:selected:inconsistent:insensitive:backdrop { + background-image: url("assets/radio-mixed-insensitive-unfocused.svg"); +} + .sidebar .radio:active, .sidebar .radio:active:focus, .sidebar .radio:active:hover { @@ -154,9 +187,8 @@ background-image: url("assets/scale-slider-horizontal.svg"); } - -GtkScale.slider:window-unfocused, -GtkScale.slider.horizontal:window-unfocused { +GtkScale.slider:backdrop, +GtkScale.slider.horizontal:backdrop { background-image: url("assets/scale-slider-horizontal-unfocused.svg"); } @@ -165,8 +197,8 @@ background-image: url("assets/scale-slider-horizontal-insensitive.svg"); } -GtkScale.slider:insensitive:window-unfocused, -GtkScale.slider.horizontal:insensitive:window-unfocused { +GtkScale.slider:insensitive:backdrop, +GtkScale.slider.horizontal:insensitive:backdrop { background-image: url("assets/scale-slider-horizontal-insensitive-unfocused.svg"); } @@ -175,7 +207,7 @@ background-image: url("assets/scale-slider-vertical.svg"); } -GtkScale.slider.vertical:window-unfocused { +GtkScale.slider.vertical:backdrop { background-image: url("assets/scale-slider-vertical-unfocused.svg"); } @@ -183,7 +215,7 @@ background-image: url("assets/scale-slider-vertical-insensitive.svg"); } -GtkScale.slider.vertical:insensitive:window-unfocused { +GtkScale.slider.vertical:insensitive:backdrop { background-image: url("assets/scale-slider-vertical-insensitive-unfocused.svg"); } @@ -191,7 +223,7 @@ background-image: url("assets/scale-slider-marks-above-horizontal.svg"); } -GtkScale.scale-has-marks-above.slider.horizontal:window-unfocused { +GtkScale.scale-has-marks-above.slider.horizontal:backdrop { background-image: url("assets/scale-slider-marks-above-horizontal-unfocused.svg"); } @@ -199,7 +231,7 @@ background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.svg"); } -GtkScale.scale-has-marks-above.slider.horizontal:insensitive:window-unfocused { +GtkScale.scale-has-marks-above.slider.horizontal:insensitive:backdrop { background-image: url("assets/scale-slider-marks-above-horizontal-insensitive-unfocused.svg"); } @@ -207,7 +239,7 @@ background-image: url("assets/scale-slider-marks-above-vertical.svg"); } -GtkScale.scale-has-marks-above.slider.vertical:window-unfocused { +GtkScale.scale-has-marks-above.slider.vertical:backdrop { background-image: url("assets/scale-slider-marks-above-vertical-unfocused.svg"); } @@ -215,7 +247,7 @@ background-image: url("assets/scale-slider-marks-above-vertical-insensitive.svg"); } -GtkScale.scale-has-marks-above.slider.vertical:insensitive:window-unfocused { +GtkScale.scale-has-marks-above.slider.vertical:insensitive:backdrop { background-image: url("assets/scale-slider-marks-above-vertical-insensitive-unfocused.svg"); } @@ -223,11 +255,15 @@ background-image: url("assets/scale-slider-marks-below-horizontal.svg"); } -GtkScale.scale-has-marks-below.slider.horizontal:window-unfocused { +GtkScale.scale-has-marks-below.slider.horizontal:backdrop { background-image: url("assets/scale-slider-marks-below-horizontal-unfocused.svg"); } -GtkScale.scale-has-marks-below.slider.horizontal:insensitive:window-unfocused { +GtkScale.scale-has-marks-below.slider.horizontal:insensitive { + background-image: url("assets/scale-slider-marks-below-horizontal-insensitive.svg"); +} + +GtkScale.scale-has-marks-below.slider.horizontal:insensitive:backdrop { background-image: url("assets/scale-slider-marks-below-horizontal-insensitive-unfocused.svg"); } @@ -235,7 +271,7 @@ background-image: url("assets/scale-slider-marks-below-vertical.svg"); } -GtkScale.scale-has-marks-below.slider.vertical:window-unfocused { +GtkScale.scale-has-marks-below.slider.vertical:backdrop { background-image: url("assets/scale-slider-marks-below-vertical-unfocused.svg"); } @@ -243,7 +279,7 @@ background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg"); } -GtkScale.scale-has-marks-below.slider.vertical:insensitive:window-unfocused { +GtkScale.scale-has-marks-below.slider.vertical:insensitive:backdrop { background-image: url("assets/scale-slider-marks-below-vertical-insensitive-unfocused.svg"); } diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css 2011-12-19 09:57:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css 2012-01-16 20:35:25.000000000 +0000 @@ -1,76 +1,66 @@ /* Button background */ .button, -.primary-toolbar .button.raised, -.primary-toolbar .raised .button, -.primary-toolbar .button.raised:focus, -.primary-toolbar .raised .button:focus, -.primary-toolbar GtkComboBox .button, -.primary-toolbar GtkComboBox .button:focus { +.toolbar .button.raised, +.toolbar .raised .button, +.toolbar .button.raised:focus, +.toolbar .raised .button:focus, +.toolbar GtkComboBox .button, +.toolbar GtkComboBox .button:focus { background-image: -gtk-gradient (linear, left top, left bottom, from (@button_gradient_color_a), - color-stop (0.2, @button_gradient_color_a), - color-stop (0.8, @button_gradient_color_b), - to (@button_gradient_color_b)); - background-color: transparent; + color-stop (0.4, @button_gradient_color_b), + to (@button_gradient_color_c)); + + background-color: transparent; } /* Pushed button background */ .button:active, .button:active:hover, -.button:active:focus, -.button:active:hover:focus, .toolbar .button:active, .toolbar .button:active:hover, -.toolbar .button:active:focus, -.toolbar .button:active:hover:focus, -/*.primary-toolbar .button:active:focus, */ +.toolbar .button.raised:active, +.toolbar .raised .button:active, +.toolbar .button.raised:active:hover, +.toolbar .raised .button:active:hover, .trough, .trough.highlight, .trough row, .trough row:hover { background-image: -gtk-gradient (linear, left top, left bottom, - from (@button_border), + from (@borders), to (shade(@theme_bg_color, 0.95))); background-color: transparent; } +/* Flipped pushed button background for vertical progressbar through and the like */ +.trough.vertical { + background-image: -gtk-gradient (linear, + left top, right top, + from (@borders), + to (shade(@theme_bg_color, 0.95))); +} + /* Primary and inline toolbars pushed button background */ .primary-toolbar .button:active, .primary-toolbar .button:active:hover, -.primary-toolbar .button:active:focus, -.primary-toolbar .button:active:focus:hover, .inline-toolbar .button:active, -.inline-toolbar .button:active:hover, -.inline-toolbar .button:active:focus, -.inline-toolbar .button:active:focus:hover { +.inline-toolbar .button:active:hover { background-image: -gtk-gradient (linear, left top, left bottom, - from (shade(@button_border, 0.95)), + from (shade(@borders, 0.95)), to (shade(@theme_bg_color, 0.88))); background-color: transparent; } -/* Flipped pushed button background for vertical progressbar through and the like */ -.trough.vertical { - background-image: -gtk-gradient (linear, - left top, right top, - from (@button_border), - to (shade(@theme_bg_color, 0.95))); -} - /* Prelit button background */ .button:hover, -.button:hover:focus, .toolbar .button:hover, -.toolbar .button:hover:focus, -.primary-toolbar .button.raised:hover, -.primary-toolbar .button.raised:hover:focus, -.primary-toolbar .raised .button:hover, -.primary-toolbar .raised .button:hover:focus, -.primary-toolbar GtkComboBox .button:hover, -.primary-toolbar GtkComboBox .button:hover:focus { +.toolbar .button.raised:hover, +.toolbar .raised .button:hover, +.toolbar GtkComboBox .button:hover { background-color: transparent; background-image: -gtk-gradient (linear, left top, left bottom, @@ -78,35 +68,27 @@ to (@button_hover_gradient_color_b)); } -.primary-toolbar .button:hover, -.primary-toolbar .button:hover:focus { +/* Prelit button on primary toolbar background */ +.primary-toolbar .button:hover { background-color: transparent; background-image: -gtk-gradient (linear, left top, left bottom, - from (alpha (@theme_base_color, 0.0)), - color-stop (0.54, alpha (shade (@theme_base_color, 0.92), 0.49)), - to (alpha (@theme_base_color, 0.0))); + from (alpha (@toolbar_button_prelight, 0)), + color-stop (0.54, @toolbar_button_prelight), + to (alpha (@toolbar_button_prelight, 0))); } /* Insensitive button background */ .button:insensitive, -.primary-toolbar GtkComboBox .button:insensitive { +.toolbar GtkComboBox .button:insensitive { background-image: none; background-color: @insensitive_bg_color; - - /* FIXME? - Not sure about insensitive colors - background-image: -gtk-gradient (linear, - left top, left bottom, - from (@insensitive_bg_color), - color-stop (0.4, @insensitive_bg_color), - to (shade (@insensitive_bg_color, 0.97))); - */ } /* Pushed + Insensitive button background */ .button:active:insensitive, -.primary-toolbar .button:active:insensitive, -.primary-toolbar GtkComboBox .button:active:insensitive { +.toolbar .button:active:insensitive, +.toolbar GtkComboBox .button:active:insensitive { background-color: transparent; background-image: -gtk-gradient (linear, left top, left bottom, @@ -116,53 +98,51 @@ } /* Unfocused window button background */ -.button:window-unfocused, -.primary-toolbar .button.raised:window-unfocused, -.primary-toolbar .raised .button:window-unfocused { +.button:backdrop, +.toolbar .button.raised:backdrop, +.toolbar .raised .button:backdrop, +.toolbar .button:hover:backdrop { background-image: none; background-color: @unfocused_button_background; } /* Unfocused window pushed button background */ -.button:active:window-unfocused { +.button:active:backdrop, +.toolbar .button:active:backdrop, +.toolbar .button:active:hover:backdrop { background-image: none; - background-color: @unfocused_borders_color; + background-color: @unfocused_borders; } /* Unfocused window insensitive button background */ -.button:insensitive:window-unfocused { +.button:insensitive:backdrop { background-image: none; background-color: @unfocused_insensitive_bg_color; } -.button:insensitive:active:window-unfocused { +.button:insensitive:active:backdrop { background-image: none; - background-color: mix(@unfocused_insensitive_bg_color, @unfocused_borders_color, 0.5); + background-color: mix(@unfocused_insensitive_bg_color, @unfocused_borders, 0.5); } /* Entry background */ .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:hover, -GtkComboBox.combobox-entry .button:focus, -GtkComboBox.combobox-entry .button:hover:focus, .primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button:hover, -.primary-toolbar GtkComboBox.combobox-entry .button:focus -.primary-toolbar GtkComboBox.combobox-entry .button:hover:focus { +.primary-toolbar GtkComboBox.combobox-entry .button:hover { + background-image: -gtk-gradient(linear, left top, left bottom, from(@entry_background_a), - color-stop(0.20, @entry_background_b), - color-stop(0.85, @entry_background_c), - to(@entry_background_d)); + to(@entry_background_b)); + box-shadow: 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4); } -/* ComboboxEntry pushed button background */ +/* Entry pushed button background */ .primary-toolbar GtkComboBox.combobox-entry .button:active, -.primary-toolbar GtkComboBox.combobox-entry .button:hover:active, +/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/ GtkComboBox.combobox-entry .button:active, -GtkComboBox.combobox-entry .button:hover:active, .spinbutton .button:active, .spinbutton .button:active:hover, column-header.button:active, @@ -177,7 +157,8 @@ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@entry_background_a, 0.9)), - to(@entry_background_d)); + to(@entry_background_b)); + box-shadow: 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4); } /* Insensitive entry background */ @@ -185,22 +166,24 @@ GtkComboBox.combobox-entry .button:insensitive { background-color: @insensitive_bg_color; background-image: none; + box-shadow: none; } /* Unfocused windows entry background */ -.entry:window-unfocused, -GtkComboBox.combobox-entry .button:window-unfocused, -column-header.button:window-unfocused, -column-header .button:window-unfocused, -column-header.button:insensitive:window-unfocused, -column-header .button:insensitive:window-unfocused { +.entry:backdrop, +GtkComboBox.combobox-entry .button:backdrop, +column-header.button:backdrop, +column-header .button:backdrop, +column-header.button:insensitive:backdrop, +column-header .button:insensitive:backdrop { background-image: none; background-color: @theme_unfocused_base_color; + box-shadow: none; } /* Unfocused windows insensitive entry background */ -.entry:insensitive:window-unfocused, -GtkComboBox.combobox-entry .button:insensitive:window-unfocused { +.entry:insensitive:backdrop, +GtkComboBox.combobox-entry .button:insensitive:backdrop { background-image: none; background-color: @unfocused_insensitive_bg_color; } @@ -214,18 +197,17 @@ background-image: -gtk-gradient (linear, left top, left bottom, - from (@toolbar_gradient_base), - color-stop (0.16, @toolbar_gradient_step1), - color-stop (0.90, @toolbar_gradient_step2), - to (@toolbar_gradient_final)); + from (@toolbar_gradient_a), + color-stop (0.50, @toolbar_gradient_b), + to (@toolbar_gradient_c)); } /* Unfocused window primary and inline toolbars background */ -.primary-toolbar .toolbar:window-unfocused, -.primary-toolbar.toolbar:window-unfocused, -.inline-toolbar.toolbar:window-unfocused { +.primary-toolbar .toolbar:backdrop, +.primary-toolbar.toolbar:backdrop, +.inline-toolbar.toolbar:backdrop { background-image: none; - background-color: @unfocused_toolbar; + background-color: @unfocused_dark_bg; } /* Active switch background*/ @@ -238,13 +220,13 @@ to (@switch_trough_active_bg_b)); } -GtkSwitch.trough:window-unfocused { +GtkSwitch.trough:backdrop { background-color: @theme_unfocused_bg_color; /* FIXME */ background-image: none; } -GtkSwitch.trough:active:window-unfocused { - background-color: @unfocused_borders_color; +GtkSwitch.trough:active:backdrop { + background-color: @unfocused_borders; background-image: none; } diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css 2011-12-19 09:57:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css 2012-01-13 17:19:43.000000000 +0000 @@ -4,16 +4,12 @@ .entry, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, -GtkComboBox.combobox-entry .button:focus, .button:active, -.button:active:hover, .button:insensitive, .trough, .trough.highlight, .trough row, -.trough row:hover, -GtkSwitch.trough, -GtkSwitch.trough:insensitive { +GtkSwitch.trough { border-image: url("borders/generic-border.svg") 3 3 4 3 / 3 3 4 3 stretch; border-radius: 3; border-width: 1 1 2 1; @@ -49,19 +45,15 @@ .primary-toolbar .entry, .primary-toolbar GtkComboBox.combobox-entry .entry, .primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button:hover, -.primary-toolbar GtkComboBox.combobox-entry .button:active, -.primary-toolbar GtkComboBox.combobox-entry .button:focus, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .primary-toolbar .button:active, -.primary-toolbar .button:active:insensitive, -.primary-toolbar .button:active:hover, +.primary-toolbar .button.raised:active, +.primary-toolbar .raised .button:active, .primary-toolbar .button.raised:insensitive, .primary-toolbar .raised .button:insensitive, .inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar .button:active:hover, .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button:active, +.inline-toolbar.toolbar GtkToolButton .button:insensitive, .primary-toolbar GtkSwitch.trough, .primary-toolbar GtkSwitch.trough:insensitive, .primary-toolbar GtkComboBox .button:active, @@ -75,11 +67,10 @@ /* primary toolbar - focused element borders */ .primary-toolbar .entry:focus, +.primary-toolbar .button:active:focus, .primary-toolbar GtkComboBox.combobox-entry .entry:focus, .primary-toolbar .button.raised:focus:active, .primary-toolbar .raised .button:focus:active, -.primary-toolbar .button.raised:focus:active:hover, -.primary-toolbar .raised .button:focus:active:hover, .primary-toolbar .button.raised.default:active, .primary-toolbar .raised .button.default:active, .inline-toolbar.toolbar .button:focus:active, @@ -95,17 +86,13 @@ /* primary toolbar - generic button borders */ .primary-toolbar .button.raised, .primary-toolbar .raised .button, -.primary-toolbar .button.raised:hover, -.primary-toolbar .raised .button:hover, .inline-toolbar.toolbar .button, -.primary-toolbar GtkComboBox .button, -.primary-toolbar GtkComboBox .button:hover { +.primary-toolbar GtkComboBox .button { border-image: url("borders/primary-toolbar-button-border.svg") 4 / 4 stretch; border-radius: 3; border-width: 2; border-style: solid; border-color: transparent; - } /* primary toolbar - focused button borders */ @@ -113,8 +100,6 @@ .primary-toolbar .button.raised.default, .primary-toolbar .raised .button:focus, .primary-toolbar .raised .button.default, -.primary-toolbar .button.raised:focus:hover, -.primary-toolbar .raised .button:focus:hover, .inline-toolbar.toolbar .button:focus, .inline-toolbar.toolbar .button.default, .primary-toolbar GtkComboBox .button:focus { @@ -123,38 +108,32 @@ border-width: 2; border-style: solid; border-color: transparent; - } /* column-headers borders */ column-header.button, column-header .button, -column-header.button:hover, -column-header .button:hover, column-header.button:focus, column-header .button:focus, -column-header .button:insensitive, -column-header.button:focus:hover, -column-header .button:focus:hover, -column-header.button:active:focus:hover, -column-header .button:active:focus:hover, -column-header.button:active:focus, -column-header .button:active:focus, +column-header.button:active, +column-header .button:active, column-header.button:active:hover, -column-header .button:active:hover { +column-header .button:active:hover +column-header.button:active:focus, +column-header .button:active:focus { border-image: -gtk-gradient (linear, left top, left bottom, - from (@button_border), + from (@borders), to (@theme_base_color)) 0 1 0 0; border-width: 0 1 0 0; border-radius: 0; } -column-header.button:window-unfocused, -column-header .button:window-unfocused { +column-header.button:backdrop, +column-header .button:backdrop { border-image: -gtk-gradient (linear, left top, left bottom, - from (@unfocused_borders_color), + from (@unfocused_borders), to (@theme_unfocused_base_color)) 0 1 0 0; border-width: 0 1 0 0; border-radius: 0; @@ -163,45 +142,38 @@ column-header.button:last-child, column-header:last-child .button, -column-header.button:hover:last-child, -column-header:last-child .button:hover, -column-header.button:focus:last-child, +column-header.button:last-child:focus, column-header:last-child .button:focus, -column-header .button:insensitive:last-child, -column-header:last-child .button:insensitive, -column-header.button:focus:hover:last-child, -column-header:last-child .button:focus:hover, -column-header.button:active:focus:hover:last-child, -column-header:last-child .button:active:focus:hover, -column-header.button:active:focus:last-child, -column-header:last-child .button:active:focus, -column-header.button:active:hover:last-child, +column-header.button:last-child:active, +column-header:last-child .button:active, +column-header.button:last-child:active:hover, column-header:last-child .button:active:hover, -column-header.button:window-unfocused:last-child, -column-hedaer:last-child .button:window-unfocused { +column-header.button:last-child:active:focus, +column-header:last-child .button:active:focus { border-image: none; border-width: 0; border-radius: 0; } /* unfocused window: generic element borders */ -.button:window-unfocused, -GtkComboBox.combobox-entry .entry:window-unfocused, -GtkComboBox.combobox-entry .button:window-unfocused, -GtkComboBox *:window-unfocused, -.entry:window-unfocused, -GtkSwitch.trough:window-unfocused, -.trough:window-unfocused { +.button:backdrop, +GtkComboBox.combobox-entry .entry:backdrop, +GtkComboBox.combobox-entry .button:backdrop, +GtkComboBox *:backdrop, +.entry:backdrop, +GtkSwitch.trough:backdrop, +.trough:backdrop { border-image: url("borders/generic-border-unfocused.svg") 3 3 4 3 / 3 3 4 3 stretch; border-radius: 3; border-width: 1 1 2 1; } /* unfocused window: primary toolbar generic element borders */ -.primary-toolbar .button.raised:window-unfocused, -.primary-toolbar .raised .button:window-unfocused, -.primary-toolbar .entry:window-unfocused, -.inline-toolbar.toolbar .button:window-unfocused { +.primary-toolbar .button:active:backdrop, +.primary-toolbar .button.raised:backdrop, +.primary-toolbar .raised .button:backdrop, +.primary-toolbar .entry:backdrop, +.inline-toolbar.toolbar .button:backdrop { border-image: url("borders/primary-toolbar-generic-border-unfocused.svg") 4 / 4 stretch; border-radius: 3; border-width: 2; diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css 2011-12-19 11:06:51.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css 2012-01-13 17:19:43.000000000 +0000 @@ -4,16 +4,12 @@ .entry, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, -GtkComboBox.combobox-entry .button:focus, .button:active, -.button:active:hover, .button:insensitive, .trough, .trough.highlight, .trough row, -.trough row:hover, -GtkSwitch.trough, -GtkSwitch.trough:insensitive { +GtkSwitch.trough { border-image: url("borders/generic-border-dark.svg") 3 3 4 3 / 3 3 4 3 stretch; border-radius: 3; border-width: 1 1 2 1; @@ -49,19 +45,15 @@ .primary-toolbar .entry, .primary-toolbar GtkComboBox.combobox-entry .entry, .primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button:hover, -.primary-toolbar GtkComboBox.combobox-entry .button:active, -.primary-toolbar GtkComboBox.combobox-entry .button:focus, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .primary-toolbar .button:active, -.primary-toolbar .button:active:insensitive, -.primary-toolbar .button:active:hover, +.primary-toolbar .button.raised:active, +.primary-toolbar .raised .button:active, .primary-toolbar .button.raised:insensitive, .primary-toolbar .raised .button:insensitive, .inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar .button:active:hover, .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button:active, +.inline-toolbar.toolbar GtkToolButton .button:insensitive, .primary-toolbar GtkSwitch.trough, .primary-toolbar GtkSwitch.trough:insensitive, .primary-toolbar GtkComboBox .button:active, @@ -69,15 +61,16 @@ border-image: url("borders/primary-toolbar-generic-border-dark.svg") 4 / 4 stretch; border-radius: 3; border-width: 2; + border-style: solid; + border-color: transparent; } /* primary toolbar - focused element borders */ .primary-toolbar .entry:focus, +.primary-toolbar .button:active:focus, .primary-toolbar GtkComboBox.combobox-entry .entry:focus, .primary-toolbar .button.raised:focus:active, .primary-toolbar .raised .button:focus:active, -.primary-toolbar .button.raised:focus:active:hover, -.primary-toolbar .raised .button:focus:active:hover, .primary-toolbar .button.raised.default:active, .primary-toolbar .raised .button.default:active, .inline-toolbar.toolbar .button:focus:active, @@ -86,19 +79,20 @@ border-image: url("borders/primary-toolbar-generic-border-focused-dark.svg") 4 / 4 stretch; border-radius: 3; border-width: 2; + border-style: solid; + border-color: transparent; } /* primary toolbar - generic button borders */ .primary-toolbar .button.raised, .primary-toolbar .raised .button, -.primary-toolbar .button.raised:hover, -.primary-toolbar .raised .button:hover, .inline-toolbar.toolbar .button, -.primary-toolbar GtkComboBox .button, -.primary-toolbar GtkComboBox .button:hover { +.primary-toolbar GtkComboBox .button { border-image: url("borders/primary-toolbar-button-border-dark.svg") 4 / 4 stretch; border-radius: 3; border-width: 2; + border-style: solid; + border-color: transparent; } /* primary toolbar - focused button borders */ @@ -106,45 +100,40 @@ .primary-toolbar .button.raised.default, .primary-toolbar .raised .button:focus, .primary-toolbar .raised .button.default, -.primary-toolbar .button.raised:focus:hover, -.primary-toolbar .raised .button:focus:hover, .inline-toolbar.toolbar .button:focus, .inline-toolbar.toolbar .button.default, .primary-toolbar GtkComboBox .button:focus { border-image: url("borders/primary-toolbar-button-border-focused-dark.svg") 4 / 4 stretch; border-radius: 3; border-width: 2; + border-style: solid; + border-color: transparent; } /* column-headers borders */ column-header.button, column-header .button, -column-header.button:hover, -column-header .button:hover, column-header.button:focus, column-header .button:focus, -column-header .button:insensitive, -column-header.button:focus:hover, -column-header .button:focus:hover, -column-header.button:active:focus:hover, -column-header .button:active:focus:hover, -column-header.button:active:focus, -column-header .button:active:focus, +column-header.button:active, +column-header .button:active, column-header.button:active:hover, -column-header .button:active:hover { +column-header .button:active:hover +column-header.button:active:focus, +column-header .button:active:focus { border-image: -gtk-gradient (linear, left top, left bottom, - from (@button_border), + from (@borders), to (@theme_base_color)) 0 1 0 0; border-width: 0 1 0 0; border-radius: 0; } -column-header.button:window-unfocused, -column-header .button:window-unfocused { +column-header.button:backdrop, +column-header .button:backdrop { border-image: -gtk-gradient (linear, left top, left bottom, - from (@unfocused_borders_color), + from (@unfocused_borders), to (@theme_unfocused_base_color)) 0 1 0 0; border-width: 0 1 0 0; border-radius: 0; @@ -153,45 +142,41 @@ column-header.button:last-child, column-header:last-child .button, -column-header.button:hover:last-child, -column-header:last-child .button:hover, -column-header.button:focus:last-child, +column-header.button:last-child:focus, column-header:last-child .button:focus, -column-header .button:insensitive:last-child, -column-header:last-child .button:insensitive, -column-header.button:focus:hover:last-child, -column-header:last-child .button:focus:hover, -column-header.button:active:focus:hover:last-child, -column-header:last-child .button:active:focus:hover, -column-header.button:active:focus:last-child, -column-header:last-child .button:active:focus, -column-header.button:active:hover:last-child, -column-header:last-child .button:active:hover { +column-header.button:last-child:active, +column-header:last-child .button:active, +column-header.button:last-child:active:hover, +column-header:last-child .button:active:hover, +column-header.button:last-child:active:focus, +column-header:last-child .button:active:focus { border-image: none; border-width: 0; + border-radius: 0; } + /* unfocused window: generic element borders */ -.button:window-unfocused, -GtkComboBox.combobox-entry .entry:window-unfocused, -GtkComboBox.combobox-entry .button:window-unfocused, -GtkComboBox *:window-unfocused, -.entry:window-unfocused, -GtkSwitch.trough:window-unfocused, -.trough:window-unfocused { +.button:backdrop, +GtkComboBox.combobox-entry .entry:backdrop, +GtkComboBox.combobox-entry .button:backdrop, +GtkComboBox *:backdrop, +.entry:backdrop, +GtkSwitch.trough:backdrop, +.trough:backdrop { border-image: url("borders/generic-border-unfocused-dark.svg") 3 3 4 3 / 3 3 4 3 stretch; border-radius: 3; border-width: 1 1 2 1; } /* unfocused window: primary toolbar generic element borders */ -.primary-toolbar .button.raised:window-unfocused, -.primary-toolbar .raised .button:window-unfocused, -.primary-toolbar .entry:window-unfocused, -.inline-toolbar.toolbar .button:window-unfocused { +.primary-toolbar .button:active:backdrop, +.primary-toolbar .button.raised:backdrop, +.primary-toolbar .raised .button:backdrop, +.primary-toolbar .entry:backdrop, +.inline-toolbar.toolbar .button:backdrop { border-image: url("borders/primary-toolbar-generic-border-unfocused-dark.svg") 4 / 4 stretch; border-radius: 3; border-width: 2; border-style: solid; border-color: transparent; - } diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets.css 2011-12-19 11:14:54.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets.css 2012-01-17 00:32:43.000000000 +0000 @@ -4,7 +4,6 @@ background-clip: padding-box; - /* Style properties */ -GtkToolButton-icon-spacing: 4; -GtkTextView-error-underline-color: @error_color; @@ -51,33 +50,32 @@ color: @theme_fg_color; } -GtkWindow:window-unfocused { +GtkWindow:backdrop { color: @theme_unfocused_fg_color; } * { + /* inherit the color from parent by default */ + color: inherit; background-color: @theme_bg_color; } -/* *:hover { - background-color: shade (@theme_bg_color, 1.02); - color: @theme_fg_color; -}*/ - -*:selected { +*:selected, +*:selected:focus { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } -*:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; +*:selected:backdrop { + /* I would like to remove colors from the backdrop state, next release*/ + background-color: @theme_unfocused_selected_bg_color; + color: @theme_unfocused_selected_fg_color; } *:insensitive { background-color: @insensitive_bg_color; color: @insensitive_fg_color; - border-color: @insensitive_border_color; + border-color: @insensitive_borders; } /* @@ -86,14 +84,14 @@ } */ -*:window-unfocused { +*:backdrop { /* I want everything nice and flat in the unfocused window */ text-shadow: none; icon-shadow: none; color: @theme_unfocused_fg_color; } -*:insensitive:window-unfocused { +*:insensitive:backdrop { /* I want everything nice and flat in the unfocused window */ text-shadow: none; icon-shadow: none; @@ -152,13 +150,13 @@ GtkTreeView .separator, .separator, .separator:hover { - color: darker (@theme_bg_color); + color: @borders; } -GtkTreeView .separator:window-unfocused, -.separator:window-unfocused, -.separator:hover:window-unfocused { - color: @unfocused_insensitive_borders_color; +GtkTreeView .separator:backdrop, +.separator:backdrop, +.separator:hover:backdrop { + color: @unfocused_insensitive_borders; } .pane-separator { @@ -175,8 +173,8 @@ background-color: @theme_bg_color; } -.pane-separator:window-unfocused, -.pane-separator:hover:window-unfocused { +.pane-separator:backdrop, +.pane-separator:hover:backdrop { background-color: @theme_unfocused_bg_color; } @@ -185,8 +183,8 @@ background-color: @theme_base_color; } -.notebook .pane-separator:window-unfocused, -.notebook .pane-separator:hover:window-unfocused { +.notebook .pane-separator:backdrop, +.notebook .pane-separator:hover:backdrop { background-color: @theme_unfocused_base_color; } @@ -200,6 +198,7 @@ * also applies to the progressbar. */ padding: 0; + -GtkEntry-inner-border: 5; -GtkEntry-progress-border: 0; @@ -221,6 +220,18 @@ -adwaita-progressbar-pattern: none; } +.entry:backdrop { + color: @theme_unfocused_text_color; +} + +.entry:insensitive:backdrop { + color: @unfocused_insensitive_fg_color; +} + +.entry:selected:backdrop { + color: @theme_unfocused_selected_fg_color; +} + /******************* * Symbolic images * *******************/ @@ -236,42 +247,24 @@ /***************** * GtkSpinButton * *****************/ -.spinbutton .button { +.spinbutton .button, +.spinbutton .button:focus { color: @internal_element_color; padding: 2 6; -} - -.spinbutton .button, -.spinbutton .button:hover, -.spinbutton .button:active, -.spinbutton .button:focus, -.spinbutton .button:insensitive, -.spinbutton .button:window-unfocused { - border-width: 0 1; + border-width: 0; border-radius: 0; - border-style: solid; + border-style: none; border-image: none; - - box-shadow: none; -} - -.spinbutton .button, -.spinbutton .button:hover, -.spinbutton .button:active, -.spinbutton .button:focus, -.spinbutton .button:insensitive { - border-color: @inset_dark_color; + box-shadow: 1 0 inset @inset_dark_color; } -.spinbutton .button:window-unfocused { - border-color: @inset_dark_color; /* FIXME */ +.spinbutton .button:backdrop { + box-shadow: 1 0 inset @unfocused_entry_separators; + box-shadow: none; } .spinbutton .button, -.spinbutton .button:hover, -.spinbutton .button:focus, -.spinbutton .button:insensitive, -.spinbutton .button:window-unfocused { +.spinbutton .button:backdrop { background-color: transparent; background-image: none; } @@ -280,42 +273,39 @@ color: @internal_element_insensitive; } +.spinbutton .button:insensitive:backdrop { + color: mix(@internal_element_color, @theme_unfocused_base_color, 0.7); +} + .spinbutton .button:active, +.spinbutton .button:active:focus, .spinbutton .button:hover { color: @internal_element_prelight; } -.spinbutton .button:first-child, -.spinbutton .button:first-child:hover, -.spinbutton .button:first-child:active, -.spinbutton .button:first-child:focus, -.spinbutton .button:first-child:insensitive, -.spinbutton .button:first-child:window-unfocused { - border-left-width: 0; +.spinbutton .button:first-child { border-radius: 2 0 0 2; + box-shadow: none; } -.spinbutton .button:last-child, -.spinbutton .button:last-child:hover, -.spinbutton .button:last-child:active, -.spinbutton .button:last-child:focus, -.spinbutton .button:last-child:insensitive, -.spinbutton .button:last-child:window-unfocused { - border-width: 0; +.spinbutton .button:last-child { border-radius: 0 2 2 0; } /* Add back the glowy effect from the entry covered by the pushed button background*/ -.spinbutton .button:active { - box-shadow: 0 1 inset alpha(@theme_selected_bg_color, 0.2), 0 -1 inset alpha(@theme_selected_bg_color, 0.2); +.spinbutton .button:active, +.spinbutton .button:active:focus { + box-shadow: 1 0 inset @inset_dark_color, 0 1 inset alpha(@theme_selected_bg_color, 0.2), 0 -1 inset alpha(@theme_selected_bg_color, 0.2); } -.spinbutton .button:first-child:active { +.spinbutton .button:first-child:active, +.spinbutton .button:first-child:active:focus { box-shadow: 1 1 inset alpha(@theme_selected_bg_color, 0.2), 0 -1 inset alpha(@theme_selected_bg_color, 0.2); } -.spinbutton .button:last-child:active { - box-shadow: 0 1 inset alpha(@theme_selected_bg_color, 0.2), -1 -1 inset alpha(@theme_selected_bg_color, 0.2); +.spinbutton .button:last-child:active, +.spinbutton .button:last-child:active:focus { + box-shadow: 1 0 inset @inset_dark_color, 0 1 inset alpha(@theme_selected_bg_color, 0.2), -1 -1 inset alpha(@theme_selected_bg_color, 0.2); } @@ -364,9 +354,12 @@ to (alpha (@progressbar_pattern, 0.25))); } -.progressbar:window-unfocused, -.progressbar row:window-unfocused, -.progressbar row:selected:window-unfocused { +.progressbar:backdrop, +.progressbar row:backdrop, +.progressbar row:selected:backdrop, +.progressbar.vertical:backdrop, +.progressbar.vertical row:backdrop, +.progressbar.vertical row:selected:backdrop { -adwaita-progressbar-pattern: none; background-image: none; background-color: @theme_unfocused_selected_bg_color; @@ -391,10 +384,12 @@ to (mix (@trough_bg_color_b, @theme_selected_bg_color, 0.25))); } -GtkProgressBar:window-unfocused, -.trough row:window-unfocused { +GtkProgressBar:backdrop, +GtkProgressBar.vertical:backdrop, +.trough row:backdrop, +.trough.vertical row:backdrop { background-image: none; - background-color: mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5); /*FIXME*/ + background-color: @unfocused_dark_bg; } /************ @@ -409,8 +404,8 @@ GtkScale.slider, GtkScale.slider:hover, GtkScale.slider:insensitive, -GtkScale.slider:window-unfocused, -GtkScale.slider:insensitive:window-unfocused { +GtkScale.slider:backdrop, +GtkScale.slider:insensitive:backdrop { border-radius: 0; border-style: none; @@ -423,16 +418,25 @@ GtkScale.trough, GtkScale.trough.highlight, GtkScale.trough.vertical, -GtkScale.trough:window-unfocused { +GtkScale.trough:backdrop { border-width: 1; border-image: none; border-style: solid; - border-color: @button_border; +} + +GtkScale.trough, +GtkScale.trough.highlight, +GtkScale.trough.vertical { + border-color: @borders; +} + +GtkScale.trough:backdrop { + border-color: @unfocused_borders; } GtkScale.trough:insensitive { background-color: @insensitive_bg_color; - border-color: @insensitive_border_color; + border-color: @insensitive_borders; box-shadow: none; background-image: none; } @@ -443,8 +447,8 @@ -adwaita-progressbar-pattern: none; } -GtkScale.progressbar:window-unfocused { - background-color: @unfocused_borders_color; +GtkScale.progressbar:backdrop { + background-color: @unfocused_borders; -adwaita-progressbar-pattern: none; } @@ -461,16 +465,16 @@ box-shadow: 0 -1 inset @theme_bg_color; } -GtkScale.trough:window-unfocused { +GtkScale.trough:backdrop { box-shadow: none; - border-color: @unfocused_borders_color; - background-color: mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5); + border-color: @unfocused_borders; + background-color: @unfocused_dark_bg; background-image: none; } -GtkScale.trough:insensitive:window-unfocused { +GtkScale.trough:insensitive:backdrop { background-color: @unfocused_insensitive_bg_color; - border-color: @unfocused_insensitive_borders_color; + border-color: @unfocused_insensitive_borders; box-shadow: none; background-image: none; } @@ -487,12 +491,15 @@ /* only render frames in a GtkScrolledWindow */ GtkScrolledWindow.frame { border-style: solid; - border-color: darker (@theme_bg_color); + border-color: @borders; border-width: 1; border-radius: 2; padding: 0; } +GtkScrolledWindow.frame:backdrop { + border-color: @unfocused_borders; +} /*********** * Buttons * @@ -500,18 +507,16 @@ .button, .button.menuitem.menubar, GtkComboBox.combobox-entry .button { - padding: 2 5; + padding: 1 4 0 4; } .button { - -GtkWidget-focus-line-width: 1; - -GtkButton-child-displacement-x: 0; -GtkButton-child-displacement-y: 1; -GtkButton-image-spacing: 4; -GtkButton-interior-focus: true; -GtkButton-default-border: 0; - -GtkButton-inner-border: 0; + -GtkButton-inner-boder: 3; color: @theme_text_color; @@ -521,190 +526,176 @@ text-shadow: @button_text_shadow 0 1; } -.button *:active, -.button *:active:hover, -.button *:active:hover:focus, -.button *:active:focus { - text-shadow: @button_active_text_shadow 0 1; - color: darker(@theme_selected_bg_color); /* Not sure about this one */ -} - -.button *:insensitive { - color: @insensitive_fg_color; - text-shadow: none; -} - -.button *:active:window-unfocused, -.button *:active:insensitive:window-unfocused { - color: @theme_unfocused_bg_color; -} - /* We may want a background for focused buttons, but in the meantime let's remove it too */ .primary-toolbar .button, -.primary-toolbar .button:focus, .primary-toolbar .button:insensitive, -.primary-toolbar .button:window-unfocused, -.primary-toolbar .button:insensitive:window-unfocused { +.primary-toolbar .button:backdrop, +.primary-toolbar .button:insensitive:backdrop { background-image: none; background-color: transparent; } /* Remove borders from primary toolbar buttons*/ -.primary-toolbar .button, -.primary-toolbar .button:hover, -.primary-toolbar .button:focus, -.primary-toolbar .button:insensitive, -.primary-toolbar .button:window-unfocused { +.primary-toolbar .button { border-image: none; /* setting border-style: none; here would override the border-width values * we set in gtk-widget-borders.css to zero. */ border-style: solid; - border-width: 0; + border-width: 2; border-color: transparent; + + text-shadow: @primary_toolbar_button_text_shadow 0 1; } -.primary-toolbar .button.raised *, -.primary-toolbar .raised .button *, -.inline-toolbar .button * { - icon-shadow: @button_text_shadow 0 1; - text-shadow: @button_text_shadow 0 1; +.button *:active { + color: @button_active_text; /* Not sure about this one */ + text-shadow: @button_active_text_shadow 0 1; } -.button.raised *:active, -.raised .button *:active, -.inline-toolbar .button *:active { - icon-shadow: @button_active_text_shadow 0 1; +.button *:insensitive { + color: @insensitive_fg_color; + text-shadow: none; } -.button.raised *:insensitive, -.raised .button *:insensitive, -.inline-toolbar .button *:insensitive { - icon-shadow: none; +.button *:insensitive:backdrop { + color: @unfocused_insensitive_fg_color; } -.primary-toolbar .button * { - text-shadow: @primary_toolbar_button_text_shadow 0 1; +.primary-toolbar .button *:insensitive:backdrop { + color: mix(@unfocused_insensitive_bg_color, @unfocused_dark_bg, 0.65); /* FIXME */ } -.button.raised, -.raised .button { - text-shadow: @button_text_shadow 0 1; +.button *:active:backdrop, +.button *:active:insensitive:backdrop { + color: @theme_unfocused_bg_color; + text-shadow: none; + icon-shadow: none; } +.toolbar .button.raised *, +.toolbar .raised .button *, +.inline-toolbar .button * { + icon-shadow: @button_text_shadow 0 1; + text-shadow: @button_text_shadow 0 1; +} -.primary-toolbar .button:insensitive { - text-shadow: none; +.toolbar .button.raised *:active, +.toolbar .raised .button *:active, +.inline-toolbar .button *:active { + icon-shadow: @button_active_text_shadow 0 1; } -.primary-toolbar .button *:insensitive:window-unfocused { - color: mix(@unfocused_insensitive_bg_color, @unfocused_toolbar, 0.5); +.toolbar .button.raised *:insensitive, +.toolbar .raised .button *:insensitive, +.inline-toolbar .button *:insensitive { + icon-shadow: none; } -.primary-toolbar .button.raised *:insensitive:window-unfocused, -.primary-toolbar .raised .button *:insensitive:window-unfocused { - color: @unfocused_insensitive_fg_color; +.toolbar .button.raised *:backdrop, +.toolbar .raised .button *:backdrop, +.inline-toolbar .button *:backdrop { + text-shadow: none; + icon-shadow: none; } /* linked buttons */ /* Set up shadows and hilights for button visual separation */ .linked .button, -.primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button, +.toolbar .button.raised.linked, +.toolbar .raised.linked .button, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar GtkToolButton .button { box-shadow: 1 0 inset @inset_light_color, -1 0 inset @inset_dark_color; } .linked .button:first-child, -.primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .raised.linked .button:first-child, +.toolbar .button.raised.linked:first-child, +.toolbar .raised.linked .button:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child .button { box-shadow: -1 0 inset @inset_dark_color; } .linked .button:last-child, -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .raised.linked .button:last-child, +.toolbar .button.raised.linked:last-child, +.toolbar .raised.linked .button:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child .button { box-shadow: 1 0 inset @inset_light_color; } .linked .button:active, -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active, +.toolbar .button.raised.linked:active, +.toolbar .raised.linked .button:active, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar GtkToolButton .button:active { box-shadow: 1 0 inset @inset_dark_color; } .linked .button:insensitive, -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive, +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button:insensitive, .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button:insensitive { box-shadow: -1 0 inset @inset_dark_color; } -.linked .button:window-unfocused, -.primary-toolbar .button.raised.linked:window-unfocused, -.primary-toolbar .raised.linked .button:window-unfocused, -.inline-toolbar.toolbar .button:window-unfocused, -.inline-toolbar.toolbar GtkToolButton .button:window-unfocused { - box-shadow: -1 0 inset @unfocused_borders_color; -} - -.linked .button:insensitive:window-unfocused, -.primary-toolbar .button.raised.linked:insensitive:window-unfocused, -.primary-toolbar .raised.linked .button:insensitive:window-unfocused, -.inline-toolbar.toolbar .button:insensitive:window-unfocused, -.inline-toolbar.toolbar GtkToolButton .button:insensitive:window-unfocused { - box-shadow: -1 0 inset @unfocused_insensitive_borders_color; -} - -.linked .button:insensitive:last-child:window-unfocused, -.primary-toolbar .button.raised.linked:insensitive:last-child:window-unfocused, -.primary-toolbar .raised.linked .button:insensitive:last-child:window-unfocused, -.inline-toolbar.toolbar .button:insensitive:last-child:window-unfocused, -.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive:window-unfocused { +.linked .button:backdrop, +.toolbar .button.raised.linked:backdrop, +.toolbar .raised.linked .button:backdrop, +.inline-toolbar.toolbar .button:backdrop, +.inline-toolbar.toolbar GtkToolButton .button:backdrop { + box-shadow: -1 0 inset @unfocused_borders; +} + +.linked .button:insensitive:backdrop, +.toolbar .button.raised.linked:insensitive:backdrop, +.toolbar .raised.linked .button:insensitive:backdrop, +.inline-toolbar.toolbar .button:insensitive:backdrop, +.inline-toolbar.toolbar GtkToolButton .button:insensitive:backdrop { + box-shadow: -1 0 inset @unfocused_insensitive_borders; +} + +.linked .button:insensitive:last-child:backdrop, +.toolbar .button.raised.linked:insensitive:last-child:backdrop, +.toolbar .raised.linked .button:insensitive:last-child:backdrop, +.inline-toolbar.toolbar .button:insensitive:last-child:backdrop, +.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive:backdrop { box-shadow: none; } /* remove box shadow from last-child and only-child */ .linked .button:only-child, -/* .primary-toolbar .button.raised.linked:only-child, -.primary-toolbar .raised.linked .button:only-child, */ .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child .button, -.linked .button:window-unfocused:last-child, +.linked .button:backdrop:last-child, .linked .button:insensitive:last-child, -.primary-toolbar .button.raised.linked:insensitive:last-child, -.primary-toolbar .raised.linked .button:insensitive:last-child, +.toolbar .button.raised.linked:insensitive:last-child, +.toolbar .raised.linked .button:insensitive:last-child, .inline-toolbar.toolbar .button:insensitive:last-child, .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive, -.primary-toolbar .button.raised.linked:window-unfocused:last-child, -.primary-toolbar .raised.linked .button:window-unfocused:last-child, -.inline-toolbar.toolbar .button:window-unfocused:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button:window-unfocused, -.linked .button:insensitive:window-unfocused:last-child, -.primary-toolbar .button.raised.linked:insensitive:window-unfocused:last-child, -.primary-toolbar .raised.linked .button:insensitive:window-unfocused:last-child, -.inline-toolbar.toolbar .button:insensitive:window-unfocused:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive:window-unfocused, -.linked .button:window-unfocused:only-child, -.primary-toolbar .button.raised.linked:window-unfocused:only-child, -.primary-toolbar .raised.linked .button:window-unfocused:only-child, -.inline-toolbar.toolbar .button:window-unfocused:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child .button:window-unfocused, -.linked .button:window-unfocused:insensitive:only-child, -.primary-toolbar .button.raised.linked:window-unfocused:insensitive:only-child, -.primary-toolbar .raised.linked .button:window-unfocused:insensitive:only-child, -.inline-toolbar.toolbar .button:window-unfocused:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive:window-unfocused { +.toolbar .button.raised.linked:backdrop:last-child, +.toolbar .raised.linked .button:backdrop:last-child, +.inline-toolbar.toolbar .button:backdrop:last-child, +.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop, +.linked .button:insensitive:backdrop:last-child, +.toolbar .button.raised.linked:insensitive:backdrop:last-child, +.toolbar .raised.linked .button:insensitive:backdrop:last-child, +.inline-toolbar.toolbar .button:insensitive:backdrop:last-child, +.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive:backdrop, +.linked .button:backdrop:only-child, +.toolbar .button.raised.linked:backdrop:only-child, +.toolbar .raised.linked .button:backdrop:only-child, +.inline-toolbar.toolbar .button:backdrop:only-child, +.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop, +.linked .button:backdrop:insensitive:only-child, +.toolbar .button.raised.linked:backdrop:insensitive:only-child, +.toolbar .raised.linked .button:backdrop:insensitive:only-child, +.inline-toolbar.toolbar .button:backdrop:insensitive:only-child, +.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive:backdrop { box-shadow: none; } @@ -714,9 +705,7 @@ .linked .button:active:hover, .linked .button:focus, .linked .button:focus:active, -.linked .button:window-unfocused, -.linked .button:active:window-unfocused, -.linked .button:active:hover:window-unfocused { +.linked .button:insensitive { border-right-width: 0; border-left-width: 0; border-image-width: 3 0 4 0; @@ -729,9 +718,7 @@ .linked .button:active:hover:first-child, .linked .button:focus:first-child, .linked .button:focus:active:first-child, -.linked .button:window-unfocused:first-child, -.linked .button:active:window-unfocused:first-child, -.linked .button:active:hover:window-unfocused:first-child { +.linked .button:insensitive:first-child { border-right-width: 0; border-image-width: 3 0 4 3; border-bottom-right-radius: 0; @@ -744,9 +731,7 @@ .linked .button:active:hover:last-child, .linked .button:focus:last-child, .linked .button:focus:active:last-child, -.linked .button:window-unfocused:last-child, -.linked .button:active:window-unfocused:last-child, -.linked .button:active:hover:window-unfocused:last-child { +.linked .button:insensitive:last-child { border-left-width: 0; border-image-width: 3 3 4 0; border-bottom-left-radius: 0; @@ -759,9 +744,7 @@ .linked .button:active:hover:only-child, .linked .button:focus:only-child, .linked .button:focus:active:only-child, -.linked .button:window-unfocused:only-child, -.linked .button:active:window-unfocused:only-child, -.linked .button:active:hover:window-unfocused:only-child { +.linked .button:insensitive:only-child { border-right-width: 1; border-left-width: 1; border-image-width: 3 3 4 3; @@ -771,42 +754,30 @@ /* Linked buttons on primary toolbars */ /* Middle button */ -.toolbar .button.raised.linked, -.toolbar .button.raised.linked:active, -.toolbar .button.raised.linked:active:hover, -.toolbar .button.raised.linked:focus, -.toolbar .button.raised.linked:focus:active, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button, -.toolbar .raised.linked .button:active, -.toolbar .raised.linked .button:active:hover, -.toolbar .raised.linked .button:focus, -.toolbar .raised.linked .button:focus:active, -.toolbar .raised.linked .button:insensitive, +.primary-toolbar .button.raised.linked, +.primary-toolbar .button.raised.linked:active, +.primary-toolbar .button.raised.linked:focus, +.primary-toolbar .button.raised.linked:focus:active, +.primary-toolbar .button.raised.linked:insensitive, +.primary-toolbar .button.raised.linked:backdrop, +.primary-toolbar .raised.linked .button, +.primary-toolbar .raised.linked .button:active, +.primary-toolbar .raised.linked .button:focus, +.primary-toolbar .raised.linked .button:focus:active, +.primary-toolbar .raised.linked .button:insensitive, +.primary-toolbar .raised.linked .button:backdrop, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar .button:active:hover, .inline-toolbar.toolbar .button:focus, .inline-toolbar.toolbar .button:focus:active, .inline-toolbar.toolbar .button:insensitive, +.inline-toolbar.toolbar .button:backdrop, .inline-toolbar.toolbar GtkToolButton .button, .inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton .button:active:hover, .inline-toolbar.toolbar GtkToolButton .button:focus, .inline-toolbar.toolbar GtkToolButton .button:focus:active, .inline-toolbar.toolbar GtkToolButton .button:insensitive, -.toolbar .button.raised.linked:window-unfocused, -.toolbar .button.raised.linked:active:window-unfocused, -.toolbar .button.raised.linked:active:hover:window-unfocused, -.toolbar .raised.linked .button:window-unfocused, -.toolbar .raised.linked .button:active:window-unfocused, -.toolbar .raised.linked .button:active:hover:window-unfocused, -.inline-toolbar.toolbar .button:window-unfocused, -.inline-toolbar.toolbar .button:active:window-unfocused, -.inline-toolbar.toolbar .button:active:hover:window-unfocused, -.inline-toolbar.toolbar GtkToolButton .button:window-unfocused, -.inline-toolbar.toolbar GtkToolButton .button:active:window-unfocused, -.inline-toolbar.toolbar GtkToolButton .button:active:hover:window-unfocused { +.inline-toolbar.toolbar GtkToolButton .button:backdrop { border-right-width: 0; border-left-width: 0; border-image-width: 4 0 4 0; @@ -814,42 +785,30 @@ } /* Leftmost button */ -.toolbar .button.raised.linked:first-child, -.toolbar .button.raised.linked:active:first-child, -.toolbar .button.raised.linked:active:hover:first-child, -.toolbar .button.raised.linked:focus:first-child, -.toolbar .button.raised.linked:focus:active:first-child, -.toolbar .button.raised.linked:insensitive:first-child, -.toolbar .raised.linked .button:first-child, -.toolbar .raised.linked .button:active:first-child, -.toolbar .raised.linked .button:active:hover:first-child, -.toolbar .raised.linked .button:focus:first-child, -.toolbar .raised.linked .button:focus:active:first-child, -.toolbar .raised.linked .button:insensitive:first-child, +.primary-toolbar .button.raised.linked:first-child, +.primary-toolbar .button.raised.linked:active:first-child, +.primary-toolbar .button.raised.linked:focus:first-child, +.primary-toolbar .button.raised.linked:focus:active:first-child, +.primary-toolbar .button.raised.linked:insensitive:first-child, +.primary-toolbar .button.raised.linked:backdrop:first-child, +.primary-toolbar .raised.linked .button:first-child, +.primary-toolbar .raised.linked .button:active:first-child, +.primary-toolbar .raised.linked .button:focus:first-child, +.primary-toolbar .raised.linked .button:focus:active:first-child, +.primary-toolbar .raised.linked .button:insensitive:first-child, +.primary-toolbar .raised.linked .button:backdrop:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar .button:active:first-child, -.inline-toolbar.toolbar .button:active:hover:first-child, .inline-toolbar.toolbar .button:focus:first-child, .inline-toolbar.toolbar .button:focus:active:first-child, .inline-toolbar.toolbar .button:insensitive:first-child, +.inline-toolbar.toolbar .button:backdrop:first-child, .inline-toolbar.toolbar GtkToolButton:first-child .button, .inline-toolbar.toolbar GtkToolButton:first-child .button:active, -.inline-toolbar.toolbar GtkToolButton:first-child .button:active:hover, .inline-toolbar.toolbar GtkToolButton:first-child .button:focus, .inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active, .inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive, -.toolbar .button.raised.linked:window-unfocused:first-child, -.toolbar .button.raised.linked:active:window-unfocused:first-child, -.toolbar .button.raised.linked:active:hover:window-unfocused:first-child, -.toolbar .raised.linked .button:window-unfocused:first-child, -.toolbar .raised.linked .button:active:window-unfocused:first-child, -.toolbar .raised.linked .button:active:hover:window-unfocused:first-child, -.inline-toolbar.toolbar .button:window-unfocused:first-child, -.inline-toolbar.toolbar .button:active:window-unfocused:first-child, -.inline-toolbar.toolbar .button:active:hover:window-unfocused:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child .button:window-unfocused, -.inline-toolbar.toolbar GtkToolButton:first-child .button:active:window-unfocused, -.inline-toolbar.toolbar GtkToolButton:first-child .button:active:hover:window-unfocused { +.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop { border-left-width: 2; border-right-width: 0; border-image-width: 4 0 4 4; @@ -858,42 +817,30 @@ } /* Rightmost button */ -.toolbar .button.raised.linked:last-child, -.toolbar .button.raised.linked:active:last-child, -.toolbar .button.raised.linked:active:hover:last-child, -.toolbar .button.raised.linked:focus:last-child, -.toolbar .button.raised.linked:focus:active:last-child, -.toolbar .button.raised.linked:insensitive:last-child, -.toolbar .raised.linked .button:last-child, -.toolbar .raised.linked .button:active:last-child, -.toolbar .raised.linked .button:active:hover:last-child, -.toolbar .raised.linked .button:focus:last-child, -.toolbar .raised.linked .button:focus:active:last-child, -.toolbar .raised.linked .button:insensitive:last-child, +.primary-toolbar .button.raised.linked:last-child, +.primary-toolbar .button.raised.linked:active:last-child, +.primary-toolbar .button.raised.linked:focus:last-child, +.primary-toolbar .button.raised.linked:focus:active:last-child, +.primary-toolbar .button.raised.linked:insensitive:last-child, +.primary-toolbar .button.raised.linked:backdrop:last-child, +.primary-toolbar .raised.linked .button:last-child, +.primary-toolbar .raised.linked .button:active:last-child, +.primary-toolbar .raised.linked .button:focus:last-child, +.primary-toolbar .raised.linked .button:focus:active:last-child, +.primary-toolbar .raised.linked .button:insensitive:last-child, +.primary-toolbar .raised.linked .button:backdrop:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:active:last-child, -.inline-toolbar.toolbar .button:active:hover:last-child, .inline-toolbar.toolbar .button:focus:last-child, .inline-toolbar.toolbar .button:focus:active:last-child, .inline-toolbar.toolbar .button:insensitive:last-child, +.inline-toolbar.toolbar .button:backdrop:last-child, .inline-toolbar.toolbar GtkToolButton:last-child .button, .inline-toolbar.toolbar GtkToolButton:last-child .button:active, -.inline-toolbar.toolbar GtkToolButton:last-child .button:active:hover, .inline-toolbar.toolbar GtkToolButton:last-child .button:focus, .inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active, .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive, -.toolbar .button.raised.linked:window-unfocused:last-child, -.toolbar .button.raised.linked:active:window-unfocused:last-child, -.toolbar .button.raised.linked:active:hover:window-unfocused:last-child, -.toolbar .raised.linked .button:window-unfocused:last-child, -.toolbar .raised.linked .button:active:window-unfocused:last-child, -.toolbar .raised.linked .button:active:hover:window-unfocused:last-child, -.inline-toolbar.toolbar .button:window-unfocused:last-child, -.inline-toolbar.toolbar .button:active:window-unfocused:last-child, -.inline-toolbar.toolbar .button:active:hover:window-unfocused:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button:window-unfocused, -.inline-toolbar.toolbar GtkToolButton:last-child .button:active:window-unfocused, -.inline-toolbar.toolbar GtkToolButton:last-child .button:active:hover:window-unfocused { +.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop { border-left-width: 0; border-right-width: 2; border-image-width: 4 4 4 0; @@ -902,42 +849,18 @@ } /* Single button */ -/* .toolbar .button.raised.linked:only-child, -.toolbar .button.raised.linked:active:only-child, -.toolbar .button.raised.linked:active:hover:only-child, -.toolbar .button.raised.linked:focus:only-child, -.toolbar .button.raised.linked:focus:active:only-child, -.toolbar .button.raised.linked:insensitive:only-child, -.toolbar .raised.linked .button:only-child, -.toolbar .raised.linked .button:active:only-child, -.toolbar .raised.linked .button:active:hover:only-child, -.toolbar .raised.linked .button:focus:only-child, -.toolbar .raised.linked .button:focus:active:only-child, -.toolbar .raised.linked .button:insensitive:only-child, */ .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:active:only-child, -.inline-toolbar.toolbar .button:active:hover:only-child, .inline-toolbar.toolbar .button:focus:only-child, .inline-toolbar.toolbar .button:focus:active:only-child, .inline-toolbar.toolbar .button:insensitive:only-child, +.inline-toolbar.toolbar .button:backdrop:only-child, .inline-toolbar.toolbar GtkToolButton:only-child .button, .inline-toolbar.toolbar GtkToolButton:only-child .button:active, -.inline-toolbar.toolbar GtkToolButton:only-child .button:active:hover, .inline-toolbar.toolbar GtkToolButton:only-child .button:focus, .inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active, .inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive, -/* .toolbar .button.raised.linked:window-unfocused:only-child, -.toolbar .button.raised.linked:active:window-unfocused:only-child, -.toolbar .button.raised.linked:active:hover:window-unfocused:only-child, -.toolbar .raised.linked .button:window-unfocused:only-child, -.toolbar .raised.linked .button:active:window-unfocused:only-child, -.toolbar .raised.linked .button:active:hover:window-unfocused:only-child, */ -.inline-toolbar.toolbar .button:window-unfocused:only-child, -.inline-toolbar.toolbar .button:active:window-unfocused:only-child, -.inline-toolbar.toolbar .button:active:hover:window-unfocused:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child .button:window-unfocused, -.inline-toolbar.toolbar GtkToolButton:only-child .button:active:window-unfocused, -.inline-toolbar.toolbar GtkToolButton:only-child .button:active:hover:window-unfocused { +.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop { border-right-width: 2; border-left-width: 2; border-image-width: 4; @@ -955,7 +878,7 @@ .notebook { padding: 0; - border-color: @notebook_border; + border-color: @borders; border-style: solid; border-width: 1; @@ -971,33 +894,45 @@ background-color: @theme_base_color; } -.notebook:window-unfocused, -.notebook GtkViewport:window-unfocused { +.notebook:backdrop, +.notebook GtkViewport:backdrop { background-color: @theme_unfocused_base_color; - border-color: @notebook_border; + border-color: @unfocused_borders; } .notebook tab { padding: 3; background-image: -gtk-gradient (linear, left top, left bottom, - from (@notebook_tab_gradient_a), + from (@notebook_tab_hilight), + color-stop (0.15, @notebook_tab_hilight), + color-stop (0.15, @notebook_tab_gradient_a), to (@notebook_tab_gradient_b)); -adwaita-focus-border-radius: 2; } -.notebook tab:window-unfocused { +/* workaround */ +.notebook tab.bottom { + padding: 3; + background-image: -gtk-gradient (linear, + left bottom, left top, + from (@notebook_tab_gradient_a), + to (@notebook_tab_gradient_b)); + -adwaita-focus-border-radius: 2; +} + +.notebook tab:backdrop { background-image: none; background-color: @theme_unfocused_bg_color; - border-color: @unfocused_insensitive_borders_color; + border-color: @unfocused_insensitive_borders; } .notebook tab:active { -adwaita-border-gradient: -gtk-gradient (linear, left top, left bottom, from (@notebook_active_tab_border), - to (@notebook_border)); + to (@borders)); -adwaita-selected-tab-color: @notebook_selected_tab_color; background-image: -gtk-gradient (linear, @@ -1006,24 +941,24 @@ to (@theme_base_color)); } -.notebook tab:active:window-unfocused { +.notebook tab:active:backdrop { /* FIXME I need to set a background-image here, background-color is ignored */ background-image: -gtk-gradient (linear, left top, left bottom, from (@theme_unfocused_base_color), to (@theme_unfocused_base_color)); background-color: @theme_unfocused_base_color; - border-color: @unfocused_borders_color; + border-color: @unfocused_borders; /* FIXME - should be possible to set it to none and use border color */ -adwaita-border-gradient: -gtk-gradient (linear, left top, left bottom, - from (@unfocused_borders_color), - to (@unfocused_borders_color)); - -adwaita-selected-tab-color: @unfocused_borders_color; + from (@unfocused_borders), + to (@unfocused_borders)); + -adwaita-selected-tab-color: @unfocused_borders; } -.notebook tab.left:active:window-unfocused, -.notebook tab.right:active:window-unfocused { +.notebook tab.left:active:backdrop, +.notebook tab.right:active:backdrop { -adwaita-selected-tab-color: alpha(@theme_base_color, 0.0); } @@ -1092,7 +1027,6 @@ padding: 0; padding-right: 6; -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 0; -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; @@ -1100,8 +1034,16 @@ text-shadow: @button_text_shadow 0 1; } +GtkComboBox *:backdrop { + color: @theme_unfocused_fg_color; +} + +GtkComboBox *:insensitive:backdrop { + color: @unfocused_insensitive_fg_color; +} + GtkComboBox.combobox-entry { - padding-right: 0; + padding-right: 0; /* does it work for rtl? */ } GtkComboBox *:insensitive { @@ -1115,50 +1057,38 @@ -GtkWidget-vertical-separator: 0; } +GtkComboBox.combobox-entry .button:first-child { + padding-right: 5; +} + +GtkComboBox.combobox-entry .button:last-child { + padding-left: 5; +} + + GtkComboBox.combobox-entry .entry:first-child, -GtkComboBox.combobox-entry .entry:focus:first-child, -GtkComboBox.combobox-entry .entry:window-unfocused:first-child, -GtkComboBox.combobox-entry .button:first-child, -GtkComboBox.combobox-entry .button:focus:first-child, -GtkComboBox.combobox-entry .button:insensitive:first-child, -GtkComboBox.combobox-entry .button:window-unfocused:first-child { +GtkComboBox.combobox-entry .button:first-child { border-image-width: 3 0 4 3; border-radius: 3 0 0 3; border-right-width: 0; } GtkComboBox.combobox-entry .entry:last-child, -GtkComboBox.combobox-entry .entry:focus:last-child, -GtkComboBox.combobox-entry .entry:window-unfocused:last-child, -GtkComboBox.combobox-entry .button:last-child, -GtkComboBox.combobox-entry .button:focus:last-child, -GtkComboBox.combobox-entry .button:insensitive:last-child, -GtkComboBox.combobox-entry .button:active:last-child, -GtkComboBox.combobox-entry .button:window-unfocused:last-child { +GtkComboBox.combobox-entry .button:last-child { border-image-width: 3 3 4 0; border-radius: 0 3 3 0; border-left-width: 0; } .primary-toolbar GtkComboBox.combobox-entry .entry:first-child, -.primary-toolbar GtkComboBox.combobox-entry .entry:focus:first-child, -.primary-toolbar GtkComboBox.combobox-entry .button:first-child, -.primary-toolbar GtkComboBox.combobox-entry .button:hover:first-child, -.primary-toolbar GtkComboBox.combobox-entry .button:active:first-child, -.primary-toolbar GtkComboBox.combobox-entry .button:focus:first-child, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:first-child { +.primary-toolbar GtkComboBox.combobox-entry .button:first-child { border-image-width: 4 0 4 4; border-radius: 3 0 0 3; border-right-width: 0; } .primary-toolbar GtkComboBox.combobox-entry .entry:last-child, -.primary-toolbar GtkComboBox.combobox-entry .entry:focus:last-child, -.primary-toolbar GtkComboBox.combobox-entry .button:last-child, -.primary-toolbar GtkComboBox.combobox-entry .button:hover:last-child, -.primary-toolbar GtkComboBox.combobox-entry .button:active:last-child, -.primary-toolbar GtkComboBox.combobox-entry .button:focus:last-child, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:last-child { +.primary-toolbar GtkComboBox.combobox-entry .button:last-child { border-image-width: 4 4 4 0; border-radius: 0 3 3 0; border-left-width: 0; @@ -1166,12 +1096,12 @@ GtkComboBox.combobox-entry .button:active:last-child, GtkComboBox.combobox-entry .button:hover:active:last-child { - box-shadow: 1 0 inset @inset_dark_color; + box-shadow: 1 0 inset @inset_dark_color, 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4);; } GtkComboBox.combobox-entry .button:active:first-child, GtkComboBox.combobox-entry .button:hover:active:first-child { - box-shadow: -1 0 inset @inset_dark_color; + box-shadow: -1 0 inset @inset_dark_color, 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4);; } GtkComboBox.combobox-entry .button *:active, @@ -1181,6 +1111,7 @@ GtkComboBox .button { padding-right: 0; + padding-bottom: 1; color: @internal_element_color; } @@ -1195,103 +1126,169 @@ .scrollbar { background-image: none; border-style: solid; - -GtkRange-trough-border: 2; - -GtkRange-arrow-scaling: 0.444; - -GtkRange-slider-width: 18; - -GtkRange-stepper-size: 18; - -GtkScrollbar-min-slider-length: 30; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ + -GtkRange-trough-border: 0; + -GtkScrollbar-has-backward-stepper: false; + -GtkScrollbar-has-forward-stepper: false; + -GtkRange-slider-width: 13; + -GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ - -GtkRange-stepper-spacing: 1; + -GtkRange-stepper-spacing: 0; -GtkRange-trough-under-steppers: 1; } .scrollbar.trough { background-image: none; - background-color: @scrollbar_trough_color; + background-color: @scrollbar_trough; border-width: 0; border-radius: 0; border-image: none; } -.scrollbar.trough:insensitive { - background-color: shade (@theme_bg_color, 0.882); +.scrollbar.button, +.scrollbar.button:active, +.scrollbar.button:active:hover, +.scrollbar.button:insensitive, +.scrollbar.button:hover:backdrop, +.scrollbar.button:active:hover:backdrop { + border-style: none; + border-image: none; + border-radius: 0; + background-image: none; + background-color: transparent; } -.scrollbar.trough:window-unfocused { - background-color: mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.3); - - /* FIXME - all those values should be inherited */ - background-image: none; - border-width: 0; - border-radius: 0; - border-image: none; +.scrollbar.button:active, +.scrollbar.button:active:hover { + background-color: mix(@scrollbar_slider, @scrollbar_trough, 0.8); } -.scrollbar.slider, -.scrollbar.button, -.scrollbar.slider:window-unfocused, -.scrollbar.button:window-unfocused { - background-image: none; - border-radius: 3; - border-width: 1; - border-image: none; +.scrollbar.button.top:hover { + box-shadow: 0 -1 inset mix(@scrollbar_slider, @scrollbar_trough, 0.8); } -.scrollbar.slider, -.scrollbar.button { - background-color: @theme_base_color; - border-color: @button_border; +.scrollbar.button.bottom:hover { + box-shadow: 0 1 inset mix(@scrollbar_slider, @scrollbar_trough, 0.8); } -.scrollbar.slider:hover { - background-image: none; - background-color: @theme_base_color; - border-color: shade (@highlighted_border, 0.964); +.scrollbar.button.right:hover { + box-shadow: 1 0 inset mix(@scrollbar_slider, @scrollbar_trough, 0.8); } -.scrollbar.slider:hover:active { - background-image: none; - background-color: @theme_base_color; - border-color: @theme_selected_bg_color; +.scrollbar.button.left:hover { + box-shadow: -1 0 inset mix(@scrollbar_slider, @scrollbar_trough, 0.8); } -.scrollbar.slider:insensitive { - background-color: @theme_base_color; +.scrollbar.button.top:hover:backdrop, +.scrollbar.button.bottom:hover:backdrop, +.scrollbar.button.right:hover:backdrop, +.scrollbar.button.left:hover:backdrop { + box-shadow: none; } .scrollbar.button { - color: @internal_element_color; + color: @scrollbar_slider; +} + +.scrollbar.button:hover { + color: @scrollbar_slider_prelight; +} + +.scrollbar.button:insensitive { + color: mix(@scrollbar_slider, @scrollbar_trough, 0.6); +} + +.scrollbar.button:active { + color: @scrollbar_slider_active; +} + +.scrollbar.button:backdrop { + color: @scrollbar_slider_unfocused; +} + +.scrollbar.button:insensitive:backdrop { + color: mix(@scrollbar_slider_unfocused, @scrollbar_trough_unfocused, 0.7); +} + +.scrollbar.trough.vertical, +.scrollbar.trough.vertical:backdrop { + /* FIXME: disable until we have have an extra px padded towards the border. It feels uncentered now. + box-shadow: -1 0 inset alpha(@theme_text_color, 0.05), 1 0 inset alpha(@theme_text_color, 0.1); + */ } -.scrollbar.button:hover, -.scrollbar.button:hover:active { +.scrollbar.trough.horizontal, +.scrollbar.trough.horizontal:backdrop { + /* box-shadow: 0 -1 inset alpha(@theme_text_color, 0.05), 0 1 inset alpha(@theme_text_color, 0.1); */ +} + +.scrollbar.trough:insensitive { + background-color: @scrollbar_trough_insensitive; + border-style: solid; + border-image: none; + border-color: transparent; + border-width: 3; +} + +.scrollbar.trough:backdrop { background-image: none; - background-color: @theme_base_color; + background-color: @scrollbar_trough_unfocused; + border-width: 0; + border-radius: 0; + border-image: none; +} +.scrollbar.trough:insensitive:backdrop { + background-image: none; + background-color: mix(@scrollbar_trough_unfocused, @scrollbar_trough_insensitive, 0.5); + border-width: 0; + border-radius: 0; border-image: none; - border-color: shade (@highlighted_border, 0.964); - border-width: 1; } -.scrollbar.button:insensitive { + +.scrollbar.slider { background-image: none; - background-color: @theme_base_color; - color: @internal_element_insensitive; + background-color: @scrollbar_slider; + border-radius: 20; + border-style: solid; + border-image: none; + border-color: transparent; + border-width: 3; +} +.scrollbar.slider:hover { + transition: 1000ms linear; /* doesn't work */ + background-image: none; + background-color: @scrollbar_slider_prelight; + border-style: solid; border-image: none; - border-color: @button_border; - border-width: 1; + border-color: transparent; + border-width: 3; } -.scrollbar.slider:window-unfocused, -.scrollbar.button:window-unfocused, -.scrollbar.button:insensitive:window-unfocused { - background-color: @theme_unfocused_base_color; - border-color: @unfocused_borders_color; +.scrollbar.slider:prelight:active { + background-image: none; + background-color: @scrollbar_slider_active; + border-style: solid; + border-image: none; + border-color: transparent; + border-width: 3; } -.scrollbar.button:insensitive:window-unfocused { - color: @internal_element_insensitive; +.scrollbar.slider:insensitive { + background-color: @scrollbar_slider_insensitive; + border-style: solid; + border-image: none; + border-color: transparent; + border-width: 3; +} + +.scrollbar.slider:backdrop { + background-color: @scrollbar_slider_unfocused; + border-style: solid; + border-image: none; + border-color: transparent; + border-width: 3; } /********* @@ -1366,36 +1363,36 @@ background-image: none; background-color: @menu_bg_color; - border-radius: 5 5 0 0; + border-radius: 4 4 0 0; } .menubar .menuitem *:hover { color: @menu_fg_color; } -.menuitem { +.menu .menuitem { -GtkMenuItem-arrow-scaling: 0.4; padding: 4; } -.menuitem.arrow { - color: @menu_controls_color; +.menu .menuitem:hover { + border-radius: 0; } -.menuitem:active, -.menuitem *:active, -.menuitem:hover, -.menuitem *:hover { +.menu .menuitem:active, +.menu .menuitem *:active, +.menu .menuitem:hover, +.menu .menuitem *:hover { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } -.menuitem:insensitive, -.menuitem *:insensitive { +.menu .menuitem:insensitive, +.menu .menuitem *:insensitive { color: mix (@menu_fg_color, @menu_bg_color, 0.6); } -.menuitem .accelerator:insensitive { +.menu .menuitem .accelerator:insensitive { color: mix (@menu_fg_color, @menu_bg_color, 0.7); } @@ -1408,6 +1405,10 @@ color: alpha (@menu_fg_color, 0.3); } +.menuitem.arrow { + color: @menu_controls_color; +} + .menuitem.separator { color: @menu_separator; @@ -1481,7 +1482,7 @@ border-radius: 5 5 0 0; border-image: none; border-width: 1 1 0 1; - border-color: shade(@button_border, 1.30); + border-color: shade(@borders, 1.30); border-style: solid; } @@ -1509,14 +1510,14 @@ * Toolbars * ************/ .toolbar { - border-style: solid; + border-style: none; border-color: darker (@theme_bg_color); - border-width: 1 0 1 0; +/* border-width: 1 0 1 0; */ padding: 4; } .toolbar .button { - padding: 3; + padding: 1; } .toolbar:insensitive { @@ -1553,6 +1554,7 @@ -GtkWidget-window-dragging: true; -GtkToolbar-button-relief: normal; + box-shadow: 0 3 inset alpha(black, 0.02), 0 2 inset alpha(black, 0.02), 0 1 inset alpha(black, 0.02); } .primary-toolbar .toolbar:insensitive, @@ -1563,9 +1565,10 @@ border-color: shade (@theme_bg_color, 0.91); } -.primary-toolbar .toolbar:window-unfocused, -.primary-toolbar.toolbar:window-unfocused { - border-color: @unfocused_borders_color; +.primary-toolbar .toolbar:backdrop, +.primary-toolbar.toolbar:backdrop { + border-color: @unfocused_borders; + box-shadow: none; } /* progressbars on primary toolbar entries are special */ @@ -1611,11 +1614,41 @@ ***********/ .sidebar, .sidebar .view { - background-color: @sidebar_bg_color; + background-color: @sidebar_bg; +} + +.sidebar:backdrop, +.sidebar .view:backdrop { + background-color: @sidebar_bg_unfocused; +} + +.sidebar .scrollbar.trough, +.sidebar .scrollbar.trough:backdrop { + box-shadow: none; + border-radius: 100; + border-style: solid; + border-width: 2; + border-color: transparent; } .sidebar .scrollbar.trough { - background-color: @sidebar_bg_color; + background-color: shade(@sidebar_bg, 0.8); +} + +.sidebar .scrollbar.trough:backdrop { + background-color: shade(@sidebar_bg_unfocused, 0.8); +} + +.sidebar .scrollbar.slider { + background-color: @sidebar_bg; +} + +.sidebar .scrollbar.slider:backdrop { + background-color: @sidebar_bg_unfocused; +} + +.sidebar .scrollbar.slider:hover { + background-color: @theme_base_color; } .sidebar .radio, @@ -1625,6 +1658,7 @@ background-color: transparent; } + /**************** * GtkAssistant * ****************/ @@ -1664,29 +1698,29 @@ GtkSwitch.trough:insensitive { background-image: none; background-color: @insensitive_bg_color; - color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5); + color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5); /* FIXME */ } -GtkSwitch.trough:window-unfocused { +GtkSwitch.trough:backdrop { color: @theme_unfocused_fg_color; } -GtkSwitch.trough:active:window-unfocused { +GtkSwitch.trough:active:backdrop { color: @theme_unfocused_bg_color; } -GtkSwitch.trough:insensitive:window-unfocused { - color: @unfocused_insensitive_borders_color; +GtkSwitch.trough:insensitive:backdrop { + color: @unfocused_insensitive_borders; } GtkSwitch.slider { border-width: 1; border-radius: 2; border-style: solid; - border-color: mix (@button_border, @theme_text_color, 0.4); + border-color: mix (@borders, @theme_text_color, 0.4); /*box-shadow: 0 -1 inset alpha(@theme_base_color, 0.50);*/ - box-shadow: 0 -1 inset alpha(white, 0.9), 0 1 inset @theme_base_color, 0 2 inset alpha(@button_border, 0.15); + box-shadow: 0 -1 inset alpha(white, 0.9), 0 1 inset @theme_base_color, 0 2 inset alpha(@borders, 0.15); padding: 2 2 3 2; @@ -1710,20 +1744,20 @@ border-color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5); } -GtkSwitch.slider:window-unfocused { +GtkSwitch.slider:backdrop { background-color: @theme_unfocused_base_color; background-image: none; - border-color: @unfocused_borders_color; + border-color: @unfocused_borders; box-shadow: none; color: @theme_unfocused_base_color; } -GtkSwitch.slider:insensitive:window-unfocused { +GtkSwitch.slider:insensitive:backdrop { background-color: @theme_unfocused_bg_color; - border-color: @unfocused_insensitive_borders_color; + border-color: @unfocused_insensitive_borders; } GtkViewport, @@ -1733,8 +1767,8 @@ background-color: @theme_base_color; } -GtkViewport:window-unfocused, -GtkIconView:window-unfocused { +GtkViewport:backdrop, +GtkIconView:backdrop { background-color: @theme_unfocused_base_color; } @@ -1757,6 +1791,11 @@ border-radius: 0; } +.view:selected { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + GtkTreeView { -GtkTreeView-vertical-separator: 0; -GtkTreeView-expander-size: 17; @@ -1774,9 +1813,9 @@ background-color: @theme_base_color; } -.view:window-unfocused, -GtkTreeView:window-unfocused, /* not working */ -GtkTreeView.view:window-unfocused /*not working*/ { +.view:backdrop, +GtkTreeView:backdrop, +GtkTreeView.view:backdrop { background-color: @theme_unfocused_base_color; color: @theme_unfocused_text_color; } @@ -1788,6 +1827,8 @@ column-header.button, column-header .button { color: @internal_element_color; + /* I'd like to have shadows inside any white box, not possible yet */ + /* box-shadow: 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4); */ } column-header.button, @@ -1807,8 +1848,8 @@ font-weight: bold; /* Not sure about this one */ } -column-header.button:window-unfocused, -column-header .button:window-unfocused { +column-header.button:backdrop, +column-header .button:backdrop { background-color: @theme_unfocused_base_color; /* color: FIXME */ } @@ -1931,12 +1972,12 @@ border-width: 0; } -GtkCalendar.button { - background-image: -gtk-gradient (linear, - left top, - left bottom, - from (rgba (0, 0, 0, 0)), - to (rgba (0, 0, 0, 0))); +GtkCalendar.button, +GtkCalendar.button:insensitive, +GtkCalendar.button:backdrop, +GtkCalendar.button:insensitive:backdrop { + background-image: none; + background-color: transparent; } .highlight, @@ -1948,24 +1989,132 @@ border-width: 0; } +/* Use different button and entry borders on infobars */ +GtkInfoBar .entry, +GtkInfoBar .entry:focus, +GtkInfoBar .button, +GtkInfoBar .button:insensitive, +GtkInfoBar .button:active, +GtkInfoBar .button:focus, +GtkInfoBar .button:active:focus, +.info .entry, +.info .entry:focus, +.info .button, +.info .button:insensitive, +.info .button:active, +.info .button:focus, +.info .button:active:focus, +.warning .entry, +.warning .entry:focus, +.warning .button, +.warning .button:insensitive, +.warning .button:active, +.warning .button:focus, +.warning .button:active:focus, +.question .entry, +.question .entry:focus, +.question .button, +.question .button:insensitive, +.question .button:active, +.question .button:focus, +.question .button:active:focus, +.error .entry, +.error .entry:focus, +.error .button, +.error .button:insensitive, +.error .button:active, +.error .button:focus, +.error .button:active:focus { + border-image: none; + + border-color: shade(@borders, 0.9); + border-style: solid; + border-width: 1; +} + +GtkInfoBar .entry:backdrop, +GtkInfoBar .button:backdrop, +GtkInfoBar .button:insensitive:backdrop, +GtkInfoBar .button:active:backdrop, +.info .entry:backdrop, +.info .button:backdrop, +.info .button:insensitive:backdrop, +.info .button:active:backdrop, +.warning .entry:backdrop, +.warning .button:backdrop, +.warning .button:insensitive:backdrop, +.warning .button:active:backdrop, +.question .entry:backdrop, +.question .button:backdrop, +.question .button:insensitive:backdrop, +.question .button:active:backdrop, +.error .entry:backdrop, +.error .button:backdrop, +.error .button:insensitive:backdrop, +.error .button:active:backdrop { + border-image: none; + + border-color: @unfocused_borders; + border-style: solid; + border-width: 1; +} + +GtkInfoBar, +.info, +.warning, +.question, +.error { + text-shadow: 0 1 alpha(black, 0.15); +} + +GtkInfoBar:backdrop, +.info:backdrop, +.warning:backdrop, +.question:backdrop, +.error:backdrop { + text-shadow: none; + background-color: @theme_base_color; + color: @theme_unfocused_fg_color; + border-color: @theme_unfocused_fg_color; +} + +GtkInfoBar:last-child, +.info:last-child, +.warning:last-child, +.question:last-child, +.error:last-child { + /* only apply a border on the last infobar if + * there's more than one packed in */ + border-bottom-width: 1; + border-style: solid; +} + .info { background-color: @info_bg_color; color: @info_fg_color; + + border-color: darker(@info_bg_color); } .warning { background-color: @warning_bg_color; color: @warning_fg_color; + + border-color: darker(@warning_bg_color); } .question { background-color: @question_bg_color; color: @question_fg_color; + + border-color: darker(@question_bg_color); } .error { background-color: @error_bg_color; color: @error_fg_color; + + border-color: darker(@error_bg_color); } .dim-label, diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css 2011-12-19 09:57:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css 2012-01-17 02:04:42.000000000 +0000 @@ -1,19 +1,3 @@ -.entry:focus { - box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7); -} - -.spinbutton .button:active { - box-shadow: 0 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 0 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), 0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7); -} - -.spinbutton .button:first-child:active { - box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 0 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), 0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7); -} - -.spinbutton .button:last-child:active { - box-shadow: 0 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7); -} - GtkIconView.view.cell:selected, GtkIconView.view.cell:selected:focus { background-color: alpha(@theme_base_color, 0.0); @@ -37,53 +21,58 @@ } .button *:active, -.button *:active:hover, -.button *:active:focus, -.button *:active:hover:focus, -GtkComboBox *:active, -GtkComboBox *:active:hover, -GtkComboBox *:active:focus, -GtkComboBox *:active:hover:focus { +GtkComboBox *:active { text-shadow: @button_active_text_shadow 0 -1; color: @theme_selected_bg_color; /* Not sure about this one */ } -.button -.button.raised, -.raised .button, -.inline-toolbar .button, -.button.raised *, -.raised .button *, +.button *:active:insensitive, +GtkComboBox *:active:insensitive { + text-shadow: none; + color: @insensitive_fg_color; +} + +.toolbar .button.raised *, +.toolbar .raised .button *, .inline-toolbar .button * { icon-shadow: @button_text_shadow 0 -1; } -.button.raised *:active, -.raised .button *:active, +.toolbar .button.raised *:active, +.toolbar .raised .button *:active, .inline-toolbar .button *:active { icon-shadow: @button_active_text_shadow 0 -1; } -.button.raised *:insensitive, -.raised .button *:insensitive, +.toolbar .button.raised *:insensitive, +.toolbar .raised .button *:insensitive, .inline-toolbar .button *:insensitive { icon-shadow: none; } +.toolbar .button.raised *:backdrop, +.toolbar .raised .button *:backdrop, +.inline-toolbar .button *:backdrop { + icon-shadow: none; +} + column-header.button, column-header .button { text-shadow: none; } + +.spinbutton .button { + icon-shadow: none; +} + .button .separator, .button .separator:prelight { color: alpha (@theme_text_color, 0.1); } -.scrollbar.slider:prelight, -.scrollbar.button:prelight, -.scrollbar.button:prelight:active { - border-color: shade (@highlighted_border, 0.75); +GtkScale.trough:insensitive:backdrop { /* not working */ + background-color: transparent; } GtkSwitch.slider { @@ -93,7 +82,56 @@ to (@switch_slider_color)); -adwaita-switch-grip-color: shade (@switch_slider_color, 0.9); - border-color: mix (@button_border, black, 0.4); - box-shadow: 0 -1 inset alpha(white, 0.04), 0 1 inset shade(@theme_bg_color, 1.1), 0 2 inset alpha(@button_border, 0.2); + border-color: mix (@borders, black, 0.4); + box-shadow: 0 -1 inset alpha(white, 0.04), + 0 1 inset shade(@theme_bg_color, 1.1), + 0 2 inset alpha(@borders, 0.2); +} + +.scrollbar.trough.vertical { + box-shadow: none; } +.scrollbar.trough.horizontal { + box-shadow: none; +} + +.primary-toolbar .toolbar, +.primary-toolbar.toolbar { + box-shadow: 0 3 inset alpha(black, 0.05), + 0 2 inset alpha(black, 0.05), + 0 1 inset alpha(black, 0.05); +} + +.entry:focus { + box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), + -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), + 1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), + -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7); +} + +.spinbutton .button:active, +.spinbutton .button:active:focus { + box-shadow: 1 0 inset @inset_dark_color, + 0 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), + 0 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), + 0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), + 0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7); +} + +.spinbutton .button:first-child:active, +.spinbutton .button:first-child:active:focus { + box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), + 0 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), + 1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), + 0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7); +} + +.spinbutton .button:last-child:active, +.spinbutton .button:last-child:active:focus { + box-shadow: 1 0 inset @inset_dark_color, + 0 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), + -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), + 0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), + -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7); +} diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/Makefile.am gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/Makefile.am --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/Makefile.am 2011-12-07 20:09:15.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/Makefile.am 2011-12-21 17:37:50.000000000 +0000 @@ -5,7 +5,6 @@ gnome-applications.css \ gtk.css \ gtk-dark.css \ - gtk-scrollbar-experiments.css \ gtk-widgets.css \ gtk-widgets-backgrounds.css \ gtk-widgets-borders.css \ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/Makefile.in gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/Makefile.in --- gnome-themes-standard-3.3.3/themes/Adwaita/gtk-3.0/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/gtk-3.0/Makefile.in 2012-01-17 02:13:46.000000000 +0000 @@ -143,6 +143,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -264,7 +265,6 @@ gnome-applications.css \ gtk.css \ gtk-dark.css \ - gtk-scrollbar-experiments.css \ gtk-widgets.css \ gtk-widgets-backgrounds.css \ gtk-widgets-borders.css \ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/Makefile.in gnome-themes-standard-3.3.4/themes/Adwaita/Makefile.in --- gnome-themes-standard-3.3.3/themes/Adwaita/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/Makefile.in 2012-01-17 02:13:46.000000000 +0000 @@ -143,6 +143,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/Adwaita/metacity-1/Makefile.in gnome-themes-standard-3.3.4/themes/Adwaita/metacity-1/Makefile.in --- gnome-themes-standard-3.3.3/themes/Adwaita/metacity-1/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Adwaita/metacity-1/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/gtk-2.0/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/gtk-2.0/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/gtk-2.0/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/gtk-2.0/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/gtk-3.0/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/gtk-3.0/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/gtk-3.0/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/gtk-3.0/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/48x48/animations/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/48x48/animations/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/48x48/animations/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/48x48/animations/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/48x48/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/48x48/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/48x48/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/48x48/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -119,6 +119,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/48x48/stock/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/48x48/stock/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/48x48/stock/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/48x48/stock/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -143,6 +143,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/actions/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/actions/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/actions/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/actions/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/actions-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/actions-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/actions-extra/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/actions-extra/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/apps/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/apps/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/apps/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/apps/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/apps-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/apps-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/apps-extra/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/apps-extra/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/categories/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/categories/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/categories/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/categories/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/categories-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/categories-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/categories-extra/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/categories-extra/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/devices/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/devices/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/devices/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/devices/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/devices-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/devices-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/devices-extra/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/devices-extra/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/emblems/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/emblems/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/emblems/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/emblems/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/emblems-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/emblems-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/emblems-extra/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/emblems-extra/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/emotes/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/emotes/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/emotes/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/emotes/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/emotes-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/emotes-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/emotes-extra/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/emotes-extra/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -119,6 +119,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/mimetypes/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/mimetypes/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/mimetypes/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/mimetypes/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/mimetypes-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/mimetypes-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/mimetypes-extra/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/mimetypes-extra/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/places/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/places/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/places/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/places/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/places-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/places-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/places-extra/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/places-extra/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/status/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/status/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/status/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/status/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -104,6 +104,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/status-extra/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/status-extra/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/icons/scalable/status-extra/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/icons/scalable/status-extra/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrast/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrast/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrast/Makefile.in 2011-12-19 11:24:31.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrast/Makefile.in 2012-01-17 02:13:47.000000000 +0000 @@ -143,6 +143,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrastInverse/gtk-2.0/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrastInverse/gtk-2.0/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrastInverse/gtk-2.0/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrastInverse/gtk-2.0/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrastInverse/gtk-3.0/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrastInverse/gtk-3.0/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrastInverse/gtk-3.0/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrastInverse/gtk-3.0/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrastInverse/icons/48x48/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrastInverse/icons/48x48/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrastInverse/icons/48x48/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrastInverse/icons/48x48/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -119,6 +119,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrastInverse/icons/48x48/stock/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrastInverse/icons/48x48/stock/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrastInverse/icons/48x48/stock/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrastInverse/icons/48x48/stock/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrastInverse/icons/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrastInverse/icons/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrastInverse/icons/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrastInverse/icons/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -143,6 +143,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/HighContrastInverse/Makefile.in gnome-themes-standard-3.3.4/themes/HighContrastInverse/Makefile.in --- gnome-themes-standard-3.3.3/themes/HighContrastInverse/Makefile.in 2011-12-19 11:24:32.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/HighContrastInverse/Makefile.in 2012-01-17 02:13:48.000000000 +0000 @@ -143,6 +143,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/gtk-2.0/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/gtk-2.0/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/gtk-2.0/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/gtk-2.0/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/gtk-3.0/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/gtk-3.0/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/gtk-3.0/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/gtk-3.0/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/actions/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/actions/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/actions/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/actions/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/apps/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/apps/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/apps/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/apps/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/categories/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/categories/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/categories/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/categories/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/devices/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/devices/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/devices/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/devices/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -119,6 +119,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/stock/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/stock/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/icons/48x48/stock/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/icons/48x48/stock/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -103,6 +103,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/icons/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/icons/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/icons/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/icons/Makefile.in 2012-01-17 02:13:50.000000000 +0000 @@ -143,6 +143,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/LowContrast/Makefile.in gnome-themes-standard-3.3.4/themes/LowContrast/Makefile.in --- gnome-themes-standard-3.3.3/themes/LowContrast/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/LowContrast/Makefile.in 2012-01-17 02:13:49.000000000 +0000 @@ -143,6 +143,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ diff -Nru gnome-themes-standard-3.3.3/themes/Makefile.in gnome-themes-standard-3.3.4/themes/Makefile.in --- gnome-themes-standard-3.3.3/themes/Makefile.in 2011-12-19 11:24:33.000000000 +0000 +++ gnome-themes-standard-3.3.4/themes/Makefile.in 2012-01-17 02:13:50.000000000 +0000 @@ -119,6 +119,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@