Merge lp:~compiz-team/compiz/build-fixes-part-1 into lp:~compiz/compiz/ubuntu

[Sam Spilsbury]

Testers should really test the last item in the branch pipeline lp:~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin

This branch fixes the "random build failure" due to missing dependencies. The problem was that an external plugin was linking libcompiz_core internally and would cause libcompiz_core to get rebuilt with the wrong header files. Since that plugin didn't actually need all of the functionality in libcompiz_core, the region calculation functions were separated out into a separate static library and this was linked instead.

Unmerged revisions

3203. By Sam Spilsbury on 2012-05-19

Merge first part of build fixes

3202. By Daniel van Vugt on 2012-05-18

Fix all compiler warnings and turn on -Werror again (treat warnings as errors)

3201. By Daniel van Vugt on 2012-05-17

Don't autmatically build compizconfig right now. It breaks cmake globally
and causes many different build failures, even in core components.

3200. By Sam Spilsbury on 2012-05-17

Don't depend on external compiz or libcompizconfig

3199. By Sam Spilsbury on 2012-05-17

Just have a separate pyclean for the python files

3198. By Sam Spilsbury on 2012-05-17

Fix some build cases

3197. By Sam Spilsbury on 2012-05-17

Make compizconfig build work

3196. By Sam Spilsbury on 2012-05-16

Disable things that are not useful for now

3195. By Sam Spilsbury on 2012-05-16

Adapt buildsystem for newly added branches

3194. By Sam Spilsbury on 2012-05-16

Merge lp:compiz-wallpaper-plugin

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2012-05-20 10:43:23 +0000
@@ -0,0 +1,1 @@
+po/compiz.pot
 
=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +0000
+++ AUTHORS	2012-05-20 10:43:23 +0000
@@ -0,0 +1,110 @@
+Adam Williamson <[e-mail]>
+Adel Gadllah <[e-mail]>
+Alan Griffiths <[e-mail]>
+Alan Griffiths <[e-mail]>
+Alyssa Hung <[e-mail]>
+Andrea Azzarone <[e-mail]>
+Bellegarde Cedric <[e-mail]>
+Bellegarde Cedric <[e-mail]>
+Bryan Nguyen <[e-mail]>
+C-F Language team <[e-mail]>
+Cedric <[e-mail]>
+Christopher Williams <[e-mail]>
+Christopher Williams <[e-mail]>
+Compiz Fusion l10n team <[e-mail]>
+Dan Winship <[e-mail]>
+Dan Winship <[e-mail]>
+Daniel Lea <[e-mail]>
+Daniel Nylander <[e-mail]>
+Daniel van Vugt <[e-mail]>
+Danny Baumann <[e-mail]>
+Danny Baumann <[e-mail]>
+Danny Baumann <[e-mail]>
+David Reveman <[e-mail]>
+David Reveman <david@ion.(none)>
+David Reveman <[e-mail]>
+Dennis Kasprzyk <[e-mail]>
+Dennis Kasprzyk <[e-mail]>
+Dennis Kasprzyk <[e-mail]>
+Didier Roche <[e-mail]>
+Diogo Ferreira <[e-mail]>
+Dominique Leuenberger <[e-mail]>
+Dominique Leuenberger <[e-mail]>
+Dominique Leuenberger <[e-mail]>
+Eduardo Gurgel Pinho <[e-mail]>
+Erkin Bahceci <[e-mail]>
+Gabor Kelemen <[e-mail]>
+Gerd Kohlberger <[e-mail]>
+Guillaume <[e-mail]>
+Guillaume Seguin <[e-mail]>
+James Jones <[e-mail]>
+Jason Smith <[e-mail]>
+Jay Catherwood <[e-mail]>
+Jeremy C. Reed <[e-mail]>
+Jigish Gohil <[e-mail] name = Jigish Gohil>
+Jigish Gohil <[e-mail]>
+Joel Bosveld <[e-mail]>
+Joel Bosveld <[e-mail]>
+Julian Sikorski <[e-mail]>
+Jürgen Kreileder <[e-mail]>
+Kristian Hogsberg <[e-mail]>
+Kristian Høgsberg <[e-mail]>
+Kristian Lyngstol <[e-mail]>
+Kristian Lyngstol <[e-mail]>
+Kristopher Ives <kris@leetbook2.(none)>
+Kristopher Ives <[e-mail]>
+Lubos Lunak <[e-mail]>
+Michael Vogt <[e-mail]>
+Mike Cook <[e-mail]>
+Mike Dransfield <[e-mail]>
+Mikkel Kamstrup Erlandsen <[e-mail]>
+Mirco Muller <[e-mail]>
+Nicolas Delvaux <[e-mail]>
+Nicolas Viennot <[e-mail]>
+Owen W. Taylor <[e-mail]>
+Patrick Niklaus <[e-mail]>
+Patrick Niklaus <[e-mail]>
+Patrick Niklaus <[e-mail]>
+Per Wigren <[e-mail]>
+Quinn Storm <[e-mail]>
+Quinn Storm <quinn@quinn-laptop.(none)>
+Randolph Chung <[e-mail]>
+Rob Taylor <[e-mail]>
+Robert Ancell <[e-mail]>
+Robert Carr <racarr@gorbie.(none)>
+Robert Carr <robb@gorbachev.(none)>
+Robert Noland <[e-mail]>
+Roi Cohen <racarr@gorbie.(none)>
+Roi Cohen <[e-mail]>
+Roland Baer <roland@Vista.(none)>
+Roland Bar <[e-mail]>
+Roland Bär <roland@Vista.(none)>
+Roland Bär <[e-mail]>
+Sam <[e-mail]>
+Sam Spilsbury <[e-mail]>
+Sam Spilsbury <[e-mail]>
+Sam Spilsbury <[e-mail]>
+Sam Spilsbury <smspillaz@XPS-FEDORA.(none)>
+Sam Spilsbury <smspillaz@XPS-U.(none)>
+Sam Spilsbury <[e-mail]>
+Sam Spilsbury <smspillaz@smspillaz-desktop.(none)>
+Scott Moreau <[e-mail]>
+Sebasian Billaudelle <[e-mail]>
+Steven Robertson <[e-mail]>
+Stjepan Glavina <[e-mail]>
+Søren Sandmann <[e-mail]>
+Thierry Reding <[e-mail]>
+Thomas Voss <[e-mail]>
+Tim Penhey <[e-mail]>
+Time Penhey <[e-mail]>
+Tomas Carnecky <[e-mail]>
+Travis Watkins <[e-mail]>
+Unity <unity@VB-U1010.(none)>
+Ville Syrjala <[e-mail]>
+Zack Rusin <[e-mail]>
+dragoran <[e-mail]>
+gandalfn <[e-mail]>
[e-mail] <[e-mail]>
+moppsy <[e-mail]>
+scott <[e-mail]>
+Δημήτρης (djdoo) <[e-mail]>
 
=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2012-05-20 10:43:23 +0000
@@ -0,0 +1,193 @@
+#
+# Main CMakeLists.txt for compiz
+#
+project (compiz)
+
+set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
+set (COMPIZ_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${COMPIZ_CMAKE_MODULE_PATH})
+
+# Common compiz CMake macros & functions.
+include (CompizCommon)
+# Packaging-specific CMake macros & functions.
+include (CompizPackage)
+include (cmake/base.cmake)
+# Check if specific function is present in library.
+include (CheckFunctionExists)
+
+enable_testing()
+
+# Import macro for doing coverage reporting
+include(EnableCoverageReport)
+
+#####################################################################
+# Enable code coverage calculation with gcov/gcovr/lcov
+# Usage:
+#  * Switch build type to coverage (use ccmake or cmake-gui)
+#  * Invoke make, make test, make coverage
+#  * Find html report in subdir coveragereport
+#  * Find xml report feasible for jenkins in coverage.xml
+#####################################################################
+IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
+  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+
+#set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRe" CACHE INTERNAL "" FORCE)
+#if (NOT CMAKE_BUILD_TYPE)
+#    set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE)
+#endif (NOT CMAKE_BUILD_TYPE)
+
+file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0)
+string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
+
+set (VERSION ${COMPIZ_RELEASE_VERSION})
+
+set (DECOR_INTERFACE_VERSION 20110504)
+
+if (COMPIZ_PACKAGING_ENABLED)
+    set (prefix ${CMAKE_INSTALL_PREFIX}                   CACHE PATH "prefix")
+    set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin          CACHE PATH "bindir")
+    set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}  CACHE PATH "libdir")
+    set (includedir ${CMAKE_INSTALL_PREFIX}/include       CACHE PATH "includedir")
+    set (datadir ${CMAKE_INSTALL_PREFIX}/share            CACHE PATH "datadir")
+else (COMPIZ_PACKAGING_ENABLED)
+    set (prefix ${CMAKE_INSTALL_PREFIX}                 )
+    set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin        )
+    set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+    set (includedir ${CMAKE_INSTALL_PREFIX}/include     )
+    set (datadir ${CMAKE_INSTALL_PREFIX}/share          )
+endif (COMPIZ_PACKAGING_ENABLED)
+
+set (compiz_plugindir ${libdir}/compiz)
+set (compiz_sharedir ${datadir}/compiz/)
+set (compiz_metadatadir ${datadir}/compiz)
+set (COMPIZ_I18N_DIR ${CMAKE_SOURCE_DIR}/po)
+
+# Translation
+set (ALL_LINGUAS af ar bg bn bn_IN bs ca cs cy da de el en_GB en_US es eu et fi fr gl gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl or pa pl pt pt_BR ro ru sk sl sr sv ta tr uk vi xh zh_CN zh_TW zu)
+set (GETTEXT_PACKAGE compiz)
+
+find_package (Boost 1.34.0 REQUIRED serialization)
+
+set (COMPIZ_REQUIRES
+    x11
+    xext
+    xdamage
+    xcomposite
+    x11-xcb
+    xrandr
+    xinerama
+    xext
+    ice
+    sm
+    libxml-2.0
+    libxslt
+    glib-2.0
+    gio-2.0
+    glibmm-2.4
+    "libstartup-notification-1.0 >= 0.7"
+)
+
+set (DECORATION_REQUIRES xrender)
+
+compiz_pkg_check_modules (COMPIZ REQUIRED ${COMPIZ_REQUIRES})
+compiz_pkg_check_modules (LIBDECORATION REQUIRED ${DECORATION_REQUIRES})
+
+list (APPEND COMPIZ_LIBRARIES ${Boost_LIBRARIES})
+
+include (CompizDefaults)
+
+set (COMPIZ_CFLAGS "${COMPIZ_CFLAGS} -I${Boost_INCLUDE_DIR}")
+
+set (_compiz_package_string "Compiz ${VERSION}")
+set (_compiz_package "Compiz")
+
+compiz_configure_file (${compiz_SOURCE_DIR}/config.h.core.in ${compiz_BINARY_DIR}/generated/config.h)
+
+compiz_configure_file (
+    ${CMAKE_SOURCE_DIR}/compiz.pc.in
+    ${CMAKE_BINARY_DIR}/compiz.pc
+    COMPIZ_REQUIRES
+    COMPIZ_CFLAGS
+)
+
+install (
+    FILES ${CMAKE_BINARY_DIR}/compiz.pc
+    DESTINATION ${COMPIZ_DESTDIR}${libdir}/pkgconfig
+)
+
+# Build Google Test and make its headers known
+find_package (GTest)
+
+if (NOT GTEST_FOUND)
+
+    # Check for google test and build it locally
+    set (GTEST_ROOT_DIR
+	"/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
+	CACHE
+	PATH
+	"Path to Google test srcs"
+    )
+
+    find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
+
+    if (GTEST_INCLUDE_DIR)
+	#FIXME - hardcoded is bad!
+	add_subdirectory (${GTEST_ROOT_DIR}
+		      gtest)
+    endif(GTEST_INCLUDE_DIR)
+
+    set (GTEST_BOTH_LIBRARIES gtest gtest_main)
+    set (GTEST_FOUND TRUE)
+
+endif (NOT GTEST_FOUND)
+
+find_library (GMOCK_LIBRARY gmock)
+find_library (GMOCK_MAIN_LIBRARY gmock_main)
+
+if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+  message ("Google Mock and Google Test not found - cannot build tests!")
+  set (COMPIZ_BUILD_TESTING OFF)
+endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+
+include_directories (${GTEST_INCLUDE_DIRS})
+
+find_package (Threads REQUIRED)
+
+# Disabled until we can sort dependency issues
+set (COMPIZ_DISABLE_PLUGIN_ANIMATIONADDON ON)
+
+# Add the rest of compiz
+add_subdirectory (cmake)
+add_subdirectory (include)
+add_subdirectory (images)
+add_subdirectory (libdecoration)
+add_subdirectory (gtk)
+add_subdirectory (kde)
+add_subdirectory (po)
+add_subdirectory (metadata)
+add_subdirectory (src)
+add_subdirectory (compizconfig)
+add_subdirectory (xslt)
+add_subdirectory (plugins)
+add_subdirectory (tests)
+
+compiz_ensure_linkage ()
+compiz_package_generation ("Compiz")
+compiz_add_uninstall ()
+compiz_add_git_dist ()
+compiz_add_distcheck ()
+compiz_add_release ()
+compiz_add_release_signoff ()
+
+_print_configure_results ()
+
+_check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG})
+
+# Enable coverage reporting for compiz
+enable_coverage_report()
+
+
 
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2012-05-20 10:43:23 +0000
@@ -0,0 +1,6 @@
+Most of the code is MIT licensed, some code is instead licensed
+under the LGPL and some under the GPL. Each source code file
+contain a header that describes the license for the code in that
+specific file.
+
+For More information see COPYING.GPL, COPYING.LGPL and COPYING.MIT.
 
=== added file 'COPYING.GPL'
--- COPYING.GPL	1970-01-01 00:00:00 +0000
+++ COPYING.GPL	2012-05-20 10:43:23 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
 
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
 
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
 
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
 
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
 
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
 
=== added file 'COPYING.LGPL'
--- COPYING.LGPL	1970-01-01 00:00:00 +0000
+++ COPYING.LGPL	2012-05-20 10:43:23 +0000
@@ -0,0 +1,510 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
 
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
 
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
 
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
 
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
 
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
 
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
 
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
 
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
 
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
 
=== added file 'COPYING.MIT'
--- COPYING.MIT	1970-01-01 00:00:00 +0000
+++ COPYING.MIT	2012-05-20 10:43:23 +0000
@@ -0,0 +1,21 @@
+
+Copyright © 2005 Novell, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of
+Novell, Inc. not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior permission.
+Novell, Inc. makes no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or
+implied warranty.
+
+NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, 
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 \ No newline at end of file
 
=== added file 'ChangeLog'
--- ChangeLog	1970-01-01 00:00:00 +0000
+++ ChangeLog	2012-05-20 10:43:23 +0000
@@ -0,0 +1,18849 @@
+Merge: 86bbd39 a7f5dbb
+Sam Spilsbury <[e-mail]>	2011-08-20
+
+    Merge upstream
+
+Sam Spilsbury <[e-mail]>	2011-08-20
+
+    Bump VERSION to reflect temporary release
+
+Sam Spilsbury <[e-mail]>	2011-08-20
+
+    Fix stray .reset ()
+
+Merge: 1be316e 126f2a2
+Sam Spilsbury <[e-mail]>	2011-08-20
+
+    Merge upstream
+
+Merge: 1852f86 1852f86
+Sam Spilsbury <[e-mail]>	2011-08-20
+
+    Merge upstream
+
+Sam Spilsbury <[e-mail]>	2011-08-20
+
+    Bump VERSION
+
+Sam Spilsbury <[e-mail]>	2011-08-20
+
+    Update NEWS for 0.9.5.92
+
+Merge: 8495379 825d16b
+Sam Spilsbury <[e-mail]>	2011-08-19
+
+    Merge upstream
+
+Merge: 825d16b c9b0a19
+Sam Spilsbury <[e-mail]>	2011-08-19
+
+    Merge in lp:~compiz-team/compiz-core/compiz-core.add_doc_for_decor
+
+Merge: 41f088c c12c848
+Sam Spilsbury <[e-mail]>	2011-08-19
+
+    Merge lp:~compiz-team/compiz-core/compiz-core.distortion_fixes
+
+Merge: b0a1b5e 3504586
+Tim Penhey <[e-mail]>	2011-08-19
+
+    Merge lp:~thumper/compiz-core/fix-crash-on-event-source-cleanup
+
+Sam Spilsbury <[e-mail]>	2011-08-19
+
+    Fix some other places we were using priv->attrib incorrectly
+
+Sam Spilsbury <[e-mail]>	2011-08-19
+
+    Added comment explaining why we can't do that
+
+Merge: 01d92ab b0a1b5e
+Sam Spilsbury <[e-mail]>	2011-08-19
+
+    Merge trunk
+
+Tim Penhey <[e-mail]>	2011-08-19
+
+    Don't have a wrapped CompEventSource as there is a bug in the destruction code.
+
+Tim Penhey <[e-mail]>	2011-08-19
+
+    Explicit constructors only make a difference when there is the ability to pass in a single argument.
+
+Tim Penhey <[e-mail]>	2011-08-19
+
+    Header now says to create an unwrapped event source.
+
+Tim Penhey <[e-mail]>	2011-08-19
+
+    Create an unwrapped CompEventSource.
+
+Merge: ab71bc8 9f4cdd6
+Sam Spilsbury <[e-mail]>	2011-08-19
+
+    Merge
+
+Merge: 9f4cdd6 a8d1bcd
+Sam Spilsbury <[e-mail]>	2011-08-19
+
+    Merge in ICCCM 4.1.4 support
+
+Sam Spilsbury <[e-mail]>	2011-08-18
+
+    Correctly support ICCCM Section 4.1.4
+
+Sam Spilsbury <[e-mail]>	2011-08-13
+
+    Don't damage the paint rectangle in normal resize mode (fixed valgrind warning)
+
+Sam Spilsbury <[e-mail]>	2011-08-13
+
+    Use priv->geometry rather than priv->attrib, since priv->attrib could be updated by XGetWindowAttributes
+    which is a synchronous operation
+
+Sam Spilsbury <[e-mail]>	2011-08-13
+
+    Don't check against the XWindowAttributes that are stored when sending resize
+    notfications, since they could have been updated synchronously with XGetWindowAttributes
+    and could be out of sync with the geometry last received from the server which is what
+    we need to process requests based on.
+    
+    Fixes cases where plugins didn't get that geometry update because of this condition,
+    which caused bugs like distorted windows in opengl since the window matrices were
+    wrong
+
+Sam Spilsbury <[e-mail]>	2011-08-12
+
+    memset the active window history so that we aren't jumping on unitialized garbage
+    in the array of windows
+
+Time Penhey <[e-mail]>	2011-08-12
+
+    Merge in flags change for dlopen () on debug builds (dlclosing () with valgrind
+    is a bit useless)
+
+Time Penhey <[e-mail]>	2011-08-12
+
+    Merge in source reset change
+
+Merge: 28cab1d e6cb461
+Sam Spilsbury <[e-mail]>	2011-08-12
+
+    Merge in GSettings CMake file change
+
+Sam Spilsbury <[e-mail]>	2011-08-10
+
+    Disable core-settings-schema too
+
+Sam Spilsbury <[e-mail]>	2011-08-10
+
+    Add option to disable GSettings schema generation
+
+Ville Syrjala <[e-mail]>	2011-08-02
+
+    [PATCH] Don't unredirect overlay windows until we have set the new
+    bounding shape for the output window.
+    
+    Unredirecting them before this time meant that they were stacked
+    underneath the overlay window and changing the bounding shape of
+    the output window would cause an expose event to be sent to
+    the overlay window causing a breif flicker as it redraws.
+    
+    Unredirecting after this means that no expose event is sent because
+    the backing store is only set again after the bounding shape of the
+    output window has been changed
+
+Merge: ceab806 f2b2dc4
+Sam Spilsbury <[e-mail]>	2011-07-29
+
+    Merge trunk
+
+Merge: f2b2dc4 c9b0a19
+Sam Spilsbury <[e-mail]>	2011-07-29
+
+    Merge in doc for decor
+
+Merge: 7347a7c 3bdb2ef
+Andrea Azzarone <[e-mail]>	2011-07-28
+
+    Merge in lp:~andyrock/compiz-core/fix-1309
+
+Andrea Azzarone <[e-mail]>	2011-07-27
+
+    If an argument to a strcmp function has an invalid value (null pointer, etc.) the behavior is undefined.
+
+Merge: 3264985 4217940
+Sam Spilsbury <[e-mail]>	2011-07-27
+
+    Merge
+
+Merge: a44844f 4bb1f70
+Sam Spilsbury <[e-mail]>	2011-07-27
+
+    Merge in gsettings schema generation
+
+Sam Spilsbury <[e-mail]>	2011-07-26
+
+    Use relocatable keys
+
+Sam Spilsbury <[e-mail]>	2011-07-26
+
+    Merge in gsettings schema generation
+
+Scott Moreau <[e-mail]>	2011-07-14
+
+    Merge in default value change for obs
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Fix typo, also add files that are being copied into staging
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Bump VERSION
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Update NEWS for 0.9.5.0
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Revert "Update NEWS for 0.9.5.0"
+    
+    This reverts commit a6e2ea3adf61e57bdcd4c5c957ce8e7223a9fb0b.
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Revert "Bump VERSION"
+    
+    This reverts commit bedeff5d74a2786dd2751fab9e48bf3f96b7790e.
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Revert "Update NEWS for 0.9.5.0"
+    
+    This reverts commit f37eda58232743ce28eb780075c1a4b73545a209.
+
+Merge: 2804807 bedeff5
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Bump VERSION
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Update NEWS for 0.9.5.0
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Bump VERSION
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Update NEWS for 0.9.5.0
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Merge in build fix and debug message removal
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Fix for bad merge, unbreak plugin build
+
+Sam Spilsbury <[e-mail]>	2011-07-14
+
+    Merge in build changes
+
+Sam Spilsbury <[e-mail]>	2011-07-13
+
+    Disable BUILD_KDE4 in the distcheck target for now as upstream KDE has moved
+    some header files around and this is breaking the build check
+
+Sam Spilsbury <[e-mail]>	2011-07-08
+
+    Merge in fix to ftbfs in some cases
+
+Merge: ee98496 e43159f
+Sam Spilsbury <[e-mail]>	2011-07-08
+
+    Merge in lp:~smspillaz/compiz-core/compiz-core.dist-buildsystem and turn
+    CTest on by default for everything
+
+Sam Spilsbury <[e-mail]>	2011-07-08
+
+    Nitpicking and fix FTBFS on bzr
+
+Sam Spilsbury <[e-mail]>	2011-07-08
+
+    Drop support for bz2, add targets for release uploads, cleanup
+
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Add various fixes for distcheck, source distributions without a VCS
+    and non-C sources (eg python bindings where we can't do try_compile
+    because C and CXX are not in the enabled languages)
+
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Add a proper set of a release targets in the CMake buildsystem for all compiz
+    projects to use
+    
+    make release-prep: generates NEWS ChangeLog and AUTHORS file
+    make distcheck: generates a tarball
+    make release-signoff: signs the tarball using the key in RELEASE_KEY and if
+    in a git repository, creates tags and branches for that
+
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Add VERSION file
+
+Merge: 0550e09 b9d6583
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Merge in lp:~unity-team/compiz-core/compiz-core.fix_706918 and hook
+    PluginClassHandler tests into make test
+
+Merge: a1268e2 7844ea3
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Merge in lp:~unity-team/compiz-core/compiz-core.fix_722830
+
+Merge: f914d15 ab21ddc
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Merge in lp:~unity-team/compiz-core/compiz-core.fix_802373
+
+Merge: faf527f 82a73b8
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Merge in lp:~smpillaz/compiz-core/compiz-core.fix_804683
+
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Remove debugging code
+
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Move timer tests into tests/timer/
+
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Revamp the unit tests, split into four separate tests, one for
+    implicit creation on get, one for construction, one for type names
+    and one for index sanity checking
+
+Sam Spilsbury <[e-mail]>	2011-07-07
+
+    Initialize index even if allocating the plugin class failed due to a buggy
+    base class
+
+Sam Spilsbury <[e-mail]>	2011-07-06
+
+    Add missing files
+
+Sam Spilsbury <[e-mail]>	2011-07-06
+
+    Remove useless #warning
+
+Sam Spilsbury <[e-mail]>	2011-07-06
+
+    Split tests up into files, poke timer.cpp, make test-timer link to the tests
+    and enable CTest
+
+Sam Spilsbury <[e-mail]>	2011-07-06
+
+    Add missing file
+
+Sam Spilsbury <[e-mail]>	2011-07-05
+
+    Test for basic value modification
+
+Sam Spilsbury <[e-mail]>	2011-07-05
+
+    Return 1 on the program if the test fails
+
+Sam Spilsbury <[e-mail]>	2011-07-05
+
+    Add more tests for timers
+
+Sam Spilsbury <[e-mail]>	2011-07-05
+
+    Add unit tests for timers
+
+Sam Spilsbury <[e-mail]>	2011-07-05
+
+    Break the dependency between CompTimeoutSource and CompTimer
+
+Sam Spilsbury <[e-mail]>	2011-07-05
+
+    Use a private implementation for CompTimer
+
+Sam Spilsbury <[e-mail]>	2011-07-05
+
+    Further break the dependency of timers on screen
+
+Sam Spilsbury <[e-mail]>	2011-07-04
+
+    Break CompTimer's dependency on CompScreen
+
+Sam Spilsbury <[e-mail]>	2011-07-04
+
+    Avoid useless calls to ::stop (). Also put ::get_time after ::attach
+    because the source must always be attached before the monotonic
+    time can be retreived
+
+Sam Spilsbury <[e-mail]>	2011-07-04
+
+    Don't use clock_getttime () directly, as there are some cases where
+    that clock can run backwards and cause our timers to mess up. GLib
+    handles this case for us, use Glib::Source::get_time in that case
+
+Sam Spilsbury <[e-mail]>	2011-06-29
+
+    Added a distcheck target
+
+Sam Spilsbury <[e-mail]>	2011-06-29
+
+    Add a more comprehensive dist target which detects running in
+    bzr, git, git with submodules and in no vcs and makes a tarball
+    no matter what and the right way
+
+Sam Spilsbury <[e-mail]>	2011-06-27
+
+    Convert to bell option
+
+Sam Spilsbury <[e-mail]>	2011-06-25
+
+    Added PluginClassHandler test
+
+Sam Spilsbury <[e-mail]>	2011-06-25
+
+    Abstract out CompPrivate storage from CompScreen so we can make it testable
+
+Sam Spilsbury <[e-mail]>	2011-06-24
+
+    Use priv->border instead of priv->input as the EWMH says that applications
+    which request to move their windows (through a normal ConfigureRequest)
+    should take into account the decoration extents and not the border extents.
+    
+    Fixes LP#722830
+
+Merge: d0f83cc 4d0f3bb
+Sam Spilsbury <[e-mail]>	2011-06-23
+
+    Merge in fix for LP#800592
+
+Sam Spilsbury <[e-mail]>	2011-06-23
+
+    Fix double call to ::updateAttributes where raise on click is enabled and
+    grabbing a window to move it would also raise the window
+
+Sam Spilsbury <[e-mail]>	2011-06-23
+
+    Fix warnings
+
+Sam Spilsbury <[e-mail]>	2011-06-23
+
+    Fix typo which caused docks to be stacked relative to override redirect windows
+    and unmapped windows or other docks when shuffling stacking to be below
+    fullscreen windows that are active
+
+Sam Spilsbury <[e-mail]>	2011-06-18
+
+    Add documentation for the decor plugin
+
+Merge: 291627c 40849c0
+Sam Spilsbury <[e-mail]>	2011-06-18
+
+    Merge in fix for bad merge
+
+Sam Spilsbury <[e-mail]>	2011-06-18
+
+    Fix typo which caused decorations to be updated recursively because
+    CompWindow::resize () would always send fake resize notify events to
+    core which would then cause CompWindow::resize () to be called again
+    with no geometry change etc etc
+
+Sam Spilsbury <[e-mail]>	2011-06-17
+
+    Refactor the code somewhat
+
+Sam Spilsbury <[e-mail]>	2011-06-17
+
+    Make ::get () return a new class instance and initialize the index
+    if it hasn't been done already for this particular kind of class.
+    
+    Fixes LP#706918
+
+Sam Spilsbury <[e-mail]>	2011-06-16
+
+    Fix typo which caused decorations to be updated recursively because
+    CompWindow::resize () would always send fake resize notify events to
+    core which would then cause CompWindow::resize () to be called again
+    with no geometry change etc etc
+
+Merge: 6fc939d 9dfc108
+Sam Spilsbury <[e-mail]>	2011-06-09
+
+    Fixes LP#795065
+    
+    -------------  This line and the following will be ignored --------------
+    
+    modified:
+      src/window.cpp
+    unknown:
+      build/
+      po/compiz.pot
+    pending merges:
+      Sam Spilsbury 2011-05-25 Fix events going to frame windows when they sho...
+
+Merge: 9e6c11d a282aba
+Sam Spilsbury <[e-mail]>	2011-06-09
+
+    Fixes LP#761616
+    
+    ------------ This line and the following will be ignored --------------
+    
+    modified:
+      src/screen.cpp
+      src/window.cpp
+    unknown:
+      build/
+      po/compiz.pot
+    pending merges:
+      Sam Spilsbury 2011-05-25 Restore selected event masks already rather tha...
+
+Merge: 79fe2cd 08828ed
+Sam Spilsbury <[e-mail]>	2011-06-09
+
+    Merge in lp:~unity-team/compiz-core/compiz-core.one_property_decor
+
+Merge: 901d4a1 c6291da
+Sam Spilsbury <[e-mail]>	2011-06-09
+
+    Merge in ~unity-team/compiz-core/compiz-core.bits_and_pieces_2011_05_21
+
+Merge: 2e57966 0545c16
+Sam Spilsbury <[e-mail]>	2011-06-09
+
+    Merge in dock stacking fix
+
+Merge: 67e833c 32affe0
+Sam Spilsbury <[e-mail]>	2011-06-09
+
+    Merge in emacs fix
+
+Merge: c6f456e a02b427
+Sam Spilsbury <[e-mail]>	2011-06-09
+
+    Merge in Scott's change from upstream
+
+Merge: f3a1776 f3a1776
+Sam Spilsbury <[e-mail]>	2011-06-09
+
+    Merge in relevant branches
+
+Scott Moreau <[e-mail]>	2011-05-27
+
+    Redetect devices unconditionally when handling ConfigureNotify event. This fixes the case where an output was moved but outputChangeNotify is not called.
+
+Merge: 2550d7e e6afcfd
+Sam Spilsbury <[e-mail]>	2011-06-01
+
+    Merge in bell fix
+
+Sam Spilsbury <[e-mail]>	2011-06-01
+
+    Fix typo in initBellValue which stopped bell actions from working
+
+Merge: 17a6530 b4d9e29
+Sam Spilsbury <[e-mail]>	2011-05-31
+
+    Merge in from lp:compiz-core
+
+Merge: 763acbb 6e4da8c
+Sam Spilsbury <[e-mail]>	2011-05-31
+
+    Merge in frame fix for switcher decorations
+
+Merge: b4d9e29 a9ac70d
+Sam Spilsbury <[e-mail]>	2011-05-31
+
+    Merge to fix broken copytex plugin
+
+Merge: 698db76 dd8ec2a
+Sam Spilsbury <[e-mail]>	2011-05-31
+
+    Fix some tray icons appearing at 1px, check the override redirect state
+    and window parent at unreparent and reparent time.
+
+Merge: a39f7e3 a39f7e3
+Sam Spilsbury <[e-mail]>	2011-05-31
+
+    Merge
+
+Sam Spilsbury <[e-mail]>	2011-05-31
+
+    Fix crash with copytex. Use shared_ptr
+
+Sam Spilsbury <[e-mail]>	2011-05-30
+
+    Ensure the switcher window is unmapped after the switcher goes away
+
+Sam Spilsbury <[e-mail]>	2011-05-30
+
+    Fix windows appearing at small sizes
+
+Sam Spilsbury <[e-mail]>	2011-05-28
+
+    Fix typo in comment
+
+Sam Spilsbury <[e-mail]>	2011-05-28
+
+    Typo
+
+Sam Spilsbury <[e-mail]>	2011-05-28
+
+    Read the current override redirect state as the client may have
+    changed it while CreateNotify is being processed and thus
+    we could be reparenting and override redirect window.
+    
+    Also ensure that when unreparenting windows that their
+    parent is still the wrapper window, otherwise
+    don't bother to reparent them back into the root
+    window, this will only cause trouble.
+    
+    Fixes LP#767095
+
+Sam Spilsbury <[e-mail]>	2011-05-26
+
+      XSync right after configureXWindow in cases where we
+      need to immediately reorder the window stack.
+    
+      This isn't a real fix, but at least fixes the following situation without
+      breaking the API and ABI
+    
+      Windows stacked A, B, C
+    
+      Plugin does: C->raise (), B->raise (), A->raise ()
+      Window list should read at this point: ... C, B, A ... (screen->windows ())
+      However, the output buffer hasn't been flushed at this point
+      so server side we will have A, B, C.
+    
+      Now if a sneaky client tries to restack A above C, we will get the
+      ConfigureRequest for that, and instead of getting B, C, A like the client
+      expects, we'll actually get C, B, A.
+    
+      The real solution is to have a list of windows last sent to the server
+      and a list of windows last recieved by it. That way plugins can
+      mess with the internal stack all they want, but when recieving
+      events for X as to the actual state of things, they can restack relative
+      to the server list.
+
+Sam Spilsbury <[e-mail]>	2011-05-25
+
+    Fix events going to frame windows when they shouldn't
+    since the client is already unmapped and there is no
+    reason a huge frame window should block input when
+    the client is animating out anyways
+
+Sam Spilsbury <[e-mail]>	2011-05-25
+
+    Restore selected event masks already rather than using hardcoded ones
+    
+    Fixes LP #761616 where edge buttons wouldn't work because we'd select
+    for button events and then they wouldn't get restored at all
+
+Merge: 342ad2f 3ea8ae7
+Sam Spilsbury <[e-mail]>	2011-05-20
+
+    Merge git://git.compiz.org/compiz/core
+
+Scott Moreau <[e-mail]>	2011-05-17
+
+    Use CMAKE_PREFIX_PATH when searching for libraries.
+
+Scott Moreau <[e-mail]>	2011-05-13
+
+    * Bump version to 0.9.5
+
+Sam Spilsbury <[e-mail]>	2011-05-08
+
+    Add hack to allow the KDE4 Window decorator to work correctly with the new
+    decoration interface, until KDE4 Window decorator is re-written to allow
+    for decoration lists.
+    
+    Note that this gives public access to KWD::Decorator, which is a bad thing.
+    
+    The way this works is to create two separate frames for inactive and active
+    decoration, and when one property is written to update the other.
+
+Sam Spilsbury <[e-mail]>	2011-05-08
+
+    Remove setting of "_COMPIZ_WINDOW_DECOR_NORMAL" put decorations with
+    state == ~DECOR_WINDOW_FOCUS in the default decorations list instead
+
+Sam Spilsbury <[e-mail]>	2011-05-08
+
+    Remove DECOR_NORMAL, just read all default decorations from a property
+    and match the state
+
+Sam Spilsbury <[e-mail]>	2011-05-08
+
+    Remove DECOR_NORMAL_ATOM_NAME, the API is now to put all default decorations
+    in a list in one property
+
+Scott Moreau <[e-mail]>	2011-05-06
+
+    Respect CMAKE_PREFIX_PATH and CMAKE_INCLUDE_PATH when searching for headers.
+
+Sam Spilsbury <[e-mail]>	2011-05-08
+
+    Place relative to frame size
+
+Sam Spilsbury <[e-mail]>	2011-05-08
+
+    Fix variable mismatch
+
+Sam Spilsbury <[e-mail]>	2011-05-08
+
+    Use bitwise or, not and.
+
+Sam Spilsbury <[e-mail]>	2011-05-07
+
+    Clean up type detection code, move into its own function
+
+Sam Spilsbury <[e-mail]>	2011-05-07
+
+    Check the actual decor properties on the window and not the default ones
+
+Sam Spilsbury <[e-mail]>	2011-05-07
+
+    Support -std=c++0x
+
+Sam Spilsbury <[e-mail]>	2011-05-07
+
+    Support new decoration API
+
+Sam Spilsbury <[e-mail]>	2011-05-07
+
+    Support different frame types, states and actions in frame properties
+
+Sam Spilsbury <[e-mail]>	2011-05-07
+
+    Support multiple frames and frames of different types, states, etc
+    in the decor plugin
+
+Sam Spilsbury <[e-mail]>	2011-05-07
+
+    Bump decoration API
+
+Sam Spilsbury <[e-mail]>	2011-05-07
+
+    Update API to allow multiple frames in one property (frame caching,
+    multiple default frame styles) and also to allow decorators to specify
+    in the frame property which window types, states and actions the frames
+    should apply to
+
+Sam Spilsbury <[e-mail]>	2011-05-04
+
+    Add modal dialog type and also fix typo
+
+Sam Spilsbury <[e-mail]>	2011-05-04
+
+    Fix warning
+
+Sam Spilsbury <[e-mail]>	2011-05-04
+
+    Restack docks primarily when the focus changes to support cases where we
+    change viewports and dock windows need to be restacked even though the
+    window that we switched to wasn't restacked. Also support always-on-top
+    and fullscreen windows.
+
+Sam Spilsbury <[e-mail]>	2011-05-03
+
+    Send a fake configure notify event when the window size doesn't change
+    on frame update since other plugins need to know when the client window
+    changed geometry.
+
+Scott Moreau <[e-mail]>	2011-04-30
+
+    Add resize_from_center option.
+
+Scott Moreau <[e-mail]>	2011-04-30
+
+    Cleanup resize options.
+
+Sam Spilsbury <[e-mail]>	2011-05-01
+
+    Fix stupid porting bug that allowed windows like emacs to resize themselves
+    off the edge of the screen
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Use premultiplied alpha in resize outline and border
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+      Check if ancestor to transient is allowed to have focus before granting focus
+      to it.
+    
+      Some stupid apps like thunderbird unmap the transient parent before unmapping
+      the child, so compiz will get all confused and try to give focus to the
+      unmapped window
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Track windows on CreateNotify again, don't rely on trying to beat the race
+    condition by putting that on MapRequest, instead check at reparent time
+    if the window has already been reparented server-side and don't reparent it
+    again.
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Don't crash if switch window can't be found
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Set correct DISPLAY env when launching commands. Do not force :0
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Also take into account server border geometry when positioning
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Always take into account border geometry when calculating actual window size
+    since we make an XGetGeometry call and take into account the border when
+    comparing sizes there. Fixes resize bugs with xterm
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Release implicit grabs as soon as we handle events.
+    
+    Implicit keyboard grabs which are created by the pressing and holding of a key
+    that was passively grabbed by XGrabKey are evil for a number of reasons.First
+    of all, there isn't any way to track them or to track which window they are
+    grabbed on so if a plugin makes an active grab and then releases it, the
+    passive grab is released on release, which means there is an inconsistency
+    between holding the key and having the grab. Secondly, if plugins actually
+    need a grab on all keys, they are better switching to an active grab
+    rather than relying on the passive one. Finally, if there is a passive grab by
+    another application by a key-modifier combo which has the same modifier mask
+    as the currently activated passive grab, then it means that this application
+    won't get its grab activated as long as the modifier is held down.
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Also check match options before defaulting to global option
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Don't ignore the match value when setting centered on xkbevent
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Fix indentation
+
+Sam Spilsbury <[e-mail]>	2011-04-30
+
+    Always monitor key events even when window isn't grabbed
+
+Sam Spilsbury <[e-mail]>	2011-03-23
+
+    Bump core ABI
+
+Sam Spilsbury <[e-mail]>	2011-03-23
+
+    Don't treat synthetic UnmapNotify the same as the real UnmapNotify
+    
+    ICCCM section 4.1.4 says that applications need to send us a synthetic
+    UnmapNotify to tell us that the window has been withdrawn in all cases
+    to cover the case where a window is already unmapped and then withdrawn.
+    
+    In this case we should handle the UnmapNotify as a request to withdraw
+    the window, but we should only handle the *real* UnmapNotify request
+    as a request to actually process the window being unmapped and withdraw
+    it there, rather than processing both twice and withdrawing the window
+    twice
+
+Sam Spilsbury <[e-mail]>	2011-03-22
+
+    Revert "If an unexpected window gets focus (e.g. by a client calling XSetInputFocus directly), make sure that moving the input focus to a default window still works when that window is closed."
+    
+    This reverts commit 1fb701594b78e950c031974d83c3566d1d648156.
+    
+    There are some problems created by this commit, reverting for now until they
+    can be evauluated
+    
+    Conflicts:
+    
+src/event.cpp           
+
+Scott Moreau <[e-mail]>	2011-03-18
+
+    Remove unused macro.
+
+Sam Spilsbury <[e-mail]>	2011-03-18
+
+    Set unmanaging before managed
+
+Sam Spilsbury <[e-mail]>	2011-03-18
+
+    Only set w->unmanaging if the window was actually managed
+    
+84a27e08e8e2f6c3a70ee7966624411e0e330db4 to master        Forward port    
+
+Merge: 0b2ed28 08ba72d
+Sam Spilsbury <[e-mail]>	2011-03-18
+
+    Merge https://github.com/robtaylor/compiz
+
+Sam Spilsbury <[e-mail]>	2011-03-18
+
+    Fix warning
+
+Scott Moreau <[e-mail]>	2011-03-18
+
+    If the root window gets focus, unset activeWindow before calling focusDefaultWindow to make sure the latter really focusses another window.
+    
+    Forward port 33f695e7c6e4fb8ac627df0978fea7771fe1b3d5 to master
+
+Scott Moreau <[e-mail]>	2011-03-18
+
+    If an unexpected window gets focus (e.g. by a client calling XSetInputFocus directly), make sure that moving the input focus to a default window still works when that window is closed.
+    
+556b681adaab3fe27fa456037be82e902dd371be to master        Forward port    
+
+Scott Moreau <[e-mail]>	2011-03-18
+
+    Don't grant focus to override_redirect windows. Most other window managers don't even track override_redirect windows, so applications relying on the focus being granted to override_redirect windows are broken anyway.
+    
+    Forward port 30a92d8a060d79181a28840d7c66428ef431200c to master
+
+Scott Moreau <[e-mail]>	2011-03-18
+
+    Don't let focus stay on the root window. It may happen that the root window is focussed, e.g. by some client calling XSetInputFocus with the root window as target. As that most likely isn't what the user wants, focus the default window instead.
+    
+    Forward port a9a35b6034517404b0c3ed4296f0c33d7d8d1d11 to master
+
+Sam Spilsbury <[e-mail]>	2011-03-18
+
+    Make sure that window has the correct parent on unmanagement.
+    
+    Reparenting the window will cause an UnmapNotify to be sent whcih will cause
+    us to unreparent the window and reparent it into the root window. In the case
+    where the application wanted to reparent a toplevel window we need to make
+    sure that we put the window back in the parent where the client actually requested it to go when we get the ReparentNotify
+
+Rob Taylor <[e-mail]>	2011-03-16
+
+    If there's a sesion manager, ask it to always restart compiz.
+
+Rob Taylor <[e-mail]>	2011-03-16
+
+    CompOption::Class had virtual functions without a virtual destructor. That's usually bad.
+
+Rob Taylor <[e-mail]>	2011-03-16
+
+    Region type in x is typedef struct _XRegion *Region. That means returning a const Regsion makes no sense - that's setting the returned pointer to const.
+
+Sam Spilsbury <[e-mail]>	2011-03-16
+
+    Also remove windows from createdWindows list if they were reparented into
+    something else
+
+Sam Spilsbury <[e-mail]>	2011-03-15
+
+    Reflect difference between actual input frame geometry and border extents
+    in the core API
+
+Sam Spilsbury <[e-mail]>	2011-03-13
+
+    Process changes to edge windows when skipping events on pointer warp
+    
+    There's a condition that can happen where we skip the events generated by
+    XWarpPointer and this causes the edge window reference to stay on the same
+    window, which is a problem when using edges since certain button bindings
+    would stop working. The new behaviour is to always update the edge window
+    reference whenever processing enter and leave events caused by pointer
+    warps
+
+Merge: f777234 011a611
+Sam Spilsbury <[e-mail]>	2011-03-12
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-03-12
+
+    Add support for a "focus on switch" option which toggles whether or not
+    the window should appear focused when switching between windows
+
+Sam Spilsbury <[e-mail]>	2011-03-12
+
+    Don't trash the pixmaps of windows that were hidden but don't have mapNum == 0 since that case only
+    happens where windows are actually closed or unmanaged
+
+Sam Spilsbury <[e-mail]>	2011-03-12
+
+    Don't need to modify priv->width, priv->height since those are representative of the server side
+    window and not the pixmap size
+
+Sam Spilsbury <[e-mail]>	2011-03-11
+
+    Don't unreparent the window until plugins are finished with animations
+    and such (eg, not while an unmap reference is held) and don't dump
+    the pixmap of the window if it is resized and unreparented and the plugins
+    hold a reference to it
+
+Sam Spilsbury <[e-mail]>	2011-03-11
+
+    Don't throw out the textures of windows that got resized or re/unreparented
+    while plugins hold an unmap reference to them as it is pretty likely that
+    those plugins need that data for animations
+
+Sam Spilsbury <[e-mail]>	2011-03-11
+
+    Don't update windows in some cases where there is an unmap reference since
+    it is likely that plugins are using them for animations. However, do allow
+    decorations to be changed where the dm asks us to.
+    
+    Also set frame extents to 0 explicitly when the window is unreparented
+
+Sam Spilsbury <[e-mail]>	2011-03-11
+
+    Revert "Don't refuse to update frame extents for windows that have an unmap reference"
+    
+    This reverts commit 86358da783bc7152c8fbe8a39d883ac922de5958.
+
+Sam Spilsbury <[e-mail]>	2011-03-11
+
+    Don't refuse to update frame extents for windows that have an unmap reference
+    
+    The previous rationale for not updating these extents is that doing so will
+    cause a resizeNotify on windows that are currently being unmapped or
+    that plugins have delayed from being unmapped and this will cause core
+    to throw out the texture of those windows. A better solution here
+    would be to not throw out the decoration pixmap and texture for windows
+    that are currently being unmapped (and also not throwing out the pixmap
+    in the composite plugin), since it would be likely that plugins are
+    using them for animations
+
+Sam Spilsbury <[e-mail]>	2011-03-07
+
+    "Update CMake Version"
+
+Sam Spilsbury <[e-mail]>	2011-03-07
+
+    "Update news for 0.9.4 release"
+
+Sam Spilsbury <[e-mail]>	2011-02-28
+
+    Fix gtk-w-d crashing when removing decoration.
+    
+    Also try to detect when windows are modal and give them modal type
+    decorations and move freedesktop.png to cube where it will actually
+    be used
+
+Sam Spilsbury <[e-mail]>	2011-02-28
+
+    Fix the loading and installation of images - core images should
+    be under the core plugin, freedesktop.png moved to cube
+    and load images based on the actual install dirs
+
+Sam Spilsbury <[e-mail]>	2011-02-27
+
+    Don't pass uninitialized value to plugins needing to update output extents
+    
+    Plugins need to check against this value in order to see if they should
+    change the extents of the decoration area on windows, don't send them
+    uninitialized garbage when doing that.
+
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Fix broken build
+
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Specify plugin name when loading images to find the correct
+    image loading dir for plugins which don't specify absolute
+    paths to their images
+
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Fix mismatched brace
+
+Merge: 1c9eb6d 9849ca3
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Remove debugging message
+
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Don't override the user's PKG_CONFIG_PATH with the CMAKE_INSTALL_PATH
+    unless the user explicitly changed the CMAKE_INSTALL_PATH.
+    
+    Rationale: If the user has their PKG_CONFIG_PATH set to /foo/bar
+    they would expect that when doing things like, eg installing plugins
+    locally (which ignores CMAKE_INSTALL_PREFIX), that the buildsystem
+    would pick up pkg-config files from their PKG_CONFIG_PATH which they
+    have specified themselves and not the default CMAKE_INSTALL_PREFIX,
+    however when the user changes the CMAKE_INSTALL_PREFIX they need
+    to have that be used for pkg-config purposes.
+
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Track focus changes for destroyed windows too since we'll change the focus later anyways
+
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Nuke warning
+
+Sam Spilsbury <[e-mail]>	2011-02-24
+
+    Preprocessor abuse to handle the Gtk+ 2.24 transition
+
+Merge: a30a8ee 54d17f0
+Sam Spilsbury <[e-mail]>	2011-02-23
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-02-23
+
+    Check if we're resizing from a grab handle first (eg isConstrained)
+    before using constraint area. Fixes crash when using alt + button2
+    to resize and hitting an edge
+
+Travis Watkins <[e-mail]>	2011-02-22
+
+    stop using deprecated gdk functions
+
+Merge: e2ead0a 3eda41c
+Sam Spilsbury <[e-mail]>	2011-02-23
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-02-23
+
+    Fix crash on exit
+
+Scott Moreau <[e-mail]>	2011-02-22
+
+    Use glib CLAMP macro.
+
+Scott Moreau <[e-mail]>	2011-02-22
+
+    Remove unnecessary definition.
+
+Sam Spilsbury <[e-mail]>	2011-02-22
+
+    Remove debug message
+
+Scott Moreau <[e-mail]>	2011-02-22
+
+    Avoid using reserved definition.
+
+Adam Williamson <[e-mail]>	2011-02-22
+
+    Generate GConf Schema files even if we don't want to install them
+
+Adam Williamson <[e-mail]>	2011-02-22
+
+    Import CFLAGS and CXXFLAGS env variables
+
+Sam Spilsbury <[e-mail]>	2011-02-22
+
+    s/Novell Inc./Canonical Ltd./ in eventsource.cpp copyright
+
+Merge: 7c0ba73 96eaecc
+Sam Spilsbury <[e-mail]>	2011-02-22
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+    
+    Conflicts:
+gtk/window-decorator/decorator.c           
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Fix initial stacking issues
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Fix down-left shift and wrong offsets for default decorations.
+    
+    Initialize settings before creating decoration frames
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Relicence eventsource.cpp to MIT
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Fix memory leaks
+    
+    - Use gtk_main_quit ();
+    - Don't create gconf clients where we don't need to
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Remove dead code
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Update copyright info
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Fix title scales not updating on theme change
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Also store correct pointer type and unref on exit
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Prevent spurious frame creation and deletion
+    
+    Bare, default and switcher decorations never change and they need to
+    come and go, so keep references to them
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Fix 2D Mode.
+    
+    Don't refresh shadow info (and check windows in paint list) if
+    compositing is not active and set the border and max border properties
+    for the default window type decoration (Without these properties,
+    CompWindow::input () would return 0,0,0,0 and an output frame wouldn't
+    be created)
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Initialize variable. Fixes valgrind warning
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Check if string is empty correctly. Fixes checks for CMAKE_BUILD_TYPE
+    string being empty always returning true and thus the CMAKE_BUILD_TYPE
+    being set to something the user didn't want
+
+Sam Spilsbury <[e-mail]>	2011-02-21
+
+    Read w->input () rather than the internal input extents.
+    
+    This provides information about the current state of the decoration
+    extents in core, rather than our own information about the window
+    decoration itself.
+    
+    Reverts part of 4ae95852e53075caed15586620127f0c1405fe474
+    
+    Fixes unresponsive decorations in kde4-window-decorator and decorations
+    initially "not responding" when you click on them (b.c.o #20)
+
+Sam Spilsbury <[e-mail]>	2011-02-20
+
+    Set default value for vpSize before loading plugins.
+    
+    There is a race where vpSize won't be updated to its "true value"
+    until we reach core's option change callback or we read the value
+    from the configuration plugin. Since we load all the plugins at once
+    on screenInitPlugins on the command line, some plugins require that this value
+    be set to *something* (It can be changed later) before they are initialized.
+    
+    Fixes incorrect vertex settings with cube, causing it to zoom out infinitely
+    when switching viewports when loaded when compiz starts
+
+Sam Spilsbury <[e-mail]>	2011-02-19
+
+    Sync after ungrabbing the server.
+    
+    Turns out that XUngrabServer is not a synchronous call, so there is a
+    race condition with the new startup order where the ungrab server request
+    will sit in the output buffer waiting to be processed and the server won't
+    actually be ungrabbed when we start loading plugins. This can have all
+    kinds of side effects, for example when initializing GConf with GDBus,
+    there will be a call to dbus-launch --autostart to try and get the
+    session bus ID which will fail if there is still a server grab
+    that hasn't been released (since it attempts to read X11 properties)
+    
+    Fixes LP: #691561
+
+Sam Spilsbury <[e-mail]>	2011-02-19
+
+    Map and unmap the switcher window directly
+
+Sam Spilsbury <[e-mail]>	2011-02-19
+
+    Update TODO
+
+Sam Spilsbury <[e-mail]>	2011-02-19
+
+    Cleanup init_settings some more, move the switcher stuff out into the
+    frame ctor and move USE_GCONF into one big ifdef
+
+Sam Spilsbury <[e-mail]>	2011-02-19
+
+    Store settings data in its own struct
+    
+    Prevents namespace issues and makes it more clear where to access this
+    data.
+
+Sam Spilsbury <[e-mail]>	2011-02-18
+
+    Cleanup.
+    
+    Move things to where they should be, remove dead code
+
+Sam Spilsbury <[e-mail]>	2011-02-18
+
+    Add memory management to frames
+    
+    We don't need to keep all the frame definitions around in memory all the
+    time, so refcount them and only add them if we actually need them.
+
+Sam Spilsbury <[e-mail]>	2011-02-17
+
+    Add frame types system, allocate to hash table and use them to manage
+    frames
+
+Sam Spilsbury <[e-mail]>	2011-02-17
+
+    Add frames refcounting system
+
+Sam Spilsbury <[e-mail]>	2011-02-17
+
+    Cleanup meta_update_border_extents function
+    
+    Don't need to retrieve the frame all the time, just get it once
+
+Sam Spilsbury <[e-mail]>	2011-02-17
+
+    Cleanup
+    
+    decor_frame_type is available in decor_t now, so no need to get that
+    manually
+
+Sam Spilsbury <[e-mail]>	2011-02-17
+
+    Added simple frames management system.
+    
+    Right now this just keeps the frames in a private area and returns a
+    pre-allocated frame, but it will be expanded to allow reference counting
+    on frames and allocation on-demand
+
+Sam Spilsbury <[e-mail]>	2011-02-17
+
+    Generalize shadow_only decoration into window decorations list
+    
+    Remove debug message
+
+Sam Spilsbury <[e-mail]>	2011-02-16
+
+    Remove more dead code
+
+Sam Spilsbury <[e-mail]>	2011-02-16
+
+    Generalize switcher into another decoration frame type
+
+Sam Spilsbury <[e-mail]>	2011-02-16
+
+    Move _default_decoration into another decor_frame_t in decor_frames
+    
+    No need to have another structure lying around for this ...
+
+Sam Spilsbury <[e-mail]>	2011-02-16
+
+    Fix shadows of non-default frame windows
+    
+    Include frame information when drawing the shadow outline and also get
+    the metacity frame type from this information rather than the WnckWindow
+
+Sam Spilsbury <[e-mail]>	2011-02-16
+
+    Fix cairo mode
+    
+    * Make sure we set the theme fptrs for get_title_scale on startup
+    * Use the frame reference in the decor_t since that works for default
+    decorations too
+
+Sam Spilsbury <[e-mail]>	2011-02-15
+
+    Fix crash when changing theme
+    
+    Connect up the signal handler for the style change correctly.
+
+Sam Spilsbury <[e-mail]>	2011-02-15
+
+    Make the switcher a decoration frame.
+    
+    It is still separate to the normal "window type" decoration, but at
+    least now it has access to everything it needs
+
+Sam Spilsbury <[e-mail]>	2011-02-15
+
+    Allow different font types in frames.
+    
+    Currently we used a single PangoContext and PangoFontDescription for
+    everything ... this resulted in custom frames having the same titlebar
+    size which wasn't any good. This commit changes a lot, namely:
+    
+     * Frame is now linked to the decoration object itself
+     * Moved style windows into the frame
+     * Moved font context and font description into the frame
+     * Added API for getting the titlebar font size: obviously with the
+    cairo decorations there isn't supposed to be any kind of visual
+    difference here but with the metacity decorations we need to get that
+    directly from libmetacity.
+    
+    It should be noted that these commits are in need of a cleanup ... which
+    is coming in the next few commits.
+
+Sam Spilsbury <[e-mail]>	2011-02-14
+
+    Add frame management system
+    
+    There are different types of frames that we will need to support - like
+    the GIMP's utility toolbox windows - we need to have stored separate
+    frames in order to support them
+
+Sam Spilsbury <[e-mail]>	2011-02-14
+
+    Add definitions for different border types
+
+Sam Spilsbury <[e-mail]>	2011-02-14
+
+    Add support for drawing with different metacity theme types
+
+Sam Spilsbury <[e-mail]>	2011-02-13
+
+    Don't catch resize notifications on startup
+    
+    DecorWindow::update might call updateWindowOutputExtents which calls
+    ::resizeNotify ... since this loops over all windows it is not safe to
+    have this function called.
+
+Sam Spilsbury <[e-mail]>	2011-02-12
+
+    Remove debugging message
+
+Sam Spilsbury <[e-mail]>	2011-02-12
+
+    Slight optimization. Don't recalculate clip region on every paint, but
+    only where it makes sense to.
+
+Sam Spilsbury <[e-mail]>	2011-02-12
+
+    Fix artefacts in shadow clipping.
+    
+    Intersect the clip region already computed by core with the output
+    region of the window so that we don't display parts of the window that
+    might be occluded
+
+Sam Spilsbury <[e-mail]>	2011-02-12
+
+    Clip shadows where it makes sense
+
+Merge: a88ce82 e1dc3f2
+Sam Spilsbury <[e-mail]>	2011-02-11
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+    
+    Conflicts:
+gtk/window-decorator/decorator.c           
+
+Merge: bd14afd c68018c
+Sam Spilsbury <[e-mail]>	2011-02-11
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop
+
+Merge: f5f41b9 09fe54a
+Sam Spilsbury <[e-mail]>	2011-02-11
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-02-11
+
+    Convert modifier masks from virtual to real ones before grabbing button.
+    
+    Also skip ignored modifier if it is also in the cleared ignored bits
+
+Sam Spilsbury <[e-mail]>	2011-02-11
+
+    Remove "semi-tracked" created windows on DestroyNotify.
+    
+    Fixes LP: #709461
+
+Sam Spilsbury <[e-mail]>	2011-02-10
+
+    Make the switcher window being override redirect.
+    
+    Previously the switcher window was a normal managed window (which
+    the switcher plugin actually lied about, see SwitchWindow::managed),
+    such that the decorators could pick it up and draw the switcher
+    decoration. However now with reparenting, this means that whenever
+    we actually manage and unmanage the switcher window (eg with map
+    and unmap) it means we must also reparent the window, which floods
+    the server with requests and makes the switcher slow.
+    
+    Since we don't interact with the switcher window, it makes no sense
+    to manage it like this, so make it override redirect
+
+Jason Smith <[e-mail]>	2011-02-05
+
+    Minor stacking fix
+
+Sam Spilsbury <[e-mail]>	2011-02-03
+
+    Use autogenerated options code to directly access option values
+    rather than looking up the options
+
+Sam Spilsbury <[e-mail]>	2011-02-03
+
+    Be a little bit smarter about that - work with stretched windows too and
+    don't accumulate pointer motion if the window is already constrained
+
+Sam Spilsbury <[e-mail]>	2011-02-03
+
+    Take up/down pointer motions as left and right if the cursor is at a screen edge
+    
+    This allows the resize borders to extend past the window somewhat and for the
+    user to still resize windows to the edge of the screen
+
+Sam Spilsbury <[e-mail]>	2011-02-03
+
+    Explicitly include <gdk/gdk.h> to avoid offset problems on amd64
+
+Travis Watkins <[e-mail]>	2011-02-02
+
+    fix bcop code generation for colors
+
+Sam Spilsbury <[e-mail]>	2011-02-02
+
+    Initialize border
+
+Merge: ff085dc 4ae9585
+Sam Spilsbury <[e-mail]>	2011-02-01
+
+    Merge branch 'master' of ../../../core
+    
+    Conflicts:
+include/core/core.h           
+src/window.cpp           
+
+Sam Spilsbury <[e-mail]>	2011-02-01
+
+    Allow semantic difference between frame window geometry and frame size.
+    
+    Rationale: some window decorators or themes might want to specify a border
+    input area that is slightly larger than the visible borders on screen
+    (eg for enhanced resize handles, a11y purposes, etc) or the theme might
+    want to specify some additional decoration which should affect placement
+    but should not be interacted with.
+    
+    In this case we have a priv->border and priv->input window property.
+    priv->border specifies the actual semantic size of the window decoration
+    that should affect placement and priv->input specifies the extents of
+    the frame window past the client.
+    
+    Fixes LP: #710271
+
+Sam Spilsbury <[e-mail]>	2011-01-28
+
+    Fix frame reference not going away on unreparent
+
+Sam Spilsbury <[e-mail]>	2011-01-28
+
+    Whitespace fix
+
+Sam Spilsbury <[e-mail]>	2011-01-28
+
+    Whitespace fix
+
+Sam Spilsbury <[e-mail]>	2011-01-28
+
+    Wait for reparent and configure operations to complete before destroying.
+    
+    We don't track frame and wrapper windows like normal windows, so if we want
+    to restack relative to the frame window on unreparent then we need to ensure
+    that the restack operation actually completed before destroying the window.
+
+Sam Spilsbury <[e-mail]>	2011-01-28
+
+    We don't care about events happening on the wrapper window during unreparent
+    
+    Listening for these events is only going to cause UnmapNotifies coming
+    from our own XReparentWindow operation and XUnmapWindow operation on the
+    frame window on the wrapper window, which will be handled by compiz making
+    some windows appear to be unmapped when they were just unreparented.
+    
+    Fixes LP #682781
+
+Sam Spilsbury <[e-mail]>	2011-01-27
+
+    Don't track window geometries or properties until they are actually managed.
+    
+    The window might get some ConfigureRequests which won't be reflected
+    in PrivateWindow at MapRequest time. Fixes LP #707853
+
+Sam Spilsbury <[e-mail]>	2011-01-26
+
+    Fix warning
+
+Sam Spilsbury <[e-mail]>	2011-01-26
+
+    Fix windows jumping around when clicking on parts that trigger move
+    
+    Since we no longer have an unconditional passive grab on Button1
+    for active and raised windows, we need to check if a client
+    sent us a _NET_WM_MOVERESIZE ClientMessage and update the pointer
+    buffer on that.
+    
+    Also clean up the pointer buffer handling code again - reduce
+    the number of roundtrips required. Remove debug message.
+
+Merge: 1c8f44d 6d72a4e
+Sam Spilsbury <[e-mail]>	2011-01-26
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop
+
+Merge: 793479d 081e136
+Sam Spilsbury <[e-mail]>	2011-01-26
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-01-26
+
+    Cleanup reparenting code
+    
+    No need to use XGetGeometry since checking the return value of
+    XGetWindowAttributes will determine if the window is destroyed.
+    
+    Also make sg a reference since copying serverGeometry is a bit useless
+
+Sam Spilsbury <[e-mail]>	2011-01-26
+
+    Set the vp size before initializing windows
+
+Merge: cd3aef5 41d6694
+Sam Spilsbury <[e-mail]>	2011-01-25
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-01-25
+
+    Fix stacking madness
+    
+    1) Don't create windows after registering for CreateNotify on the root
+       window and then do XQueryTree after calling XCreateWindow since this
+       will add the window to the internal stack twice (once for
+       XQueryTree and once for the CreateNotify)
+    
+    2) Enforce a full restack on all windows once we have decided
+       what our initial stack order is - so that dock windows don't
+       end up going underneath desktop windows
+    
+    3) Immediately stack the frame window underneath the client
+       and wait for the stacking operation to complete before reparenting
+       since sometimes the frame window would be created and mapped at the
+       top of the X11 stack whereas the client window would be tracked
+       from the bottom of the stack. Remove hack to restack window
+       within compiz since that didn't actually work.
+
+Travis Watkins <[e-mail]>	2011-01-24
+
+    fix build system so you can disable building decor plugin
+
+Merge: eef7eab 2b7e757
+Sam Spilsbury <[e-mail]>	2011-01-24
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+
+Sam Spilsbury <[e-mail]>	2011-01-24
+
+    Don't try to set target properties for blur if we disabled building it
+
+Sam Spilsbury <[e-mail]>	2011-01-24
+
+    Don't make if-statement depend on XWindowAttributes which might be garbage.
+    
+    The window could have been destroyed by the time we do XGetWindowAttributes
+    on it, so we need to check if that's the case. We still add it to the tree
+    anyways - but only because in between the time when we handle the DestroyNotify
+    for it and the CreateNotify, some windows might have done a ConfigureRequest
+    asking us to stack windows relative to it
+
+Sam Spilsbury <[e-mail]>	2011-01-24
+
+    Fix not tracking windows that became override-redirect after create.
+    
+    Some broken toolkits like QT change their override-redirectness after
+    CreateNotify, which would cause us not to track them. Unfortunately this
+    means that we need to track them on MapNotify, but that's not really
+    a problem anyways since they are override-redirect
+
+Merge: eef7eab 7ce34ea
+Sam Spilsbury <[e-mail]>	2011-01-20
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+
+Merge: 7194f67 af8424c
+Sam Spilsbury <[e-mail]>	2011-01-20
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop
+
+Sam Spilsbury <[e-mail]>	2011-01-19
+
+    Update passive button grabs on reparent
+
+Sam Spilsbury <[e-mail]>	2011-01-19
+
+    Fix not tracking windows which get unmapped, not destroyed and then remapped
+
+Sam Spilsbury <[e-mail]>	2011-01-19
+
+    Revert "Don't stack mapping windows which requested no focus above the active window."
+    
+    This reverts commit ecc61dc04567947e92cbb9686c1041619abc05b1.
+
+Sam Spilsbury <[e-mail]>	2011-01-14
+
+    Track override redirect windows from the first CreateNotify.
+    
+    We don't get a MapRequest from these windows, so we need to
+    track them from CreateNotify (which isn't really evil anyways
+    since we aren't reparenting them)
+    
+    Fixes (most) issues with menus not appearing.
+
+Sam Spilsbury <[e-mail]>	2011-01-13
+
+    Update core ABI
+
+Travis Watkins <[e-mail]>	2011-01-12
+
+    fix logic craziness
+    
+    Stop screwing with my brain and put the code at the one place it will
+    actually be used.
+
+Sam Spilsbury <[e-mail]>	2011-01-13
+
+    Don't create CompWindow and initialize plugins until MapRequest.
+    
+    Having all plugins track windows on CreateNotify doesn't make any
+    sense because they are not visible, and the ones that they would
+    need to track would be override-redirect anyways. Also tracking
+    windows in this way broke reparenting in such a way that a number
+    of buggy applications using xembed (eg gnome-panel applets and
+    Adobe Flash would consistently crash).
+
+Sam Spilsbury <[e-mail]>	2011-01-12
+
+    Don't stack mapping windows which requested no focus above the active window.
+    
+    This adds a managing variable to PrivateWindow which represents the managing
+    state of the window. In addition, ::updateAttributes did not stack windows
+    below correctly if they were already directly on top of an active window
+    (since it is not valid to stack a window below itself, and the algorithm would
+    pass the below to the findValidStackSiblingBelow function as well as a
+    pointer to the active window (== below)). The function now compares the
+    below sibling to the window we want to be stacked.
+
+Merge: 78a5ebd ab1861b
+Sam Spilsbury <[e-mail]>	2011-01-11
+
+    Merge branch 'glibmm-experimental'
+    
+    Conflicts:
+src/screen.cpp           
+
+Merge: aa8edad cf2117b
+Sam Spilsbury <[e-mail]>	2011-01-11
+
+    Merge git://git.compiz.org/compiz/core into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2011-01-08
+
+    Fix grabs activating when we don't need them to, fixing some applications
+    receiving wrong events
+
+Sam Spilsbury <[e-mail]>	2011-01-05
+
+    Also check for FocusChange events on windows of other screens.
+    
+    Don't continually set the input focus if it is already set - the focus
+    can change to be on another screen, register for events to detect
+    that case
+
+Sam Spilsbury <[e-mail]>	2011-01-05
+
+    Move sources around into relevant files
+
+Sam Spilsbury <[e-mail]>	2011-01-05
+
+    Remove glib plugin.
+    
+    It conflicts with this branch
+
+Sam Spilsbury <[e-mail]>	2011-01-05
+
+    Use clock_gettime and add a TIMESPECDIFF macro
+
+Sam Spilsbury <[e-mail]>	2011-01-05
+
+    Make the timeout for the zero-timer case 15, just so that we don't
+    end up spamming things (15msec isn't that long)
+
+Sam Spilsbury <[e-mail]>	2011-01-04
+
+    We can have a brief spin-wait system in place for CompTimeoutSource since
+    there isn't any case where we don't have timers running
+
+Sam Spilsbury <[e-mail]>	2011-01-04
+
+    Re-add paint-smartness to composite.cpp
+
+Sam Spilsbury <[e-mail]>	2011-01-04
+
+    Re-write timers to be a regular Glib::Source
+    
+    We previously used Glib::TimeoutSource but this one is broken
+    for a number of usecases that we need, so create our own timeout
+    source which is similar to the stock one, except that we only insert
+    one source into the glib stack with grouped timeout times for the rest
+    of our timers.
+    
+    Allows the use of setTimes () and setCallback () without glib
+    becoming a disaster-zone. Also fixes a number of crashes related
+    to the buggy glibmm implementation.
+
+Merge: 8649381 2ced0ab
+Sam Spilsbury <[e-mail]>	2011-01-02
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2011-01-02
+
+    Only set unmanaging bit while window is actually being unmanaged.
+    
+    Also de-obfuscate gravity handling in _NET_WM_MOVERESIZE request
+
+Sam Spilsbury <[e-mail]>	2010-12-31
+
+    Fix crashes when loading plugins on the command line
+    
+    plugin.cpp:plugins is a reverse list, so iterate it in reverse
+
+Sam Spilsbury <[e-mail]>	2010-12-31
+
+    Raise window on move/resize initiation in raise-on-click mode.
+    
+    Forward port a32f5bf9cef3ec0c40c7ac60b8b87f4083016f98 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-24
+
+    Allow plugins to initiate scale when initiated to change the match
+
+Sam Spilsbury <[e-mail]>	2010-12-24
+
+    Don't clear terminate state until action is actually finished clearing up.
+    
+    Clearing the terminate state before this will confuse other plugins which
+    check activity states
+
+Merge: b3c2c22 07f258e
+Sam Spilsbury <[e-mail]>	2010-12-24
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2010-12-23
+
+    Add signals for viewport change begin/end
+
+Sam Spilsbury <[e-mail]>	2010-12-19
+
+    Other mouse buttons should be allowed to change the selected window.
+    
+    But only button 1 should be able to select windows and terminate scale mode.
+    
+    Fixes incorrectly selected window when the mouse has not been moved after
+    scale mode has been initiated and the mouse is hovering over an unselected
+    window, and then Button2, or Button3 eg is pressed. This broke scaleaddon's
+    pull window and close window bindings.
+    
+    Fixes LP #691087
+
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Cleanup
+
+Merge: af62da3 b2077af
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Merge git://git.compiz.org/compiz/core into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Send window id in decoration notification
+
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Fix unintialized variable usage
+
+Merge: abb0874 8dd7395
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Merge git://git.compiz.org/compiz/core into glibmm-experimental
+
+Merge: da624e3 8dd7395
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Also beautify
+
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Break after updating after reparent
+
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Add a compiz event for when we have been decorated
+
+Didier Roche <[e-mail]>	2010-12-13
+
+    package mode is release debug for plugins
+    
+    also ship the slipped gconf cmake helper
+
+Sam Spilsbury <[e-mail]>	2010-12-13
+
+    Fix buffer overflow on some platforms (Non NULL passed to XOpenDisplay)
+
+Sam Spilsbury <[e-mail]>	2010-12-11
+
+    Ensure decoration is updated on shade. Fixes artifacts.
+    
+    Previously we'd rely upon a change in winDecorAtom to tell us when to update
+    the decoration, however now that we are reparenting we can't do that anymore
+    so hook windowNotify to watch for shade and unshade and then force the
+    decoration to be updated on resizeNotify if this is the case.
+
+Sam Spilsbury <[e-mail]>	2010-12-09
+
+    Fix some typoes and handle the case where the window is already under a dock
+
+Sam Spilsbury <[e-mail]>	2010-12-09
+
+    Be a little bit more clever about constraining resizes to workareas.
+    
+    Basically we want to constrain resizes to workareas, but not
+    in the case where two outputs touch. In the case that two outputs touch
+    they must be directly adjacent and there must not be a panel or dock in
+    the way
+
+Merge: 9211a51 4666435
+Sam Spilsbury <[e-mail]>	2010-12-08
+
+    Merge git://git.compiz.org/compiz/core into glibmm-experimental
+    
+    Conflicts:
+include/core/screen.h           
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Don't stack focus-denied windows in a disallowed position
+    
+    When a window is focus-stealing-prevented, we should only stack
+    it below the active window if that is possible. If it's not
+    (the window has the "Above" state, for example), then we should
+    stack it at the normal location.
+    
+    http://bugs.opencompositing.org/show_bug.cgi?id=1304
+    
+    Forward port 984bca5801d6179b9f8081c4b6c466063975d940 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Only reflect the decoration size in MapRequest gravity adjustment, not
+    the whole window size.
+    
+    Forward port a86c461684f122fd286884c4ff28f6ea673fe669
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Also update desktop keys
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Update path names in gconf keybindings
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Cleanup key binding list from redundant and unneeded keys and add scale
+    binding.
+    
+    Forward port c9993a7739e9bf6b595e5efa62605027241c3d7f  to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Also handle windows that have a server border set in pointer placement mode.
+    
+    Also fix typo.
+    
+1d5f80cd52274484ecb59a1c8f7e7b6cea3b1844  to master        Forward port    
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Correctly reflect that the switcher window is managed.
+    
+    Forward port 46371f9172089a3e60648b834611d5694df2e80b to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Make short descriptions in opacity a little more verbose
+    
+    Forward port f089351c2d6d62302e59f52a810b722808a4a574 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Move window position validation to validateWindowResizeRequest function.
+    
+    Forward port 2a37340f9610e7f80a66ed6ab48190c181784f6b to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Don't make minimized windows unmanaged.
+    
+    Forward port 8dcfbb256322565228cbcda5230de95343887fac
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Fix window offset at the start of close animation.
+    
+    Forward port 0a28ca484a8a72060b580e0ccc75ea20f3ddab1a
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    resize: Remove constrain_y, limit to work area instead of screen edges.
+    
+    Forward port 3075fa6eac1f4c7faa804b319f916899589702cc
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    resize: Fix typo
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    resize: Allow resizing outside screen edges when initiated with key.
+    
+    Forward port 6e281003bbcb01ac028aa963ab1bee0349c41376 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    place: Fix typo (off by one error)
+    
+    Forward port 4832c514b0c460febc90720a61c11d6a0f64ec84 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Also set constrainY to FALSE if move is not loaded.
+    
+    Forward port 615d823f5edc26eaa12e83c97099c7ab0f017968 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Constrain resizes to screen edges and fix constraining.
+    
+    Forward port 6c12e5a60297143a72c4e4bb104b0c35102ff3f4 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    resize: Obey move's constrain_y option
+    
+    Forward port 0d23e499774769d295509f189fbf4b7c21763ef6 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Fix typo
+    
+    Forward port 466184685e570b6736adce7800253815d72e1c02 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Fix assertion if core is specified as plugin on the command line.
+    
+    Forward port 2a0087732f23cd87284366ec0dc224cbd5fd68ec to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    scale: Properly remove closing window.
+    
+    Forward port 96e59168920650f49c5e79b342261c863694fb23 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Switcher: prevent simulataneous plugin uses that don't make sense.
+    
+    Forward port 1974f9b5bfbab24023a0a647b606eedccbb83d04 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Avoid adding core twice to plugin list
+    
+    Forward port 20cdf69d096616104cd26fc30c8efd7e4e4e164d to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Fix sibling checking logic.
+    
+    Forward port f4af2061d93057843efd437b30b8199dc89defdd to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Make sure findValidStackSibling below doesn't return a sibling that
+    we're not allowed to stack under.
+    
+    Forward port 1baf514fefb9177764af99cf508596686583244e to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Fix up coding style, add some comments.
+    
+    Forward port 24dd71f04892ddd031ac2bf7b166e10b74aa1bbd to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Never unload plugins passed to the cmdline
+    
+    Forward port 27430deae222b4380c0e91da849f930a297afb73 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    gnomecompat: Default to gnome-terminal for terminal keybinding.
+    
+    Forward port 060a99697cde9105c85623cb464a36b46da3bf97 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Revert gravity adjustment made at MapRequest time at UnmapNotify time
+    
+    Forward port a0be58f5e9f5e419af4f5f15505e9a9f6fe47bdd  to master
+
+Sam Spilsbury <[e-mail]>	2010-12-07
+
+    Don't take screenshot if Escape was pressed.
+    
+    Forward port c9239e92fe0b2d6bfc674b523313617017ca062f to master
+
+Sam Spilsbury <[e-mail]>	2010-12-06
+
+    Revert "Fix windows being forever treated as "not managed" in focus () and not entering into scale mode, etc"
+    
+    This reverts commit 51e01727d309f39e3f42ecf6b53b4ebb31a385dc.
+    
+    There is a better way to do this
+
+Sam Spilsbury <[e-mail]>	2010-12-06
+
+    Fix startup order.
+    
+    Previously we were doing something like this:
+    
+    init -> screen init -> init core plugin screen -> create windows ->
+    eventLoop -> updatePlugins -> initPlugin (initScreen (initWindow))).
+    
+    This order has a number of problems with it - namely that config plugins
+    will be loaded on one full pass of the event loop and then core options
+    are initialized, before which we were doing certain startup procedures
+    on the default options, which resulted in strange race condition bugs.
+    Also, if we are compositing we have a brief (visible) switch from 2D mode
+    to 3D mode - in reality we want to be in 3D mode ASAP.
+    
+    The new order is init -> updatePlugins (load plugins specified on command
+     line) -> screen init -> load command line plugins -> update plugins (load
+    new plugins specified by config plugins on the command line) -> init screens
+    -> create window (init plugins for window) -> eventLoop.
+    
+    This means that it takes longer for us to get to the event loop, but at least
+    we can zip through the initialization phase quite quickly
+
+Merge: 89e6c77 a8ad8f2
+Sam Spilsbury <[e-mail]>	2010-12-05
+
+    Merge commit 'a8ad8f2c28a95ee8ebc39d404069586942c2e292' into glibmm-experimental
+
+Merge: f4ae798 ce53cec
+Sam Spilsbury <[e-mail]>	2010-12-05
+
+    Merge commit 'ce53cec922f54c754e8c7eb19d786a2dffe0f496' into glibmm-experimental
+
+Merge: a26a16b a8ad8f2
+Sam Spilsbury <[e-mail]>	2010-12-05
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop
+
+Jason Smith <[e-mail]>	2010-12-04
+
+    Fix memory leaks introduced in last commit
+
+Sam Spilsbury <[e-mail]>	2010-12-05
+
+    Fix windows being forever treated as "not managed" in focus () and not entering into scale mode, etc
+    
+    We need to re-set unmanaging too once managed is set again
+
+Sam Spilsbury <[e-mail]>	2010-12-04
+
+    Fix windows consistently moving by gravity * window decoration extents.
+    
+    The behaviour from 0.8 was ported to update decoration windows on the window destructor, but because we are moving windows on a timer in order to handle reparenting issues when decorating them, this also causes the time to be destroyed when the CompWindow is, so the windows never actually get moved back into place correctly.
+    
+    FIXME: Timers should have a referencing system, it does not make sense that we have to preserve their scope
+
+Merge: 56b97b9 2d4b54b
+Sam Spilsbury <[e-mail]>	2010-12-04
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2010-12-04
+
+    Fix typo
+
+Sam Spilsbury <[e-mail]>	2010-12-04
+
+    The window must always have a frame before we do anything with it
+
+Sam Spilsbury <[e-mail]>	2010-12-04
+
+    Wait until reparent to decorate
+
+Sam Spilsbury <[e-mail]>	2010-12-04
+
+    Fix typo which caused windows not to be recognized
+
+Sam Spilsbury <[e-mail]>	2010-12-04
+
+    Revert "Constrain windows to workArea when moving for decorations"
+    
+    This reverts commit d07d0103b7e76a10fb9b360d25c4ec32470eaa53.
+
+Jason Smith <[e-mail]>	2010-12-03
+
+    Fix compregion to be a more true to form wrapper of X11 region
+
+Merge: 80b1c01 4a5ec2b
+Sam Spilsbury <[e-mail]>	2010-12-03
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2010-12-03
+
+    Fix typo which caused windows > screen height to be placed incorrectly
+
+Sam Spilsbury <[e-mail]>	2010-12-03
+
+    Fix typos
+
+Sam Spilsbury <[e-mail]>	2010-12-03
+
+    Fix window position validation for windows that change size without
+    changing position.
+    Previously, we left the position of windows that have USPosition set
+    untouched, even if they didn't try to change position at all, but only
+    changed size.
+    This caused such windows to become partially offscreen e.g. if they were
+    positioned at the lower edge of the work area before the size change and
+    increased height afterwards.
+    
+    Forward port 3c16152938c44454f42d08a4b92cc46093c9a782 to master
+
+Sam Spilsbury <[e-mail]>	2010-12-03
+
+    Fix some focus issues:
+    - Don't give soon-to-be-unmanaged windows focus when closing a window
+    - Transfer focus to another window if a window that is about to get
+      focus is closed
+    
+    Forward port 5a78a90a3ec9de02b8e52790fbc376a2502cead7 to master.
+    
+    Fixes gnome-do issue
+
+Sam Spilsbury <[e-mail]>	2010-12-03
+
+    Revert "Ensure that we can change the input focus, even if we requested a client to take focus and it failed to do it before it was unmapped"
+    
+    This reverts commit 1084f0be5c200d46ad3b4358a477963d31040736.
+    
+    Danny suggested a better way to do this from a commit to 0.8
+
+Sam Spilsbury <[e-mail]>	2010-12-03
+
+    Add some documentation for decorator.c
+
+Sam Spilsbury <[e-mail]>	2010-12-03
+
+    Ensure that we can change the input focus, even if we requested a client to take focus and it failed to do it before it was unmapped
+
+Sam Spilsbury <[e-mail]>	2010-12-02
+
+    Make w->managed () wrapable
+
+Sam Spilsbury <[e-mail]>	2010-12-02
+
+    Fix debug message
+
+Merge: ef1399c 81c768f
+Unity <unity@VB-U1010.(none)>	2010-12-02
+
+    Merge branch 'glibmm-experimental' of git://git.compiz.org/users/dbo/compiz-with-glib-mainloop into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2010-12-02
+
+    Remove doPoll () and rewrite CompWatchFd to use Glib::IOSource
+    
+    This changes compiz to monitor file descriptors directly in
+    the glib mainloop which fixes things like not exiting correctly
+    with session managers and the like.
+
+Sam Spilsbury <[e-mail]>	2010-11-27
+
+    Fix switcher background drawing
+    
+    As the default composition mode is SourceOver and the old contents are uninitialized, all sorts of graphical corruption could occur. Fix that by using Source composition mode and thus not using the old contents for blending.
+    
+    Forward port 50c061b29c9fccdc937f0de92ba1edccab1a05a4 to master
+
+Sam Spilsbury <[e-mail]>	2010-11-27
+
+    No need to reset the source, it happens for us on destructor
+
+Sam Spilsbury <[e-mail]>	2010-11-27
+
+    Detect when glib is being stupid and calls ::internalCallback even though we asked for the source to be removed (prevents access to free'd memory once we delete a CompTimer)
+
+Merge: 2bb01fb 5170cb0
+Sam Spilsbury <[e-mail]>	2010-11-27
+
+    Merge git://git.compiz.org/compiz/core into glibmm-experimental
+
+Merge: dbcb185 e9f553a
+Sam Spilsbury <[e-mail]>	2010-11-27
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Merge: 1730f6a e9f553a
+Sam Spilsbury <[e-mail]>	2010-11-27
+
+    Merge git://git.compiz.org/compiz/core into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2010-11-27
+
+    Ensure that we check options nested in <group> and <subgroup> tags too (eg add an extra "/")
+
+Didier Roche <[e-mail]>	2010-11-26
+
+    fix the gconf schema generation to compiz-1
+
+Merge: 86074c1 cbd2c12
+Sam Spilsbury <[e-mail]>	2010-11-25
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop into glibmm-experimental
+
+Sam Spilsbury <[e-mail]>	2010-11-25
+
+    Return false once we're done with the source
+
+Sam Spilsbury <[e-mail]>	2010-11-25
+
+    Fix hang on exit
+
+Merge: c26f860 7c7b898
+Sam Spilsbury <[e-mail]>	2010-11-24
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+
+Merge: 029817a 7c7b898
+Sam Spilsbury <[e-mail]>	2010-11-24
+
+    Merge git://git.compiz.org/compiz/core into glibmm-experimental
+
+Didier Roche <[e-mail]>	2010-11-23
+
+    fix typos and leftover from previous commit
+
+Didier Roche <[e-mail]>	2010-11-23
+
+    add signals for the bailer plugin + hw rendering detection
+
+Merge: 2eda891 ce0a8bb
+Didier Roche <[e-mail]>	2010-11-23
+
+    Merge branch 'master' of git://anongit.compiz.org/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-11-23
+
+    Fix decoration flicker of switcher window.
+    
+    Previously, the pixmaps were recreated as soon as any property changed (and thus way too often), so it would happen that at the time the decoration plugin needs to access the pixmap, it would already have been destroyed. Avoid that by only recreating the pixmaps when needed.
+    
+    Forward port of edb51e95e959accd3873179a20bc4674c51f5efe to master
+
+Merge: 318465e a8737b6
+Didier Roche <[e-mail]>	2010-11-22
+
+    Merge branch 'master' of git://anongit.compiz.org/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-11-22
+
+    Damage rectangles correctly when coming out of stretch resize mode from constrainment
+
+Sam Spilsbury <[e-mail]>	2010-11-21
+
+    Drop the individual bindings for resize modes and move to a mod mask system
+
+Sam Spilsbury <[e-mail]>	2010-11-21
+
+    Turn resize_from_center into a match
+
+Sam Spilsbury <[e-mail]>	2010-11-20
+
+    Add a short TODO
+
+Sam Spilsbury <[e-mail]>	2010-11-20
+
+    Only use ::reset for the RefPtr because that will automatically take care of destroying it for us
+
+Sam Spilsbury <[e-mail]>	2010-11-20
+
+    Port C based glib to C++ glibmm
+
+Didier Roche <[e-mail]>	2010-11-18
+
+    [PATCH] Fix keybinding window manager names in compiz-gnome
+
+Didier Roche <[e-mail]>	2010-11-18
+
+    Update the binding properties to compiz wm with gnome capplets
+    
+    As now the wmname is Compiz and not compiz, update to the new wmname.
+
+Sam Spilsbury <[e-mail]>	2010-11-18
+
+    Fix weird condition where gboolean != bool bitwise which caused timers to segfault on occasion
+
+Sam Spilsbury <[e-mail]>	2010-11-13
+
+    Split GConf schema generation into a plugin_extension
+
+Merge: 70e344e 868eeab
+Sam Spilsbury <[e-mail]>	2010-11-12
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-11-12
+
+    Use C++ false
+
+Sam Spilsbury <[e-mail]>	2010-11-12
+
+    Install plugin images and data to separate plugin-specific subdirectories (so that plugins can't overwrite other plugin's data). Also fix typo in CompizGenInstallData.cmake
+
+Sam Spilsbury <[e-mail]>	2010-11-12
+
+    Remove testing CompizGenPrintMessage.cmake
+
+Sam Spilsbury <[e-mail]>	2010-11-12
+
+    Add a CompizGenInstallImages.cmake extension, which installs images
+
+Sam Spilsbury <[e-mail]>	2010-11-12
+
+    Add CompizGenInstallData.cmake
+
+Sam Spilsbury <[e-mail]>	2010-11-12
+
+    Split plugin data file generation into cmake extension
+
+Sam Spilsbury <[e-mail]>	2010-11-12
+
+    Added a simple CMake buildsystem extensions system
+
+Didier Roche <[e-mail]>	2010-11-12
+
+    [PATCH] Cleanup cmake file. No need to get set var {var} CACHE
+
+Sam Spilsbury <[e-mail]>	2010-11-11
+
+    Spin the mainloop properly
+
+Sam Spilsbury <[e-mail]>	2010-11-11
+
+    Listen for FocusIn/FocusOut on NotifyGrab NotifyUngrab and set an internal bit that plugins can query
+
+Sam Spilsbury <[e-mail]>	2010-11-11
+
+    Make sure that we properly unregister actions when removing the option private with operator=
+
+Sam Spilsbury <[e-mail]>	2010-11-11
+
+    Bump core ABI
+
+Merge: 7c9baac 87a93df
+Sam Spilsbury <[e-mail]>	2010-11-11
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+
+Merge: c297f4d e89d6d4
+Sam Spilsbury <[e-mail]>	2010-11-09
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop
+
+Danny Baumann <[e-mail]>	2010-11-09
+
+    [PATCH] Be a little bit more clever when handing option construction in handleActionEvent.
+    
+    Previously we would have a static CompAction::Vector which we would resize to lower sizes (so that triggerFooBindings doesn't die) but this causes us to be reconstruction CompOptions all the time which is expensive.
+    
+    Instead just reset the option to make it "dead" (eg keep it in memory for longer) but don't create and recreate them all the time
+    
+    Also copy the active state of a CompAction on copy-construct
+
+Didier Roche <[e-mail]>	2010-11-05
+
+    Fix COMPIZ_DEFAULT_PLUGINS to be really taken into account
+
+Jason Smith <[e-mail]>	2010-11-08
+
+    Remove clever timers for now to see if we cant help damage issues
+
+Dominique Leuenberger <[e-mail]>	2010-11-08
+
+    Require at leasst gtk 2.18.0.
+
+Sam Spilsbury <[e-mail]>	2010-11-08
+
+    Don't increase core action register reference counts if the same action was already registered
+
+Didier Roche <[e-mail]>	2010-11-08
+
+    Preserve DESTDIR if no override in COMPIZ_DESTDIR
+
+Dominique Leuenberger <[e-mail]>	2010-11-06
+
+    Install translations into LC_MESSAGES instead of lc_messages.
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Don't increase leave pendingMaps at a non-zero number once the window is mapped.
+    We used to assume that for every MapRequest event that we got for which we also sent an XMapWindow that we would get a MapNotify. According to the man XMapWindow this doesn't make any sense since trying calling XMapWindow on an already mapped window for which we have SubstructureRedirectMask set results in a NoOp anyways (so we'll only ever get one MapNotify and multiple MapRequests). This fixes a case where no input focus would be set on closing windows with multiple remaining pendingMaps since we don't move the input focus if this is the case
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Revert "Don't increase leave pendingMaps at a non-zero number once the window is mapped."
+    
+    This reverts commit d5e0df487697855fc07e8176d8586b7b14f6f778.
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Add COMPIZ_VERSION_MACRO and update to 0.9.2.1
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Don't increase leave pendingMaps at a non-zero number once the window is mapped.
+    
+    We used to assume that for every MapRequest event that we got for which we also sent an XMapWindow that we would get a MapNotify.
+    
+    According to the man XMapWindow this doesn't make any sense since trying calling XMapWindow on an already mapped window for which we have SubstructureRedirectMask set results in a NoOp anyways (so we'll only ever get one MapNotify and multiple MapRequests).
+    
+    This fixes a case where no input focus would be set on closing windows with multiple remaining pendingMaps since we don't move the input focus if this is the case
+
+Sam Spilsbury <[e-mail]>	2010-11-05
+
+    Release the connection name on unload so we don't cause dbus to get angry on ::updatePlugins
+
+Sam Spilsbury <[e-mail]>	2010-11-05
+
+    Revert "Don't queue incoming name requests and it is also safe to unref the bus"
+    
+    This reverts commit efcbe55d9fae7553acadf731bc3b15f46dae99cf.
+
+Sam Spilsbury <[e-mail]>	2010-11-05
+
+    Don't queue incoming name requests and it is also safe to unref the bus
+    in the case that we aren't unreffing it due to plugin failure
+
+Merge: 267b9d1 773e8a0
+Sam Spilsbury <[e-mail]>	2010-11-09
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Danny Baumann <[e-mail]>	2010-11-09
+
+    [PATCH] Be a little bit more clever when handing option construction in handleActionEvent.
+    
+    Previously we would have a static CompAction::Vector which we would resize to lower sizes (so that triggerFooBindings doesn't die) but this causes us to be reconstruction CompOptions all the time which is expensive.
+    
+    Instead just reset the option to make it "dead" (eg keep it in memory for longer) but don't create and recreate them all the time
+    
+    Also copy the active state of a CompAction on copy-construct
+
+Didier Roche <[e-mail]>	2010-11-05
+
+    Fix COMPIZ_DEFAULT_PLUGINS to be really taken into account
+
+Jason Smith <[e-mail]>	2010-11-08
+
+    Remove clever timers for now to see if we cant help damage issues
+
+Merge: e62dd35 86d92fd
+Dominique Leuenberger <[e-mail]>	2010-11-08
+
+    Merge branch 'master' of ssh://git.compiz.org/git/compiz/core
+
+Dominique Leuenberger <[e-mail]>	2010-11-08
+
+    Require at leasst gtk 2.18.0.
+
+Sam Spilsbury <[e-mail]>	2010-11-08
+
+    Don't increase core action register reference counts if the same action was already registered
+
+Didier Roche <[e-mail]>	2010-11-08
+
+    Preserve DESTDIR if no override in COMPIZ_DESTDIR
+
+Dominique Leuenberger <[e-mail]>	2010-11-06
+
+    Install translations into LC_MESSAGES instead of lc_messages.
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Don't increase leave pendingMaps at a non-zero number once the window is mapped.
+    We used to assume that for every MapRequest event that we got for which we also sent an XMapWindow that we would get a MapNotify. According to the man XMapWindow this doesn't make any sense since trying calling XMapWindow on an already mapped window for which we have SubstructureRedirectMask set results in a NoOp anyways (so we'll only ever get one MapNotify and multiple MapRequests). This fixes a case where no input focus would be set on closing windows with multiple remaining pendingMaps since we don't move the input focus if this is the case
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Revert "Don't increase leave pendingMaps at a non-zero number once the window is mapped."
+    
+    This reverts commit d5e0df487697855fc07e8176d8586b7b14f6f778.
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Add COMPIZ_VERSION_MACRO and update to 0.9.2.1
+
+Sam Spilsbury <[e-mail]>	2010-11-06
+
+    Don't increase leave pendingMaps at a non-zero number once the window is mapped.
+    
+    We used to assume that for every MapRequest event that we got for which we also sent an XMapWindow that we would get a MapNotify.
+    
+    According to the man XMapWindow this doesn't make any sense since trying calling XMapWindow on an already mapped window for which we have SubstructureRedirectMask set results in a NoOp anyways (so we'll only ever get one MapNotify and multiple MapRequests).
+    
+    This fixes a case where no input focus would be set on closing windows with multiple remaining pendingMaps since we don't move the input focus if this is the case
+
+Sam Spilsbury <[e-mail]>	2010-11-05
+
+    Release the connection name on unload so we don't cause dbus to get angry on ::updatePlugins
+
+Sam Spilsbury <[e-mail]>	2010-11-05
+
+    Revert "Don't queue incoming name requests and it is also safe to unref the bus"
+    
+    This reverts commit efcbe55d9fae7553acadf731bc3b15f46dae99cf.
+
+Sam Spilsbury <[e-mail]>	2010-11-05
+
+    Don't queue incoming name requests and it is also safe to unref the bus
+    in the case that we aren't unreffing it due to plugin failure
+
+Merge: 3a5c997 83ffe50
+Sam Spilsbury <[e-mail]>	2010-11-04
+
+    Merge branch 'master' of git://git.compiz.org/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-11-01
+
+    Fix cairo decoration offsets
+
+Sam Spilsbury <[e-mail]>	2010-11-01
+
+    Fix decoration offsets in metacity 2D mode (hopefully for real this time)
+
+Sam Spilsbury <[e-mail]>	2010-11-01
+
+    Don't create window with shadow size in 2D Mode
+
+Merge: 2adde93 8c5348c
+Sam Spilsbury <[e-mail]>	2010-10-29
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-10-29
+
+    Bump version to 0.9.2
+
+Sam Spilsbury <[e-mail]>	2010-10-29
+
+    Constrain windows to workArea when moving for decorations
+    
+    Since we move the window to account for adding the decorations on a
+    zero timer (eg, after handleEvent, where windows have already been placed)
+    we need to make sure we account for the workArea (so that we don't
+    move windows below panels and offscreen)
+
+Sam Spilsbury <[e-mail]>	2010-10-29
+
+    Fix typos
+
+Merge: db5b0ff 709496d
+Danny Baumann <[e-mail]>	2010-10-27
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Danny Baumann <[e-mail]>	2010-10-27
+
+    Create cmake modules directory before copying file to it.
+
+Sam Spilsbury <[e-mail]>	2010-10-26
+
+    Fix out of bounds memory read / write
+
+Sam Spilsbury <[e-mail]>	2010-10-26
+
+    Change the match expression handler after Regex screen constructor.
+    
+    It is possible for RegexWindow::get () to be called from this wrapped function,
+    which is wrong because memory for a RegexWindow hasn't yet been allocated.
+    
+    (CompScreen::matchExpHandlerChanged -> SomePlugin::CompMatch::Evaluate -> RegexExp::evaluate -> RegexWindow::get)
+
+Sam Spilsbury <[e-mail]>	2010-10-26
+
+    Check if header token matches part of another word.
+    
+    The prepending function would only check for the existence of part of the header op in the function string, and did not check if the matched string was actually part of another word. This caused fragment programs like this to fail:
+    
+    program name: temporary
+    !!ARBfp1.0
+    TEMP temp, foo, bar;
+    FOO temp, bar, temp;
+    
+    Which would be outputted like this:
+    
+    TEMP temporary_temp, temporary_foo, temporary_bar;
+    FOO temporary_temporary_temp, bar, temporary_temporary_bar;
+    
+    (since "temp" was matched in "temporary" incorreclty).
+    
+    The new code now checks for a ".", ";" or "," or if the word is the last in the string before prepending it.
+    
+    This bug was most noticable in the colorfilter plugin, where one of the filters could be named "negative" with a temporary variable called "neg"
+
+Sam Spilsbury <[e-mail]>	2010-10-24
+
+    Fix omission in NEWS and fix date
+
+Sam Spilsbury <[e-mail]>	2010-10-24
+
+    Update NEWS for 0.9.2 release
+
+Sam Spilsbury <[e-mail]>	2010-10-24
+
+    Fix memory leak
+
+Sam Spilsbury <[e-mail]>	2010-10-24
+
+    Fix memory leak
+
+Sam Spilsbury <[e-mail]>	2010-10-24
+
+    Use XFreeStringList to recursively free the entire array
+
+Sam Spilsbury <[e-mail]>	2010-10-24
+
+    Cleanup (static analysis)
+
+Sam Spilsbury <[e-mail]>	2010-10-24
+
+    Fix some memory leaks (it looks like there are some more in XTextPropertyToStringList too)
+
+Sam Spilsbury <[e-mail]>	2010-10-23
+
+    scale: Reduce scope of variables where appropriate
+
+Sam Spilsbury <[e-mail]>	2010-10-19
+
+    composite.cpp: minor cleanup, don't keep things in scope if they don't need to be (static analysis)
+
+Sam Spilsbury <[e-mail]>	2010-10-19
+
+    compiztoolbox: make functions public
+
+Sam Spilsbury <[e-mail]>	2010-10-19
+
+    blur: minor code cleanup (static analysis)
+
+Sam Spilsbury <[e-mail]>	2010-10-19
+
+    opengl: minor style fixups (static analysis)
+
+Sam Spilsbury <[e-mail]>	2010-10-19
+
+    kde4-window-decorator: minor style related changed (static analysis)
+
+Sam Spilsbury <[e-mail]>	2010-10-19
+
+    core: general code cleanup (static analysis)
+
+Sam Spilsbury <[e-mail]>	2010-10-19
+
+    Avoid a roundtrip
+
+Sam Spilsbury <[e-mail]>	2010-10-18
+
+    Take into account the server border width when calculating the texture size
+
+Sam Spilsbury <[e-mail]>	2010-10-18
+
+    We need to make a temporary copy of the color string since it is free'd on the temporary function call's destructor.
+
+Sam Spilsbury <[e-mail]>	2010-10-03
+
+    Don't attempt to re-use buffer pixmaps.
+    
+    It's not safe to re-use these pixmaps, because there isn't any guaruntee that they haven't been nuked by compiz
+
+Sam Spilsbury <[e-mail]>	2010-10-03
+
+    Don't reparent so overzealously.
+    
+    Also tweak offset code to handle shadow offsets. Unfortunately this breaks some themes. However, the standard ones such as Clearlooks and friends should continue to work
+
+Merge: e9574b4 0301c9f
+Jason Smith <[e-mail]>	2010-10-15
+
+    Merge branch 'master' of ssh://anongit.compiz.org/git/compiz/core
+
+Scott Moreau <[e-mail]>	2010-10-14
+
+    Get rid of Prev/Next Slide since they are entirely unused.
+
+Scott Moreau <[e-mail]>	2010-10-14
+
+    Paint all viewports if caps are transparent.
+
+Jason Smith <[e-mail]>	2010-10-07
+
+    Ensure g type is setup
+
+Scott Moreau <[e-mail]>	2010-09-30
+
+    Remove unused variables to silence warnings.
+
+Scott Moreau <[e-mail]>	2010-09-30
+
+    Handle top and bottom cap colors separately.
+
+Scott Moreau <[e-mail]>	2010-09-30
+
+    Remove cap image settings since it's handled by cubeaddons.
+
+Jason Smith <[e-mail]>	2010-10-04
+
+    Ensure we dont end up processing extra mouse events for no reason
+
+Scott Moreau <[e-mail]>	2010-10-03
+
+    Fix porting bugs.
+
+Jason Smith <[e-mail]>	2010-10-03
+
+    Revert ugly event hack as workaround in plugin is found
+
+Scott Moreau <[e-mail]>	2010-10-03
+
+    Remove duplicate if statement.
+
+Scott Moreau <[e-mail]>	2010-09-30
+
+    Remove unused variables to silence warnings.
+
+Scott Moreau <[e-mail]>	2010-09-30
+
+    Handle top and bottom cap colors separately.
+
+Scott Moreau <[e-mail]>	2010-09-30
+
+    Remove cap image settings since it's handled by cubeaddons.
+
+Sam Spilsbury <[e-mail]>	2010-09-29
+
+    Update INSTALL file
+
+Scott Moreau <[e-mail]>	2010-09-28
+
+    Don't require both opengl and composite since opengl already requires composite. This can cause flicker or momentary black screen with some drivers.
+
+Dominique Leuenberger <[e-mail]>	2010-09-28
+
+    Do not use deprecated gdk_display macro.
+
+Dominique Leuenberger <[e-mail]>	2010-09-28
+
+    Do not use gdk_display, it's deprecated (one more place it was missed).
+
+Sam Spilsbury <[e-mail]>	2010-09-27
+
+    Don't attempt to write the property if the template was not read in the first place
+
+Sam Spilsbury <[e-mail]>	2010-09-27
+
+    Don't use deprecated gdk_display symbol
+
+Sam Spilsbury <[e-mail]>	2010-09-27
+
+    Move list of compiz libs to compizplugin.
+    
+    New DSO linking rules require that plugins be explcitly linked to all of the compiz dependencies.
+
+Jason Smith <[e-mail]>	2010-09-30
+
+    Ensure we get lots of events on input windows. This is likely evil and needs a better fix
+
+Sam Spilsbury <[e-mail]>	2010-09-30
+
+    Clean up isViewable
+
+Merge: 8942e33 912aac9
+Sam Spilsbury <[e-mail]>	2010-09-29
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-09-29
+
+    Update INSTALL file
+
+Scott Moreau <[e-mail]>	2010-09-28
+
+    Don't require both opengl and composite since opengl already requires composite. This can cause flicker or momentary black screen with some drivers.
+
+Dominique Leuenberger <[e-mail]>	2010-09-28
+
+    Do not use deprecated gdk_display macro.
+
+Dominique Leuenberger <[e-mail]>	2010-09-28
+
+    Do not use gdk_display, it's deprecated (one more place it was missed).
+
+Sam Spilsbury <[e-mail]>	2010-09-27
+
+    Don't attempt to write the property if the template was not read in the first place
+
+Sam Spilsbury <[e-mail]>	2010-09-27
+
+    Don't use deprecated gdk_display symbol
+
+Sam Spilsbury <[e-mail]>	2010-09-27
+
+    Move list of compiz libs to compizplugin.
+    
+    New DSO linking rules require that plugins be explcitly linked to all of the compiz dependencies.
+
+Merge: 5967495 02dae69
+Jason Smith <[e-mail]>	2010-09-14
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop
+    
+    Conflicts:
+src/screen.cpp           
+
+Jason Smith <[e-mail]>	2010-09-14
+
+    Remove spare ;
+
+Sam Spilsbury <[e-mail]>	2010-09-14
+
+    Cleanup
+
+Merge: fc6a55e 840cbcc
+Sam Spilsbury <[e-mail]>	2010-09-14
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop
+
+Jason Smith <[e-mail]>	2010-09-13
+
+    Stop using gio for polling as it just doesn't seem to work as expected. Scrolling issues are now gone.
+
+Merge: 1fe1ac8 72d099a
+Sam Spilsbury <[e-mail]>	2010-09-11
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/users/dbo/compiz-with-glib-mainloop
+
+Jason Smith <[e-mail]>	2010-09-10
+
+    minor changes
+
+Sam Spilsbury <[e-mail]>	2010-09-09
+
+    Force input focus on button 1/2/3 press.
+    
+    Sometimes there is a case where the window is active on one screen already,
+    and because compiz is not multi-screen aware, when another window is focussed
+    on another screen, the window will continue to be "active" but not focussed.
+    
+    Previously, when clicking on this window again, the window would not be
+    focussed again since it was already active.
+    
+    This commit forces input focus regardless of the "active" state
+
+Sam Spilsbury <[e-mail]>	2010-09-09
+
+    Also obey force placement match when validating ConfigureRequest events.
+    
+    Forward port of d01732e22007018ca54d4dfe810202ee4d3ee16 to master
+
+Sam Spilsbury <[e-mail]>	2010-09-08
+
+    compiztoolbox.cpp: Move input focus to highlighted windows so it is possible to alt-f4 them
+    switcher.cpp: Move input focus back to last active window if switcher action is cancelled
+
+Danny Baumann <[e-mail]>	2010-09-06
+
+    [PATCH] Replace old gdk_draw_drawable method calls with cairo equivalents.
+
+Scott Moreau <[e-mail]>	2010-09-02
+
+    Add reszie_from_center option.
+
+Sam Spilsbury <[e-mail]>	2010-09-09
+
+    Force input focus on button 1/2/3 press.
+    
+    Sometimes there is a case where the window is active on one screen already,
+    and because compiz is not multi-screen aware, when another window is focussed
+    on another screen, the window will continue to be "active" but not focussed.
+    
+    Previously, when clicking on this window again, the window would not be
+    focussed again since it was already active.
+    
+    This commit forces input focus regardless of the "active" state
+
+Sam Spilsbury <[e-mail]>	2010-09-09
+
+    Also obey force placement match when validating ConfigureRequest events.
+    
+    Forward port of d01732e22007018ca54d4dfe810202ee4d3ee16 to master
+
+Sam Spilsbury <[e-mail]>	2010-09-08
+
+    compiztoolbox.cpp: Move input focus to highlighted windows so it is possible to alt-f4 them
+    switcher.cpp: Move input focus back to last active window if switcher action is cancelled
+
+Danny Baumann <[e-mail]>	2010-09-06
+
+    [PATCH] Replace old gdk_draw_drawable method calls with cairo equivalents.
+
+Scott Moreau <[e-mail]>	2010-09-02
+
+    Add reszie_from_center option.
+
+Sam Spilsbury <[e-mail]>	2010-09-09
+
+    Force input focus on button 1/2/3 press.
+    
+    Sometimes there is a case where the window is active on one screen already,
+    and because compiz is not multi-screen aware, when another window is focussed
+    on another screen, the window will continue to be "active" but not focussed.
+    
+    Previously, when clicking on this window again, the window would not be
+    focussed again since it was already active.
+    
+    This commit forces input focus regardless of the "active" state
+
+Sam Spilsbury <[e-mail]>	2010-09-09
+
+    Also obey force placement match when validating ConfigureRequest events.
+    
+    Forward port of d01732e22007018ca54d4dfe810202ee4d3ee16 to master
+
+Sam Spilsbury <[e-mail]>	2010-09-08
+
+    compiztoolbox.cpp: Move input focus to highlighted windows so it is possible to alt-f4 them
+    switcher.cpp: Move input focus back to last active window if switcher action is cancelled
+
+Merge: 64ee56f 8531355
+Sam Spilsbury <[e-mail]>	2010-09-06
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Danny Baumann <[e-mail]>	2010-09-06
+
+    [PATCH] Replace old gdk_draw_drawable method calls with cairo equivalents.
+
+Sam Spilsbury <[e-mail]>	2010-09-03
+
+    Kick the event loop so that we get glib events
+
+Sam Spilsbury <[e-mail]>	2010-09-03
+
+    Minor cleanup - add onTimerTimeout as a friend, adapt to coding style,
+    fix warnings etc
+
+Scott Moreau <[e-mail]>	2010-09-02
+
+    Add reszie_from_center option.
+
+Jason Smith <[e-mail]>	2010-09-02
+
+    Reduce CPU usage by utilizing max times a bit
+
+Jason Smith <[e-mail]>	2010-09-01
+
+    Minor cleanup and stop constant removal/addition of drawing timer to help improve performance. There is a wakeup issue remaining to be resolved
+
+Jason Smith <[e-mail]>	2010-08-31
+
+    Reduce CPU load, probably breaks certain damage event paints
+
+Jason Smith <[e-mail]>	2010-08-31
+
+    Compiz now works fast with glib
+
+Jason Smith <[e-mail]>	2010-08-31
+
+    Initial timer support. Compiz actually runs (very slow) with bugs
+
+Jason Smith <[e-mail]>	2010-08-31
+
+    First pass at glib loop, invariably breaking things
+
+Danny Baumann <[e-mail]>	2010-08-29
+
+    Fix property handling.
+
+Sam Spilsbury <[e-mail]>	2010-08-28
+
+    Check property size before reading
+
+Sam Spilsbury <[e-mail]>	2010-08-28
+
+    Better checking if the window is destroyed and use the default visual
+    and colormap, unless the window has request an ARGB one, in which case
+    use that (like metacity).
+    
+    This fixes problems with windows which set incorrect colormap/visual
+    combinations in their XSetWindowAttribs, like some SDL windows such
+    as frozen-bubble and SDL/testwm
+
+Merge: 4befd8b 9f936c2
+Sam Spilsbury <[e-mail]>	2010-08-21
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-08-21
+
+    Don't declare metacity funcs if we aren't using it
+
+Scott Moreau <[e-mail]>	2010-08-20
+
+    Properly fix warnings.
+
+Scott Moreau <[e-mail]>	2010-08-20
+
+    Fix warnings.
+
+Scott Moreau <[e-mail]>	2010-08-20
+
+    Fix warnings.
+
+Scott Moreau <[e-mail]>	2010-08-20
+
+    Fix warning.
+
+Scott Moreau <[e-mail]>	2010-08-20
+
+    Fix warning.
+
+Scott Moreau <[e-mail]>	2010-08-20
+
+    Fix typo.
+
+Scott Moreau <[e-mail]>	2010-08-20
+
+    Fix warnings.
+
+Merge: d661a59 afe7893
+Sam Spilsbury <[e-mail]>	2010-08-20
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-08-20
+
+    Use X11 Window Properties for Shadow Settings Storage / Retreival.
+    
+    Remove the DBUS and GConf based settings retreival. It was long
+    broken and based on a bunch of old assumptions
+
+Jay Catherwood <[e-mail]>	2010-08-17
+
+    Don't give all windows struts
+
+Sam Spilsbury <[e-mail]>	2010-08-17
+
+    Use isViewable () rather than invisible ()
+
+Sam Spilsbury <[e-mail]>	2010-08-17
+
+    Revert "Revert "Keep pixmaps of unmapped windows around if they are used for animations.""
+    
+    This reverts commit e37b87173812da4af24c480a1adc9f8075a05e98.
+
+Sam Spilsbury <[e-mail]>	2010-08-15
+
+    Update dbus settings paths.
+
+Sam Spilsbury <[e-mail]>	2010-08-15
+
+    Bump COMPIZ_CUBE_ABI
+
+Sam Spilsbury <[e-mail]>	2010-08-15
+
+    Kill paintAllViewports and make a new wrapable function cubeShouldPaintAllViewports
+
+Merge: d57e882 bfa9742
+Sam Spilsbury <[e-mail]>	2010-08-14
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-08-14
+
+    Split gtk-window-decorator into files
+
+Jay Catherwood <[e-mail]>	2010-08-12
+
+    Fix tooltip open animations not firing
+    
+    Sometimes tooltip open animations do not fire because they are
+    set to viewable early on. This patch runs a map window notification
+    when map is called even if the window is already viewable.
+
+Sam Spilsbury <[e-mail]>	2010-08-13
+
+    Revert "Keep pixmaps of unmapped windows around if they are used for animations."
+    
+    This reverts commit 6c7d254d7f7b3706e9a6294a1c16c7cc9a05568f.
+
+Danny Baumann <[e-mail]>	2010-08-13
+
+    Check with wmType () if the window is really a Dock or a Desktop window;
+    
+    window->type () can be changed depending on the state of that window
+    (eg dock + below = normal). This can cause some dock and desktop
+    windows to be decorated when they shouldn't be.
+
+Sam Spilsbury <[e-mail]>	2010-08-13
+
+    Revert "Fix decoration of windows of the wrong type in the decor plugin"
+    
+    This reverts commit 11a42a7e3fb9d42b7623ac2e4f391482af6020b5.
+
+Merge: b613c2f 9dfda73
+Sam Spilsbury <[e-mail]>	2010-08-13
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-08-13
+
+    Update DBUS strings to get shadow correctly
+
+Sam Spilsbury <[e-mail]>	2010-08-12
+
+    Fix decoration of windows of the wrong type in the decor plugin
+
+Scott Moreau <[e-mail]>	2010-08-10
+
+    Don't use bool as int. Fixes 'inside cube'.
+
+Sam Spilsbury <[e-mail]>	2010-08-11
+
+    Use restack () instead of restackBelow () to ensure stack synchronousity
+
+Merge: 8f8a983 ccde9fb
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Don't free a local variable by creating a pointer to it and then not
+    knowing whether that pointer is actually heap or stack memory
+
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Also include frame region in input region shape
+
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Make minimize, unminimize and minimized () functions wrappable
+
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Revert "Call wrapped hide and show functions for minimize and unminimize and also"
+    
+    This reverts commit 4e0bad2e7f8a1e16cec41f6909c19bab33d93e17.
+
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Call wrapped hide and show functions for minimize and unminimize and also
+    unite frame region with input shaped region (so that decorations don't lose input)
+
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Use anchor stacking point as either directly above or directly below
+    window when reparenting windows
+
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Fix typo
+
+Merge: 8ba8b19 4e1a665
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-08-10
+
+    Handle the ShapeInput and ShapeBounding XShape regions
+
+Jay Catherwood <[e-mail]>	2010-08-09
+
+    Fix gimp layers window disappearing
+    
+    This fixes bug 1303. Under certain circumstances restack ends up
+    being called with the window as its own aboveId, causing it to
+    disappear.
+
+Sam Spilsbury <[e-mail]>	2010-08-08
+
+    Make minimization functions wrappable. Check return functions for minimized state rather than internal variables (since a plugin may want to change the reported state of minimization)
+
+Sam Spilsbury <[e-mail]>	2010-08-07
+
+    Export the CompWindow in ScaleWindowList and don't prevent the creation of a ScaleSlot for a window if one isn't already assigned (with setSlot ())
+    
+    Bump COMPIZ_SCALE_ABI
+
+Sam Spilsbury <[e-mail]>	2010-07-31
+
+    Handle property data types other than XA_CARDINAL and XA_STRING. Fixes window hints not being written for other data types, such as XA_WINDOW which is used by compiztoolbox for switcher background drawing
+
+Guillaume Seguin <[e-mail]>	2010-07-29
+
+    Workaround CMake problem with -D_REENTRANT on TryCompile
+
+Guillaume Seguin <[e-mail]>	2010-07-29
+
+    Fix typo
+
+Sam Spilsbury <[e-mail]>	2010-07-29
+
+    Increment count
+
+Sam Spilsbury <[e-mail]>	2010-07-29
+
+    Initialize XPolygonRegion arguments and use WindingRule
+
+Merge: ffbb452 7200386
+Sam Spilsbury <[e-mail]>	2010-07-25
+
+    Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-07-25
+
+    Add a constructor to initialize a CompRegion from a series of CompPoint's,
+    much like the XPolygonRegion construct allows for
+
+Sam Spilsbury <[e-mail]>	2010-07-25
+
+    PropertyWriter went into core a while ago, no need to depend on compiztoolbox
+
+Scott Moreau <[e-mail]>	2010-07-24
+
+    Fix warnings.
+
+Sam Spilsbury <[e-mail]>	2010-07-19
+
+    Set scale slot geometry correctly. Fixes keyboard focus moving incorrectly
+
+Sam Spilsbury <smspillaz@XPS-U.(none)>	2010-07-12
+
+    Determine the id of the appropriate child window and pass that as "window"
+    for xbutton events in button actions.
+    
+    The previous behaviour was to pass the xbutton.window, but this was usually
+    the frame wrapper window, which meant calls to screen->findWindow () would
+    fail since this window was not in screen->windows ();
+
+Sam Spilsbury <[e-mail]>	2010-07-04
+
+    Update NEWS for 0.9.0 release
+
+Sam Spilsbury <[e-mail]>	2010-07-04
+
+    Fix debugging prefix
+
+Sam Spilsbury <[e-mail]>	2010-07-04
+
+    Add NEWS changes from 0.7.8-0.8.6
+
+Sam Spilsbury <[e-mail]>	2010-07-04
+
+    Install and load local information from XDG_HOME/.compiz-1 to prevent conflicts with compiz-0.8
+
+Sam Spilsbury <[e-mail]>	2010-07-02
+
+    Fix warning in annotate
+
+Sam Spilsbury <[e-mail]>	2010-07-02
+
+    Simplify serialization interface
+
+Sam Spilsbury <[e-mail]>	2010-06-23
+
+    Kill debug message
+
+Sam Spilsbury <[e-mail]>	2010-06-23
+
+    Add install type package vars to avoid a bug where we might install
+    into "/" on some systems
+
+Sam Spilsbury <[e-mail]>	2010-06-19
+
+    Revert "[PATCH] Handle dock windows with keep-below mask."
+    
+    This reverts commit 2fb7e4227d516cd2ba8b81e411bbfc0aca127943.
+    
+    Handling dock windows like this causes problems for docks that are set
+    above windows (like plasma panel) we need to find a better way to handle
+    these windows
+
+Sam Spilsbury <[e-mail]>	2010-06-18
+
+    Kill debug messages
+
+Sam Spilsbury <[e-mail]>	2010-06-18
+
+    Add COMPIZ_ENABLE_PACKAGING option so that distros with default settings for prefix, etc don't override
+    what the use has specified with CMAKE_INSTALL_PREFIX
+    
+    Also remove install (libcompiz.so), we use compiz_opt_install_file anyways for it
+
+Sam Spilsbury <[e-mail]>	2010-06-13
+
+    Add missing files
+
+Sam Spilsbury <[e-mail]>	2010-06-12
+
+    A few big changes:
+     * Rewrite PropertyWriter, move it out of compiztoolbox
+     * Added CompPluginStateWriter, a serialization interface, which plugins inherit, and specify how to serialize their class members, which will be automatically unloaded and reloaded as plugins unload and reload.
+     * Currently there are bugs with this interface, so it is disabled by default (mostly bugs to do with boost and libdl)
+     * Depend on libboost-serialization
+     * A few bugfixes
+
+Adel Gadllah <[e-mail]>	2010-06-05
+
+    Install locale in standard location
+    
+    Translations should be in ${datadir}/locale not ${datadir}/compiz/locale
+
+Dominique Leuenberger <[e-mail]>	2010-06-01
+
+    [PATCH] Cmake: give more control to packagers - allowing them to specify install
+    
+    Allows developers to specify libbdir, datadir and bindir, just as they are used from autotools based projects.  Additionally, this removes the need for packagers to fiddle with LIB_SUFFIX.
+
+Sebasian Billaudelle <[e-mail]>	2010-05-25
+
+    [PATCH] Handle dock windows with keep-below mask.
+
+Sam Spilsbury <[e-mail]>	2010-05-25
+
+    Load after decor plugin where appropriate to prevent windows shifting on plugin load and unload
+
+Sam Spilsbury <[e-mail]>	2010-05-23
+
+    Don't dump the template once we delete a property
+
+Sam Spilsbury <[e-mail]>	2010-05-23
+
+    Sanity check
+
+Sam Spilsbury <[e-mail]>	2010-05-23
+
+    Add getReadTemplate function and make plugins use that.
+    
+    This avoids some repetitive coding when setting up values to input into the property.
+
+Sam Spilsbury <[e-mail]>	2010-05-23
+
+    Use PropertyWriter in plugins which set window properties
+
+Sam Spilsbury <[e-mail]>	2010-05-23
+
+    Don't require opengl or composite, but load after them if available
+
+Sam Spilsbury <[e-mail]>	2010-05-23
+
+    Added generic X11 Window Property handler class which reads and writes
+    window properties on a template
+
+Sam Spilsbury <[e-mail]>	2010-05-22
+
+    compiz_opt_install_file already adds destdir, no need to double it
+
+Sam Spilsbury <[e-mail]>	2010-05-22
+
+    Don't generate files to COMPIZ_DESTDIR
+
+Sam Spilsbury <[e-mail]>	2010-05-21
+
+    Link Xext explicitly because distributions are moving in the direction of requiring strict DSO linking
+
+Sam Spilsbury <[e-mail]>	2010-05-19
+
+    COMPIZ_DESTDIR support for windowsettings xml
+
+Sam Spilsbury <[e-mail]>	2010-05-19
+
+    Fix DESTDIR related typo
+    
+    Ensure no rpath linkage in kde4-w-d gtk-w-d and blur
+
+Danny Baumann <[e-mail]>	2010-05-19
+
+    Return resName as CompString so it can't be modified by the caller.
+
+Travis Watkins <[e-mail]>	2010-05-18
+
+    add resName getter
+
+Sam Spilsbury <[e-mail]>	2010-05-18
+
+    Added DESTDIR support for packaging
+
+Sam Spilsbury <[e-mail]>	2010-05-18
+
+    Make full rpath support optional (for those who need to build in a non-standard path)
+
+Sam Spilsbury <[e-mail]>	2010-05-15
+
+    Add ability to have bindings toggle scale mode
+
+Sam Spilsbury <[e-mail]>	2010-05-15
+
+    Cleanup linkage handling and use rpath for plugins.
+    
+    rpath is generally bad because it results in stupid linkage which can
+    break with distribution upgrades (which is the reason for previous
+    commits which use ldconfig LIBDIR). However, it doesn't appear to be
+    against any distribution's policy to use rpath for "internal" libraries
+    such as plugins linking against each other - so instead of adding those
+    rather generic names to the ld.so cache, just specify an rpath, since there
+    is no way there would be multiple versions of a plugin at once (and even then
+    plugins would have to manually link).
+    
+    This *does* stretch the boundaries allowed by distributions slightly however,
+    since other plugins usually have to link with libcomposite and libopengl
+    in order to load them, however we have our own system of safeguard checks
+    to ensure that the right plugins are loaded in any case (since the linkage
+    will change dynamically on dlopen () - the initial linkage is only there
+    so that dlopen () will not complain when it can't find the composite and
+    opengl libraries, but in that case, it wouldn't even matter anyways since
+    those plugins have to be loaded in order to be useful)
+    
+    For distribution policy, see:
+    http://wiki.debian.org/RpathIssue
+    http://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+
+Sam Spilsbury <[e-mail]>	2010-05-15
+
+    Typofix
+
+Sam Spilsbury <[e-mail]>	2010-05-15
+
+    CompizToolbox depends on composite and opengl, although it really shouldn't
+
+Sam Spilsbury <[e-mail]>	2010-05-15
+
+    Added compiz_ensure_linkage function and dropped some more rpath stuff
+
+Sam Spilsbury <[e-mail]>	2010-05-15
+
+    Add necessary changes to compile without rpath usage
+
+Sam Spilsbury <[e-mail]>	2010-05-14
+
+    Fix another build related typo
+
+Sam Spilsbury <[e-mail]>	2010-05-14
+
+    Fix typo
+
+Sam Spilsbury <[e-mail]>	2010-05-14
+
+    Never skip rpath
+
+Sam Spilsbury <[e-mail]>	2010-05-14
+
+    To be similar to autofoo it should be "make dist"
+
+Travis Watkins <[e-mail]>	2010-05-13
+
+    add soversion for libdecoration
+
+Travis Watkins <[e-mail]>	2010-05-13
+
+    build fixes
+
+Sam Spilsbury <[e-mail]>	2010-05-14
+
+    Added more commands to commands plugin.
+    
+    Some people use compiz as a standalone WM and require some ridiculous
+    number of command shortcuts. We like to put options in to facilitate those
+    people because we are nice :).
+
+Sam Spilsbury <[e-mail]>	2010-05-13
+
+    Add compiz_add_git_dist macro to CompizCommon
+
+Sam Spilsbury <[e-mail]>	2010-05-13
+
+    Fix warning
+
+Merge: ae325b9 e682cc2
+Sam Spilsbury <[e-mail]>	2010-05-13
+
+    Merge branch 'master' of git+ssh://[e-mail]/git/compiz/core
+
+Sam Spilsbury <[e-mail]>	2010-05-13
+
+    Ensure that plugins get correctly loaded after composite and opengl.
+    
+    Some plugins had an oversight which caused them to not load correctly
+    due to a missing <deps> tag. Also some plugins should have been loading
+    after these plugins.
+    
+    This fixes a potential glitch in newer versions of libdri.
+    
+    It also fixes ugliness in the mass redirection/unredirection of windows
+    when the opengl plugin is loaded/reloaded
+
+Travis Watkins <[e-mail]>	2010-05-12
+
+    add a simple `make dist` target
+
+Sam Spilsbury <[e-mail]>	2010-05-12
+
+    Use configureXWindow and XConfigureWindow respectively instead of ::resize.
+    
+    ::resize and XMoveResizeWindow are mostly functions for internal use and they
+    don't correclty configure the window the way we need it. This results
+    in some weird display artefacts with the switcher popup window
+
+Sam Spilsbury <[e-mail]>	2010-05-11
+
+    A slightly more detailed description of what "Hover Timeout" actually does
+
+Sam Spilsbury <[e-mail]>	2010-05-11
+
+    Fix conditional jump or move being based on uninitialized values
+
+Sam Spilsbury <[e-mail]>	2010-05-09
+
+    Read decoration settings from the decor plugin and not the decoration plugin
+
+Sam Spilsbury <[e-mail]>	2010-05-09
+
+    Don't use pkg-config to link blur with libdecoration.
+    
+    Set the install rpath so that blur can be linked locally with libdecoration.
+    This fixes a case where pkg-config would import wrong include files if 0.8.x
+    was installed.
+
+Sam Spilsbury <smspillaz@XPS-FEDORA.(none)>	2010-05-06
+
+    Kill some debug messages
+
+Sam Spilsbury <smspillaz@XPS-FEDORA.(none)>	2010-05-06
+
+    Check to see if switcher grab does NOT exist before focusing default window
+    (Previous behaviour was most likely a typo)
+
+Sam Spilsbury <smspillaz@XPS-FEDORA.(none)>	2010-05-05
+
+    Move dbus to utility
+
+Sam Spilsbury <smspillaz@XPS-FEDORA.(none)>	2010-05-03
+
+    Use corect calculation
+
+Sam Spilsbury <smspillaz@XPS-FEDORA.(none)>	2010-05-03
+
+    Typofix
+
+Danny Baumann <[e-mail]>	2010-05-02
+
+    Optionally traverse through ancestry when getting the client leader of a
+    window which has no own client leader set.
+
+Sam Spilsbury <smspillaz@XPS-FEDORA.(none)>	2010-04-29
+
+    dbus: Use C++ bool
+
+Merge: a4c0bd1 4719477
+Danny Baumann <[e-mail]>	2010-04-28
+
+    Merge branch 'master' of git+ssh://git.compiz-fusion.org/git/compiz/core
+
+Danny Baumann <[e-mail]>	2010-04-28
+
+    Add some additional accessor functions for more consistent class usage.
+
+Sam Spilsbury <[e-mail]>	2010-04-27
+
+    blur: link correctly with libdecoration
+
+Sam Spilsbury <[e-mail]>	2010-04-23
+
+    Don't recursively add plugins in folder
+
+Sam Spilsbury <[e-mail]>	2010-04-23
+
+    Move some buildsystem defines into CompizCommon
+
+Sam Spilsbury <[e-mail]>	2010-04-23
+
+    Fix double define
+
+Sam Spilsbury <[e-mail]>	2010-04-23
+
+    Move certain defines to CompizCommon
+
+Sam Spilsbury <[e-mail]>	2010-04-23
+
+    Use CompizDefaults to export file locations instead
+
+Sam Spilsbury <[e-mail]>	2010-04-23
+