Merge lp:~gala-dev/gala/plugins into lp:gala

[Tom Beckmann]

Add plugin support, move zoom functionality into a plugin

This adds plugin support to gala.

First change is a split of the current code to a libgala, which basically is just an interface to the WindowManager class with those functions we want publicly available, and the actual gala, which implements this interface.

Next we have a Plugin class, which can be implemented by plugins. Any plugin that is found at $PKGDATADIR/plugins, which is now $PLUGINDIR, will be loaded at gala's start.
The plugin class will receive an instance of the wm when it is initialized, from which it can then access the entire libmutter Plugin/Screen/Display API. A plugin also has the option to set its region property, which allows it to define which parts of the screen should deliver mouse events to the plugin. The Utils.set_input_area then takes care of combining those with for example the hotcorners.

I also moved the Zooming.vala class out as a plugin to "prove" that it works. One sidenote on that, the Clutter.Threads.Timeout.add in this class causes gala to crash, using the traditional GLib.Timeout.add works. This also happened before making it a plugin, I just hadn't noticed it till now. The backtrace wasn't really helpful, so I'm not sure why that is yet.

[lp:~gala-dev/gala/plugins]

365. By Rico Tzschichholz on 2014-01-17

vapi: Update mutter bindings to 3.11.4

366. By Rico Tzschichholz on 2014-01-17

build: Bump mutter requirements to their latest releases

[Rico Tzschichholz (ricotz)]

* pkg-config file (libgala.pc) is missing

* libgala.deps generation summons not needed dependencies e.g. granite, clutter-gtk-1.0 are
  not exposed in the public api, and xfixes-4.0 is missing there

* How do we want to handle vala bindings for libbamf3, libmutter and xfixes which would need
  to be installed to have a working libgala.vapi?

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

It is probably better to split things using a private library to discourage a wider use until the API is settled to get this merged sooner?

review: Needs Information

[lp:~gala-dev/gala/plugins]

367. By Rico Tzschichholz on 2014-02-05

vapi: Update mutter bindings to 3.11.5

368. By Rico Tzschichholz on 2014-02-05

Adjustments for mutter 3.11.5 API changes

369. By Tom Beckmann on 2013-12-17

split gala into a wm part and a library, add plugin system, move zooming out to a plugin, add a template plugin

370. By Cody Garver on 2013-12-19

Minor alignment fix in CMakeLists.txt

371. By Cody Garver on 2013-12-19

Remove using statements

372. By Tom Beckmann on 2014-03-08

Ported plugins branch to autotools based on the setup of lp:~docky-core/docky/plank-docky
Default plugins are not compiled and installed yet

373. By Tom Beckmann on 2014-03-08

add build setup for default plugin

374. By Tom Beckmann on 2014-03-08

add gsettings setup based on lp:~ricotz/plank/gsettings

375. By Tom Beckmann on 2014-03-08

apply various fixes by ricotz

376. By Tom Beckmann on 2014-03-08

move -avoid-version to central variable for plugins

377. By Tom Beckmann on 2014-03-09

correct valac version, add min version requirement for libmutter, fix whitespaces

378. By Rico Tzschichholz on 2014-03-09

Fix determining the available mutter version

379. By Rico Tzschichholz on 2014-03-09

Minor clean ups

380. By Rico Tzschichholz on 2014-03-09

Merge trunk

381. By Rico Tzschichholz on 2014-03-09

Drop support for Mutter < 3.8.4

382. By Rico Tzschichholz on 2014-03-09

lib: Add missing copyright headers

383. By Rico Tzschichholz on 2014-03-09

lib: Drop obsolete cmake file

384. By Rico Tzschichholz on 2014-03-09

src: Add missing copyright headers

[Rico Tzschichholz (ricotz)]

My concerns are gone while using a private library for now.

[lp:~gala-dev/gala/plugins]

385. By Tom Beckmann on 2014-03-12

Fix various little problems, add track_actor functionality, add extended
plugin info allowing plugins to replace built-in componenets, allow them
to delay their load.

386. By Tom Beckmann on 2014-03-12

various little fixes

387. By Rico Tzschichholz on 2014-03-22

Merge trunk r371

388. By Tom Beckmann on 2014-04-06

make region gathering code nicer

389. By Tom Beckmann on 2014-04-06

fix ordering of class members, make recalculate_regions private

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-09-22 21:09:25 +0000
+++ .bzrignore	2014-04-06 18:03:36 +0000
@@ -1,1 +1,41 @@
+aclocal.m4
+autom4te.cache
+/build-aux/*
+ChangeLog
+config.h
+config.h.in
+config.log
+config.status
+configure
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
+libtool
+m4
+mkinstalldirs
+stamp-h1
+Makefile
+Makefile.in
+.version
+.deps
+.dirstamp
+.libs
+*.c
+*.h
+*.lo
+*.la
+*.pc
+*.stamp
+data/gala.desktop
+data/gschemas.compiled
+data/org.pantheon.desktop.gala.gschema.valid
+data/org.pantheon.desktop.gala.gschema.xml
+data/org.pantheon.desktop.gala.gschema.xml.in
+lib/gala.vapi
+po/*.gmo
+po/.intltool-merge-cache
+po/Makefile.in.in
+po/POTFILES
+po/stamp-it
+src/gala
 build

=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +0000
+++ AUTHORS	2014-04-06 18:03:36 +0000
@@ -0,0 +1,8 @@
+Cody Garver <[e-mail]>
+Daniel Fore <[e-mail]>
+Garden Gnome <[e-mail]>
+Niels Avonds <[e-mail]>
+Rico Tzschichholz <[e-mail]>
+Sergey "Shnatsel" Davidoff <[e-mail]>
+Timo Reimerdes <[e-mail]>
+Tom Beckmann <[e-mail]>

=== removed file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-18 04:30:24 +0000
+++ CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-# Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
-
-project (gala)
-cmake_minimum_required (VERSION 2.8)
-cmake_policy (VERSION 2.6)
-
-list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
-
-#
-# Base bits
-#
-
-enable_testing ()
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/gala")
-set (GETTEXT_PACKAGE "gala")
-set (RELEASE_NAME "")
-set (VERSION "0.1.0")
-set (VERSION_INFO "Release")
-set (CMAKE_C_FLAGS "-ggdb")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (DOLLAR "$")
-
-set(CPACK_SOURCE_GENERATOR "TBZ2")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
-set(CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;~$;.bzrignore;${CPACK_SOURCE_IGNORE_FILES}")
-include(CPack)
-add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
-
-list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-
-configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.cmake ${CMAKE_BINARY_DIR}/src/Config.vala)
-add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DGNOME_DESKTOP_USE_UNSTABLE_API -w)
-
-find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED libmutter>=3.4 granite clutter-1.0>=1.9.16 clutter-gtk-1.0 libbamf3 xfixes gee-0.8 plank gnome-desktop-3.0)
-
-set (MUTTER36_FLAGS "")
-pkg_check_modules(MUTTER36 QUIET libmutter>=3.5)
-if (MUTTER36_FOUND)
-	pkg_check_modules(MUTTER36 REQUIRED libmutter>=3.6.3)
-	set (MUTTER36_FLAGS "--define=HAS_MUTTER36")
-endif (MUTTER36_FOUND)
-
-set (MUTTER38_FLAGS "")
-pkg_check_modules(MUTTER38 QUIET libmutter>=3.7)
-if (MUTTER38_FOUND)
-	pkg_check_modules(MUTTER38 REQUIRED libmutter>=3.8.4)
-	set (MUTTER38_FLAGS "--define=HAS_MUTTER38")
-endif (MUTTER38_FOUND)
-
-set (MUTTER310_FLAGS "")
-pkg_check_modules(MUTTER310 QUIET libmutter>=3.9)
-if (MUTTER310_FOUND)
-	pkg_check_modules(MUTTER310 REQUIRED libmutter>=3.10.3)
-	set (MUTTER310_FLAGS "--define=HAS_MUTTER310")
-endif (MUTTER310_FOUND)
-
-set (MUTTER312_FLAGS "")
-pkg_check_modules(MUTTER312 QUIET libmutter>=3.11)
-if (MUTTER312_FOUND)
-	pkg_check_modules(MUTTER310 REQUIRED libmutter>=3.11.91)
-	set (MUTTER312_FLAGS "--define=HAS_MUTTER312")
-endif (MUTTER312_FOUND)
-
-add_definitions(${DEPS_CFLAGS})
-
-link_libraries(${DEPS_LIBRARIES})
-link_directories(${DEPS_LIBRARY_DIRS})
-
-find_package(Vala REQUIRED)
-include(ValaVersion)
-ensure_vala_version("0.22.0" MINIMUM)
-
-include(ValaPrecompile)
-vala_precompile(VALA_C
-    src/DBus.vala
-    src/DragDropAction.vala
-    src/Main.vala
-    src/Plugin.vala
-    src/ScreenSaver.vala
-    src/Settings.vala
-    src/TextShadowEffect.vala
-    src/Utils.vala
-    src/Zooming.vala
-    src/Background/Background.vala
-    src/Background/BackgroundCache.vala
-    src/Background/BackgroundManager.vala
-    src/Background/SlideShow.vala
-    src/Background/SystemBackground.vala
-    src/Widgets/AppIcon.vala
-    src/Widgets/WindowOverview.vala
-    src/Widgets/WindowSwitcher.vala
-    src/Widgets/WindowThumb.vala
-    src/Widgets/WorkspaceThumb.vala
-    src/Widgets/WorkspaceView.vala
-    ${CMAKE_BINARY_DIR}/src/Config.vala
-PACKAGES
-    granite
-    libbamf3
-    libmutter
-    plank
-    clutter-gtk-1.0
-    gdk-x11-3.0
-    gdesktopenums-3.0
-    gnome-desktop-3.0
-    xfixes-4.0
-    cogl-fixes
-OPTIONS
-    -g
-    --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
-    ${MUTTER36_FLAGS}
-    ${MUTTER38_FLAGS}
-    ${MUTTER310_FLAGS}
-    ${MUTTER312_FLAGS}
-    )
-
-#add_subdirectory (po)
-
-include(GSettings)
-add_schema ("data/org.pantheon.desktop.gala.gschema.xml")
-
-add_executable(gala ${VALA_C})#src/main.c)
-target_link_libraries(gala m)
-
-install(TARGETS gala RUNTIME DESTINATION bin)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/gala.desktop DESTINATION share/applications)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/gala.css DESTINATION ${PKGDATADIR})
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/texture.png DESTINATION ${PKGDATADIR})

=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2014-04-06 18:03:36 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  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.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     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
+state 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program 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, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU 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 Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== modified file 'INSTALL'
--- INSTALL	2012-06-04 20:35:08 +0000
+++ INSTALL	2014-04-06 18:03:36 +0000
@@ -1,18 +1,370 @@
-Dependencies:
-    cmake
-    libgranite-dev
-    libmutter-dev
-    libclutter-gtk-1.0-dev
-    libgtk-3-dev
-    gsettings-desktop-schemas-dev
-    libxfixes-dev
-    libbamf3-dev
-    valac-0.16
-
-Installation:
-    bzr branch lp:gala
-    cd gala
-    mkdir build
-    cd build
-    cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-    sudo make install
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.

=== added file 'Makefile.am'
--- Makefile.am	1970-01-01 00:00:00 +0000
+++ Makefile.am	2014-04-06 18:03:36 +0000
@@ -0,0 +1,47 @@
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = \
+	data \
+	lib \
+	plugins \
+	src \
+	po \
+	vapi \
+	$(NULL)
+
+EXTRA_DIST = \
+	.version \
+	build-aux/bzr-version-gen \
+	$(NULL)
+
+BUILT_SOURCES = \
+	$(top_srcdir)/.version \
+	$(NULL)
+
+$(top_srcdir)/.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
+
+dist-hook:
+	echo $(VERSION) > $(distdir)/.tarball-version
+
+distclean-local:
+	if test "x$(srcdir)" = "x."; then :; else \
+		rm -f ChangeLog; \
+	fi
+
+ChangeLog:
+	@echo Creating $@
+	@if test -d "$(srcdir)/.bzr"; then \
+		(bzr log --gnu -n1) | fmt --split-only --width=80 > $@.tmp \
+		&& mv -f $@.tmp $@ \
+		|| ($(RM) $@.tmp; \
+			echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+			(test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+		test -f $@ || \
+		(echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+		echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
+
+.PHONY: ChangeLog
+

=== added file 'Makefile.common'
--- Makefile.common	1970-01-01 00:00:00 +0000
+++ Makefile.common	2014-04-06 18:03:36 +0000
@@ -0,0 +1,15 @@
+NULL =
+
+AM_V_VALA = $(am__v_VALA_$(V))
+am__v_VALA_ = $(am__v_VALA_$(AM_DEFAULT_VERBOSITY))
+am__v_VALA_0 = @echo "  VALAC " $?;
+
+AM_CPPFLAGS = \
+	-include $(CONFIG_HEADER) \
+	-DDATADIR=\"$(datadir)\" \
+	-DPKGDATADIR=\"$(pkgdatadir)\" \
+	-DLIBDIR=\"$(libdir)\" \
+	-DPKGLIBDIR=\"$(pkglibdir)\" \
+	-DPLUGINDIR=\"$(pkglibdir)/plugins\" \
+	-DSCHEMA=\"org.pantheon.desktop.gala\" \
+	$(NULL)

=== added file 'NEWS'
=== added file 'README'
=== added file 'autogen.sh'
--- autogen.sh	1970-01-01 00:00:00 +0000
+++ autogen.sh	2014-04-06 18:03:36 +0000
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gala"
+
+(test -f $srcdir/configure.ac \
+  && test -f $srcdir/autogen.sh) || {
+    echo -n "**Error**: Directory \`$srcdir' does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+if which gnome-autogen.sh ; then
+  REQUIRED_AUTOMAKE_VERSION=1.11 . gnome-autogen.sh
+else
+  if which intltoolize && which autoreconf ; then
+    intltoolize --copy --force --automake || \
+      (echo "There was an error in running intltoolize." > /dev/stderr;
+       exit 1)
+    autoreconf --force --install || \
+      (echo "There was an error in running autoreconf." > /dev/stderr;
+       exit 1)
+  else
+    echo "No build script available.  You have two choices:"
+    echo "1. You need to install the gnome-common module and make"
+    echo "   sure the gnome-autogen.sh script is in your \$PATH."
+    echo "2. You need to install the following scripts:"
+    echo "   * intltool"
+    echo "   * libtool"
+    echo "   * automake"
+    echo "   * autoconf"
+    echo "   Additionally, you need to make"
+    echo "   sure that they are in your \$PATH."
+    exit 1
+  fi
+fi
+

=== added directory 'build-aux'
=== added file 'build-aux/bzr-version-gen'
--- build-aux/bzr-version-gen	1970-01-01 00:00:00 +0000
+++ build-aux/bzr-version-gen	2014-04-06 18:03:36 +0000
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+scriptversion=2010-05-09.22; # UTC
+
+# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+
+# Additional permission under GNU GPL version 3 section 7
+
+
+# Written by Giuseppe Scrivano.
+
+if test -f .tarball-version
+then
+    cat .tarball-version | tr -d '\n'
+    exit 0
+fi
+
+DIRTY=""
+
+test -n "$(bzr diff | tr -d '\n')" && DIRTY="-dirty"
+
+REVNO=$(bzr revno)
+
+TAG=$(bzr tags -r $REVNO | cut -d' ' -f1)
+if test -z "$TAG"
+then
+    TAG=$(bzr tags -r ..$REVNO | cut -d' ' -f1)
+
+    # No tags yet
+    if test -z "$1"
+    then
+        test -z "$TAG" && TAG="unknown"
+    else
+        TAG=$1
+    fi
+
+    TAG=$TAG.$REVNO
+fi
+
+
+printf "%s%s" "$TAG" "$DIRTY"
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

=== removed directory 'cmake'
=== removed file 'cmake/FindVala.cmake'
--- cmake/FindVala.cmake	2012-05-20 13:20:38 +0000
+++ cmake/FindVala.cmake	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-##
-# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#    1. Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#    2. Redistributions in binary form must reproduce the above copyright notice,
-#       this list of conditions and the following disclaimer in the documentation
-#       and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies,
-# either expressed or implied, of Jakob Westhoff
-##
-
-##
-# Find module for the Vala compiler (valac)
-#
-# This module determines wheter a Vala compiler is installed on the current
-# system and where its executable is.
-#
-# Call the module using "find_package(Vala) from within your CMakeLists.txt.
-#
-# The following variables will be set after an invocation:
-#
-#  VALA_FOUND       Whether the vala compiler has been found or not
-#  VALA_EXECUTABLE  Full path to the valac executable if it has been found
-#  VALA_VERSION     Version number of the available valac
-##
-
-
-# Search for the valac executable in the usual system paths.
-find_program(VALA_EXECUTABLE
-  NAMES valac)
-
-# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
-# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
-# VALA_EXECUTABLE is set)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE)
-
-mark_as_advanced(VALA_EXECUTABLE)
-
-# Determine the valac version
-if(VALA_FOUND)
-    execute_process(COMMAND ${VALA_EXECUTABLE} "--version" 
-                    OUTPUT_VARIABLE "VALA_VERSION")
-    string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
-    string(STRIP ${VALA_VERSION} "VALA_VERSION")
-endif(VALA_FOUND)

=== removed file 'cmake/GSettings.cmake'
--- cmake/GSettings.cmake	2012-05-20 13:20:38 +0000
+++ cmake/GSettings.cmake	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
-
-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ON)
-
-option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
-
-if(GSETTINGS_LOCALINSTALL)
-    message(STATUS "GSettings schemas will be installed locally.")
-endif()
-
-if(GSETTINGS_COMPILE)
-    message(STATUS "GSettings shemas will be compiled.")
-endif()
-
-macro(add_schema SCHEMA_NAME)
-
-    set(PKG_CONFIG_EXECUTABLE pkg-config)
-    # Have an option to not install the schema into where GLib is
-    if (GSETTINGS_LOCALINSTALL)
-        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
-    else (GSETTINGS_LOCALINSTALL)
-        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
-        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
-    endif (GSETTINGS_LOCALINSTALL)
-
-    # Run the validator and error if it fails
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (_schemas_invalid)
-      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
-    endif (_schemas_invalid)
-
-    # Actually install and recomple schemas
-    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
-
-    if (GSETTINGS_COMPILE)
-        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
-    endif ()
-endmacro()

=== removed file 'cmake/ParseArguments.cmake'
--- cmake/ParseArguments.cmake	2012-05-20 13:20:38 +0000
+++ cmake/ParseArguments.cmake	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-##
-# This is a helper Macro to parse optional arguments in Macros/Functions
-# It has been taken from the public CMake wiki.  
-# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and
-# licensing.
-##
-macro(parse_arguments prefix arg_names option_names)
-  set(DEFAULT_ARGS)
-  foreach(arg_name ${arg_names})
-    set(${prefix}_${arg_name})
-  endforeach(arg_name)
-  foreach(option ${option_names})
-    set(${prefix}_${option} FALSE)
-  endforeach(option)
-
-  set(current_arg_name DEFAULT_ARGS)
-  set(current_arg_list)
-  foreach(arg ${ARGN})
-    set(larg_names ${arg_names})
-    list(FIND larg_names "${arg}" is_arg_name)
-    if(is_arg_name GREATER -1)
-      set(${prefix}_${current_arg_name} ${current_arg_list})
-      set(current_arg_name ${arg})
-      set(current_arg_list)
-    else(is_arg_name GREATER -1)
-      set(loption_names ${option_names})
-      list(FIND loption_names "${arg}" is_option)
-      if(is_option GREATER -1)
-	    set(${prefix}_${arg} TRUE)
-      else(is_option GREATER -1)
-	    set(current_arg_list ${current_arg_list} ${arg})
-      endif(is_option GREATER -1)
-    endif(is_arg_name GREATER -1)
-  endforeach(arg)
-  set(${prefix}_${current_arg_name} ${current_arg_list})
-endmacro(parse_arguments)

=== removed file 'cmake/README'
--- cmake/README	2012-05-20 13:20:38 +0000
+++ cmake/README	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-        Elementary CMake modules
-
-This is a set of CMake modules: Translations, GSettings, and Vala modules.
-
-For all the Vala related modules see README.Vala.rst: 
-    - ParseArguments.cmake
-    - ValaPrecompile.cmake
-    - ValaVersion.cmake
-    - FindVala.cmake
-

=== removed file 'cmake/README.Vala.rst'
--- cmake/README.Vala.rst	2012-05-20 13:20:38 +0000
+++ cmake/README.Vala.rst	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
-==========
-Vala CMake
-==========
-:Author: 
-    Jakob Westhoff
-:Version:
-    Draft
-
-
-Overview
-========
-
-Vala CMake is a collection of macros for the CMake_ build system to allow the
-creation and management of projects developed using the Vala_ programming
-language or its "Genie" flavor (less tested).
-
-
-Installation
-============
-
-To use the Vala macros in your own project you need to copy the macro files to
-an arbitrary folder in your projects directory and reference them in your
-``CMakeLists.txt`` file.
-
-Assuming the macros are stored under ``cmake/vala`` in your projects folder you
-need to add the following information to your base ``CMakeLists.txt``::
-
-    list(APPEND CMAKE_MODULE_PATH 
-        ${CMAKE_SOURCE_DIR}/cmake/vala
-    )
-
-After the new module path as been added you can simply include the provided
-modules or use the provided find routines.
-
-
-Finding Vala
-============
-
-The find module for vala works like any other Find module in CMake.
-You can use it by simply calling the usual ``find_package`` function. Default
-parameters like ``REQUIRED`` and ``QUIETLY`` are supported.
-
-::
-
-    find_package(Vala REQUIRED)
-
-After a successful call to the find_package function the following variables 
-will be set:
-
-VALA_FOUND
-    Whether the vala compiler has been found or not
-
-VALA_EXECUTABLE
-    Full path to the valac executable if it has been found
-
-VALA_VERSION
-    Version number of the available valac
-
-
-Precompiling Vala sources
-=========================
-
-CMake is mainly supposed to handle c or c++ based projects. Luckily every vala
-program is translated into plain c code using the vala compiler, followed by
-normal compilation of the generated c program using gcc.
-
-The macro ``vala_precompile`` uses that fact to create c files from your .vala
-sources for further CMake processing. 
-
-The first parameter provided is a variable, which will be filled with a list of
-c files outputted by the vala compiler. This list can than be used in
-conjunction with functions like ``add_executable`` or others to create the
-necessary compile rules with CMake.
-
-The initial variable is followed by a list of .vala files to be compiled.
-Please take care to add every vala file belonging to the currently compiled
-project or library as Vala will otherwise not be able to resolve all
-dependencies.
-
-The following sections may be specified afterwards to provide certain options
-to the vala compiler:
-
-PACKAGES  
-    A list of vala packages/libraries to be used during the compile cycle. The
-    package names are exactly the same, as they would be passed to the valac
-    "--pkg=" option.
-
-OPTIONS
-    A list of optional options to be passed to the valac executable. This can be
-    used to pass "--thread" for example to enable multi-threading support.
-
-DIRECTORY
-    Specify the directory where the output source files will be stored. If 
-    ommitted, the source files will be stored in CMAKE_CURRENT_BINARY_DIR.
-
-CUSTOM_VAPIS
-    A list of custom vapi files to be included for compilation. This can be
-    useful to include freshly created vala libraries without having to install
-    them in the system.
-
-GENERATE_VAPI
-    Pass all the needed flags to the compiler to create an internal vapi for
-    the compiled library. The provided name will be used for this and a
-    <provided_name>.vapi file will be created.
-
-GENERATE_HEADER
-    Let the compiler generate a header file for the compiled code. There will
-    be a header file as well as an internal header file being generated called
-    <provided_name>.h and <provided_name>_internal.h
-
-The following call is a simple example to the vala_precompile macro showing an
-example to every of the optional sections::
-
-    vala_precompile(VALA_C
-        source1.vala
-        source2.vala
-        source3.vala
-    PACKAGES
-        gtk+-2.0
-        gio-1.0
-        posix
-    OPTIONS
-        --thread
-    CUSTOM_VAPIS
-        some_vapi.vapi
-    GENERATE_VAPI
-        myvapi
-    GENERATE_HEADER
-        myheader
-    )
-
-Most important is the variable VALA_C which will contain all the generated c
-file names after the call. The easiest way to use this information is to tell
-CMake to create an executable out of it.
-
-::
-
-    add_executable(myexecutable ${VALA_C})
-
-
-Further reading
-===============
-
-The `Pdf Presenter Console`__ , which is a vala based project of mine, makes
-heavy usage of the here described macros.  To look at a real world example of
-these macros the mentioned project is the right place to take a look. The svn
-trunk of it can be found at::
-
-	svn://pureenergy.cc/pdf_presenter_console/trunk
-
-
-__ http://westhoffswelt.de/projects/pdf_presenter_console.html
-
-
-Acknowledgments
-===============
-
-Thanks go out to Florian Sowade, a fellow local PHP-Usergroupie, who helped me
-a lot with the initial version of this macros and always answered my mostly
-dumb CMake questions.
-
-.. _CMake: http://cmake.org
-.. _Vala: http://live.gnome.org/Vala
-.. _Genie: http://live.gnome.org/Genie
-
-
-

-..
-   Local Variables:
-   mode: rst
-   fill-column: 79
-   End: 
-   vim: et syn=rst tw=79

=== removed file 'cmake/Tests.cmake'
--- cmake/Tests.cmake	2012-05-20 13:20:38 +0000
+++ cmake/Tests.cmake	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Test macros for Marlin, feel free to re-use them.
-
-macro(add_test_executable EXE_NAME)
-    add_test(${EXE_NAME} gtester ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME})
-endmacro()

=== removed file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2012-05-20 13:20:38 +0000
+++ cmake/Translations.cmake	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
-
-macro(add_translations_directory NLS_PACKAGE)
-    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
-    find_program (MSGFMT_EXECUTABLE msgfmt)
-    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
-    foreach (PO_INPUT ${PO_FILES})
-        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
-        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
-        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
-
-        install (FILES ${MO_OUTPUT} DESTINATION
-            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
-            RENAME ${NLS_PACKAGE}.mo)
-    endforeach (PO_INPUT ${PO_FILES})
-endmacro(add_translations_directory)
-
-
-macro(add_translations_catalog NLS_PACKAGE)
-    add_custom_target (pot COMMENT “Building translation catalog.”)
-    find_program (XGETTEXT_EXECUTABLE xgettext)
-
-
-    set(C_SOURCE "")
-
-    foreach(FILES_INPUT ${ARGN})
-        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-    endforeach()
-
-    add_custom_command (TARGET pot COMMAND
-        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-8
-        )
-endmacro()

=== removed file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2012-05-20 13:20:38 +0000
+++ cmake/ValaPrecompile.cmake	1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-##
-# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#    1. Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#    2. Redistributions in binary form must reproduce the above copyright notice,
-#       this list of conditions and the following disclaimer in the documentation
-#       and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies,
-# either expressed or implied, of Jakob Westhoff
-##
-
-include(ParseArguments)
-find_package(Vala REQUIRED)
-
-##
-# Compile vala files to their c equivalents for further processing. 
-#
-# The "vala_precompile" macro takes care of calling the valac executable on the
-# given source to produce c files which can then be processed further using
-# default cmake functions.
-# 
-# The first parameter provided is a variable, which will be filled with a list
-# of c files outputted by the vala compiler. This list can than be used in
-# conjuction with functions like "add_executable" or others to create the
-# neccessary compile rules with CMake.
-# 
-# The initial variable is followed by a list of .vala files to be compiled.
-# Please take care to add every vala file belonging to the currently compiled
-# project or library as Vala will otherwise not be able to resolve all
-# dependencies.
-# 
-# The following sections may be specified afterwards to provide certain options
-# to the vala compiler:
-# 
-# PACKAGES
-#   A list of vala packages/libraries to be used during the compile cycle. The
-#   package names are exactly the same, as they would be passed to the valac
-#   "--pkg=" option.
-# 
-# OPTIONS
-#   A list of optional options to be passed to the valac executable. This can be
-#   used to pass "--thread" for example to enable multi-threading support.
-#
-# CUSTOM_VAPIS
-#   A list of custom vapi files to be included for compilation. This can be
-#   useful to include freshly created vala libraries without having to install
-#   them in the system.
-#
-# GENERATE_VAPI
-#   Pass all the needed flags to the compiler to create an internal vapi for
-#   the compiled library. The provided name will be used for this and a
-#   <provided_name>.vapi file will be created.
-# 
-# GENERATE_HEADER
-#   Let the compiler generate a header file for the compiled code. There will
-#   be a header file as well as an internal header file being generated called
-#   <provided_name>.h and <provided_name>_internal.h
-#
-# The following call is a simple example to the vala_precompile macro showing
-# an example to every of the optional sections:
-#
-#   vala_precompile(VALA_C
-#       source1.vala
-#       source2.vala
-#       source3.vala
-#   PACKAGES
-#       gtk+-2.0
-#       gio-1.0
-#       posix
-#   DIRECTORY
-#       gen
-#   OPTIONS
-#       --thread
-#   CUSTOM_VAPIS
-#       some_vapi.vapi
-#   GENERATE_VAPI
-#       myvapi
-#   GENERATE_HEADER
-#       myheader
-#   )
-#
-# Most important is the variable VALA_C which will contain all the generated c
-# file names after the call.
-##
-
-macro(vala_precompile output)
-    parse_arguments(ARGS "PACKAGES;OPTIONS;DIRECTORY;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
-    if(ARGS_DIRECTORY)
-        set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
-    else(ARGS_DIRECTORY)
-        set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    endif(ARGS_DIRECTORY)
-    include_directories(${DIRECTORY})
-    set(vala_pkg_opts "")
-    foreach(pkg ${ARGS_PACKAGES})
-        list(APPEND vala_pkg_opts "--pkg=${pkg}")
-    endforeach(pkg ${ARGS_PACKAGES})
-    set(in_files "")
-    set(out_files "")
-    set(${output} "")
-    foreach(src ${ARGS_DEFAULT_ARGS})
-        string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" src ${src})
-        string(REGEX MATCH "^/" IS_MATCHED ${src})
-        if(${IS_MATCHED} MATCHES "/")
-            list(APPEND in_files "${src}")
-        else()
-            list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
-        endif()
-        string(REPLACE ".vala" ".c" src ${src})
-        string(REPLACE ".gs" ".c" src ${src})
-        if(${IS_MATCHED} MATCHES "/")
-            get_filename_component(VALA_FILE_NAME ${src} NAME)
-            set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
-            list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
-        else()
-            set(out_file "${DIRECTORY}/${src}")
-            list(APPEND out_files "${DIRECTORY}/${src}")
-        endif()
-        list(APPEND ${output} ${out_file})
-    endforeach(src ${ARGS_DEFAULT_ARGS})
-
-    set(custom_vapi_arguments "")
-    if(ARGS_CUSTOM_VAPIS)
-        foreach(vapi ${ARGS_CUSTOM_VAPIS})
-            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-                list(APPEND custom_vapi_arguments ${vapi})
-            else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-                list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
-            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-        endforeach(vapi ${ARGS_CUSTOM_VAPIS})
-    endif(ARGS_CUSTOM_VAPIS)
-
-    set(vapi_arguments "")
-    if(ARGS_GENERATE_VAPI)
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
-        set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi")
-
-        # Header and internal header is needed to generate internal vapi
-        if (NOT ARGS_GENERATE_HEADER)
-            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
-        endif(NOT ARGS_GENERATE_HEADER)
-    endif(ARGS_GENERATE_VAPI)
-
-    set(header_arguments "")
-    if(ARGS_GENERATE_HEADER)
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h")
-        list(APPEND header_arguments "--header=${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
-        list(APPEND header_arguments "--internal-header=${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h")
-    endif(ARGS_GENERATE_HEADER)
-
-    add_custom_command(OUTPUT ${out_files} 
-    COMMAND 
-        ${VALA_EXECUTABLE} 
-    ARGS 
-        "-C" 
-        ${header_arguments} 
-        ${vapi_arguments}
-        "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
-        "-d" ${DIRECTORY} 
-        ${vala_pkg_opts} 
-        ${ARGS_OPTIONS} 
-        ${in_files} 
-        ${custom_vapi_arguments}
-    DEPENDS 
-        ${in_files} 
-        ${ARGS_CUSTOM_VAPIS}
-    )
-endmacro(vala_precompile)

=== removed file 'cmake/ValaVersion.cmake'
--- cmake/ValaVersion.cmake	2012-05-20 13:20:38 +0000
+++ cmake/ValaVersion.cmake	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-##
-# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#    1. Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#    2. Redistributions in binary form must reproduce the above copyright notice,
-#       this list of conditions and the following disclaimer in the documentation
-#       and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies,
-# either expressed or implied, of Jakob Westhoff
-##
-
-include(ParseArguments)
-find_package(Vala REQUIRED)
-
-##
-# Ensure a certain valac version is available
-#
-# The initial argument is the version to check for
-# 
-# It may be followed by a optional parameter to specifiy a version range. The
-# following options are valid:
-# 
-# EXACT
-#   Vala needs to be available in the exact version given
-# 
-# MINIMUM
-#   The provided version is the minimum version. Therefore Vala needs to be
-#   available in the given version or any higher version
-#
-# MAXIMUM
-#   The provided version is the maximum. Therefore Vala needs to be available
-#   in the given version or any version older than this
-#
-# If no option is specified the version will be treated as a minimal version.
-##
-macro(ensure_vala_version version)
-    parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN})
-	set(compare_message "")
-	set(error_message "")
-	if(ARGS_MINIMUM)
-		set(compare_message "a minimum ")
-		set(error_message "or greater ")
-	elseif(ARGS_MAXIMUM)
-		set(compare_message "a maximum ")
-		set(error_message "or less ")
-	endif(ARGS_MINIMUM)
-	
-	message(STATUS 
-		"checking for ${compare_message}Vala version of ${version}"
-	)
-
-	unset(version_accepted)
-	
-	# MINIMUM is the default if no option is specified
-	if(ARGS_EXACT)
-		if(${VALA_VERSION} VERSION_EQUAL ${version} )
-			set(version_accepted TRUE)	
-		endif(${VALA_VERSION} VERSION_EQUAL ${version})
-	elseif(ARGS_MAXIMUM)
-		if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-			set(version_accepted TRUE)	
-		endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-	else(ARGS_MAXIMUM)
-		if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-			set(version_accepted TRUE)	
-		endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-	endif(ARGS_EXACT)
-
-	if (NOT version_accepted)
-		message(FATAL_ERROR 
-			"Vala version ${version} ${error_message}is required."
-		)
-	endif(NOT version_accepted)
-
-	message(STATUS
-		"  found Vala, version ${VALA_VERSION}"
-	)
-endmacro(ensure_vala_version)

=== added file 'configure.ac'
--- configure.ac	1970-01-01 00:00:00 +0000
+++ configure.ac	2014-04-06 18:03:36 +0000
@@ -0,0 +1,206 @@
+# If not 1, append revision to the version number and enable other development stuff
+m4_define([gala_released], [0])
+
+m4_define([gala_major_version], [0])
+m4_define([gala_minor_version], [1])
+m4_define([gala_micro_version], [0])
+m4_define([gala_nano_version], [0])
+
+# If library source has changed since last release, increment revision
+# If interfaces have been removed or changed since last release,
+#  increment current and set revision to 0
+# If interfaces have been added since last release, increment age
+# If interfaces have been removed since last release, set age to 0
+m4_define([gala_lt_current], [0])
+m4_define([gala_lt_revision], [0])
+m4_define([gala_lt_age], [0])
+
+# Display the nano_version only if it's not '0'
+m4_define([gala_base_version],
+          gala_major_version.gala_minor_version.gala_micro_version)
+m4_define([gala_full_version],
+          [m4_if(gala_nano_version, [0],
+                 gala_base_version, gala_base_version.gala_nano_version)])
+
+# Extend version with bzr revision for non-release builds
+m4_define([gala_version], m4_if(gala_released, [1],
+          [gala_full_version], [m4_esyscmd([build-aux/bzr-version-gen gala_full_version])]))
+m4_define([gala_major_minor_version], gala_major_version.gala_minor_version)
+m4_define([gala_module_version], gala_lt_current)
+
+AC_INIT([gala], gala_version,
+        [https://bugs.launchpad.net/gala], [gala],
+        [https://launchpad.net/gala])
+AC_DEFINE(RELEASE_NAME, "Window Manager.", Codename of this release)
+AC_DEFINE(VERSION_INFO, m4_if(gala_released, [1], "Release", "Development"), Version info for package)
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+AC_PREREQ([2.65])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_SRCDIR([configure.ac])
+AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability subdir-objects])
+AM_MAINTAINER_MODE
+
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_DISABLE_STATIC
+LT_INIT
+PKG_PROG_PKG_CONFIG([0.21])
+
+GLIB_GSETTINGS
+
+AC_SUBST([CFLAGS])
+AC_SUBST([CPPFLAGS])
+AC_SUBST([LDFLAGS])
+
+LT_CURRENT=gala_lt_current
+LT_REVISION=gala_lt_revision
+LT_AGE=gala_lt_age
+AC_SUBST([LT_CURRENT])
+AC_SUBST([LT_REVISION])
+AC_SUBST([LT_AGE])
+
+GALA_MAJOR_MINOR_VERSION=gala_major_minor_version
+AC_SUBST([GALA_MAJOR_MINOR_VERSION])
+
+API_VERSION=0.2
+AC_SUBST([API_VERSION])
+
+
+# -----------------------------------------------------------
+# Vala
+# -----------------------------------------------------------
+VALA_MIN_VERSION=0.22.0
+
+AM_PROG_VALAC([$VALA_MIN_VERSION])
+if test "x$VALAC" = "x"; then
+    AC_MSG_ERROR([Vala requested but valac >= $VALA_MIN_VERSION is not installed])
+fi
+
+AC_PATH_PROG([VAPIGEN], [vapigen], [])
+if test "x$VAPIGEN" = "x"; then
+    AC_MSG_ERROR([Vala must be built with --enable-vapigen])
+fi
+
+# -----------------------------------------------------------
+# Dependencies
+# -----------------------------------------------------------
+GTK_MIN_VERSION=3.4.0
+GLIB_MIN_VERSION=2.32.0
+PLANK_MIN_VERSION=0.3.0
+MUTTER_MIN_VERSION=3.8.4
+MUTTER_API="3.8"
+
+GALA_CORE_PKGS="gobject-2.0 >= $GLIB_MIN_VERSION \
+                 glib-2.0 >= $GLIB_MIN_VERSION \
+                 gio-2.0 >= $GLIB_MIN_VERSION \
+                 gio-unix-2.0 >= $GLIB_MIN_VERSION \
+                 gmodule-2.0 \
+                 gtk+-3.0 >= $GTK_MIN_VERSION \
+                 gdk-x11-3.0 >= $GTK_MIN_VERSION \
+                 libbamf3 \
+                 clutter-gtk-1.0 \
+                 granite \
+                 libmutter >= $MUTTER_MIN_VERSION \
+                 gee-0.8 \
+                 gnome-desktop-3.0 \
+                 plank >= $PLANK_MIN_VERSION"
+
+GALA_CORE_VALA_PKGS="--pkg gio-unix-2.0 \
+                      --pkg gmodule-2.0 \
+                      --pkg gtk+-3.0 \
+                      --pkg gdk-x11-3.0 \
+                      --pkg libbamf3 \
+                      --pkg libmutter \
+                      --pkg clutter-gtk-1.0 \
+                      --pkg granite \
+                      --pkg gee-0.8 \
+                      --pkg gdesktopenums-3.0 \
+                      --pkg gnome-desktop-3.0 \
+                      --pkg xfixes-4.0 \
+                      --pkg plank"
+
+VALAFLAGS="$VALAFLAGS --thread --target-glib=2.32"
+
+
+PKG_CHECK_MODULES(GALA_CORE, $GALA_CORE_PKGS)
+
+# Plugins
+PLUGIN_LDFLAGS="-module -avoid-version"
+AC_SUBST([PLUGIN_LDFLAGS])
+
+# -----------------------------------------------------------
+# Optional Dependencies
+# -----------------------------------------------------------
+
+# 3.10
+PKG_CHECK_MODULES(MUTTER, [libmutter >= 3.9], [have_mutter310=yes], [have_mutter310=no])
+if test "x$have_mutter310" = "xyes" ; then
+    PKG_CHECK_MODULES(MUTTER, "libmutter >= 3.10.4")
+    VALAFLAGS="$VALAFLAGS --define HAS_MUTTER310"
+    MUTTER_API="3.10"
+fi
+
+# 3.12
+PKG_CHECK_MODULES(MUTTER, [libmutter >= 3.11], [have_mutter312=yes], [have_mutter312=no])
+if test "x$have_mutter312" = "xyes" ; then
+    PKG_CHECK_MODULES(MUTTER, [libmutter >= 3.11.91])
+    VALAFLAGS="$VALAFLAGS --define HAS_MUTTER312"
+    MUTTER_API="3.12"
+fi
+
+# -----------------------------------------------------------
+# Addional configure flags
+# -----------------------------------------------------------
+
+# Enable Vala debug-flag by default for non-release builds
+AC_ARG_ENABLE([debug],
+              AS_HELP_STRING([--disable-debug],[compile without debug code]),
+              [enable_debug=$enableval], [m4_if(gala_released, [1], [enable_debug=no], [enable_debug=yes])])
+if test "x$enable_debug" = "xyes" ; then
+    VALAFLAGS="$VALAFLAGS -g"
+fi
+
+GALA_CORE_VALAFLAGS="$VALAFLAGS $GALA_CORE_VALA_PKGS"
+AC_SUBST(GALA_CORE_VALAFLAGS)
+
+# -----------------------------------------------------------
+# Gettext
+# -----------------------------------------------------------
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
+IT_PROG_INTLTOOL([0.35.0])
+
+
+# -----------------------------------------------------------
+# Final output
+# -----------------------------------------------------------
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+lib/Makefile
+data/Makefile
+vapi/Makefile
+plugins/Makefile
+plugins/zoom/Makefile
+po/Makefile.in
+])
+
+AC_OUTPUT
+
+echo "
+${PACKAGE} ${VERSION}
+
+    Prefix......................:  ${prefix}
+    Vala Compiler...............:  ${VALAC}
+    Vala Flags..................:  ${VALAFLAGS}
+    C Compiler Flags............:  ${CFLAGS}
+
+    Using Mutter................:  ${MUTTER_API}
+"

=== added file 'data/Makefile.am'
--- data/Makefile.am	1970-01-01 00:00:00 +0000
+++ data/Makefile.am	2014-04-06 18:03:36 +0000
@@ -0,0 +1,36 @@
+stylesdir = $(pkgdatadir)
+styles_DATA = gala.css texture.png
+
+applicationsdir = $(datadir)/applications
+applications_DATA = gala.desktop
+
+gsettings_SCHEMAS = org.pantheon.desktop.gala.gschema.xml
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+	$(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' $< > $@ || rm $@
+
+@INTLTOOL_XML_RULE@
+
+@GSETTINGS_RULES@
+
+gschemas.compiled: Makefile $(gsettings_SCHEMAS:.xml=.valid)
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=$(builddir) $(builddir)
+
+all-local: gschemas.compiled
+
+EXTRA_DIST = \
+	gala.css \
+	gala.desktop \
+	texture.png \
+	org.pantheon.desktop.gala.gschema.xml.in.in \
+	$(NULL)
+
+CLEANFILES = \
+	$(applications_DATA) \
+	$(styles_DATA) \
+	$(gsettings_SCHEMAS) \
+	gschemas.compiled \
+	data/org.pantheon.desktop.gala.gschema.xml \
+	data/org.pantheon.desktop.gala.gschema.xml.in \
+	$(NULL)
+

=== renamed file 'data/org.pantheon.desktop.gala.gschema.xml' => 'data/org.pantheon.desktop.gala.gschema.xml.in.in'
--- data/org.pantheon.desktop.gala.gschema.xml	2013-09-28 22:35:41 +0000
+++ data/org.pantheon.desktop.gala.gschema.xml.in.in	2014-04-06 18:03:36 +0000
@@ -83,7 +83,7 @@
 		</key>
 	</schema>
 	
-	<schema path="/org/pantheon/desktop/gala/keybindings/" id="org.pantheon.desktop.gala.keybindings" gettext-domain="gala">
+	<schema path="/org/pantheon/desktop/gala/keybindings/" id="org.pantheon.desktop.gala.keybindings" gettext-domain="@GETTEXT_PACKAGE@">
 		<key type="as" name="switch-to-workspace-first">
 			<default><![CDATA[['<Super>Home']]]></default>
 			<summary>Shortcut to move to first workspace</summary>

=== added directory 'lib'
=== added file 'lib/Makefile.am'
--- lib/Makefile.am	1970-01-01 00:00:00 +0000
+++ lib/Makefile.am	2014-04-06 18:03:36 +0000
@@ -0,0 +1,66 @@
+include $(top_srcdir)/Makefile.common
+
+VAPIDIR = $(top_srcdir)/vapi
+
+BUILT_SOURCES = \
+	libgala_la_vala.stamp \
+	$(NULL)
+
+libgala_la_LTLIBRARIES = libgala.la
+
+libgala_ladir = $(pkglibdir)
+
+libgala_la_CFLAGS = \
+	$(GALA_CORE_CFLAGS) \
+	-include config.h \
+	-w \
+	$(NULL)
+
+libgala_la_LDFLAGS = \
+	-avoid-version \
+	$(GALA_CORE_LDFLAGS) \
+	$(NULL)
+
+libgala_la_VALAFLAGS = \
+	$(GALA_CORE_VALAFLAGS) \
+	--vapidir $(VAPIDIR) \
+	$(VAPIDIR)/config.vapi \
+	$(NULL)
+
+libgala_la_LIBADD = \
+	$(GALA_CORE_LIBS) \
+	$(NULL)
+
+libgala_la_VALASOURCES = \
+	Plugin.vala \
+	Utils.vala \
+	WindowManager.vala \
+	$(NULL)
+
+nodist_libgala_la_SOURCES = \
+	$(BUILT_SOURCES) \
+	$(libgala_la_VALASOURCES:.vala=.c) \
+	$(NULL)
+
+libgala_la_vala.stamp: $(libgala_la_VALASOURCES)
+	$(AM_V_VALA)$(VALAC) \
+		$(libgala_la_VALAFLAGS) \
+		--basedir $(srcdir) \
+		--directory $(builddir) \
+		-C \
+		-H gala.h \
+		--vapi gala.vapi \
+		--library gala \
+		$(filter %.vala %.c,$^)
+	$(AM_V_at)touch $@
+
+CLEANFILES = \
+	$(nodist_libgala_la_SOURCES) \
+	gala.vapi \
+	gala.h \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(libgala_la_VALASOURCES) \
+	$(NULL)
+

=== added file 'lib/Plugin.vala'
--- lib/Plugin.vala	1970-01-01 00:00:00 +0000
+++ lib/Plugin.vala	2014-04-06 18:03:36 +0000
@@ -0,0 +1,210 @@
+//  
+//  Copyright (C) 2014 Tom Beckmann
+// 
+//  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 3 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, see <http://www.gnu.org/licenses/>.
+// 
+
+namespace Gala
+{
+	public enum PluginFunction
+	{
+		ADDITION,
+		WINDOW_SWITCHER,
+		DESKTOP,
+		WORKSPACE_VIEW,
+		WINDOW_OVERVIEW
+	}
+
+	public enum LoadPriority
+	{
+		/**
+		 * Have your plugin loaded immediately once gala has started
+		 */
+		IMMEDIATE,
+		/**
+		 * Allow gala to defer loading your plugin once it got the
+		 * major part of the initialization done
+		 */
+		DEFERRED
+	}
+
+	public struct PluginInfo
+	{
+		string name;
+		string author;
+
+		/**
+		 * Type of your plugin class, has to be derived from the Plugin class.
+		 */
+		Type plugin_type;
+
+		/**
+		 * This property allows you to override default functionality of gala
+		 * so systems won't be instantiated next to each other. Use
+		 * PluginFunction.ADDITION if no special component is overridden.
+		 */
+		PluginFunction provides;
+
+		/**
+		 * Give gala a hint for when to load your plugin. Especially use DEFERRED
+		 * if you're adding a completely new ui component that's not directly
+		 * related to the wm.
+		 */
+		LoadPriority load_priority;
+
+		/**
+		 * You don't have to fill this field, it will be filled by gala with
+		 * the filename in which your module was found.
+		 */
+		string module_name;
+	}
+
+	/**
+	 * This class has to be implemented by every plugin.
+	 * Additionally, the plugin module is required to have a register_plugin
+	 * function which returns a PluginInfo struct.
+	 * The plugin_type field has to be the type of your plugin class derived
+	 * from this class.
+	 */
+	public abstract class Plugin : Object
+	{
+		/**
+		 * Emitted when update_region is called. Mainly for internal purposes.
+		 */
+		public signal void region_changed ();
+
+		/**
+		 * The region indicates an area where mouse events should be sent to
+		 * the stage, which means your actors, instead of the windows.
+		 *
+		 * It is calculated by the system whenever update_region is called.
+		 * You can influce it with the custom_region and the track_actor function.
+		 */
+		public X.Xrectangle[] region { get; set; }
+
+		/**
+		 * This list will be merged with the region property. See region for
+		 * more details. Changing this property will cause update_region to be
+		 * called. Default to null.
+		 */
+		protected X.Xrectangle[]? custom_region {
+			get {
+			   return _custom_region;
+			}
+			protected set {
+				_custom_region = value;
+				update_region ();
+			}
+		}
+
+		/**
+		 * Set this property to true while animating an actor if you have tracked
+		 * actors to prevent constant recalculations of the regions during an
+		 * animation.
+		 */
+		protected bool freeze_track { get; protected set; default = false; }
+
+		private X.Xrectangle[]? _custom_region = null;
+		private Gee.LinkedList<Clutter.Actor> tracked_actors = new Gee.LinkedList<Clutter.Actor> ();
+
+		/**
+		 * Once this method is called you can start adding actors to the stage
+		 * using via the windowmanager instance that is given to you.
+		 *
+		 * @param wm The window manager.
+		 */
+		public abstract void initialize (WindowManager wm);
+
+		/**
+		 * This method is currently not called in the code, however you should
+		 * still implement it to be compatible whenever we decide to use it.
+		 * It should make sure that everything your plugin added to the stage 
+		 * is cleaned up.
+		 */
+		public abstract void destroy ();
+
+		/**
+		 * Listen to changes to the allocation of actor and update the region
+		 * accordingly. You may add multiple actors, their shapes will be 
+		 * combined when one of them changes.
+		 *
+		 * @param actor The actor to be tracked
+		 */
+		public void track_actor (Clutter.Actor actor)
+		{
+			tracked_actors.add (actor);
+			actor.allocation_changed.connect (actor_allocation_changed);
+
+			update_region ();
+		}
+
+		/**
+		 * Stop listening to allocation changes and remove the actor's
+		 * allocation from the region array.
+		 *
+		 * @param actor The actor to stop listening the changes on
+		 */
+		public void untrack_actor (Clutter.Actor actor)
+		{
+			if (tracked_actors.remove (actor)) {
+				actor.allocation_changed.disconnect (actor_allocation_changed);
+			}
+		}
+
+		/**
+		 * You can call this method to force the system to update the region that
+		 * is used by the window manager. It will automatically upon changes to
+		 * the custom_region property and when a tracked actor's allocation changes
+		 * unless freeze_track is set to true. You may need to call this function
+		 * after setting freeze_track back to false after an animation to make the
+		 * wm aware of the new position of the actor in question.
+		 */
+		public void update_region ()
+		{
+			var has_custom = custom_region != null;
+			var len = tracked_actors.size + (has_custom ? custom_region.length : 0);
+
+			X.Xrectangle[] regions = new X.Xrectangle[len];
+			var i = 0;
+
+			if (has_custom) {
+				for (var j = 0; j < custom_region.length; j++) {
+					regions[i++] = custom_region[j];
+				}
+			}
+
+			foreach (var actor in tracked_actors) {
+				float x, y, w, h;
+				actor.get_transformed_position (out x, out y);
+				actor.get_transformed_size (out w, out h);
+
+				if (w == 0 || h == 0)
+					continue;
+
+				regions[i++] = { (short)x, (short)y, (short)w, (short)h };
+			}
+
+			region = regions;
+
+			region_changed ();
+		}
+
+		private void actor_allocation_changed (Clutter.ActorBox box, Clutter.AllocationFlags f)
+		{
+			if (!freeze_track)
+				update_region ();
+		}
+	}
+}
+

=== added file 'lib/Utils.vala'
--- lib/Utils.vala	1970-01-01 00:00:00 +0000
+++ lib/Utils.vala	2014-04-06 18:03:36 +0000
@@ -0,0 +1,268 @@
+//  
+//  Copyright (C) 2012 Tom Beckmann, Rico Tzschichholz
+// 
+//  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 3 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, see <http://www.gnu.org/licenses/>.
+// 
+
+namespace Gala
+{
+	public class Utils
+	{
+		// Cache xid:pixbuf and icon:pixbuf pairs to provide a faster way aquiring icons
+		static Gee.HashMap<string, Gdk.Pixbuf> xid_pixbuf_cache;
+		static Gee.HashMap<string, Gdk.Pixbuf> icon_pixbuf_cache;
+		static uint cache_clear_timeout = 0;
+		
+		static construct
+		{
+			xid_pixbuf_cache = new Gee.HashMap<string, Gdk.Pixbuf> ();
+			icon_pixbuf_cache = new Gee.HashMap<string, Gdk.Pixbuf> ();
+		}
+		
+		/**
+		 * Clean icon caches
+		 */
+		static void clean_icon_cache (uint32[] xids)
+		{
+			var list = xid_pixbuf_cache.keys.to_array ();
+			var pixbuf_list = icon_pixbuf_cache.values.to_array ();
+			var icon_list = icon_pixbuf_cache.keys.to_array ();
+
+			foreach (var xid_key in list) {
+				var xid = (uint32)uint64.parse (xid_key.split ("::")[0]);
+				if (!(xid in xids)) {
+					var pixbuf = xid_pixbuf_cache.get (xid_key);
+					for (var j = 0; j < pixbuf_list.length; j++) {
+						if (pixbuf_list[j] == pixbuf) {
+							xid_pixbuf_cache.unset (icon_list[j]);
+						}
+					}
+
+					xid_pixbuf_cache.unset (xid_key);
+				}
+			}
+		}
+		
+		public static void request_clean_icon_cache (uint32[] xids)
+		{
+			if (cache_clear_timeout > 0)
+				GLib.Source.remove (cache_clear_timeout);
+			
+			cache_clear_timeout = Timeout.add_seconds (30, () => {
+				cache_clear_timeout = 0;
+				Idle.add (() => {
+					clean_icon_cache (xids);
+					return false;
+				});
+				return false;
+			});
+		}
+		
+		/**
+		 * returns a pixbuf for the application of this window or a default icon
+		 **/
+		public static Gdk.Pixbuf get_icon_for_window (Meta.Window window, int size)
+		{
+			Gdk.Pixbuf? result = null;
+			
+			var xid = (uint32)window.get_xwindow ();
+			var xid_key = "%u::%i".printf (xid, size);
+			
+			if ((result = xid_pixbuf_cache.get (xid_key)) != null)
+				return result;
+			
+			var app = Bamf.Matcher.get_default ().get_application_for_xid (xid);
+			result = get_icon_for_application (app, size);
+			
+			xid_pixbuf_cache.set (xid_key, result);
+			
+			return result;
+		}
+		
+		/**
+		 * returns a pixbuf for this application or a default icon
+		 **/
+		public static Gdk.Pixbuf get_icon_for_application (Bamf.Application app, int size)
+		{
+			Gdk.Pixbuf? image = null;
+			bool not_cached = false;
+			
+			string? icon = null;
+			string? icon_key = null;
+			
+			if (app != null && app.get_desktop_file () != null) {
+				try {
+					var appinfo = new DesktopAppInfo.from_filename (app.get_desktop_file ());
+					if (appinfo != null) {
+						icon = Plank.Drawing.DrawingService.get_icon_from_gicon (appinfo.get_icon ());
+						icon_key = "%s::%i".printf (icon, size);
+						if ((image = icon_pixbuf_cache.get (icon_key)) == null) {
+							image = Plank.Drawing.DrawingService.load_icon (icon, size, size);
+							not_cached = true;
+						}
+					}
+				} catch (Error e) {
+					warning (e.message);
+				}
+			}
+			
+			if (image == null) {
+				try {
+					unowned Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default ();
+					icon = "application-default-icon";
+					icon_key = "%s::%i".printf (icon, size);
+					if ((image = icon_pixbuf_cache.get (icon_key)) == null) {
+						image = icon_theme.load_icon (icon, size, 0);
+						not_cached = true;
+					}
+				} catch (Error e) {
+					warning (e.message);
+				}
+			}
+			
+			if (image == null) {
+				icon = "";
+				icon_key = "::%i".printf (size);
+				if ((image = icon_pixbuf_cache.get (icon_key)) == null) {
+					image = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, size, size);
+					image.fill (0x00000000);
+					not_cached = true;
+				}
+			}
+			
+			if (size != image.width || size != image.height)
+				image = Plank.Drawing.DrawingService.ar_scale (image, size, size);
+			
+			if (not_cached)
+				icon_pixbuf_cache.set (icon_key, image);
+			
+			return image;
+		}
+		
+		/**
+		 * get the next window that should be active on a workspace right now
+		 **/
+		public static Meta.Window get_next_window (Meta.Workspace workspace, bool backward=false)
+		{
+			var screen = workspace.get_screen ();
+			var display = screen.get_display ();
+			
+			var window = display.get_tab_next (Meta.TabList.NORMAL, screen, 
+				screen.get_active_workspace (), null, backward);
+			
+			if (window == null)
+				window = display.get_tab_current (Meta.TabList.NORMAL, screen, workspace);
+			
+			return window;
+		}
+		
+		/**
+		 * get the number of toplevel windows on a workspace
+		 **/
+		public static uint get_n_windows (Meta.Workspace workspace)
+		{
+			var n = 0;
+			foreach (var window in workspace.list_windows ()) {
+				if (window.is_on_all_workspaces ())
+					continue;
+				if (window.window_type == Meta.WindowType.NORMAL ||
+					window.window_type == Meta.WindowType.DIALOG ||
+					window.window_type == Meta.WindowType.MODAL_DIALOG)
+					n ++;
+			}
+		
+			return n;
+		}
+		
+		static Gtk.CssProvider fallback_style = null;
+		
+		public static Gtk.CssProvider get_default_style ()
+		{
+			if (fallback_style == null) {
+				fallback_style = new Gtk.CssProvider ();
+				try {
+					fallback_style.load_from_path (Config.PKGDATADIR + "/gala.css");
+				} catch (Error e) { warning (e.message); }
+			}
+			
+			return fallback_style;
+		}
+
+		public static void get_window_frame_offset (Meta.Window window, out float x, out float y, out float width, out float height)
+		{
+			var actor = window.get_compositor_private () as Clutter.Actor;
+			var frame = window.get_outer_rect ();
+			x = actor.x - frame.x;
+			y = actor.y - frame.y;
+			width = actor.width - frame.width;
+			height = actor.height - frame.height;
+		}
+
+		public static void bell (Meta.Screen screen)
+		{
+			if (Meta.Prefs.bell_is_audible ())
+				Gdk.beep ();
+			else
+				screen.get_display ().get_compositor ().flash_screen (screen);
+		}
+
+		/**
+		 * Plank DockTheme
+		 */
+		public class DockThemeManager : Object
+		{
+			Plank.DockPreferences? dock_settings = null;
+			Plank.Drawing.DockTheme? dock_theme = null;
+
+			public signal void dock_theme_changed (Plank.Drawing.DockTheme? old_theme,
+				Plank.Drawing.DockTheme new_theme);
+
+			DockThemeManager ()
+			{
+				dock_settings = new Plank.DockPreferences.with_filename (Environment.get_user_config_dir () + "/plank/dock1/settings");
+				dock_settings.notify["Theme"].connect (load_dock_theme);
+			}
+
+			public Plank.Drawing.DockTheme get_dock_theme ()
+			{
+				if (dock_theme == null)
+					load_dock_theme ();
+
+				return dock_theme;
+			}
+
+			public Plank.DockPreferences get_dock_settings ()
+			{
+				return dock_settings;
+			}
+
+			void load_dock_theme ()
+			{
+				var new_theme = new Plank.Drawing.DockTheme (dock_settings.Theme);
+				new_theme.load ("dock");
+				dock_theme_changed (dock_theme, new_theme);
+				dock_theme = new_theme;
+			}
+
+			static DockThemeManager? instance = null;
+			public static DockThemeManager get_default ()
+			{
+				if (instance == null)
+					instance = new DockThemeManager ();
+
+				return instance;
+			}
+		}
+	}
+}

=== added file 'lib/WindowManager.vala'
--- lib/WindowManager.vala	1970-01-01 00:00:00 +0000
+++ lib/WindowManager.vala	2014-04-06 18:03:36 +0000
@@ -0,0 +1,53 @@
+//  
+//  Copyright (C) 2014 Tom Beckmann
+// 
+//  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 3 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, see <http://www.gnu.org/licenses/>.
+// 
+
+namespace Gala
+{
+	public enum ActionType
+	{
+		NONE = 0,
+		SHOW_WORKSPACE_VIEW,
+		MAXIMIZE_CURRENT,
+		MINIMIZE_CURRENT,
+		OPEN_LAUNCHER,
+		CUSTOM_COMMAND,
+		WINDOW_OVERVIEW,
+		WINDOW_OVERVIEW_ALL
+	}
+	
+	public enum InputArea
+	{
+		NONE,
+		FULLSCREEN,
+		HOT_CORNER
+	}
+
+	public interface WindowManager : Meta.Plugin
+	{
+		public abstract Clutter.Actor ui_group { get; protected set; }
+		public abstract Meta.BackgroundGroup background_group { get; protected set; }
+		public abstract Clutter.Stage stage { get; protected set; }
+
+		public abstract void begin_modal ();
+		public abstract void end_modal ();
+		public abstract void perform_action (ActionType type);
+		public abstract void update_input_area ();
+		public abstract void move_window (Meta.Window? window, Meta.MotionDirection direction);
+		public abstract void switch_to_next_workspace (Meta.MotionDirection direction);
+	}
+}
+

=== added directory 'plugins'
=== added file 'plugins/Makefile.am'
--- plugins/Makefile.am	1970-01-01 00:00:00 +0000
+++ plugins/Makefile.am	2014-04-06 18:03:36 +0000
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	zoom \
+	$(NULL)

=== added directory 'plugins/template'
=== added file 'plugins/template/Main.vala'
--- plugins/template/Main.vala	1970-01-01 00:00:00 +0000
+++ plugins/template/Main.vala	2014-04-06 18:03:36 +0000
@@ -0,0 +1,118 @@
+//  
+//  Copyright (C) 2014 Tom Beckmann
+// 
+//  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 3 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, see <http://www.gnu.org/licenses/>.
+// 
+
+/*
+  This is a template class showing some of the things that can be done
+  with a gala plugin and how to do them.
+*/
+
+namespace Gala.Plugins.Template
+{
+	public class Main : Gala.Plugin
+	{
+		const int PADDING = 50;
+
+		Gala.WindowManager? wm = null;
+		Clutter.Actor red_box;
+
+		// This function is called as soon as Gala has started and gives you
+		// an instance of the GalaWindowManager class.
+		public override void initialize (Gala.WindowManager wm)
+		{
+			// we will save the instance to our wm property so we can use it later again
+			// especially helpful when you have larger plugins with more functions,
+			// we won't need it here
+			this.wm = wm;
+
+			// for demonstration purposes we'll add a red quad to the stage which will
+			// turn green when clicked
+			red_box = new Clutter.Actor ();
+			red_box.set_size (100, 100);
+			red_box.background_color = { 255, 0, 0, 255 };
+			red_box.reactive = true;
+			red_box.button_press_event.connect (turn_green);
+
+			// we want to place it in the lower right of the primary monitor with a bit
+			// of padding. refer to vapi/libmutter.vapi in gala's source for something
+			// remotely similar to a documentation
+			var screen = wm.get_screen ();
+			var rect = screen.get_monitor_geometry (screen.get_primary_monitor ());
+
+			red_box.x = rect.x + rect.width - red_box.width - PADDING;
+			red_box.y = rect.y + rect.height - red_box.height - PADDING;
+
+			// to order Gala to deliver mouse events to our box instead of the underlying
+			// windows, we need to mark the region where the quad is located.
+			// The plugin class offers an utility function for this purpose, the track_actor
+			// function. It will update the region with the allocation of the actor
+			// whenever its allocation changes. Make sure to set freeze_track to 
+			// true while animating the actor to not make gala update the region
+			// every single frame.
+			// You can also handle the region manually by setting the custom_region
+			// property. The tracked actors and custom regions will be merged by
+			// the plugin.
+			track_actor (red_box);
+
+			// now we'll add our box into the ui_group. This is where all the shell
+			// elements and also the windows and backgrouds are located.
+			wm.ui_group.add_child (red_box);
+		}
+
+		bool turn_green (Clutter.ButtonEvent event)
+		{
+			red_box.background_color = { 0, 255, 0, 255 };
+			return true;
+		}
+
+		// This function is actually not even called by Gala at the moment,
+		// still it might be a good idea to implement it anyway to make sure
+		// your plugin is compatible in case we'd add disabling specific plugins
+		// in the future
+		public override void destroy ()
+		{
+			// here you would destroy actors you added to the stage or remove
+			// keybindings
+
+			red_box.destroy ();
+		}
+	}
+}
+
+// this little function just tells Gala which class of those you may have in
+// your plugin is the one you want to start with and delivers some additional
+// details about your plugin. It also gives you the option to choose a specific
+// function which your plugin fulfils. Gala will then make sure that there is
+// no duplicate functionality.
+public Gala.PluginInfo register_plugin ()
+{
+	return {
+		"template-plugin",                    // the plugin's name
+		"Tom Beckmann <[e-mail]>", // you, the author
+		typeof (Gala.Plugins.Template.Main),  // the type of your plugin class
+
+		Gala.PluginFunction.ADDITION,         // the function which your plugin
+		                                      // fulfils, ADDITION means nothing 
+		                                      // specific
+
+		Gala.LoadPriority.IMMEDIATE           // indicates whether your plugin's
+		                                      // start can be delayed until gala
+		                                      // has loaded the important stuff or
+		                                      // if you want your plugin to start
+		                                      // right away. False means wait.
+	};
+}
+

=== added file 'plugins/template/Makefile.am'
--- plugins/template/Makefile.am	1970-01-01 00:00:00 +0000
+++ plugins/template/Makefile.am	2014-04-06 18:03:36 +0000
@@ -0,0 +1,58 @@
+include $(top_srcdir)/Makefile.common
+
+VAPIDIR = $(top_srcdir)/vapi
+
+BUILT_SOURCES = libgala_template_la_vala.stamp
+
+libgala_template_la_LTLIBRARIES = libgala-template.la
+
+libgala_template_ladir = $(pkglibdir)/plugins
+
+libgala_template_la_LDFLAGS = \
+	$(PLUGIN_LDFLAGS) \
+	$(GALA_CORE_LDFLAGS) \
+	$(top_builddir)/lib/libgala.la \
+	$(NULL)
+
+libgala_template_la_CFLAGS = \
+	$(GALA_CORE_CFLAGS) \
+	-include config.h \
+	-w \
+	-I$(top_builddir)/lib \
+	$(NULL)
+
+libgala_template_la_VALAFLAGS = \
+	$(GALA_CORE_VALAFLAGS) \
+	$(top_builddir)/lib/gala.vapi \
+	--vapidir $(VAPIDIR) \
+	$(VAPIDIR)/config.vapi \
+	$(NULL)
+
+libgala_template_la_LIBADD = \
+	$(GALA_CORE_LIBS) \
+	$(NULL)
+
+libgala_template_la_VALASOURCES = \
+	Main.vala \
+	$(NULL)
+
+nodist_libgala_template_la_SOURCES = \
+	$(BUILT_SOURCES) \
+	$(libgala_template_la_VALASOURCES:.vala=.c) \
+	$(NULL)
+
+libgala_template_la_vala.stamp: $(libgala_template_la_VALASOURCES)
+	$(AM_V_VALA)$(VALAC) \
+		$(libgala_template_la_VALAFLAGS) \
+		-C \
+		$(filter %.vala %.c,$^)
+	$(AM_V_at)touch $@
+
+CLEANFILES = \
+	$(nodist_libgala_template_la_SOURCES) \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(libgala_template_la_VALASOURCES) \
+	$(NULL)
+

=== added file 'plugins/template/README'
--- plugins/template/README	1970-01-01 00:00:00 +0000
+++ plugins/template/README	2014-04-06 18:03:36 +0000
@@ -0,0 +1,73 @@
+
+Note for compilition
+--------------------
+If you want your own plugin within this source tree
+don't forget to add the new subdirectory to the plugins' Makefile.am
+SUBDIRS list and add your Makefile to the list of Makefiles found at
+about the end of the configure.ac file AC_CONFIG_FILES.
+The API is currently internal until the API is finalized, so you have
+to build it in this source tree.
+
+Some more useful notes on developing plugins:
+
+Modal Mode
+----------
+If you want to display large elements that can be toggled instead of small overlays,
+you can use wm.begin_modal() to make Gala enter modal mode. In this mode, you'll be
+able to receive key events and all mouse events will be delivered regardless of the
+region you have set. Don't forget to call wm.end_modal() and provide an obvious way
+to exit modal mode for the user, otherwise he will be stuck and can only restart
+Gala.
+
+Keybindings
+-----------
+To add keybindings, you'll need a gsettings schema. You can take a look at Gala's
+schema in data/org.pantheon.desktop.gschema.xml for an example. You'll also find
+how to correctly declare shortcut keys in that file. Once you got this file ready
+it's pretty easy. Just enable its installation in cmake, the relevant is commented
+out in this template, and call wm.get_screen().get_display().add_keybinding().
+The keybinding function takes the name of the shortcut key in your 
+schema, then a GSettings instance for that schema, which can be obtained with
+'new GLib.Settings("org.pantheon.gala.plugins.my-plugin")', then some flags, for
+which you can almost always use 0, refer to the vapi for more details, and finally
+your function as arguments. Its delegate is:
+
+public delegate void KeyHandlerFunc (Meta.Display display, Meta.Screen screen,
+	Meta.Window? window, X.Event event, Meta.KeyBinding binding);
+
+So it'd be something like
+
+void initialize (Gala.WindowManager wm)
+{
+	[...]
+	var display = wm.get_screen ().get_display ();
+	var schema = new GLib.Settings ("org.pantheon.desktop.gala.plugins");
+	display.add_keybinding ("my-shortcut", schema, 0, my_handler);
+	[...]
+}
+void my_handler (Meta.Display display, Meta.Screen screen, Meta.Window? window,
+	X.Event event, Meta.KeyBinding binding)
+{
+	print ("Shortcut hit! D:");
+}
+void destroy ()
+{
+	wm.get_screen ().get_display ().remove_keybinding ("my-shortcut");
+}
+
+Overriding default keybindings
+------------------------------
+Libmutter allows you to override exisiting shortcuts, which is a lot easier than
+adding new ones. All you have to do is:
+
+Keybinding.set_custom_handler ("shortcut-name", my_handler);
+
+The signature for my_handler is the same as above.
+
+More info
+---------
+A great source for exploring the possibilities of mutter's API is scrolling through
+the mentioned mutter vapi. In some cases you can find documentation on particular
+functions in the mutter source code. Just grep for their C names.
+
+*/

=== added directory 'plugins/zoom'
=== renamed file 'src/Zooming.vala' => 'plugins/zoom/Main.vala'
--- src/Zooming.vala	2013-11-27 18:50:56 +0000
+++ plugins/zoom/Main.vala	2014-04-06 18:03:36 +0000
@@ -1,5 +1,5 @@
 //  
-//  Copyright (C) 2012 Tom Beckmann, Rico Tzschichholz
+//  Copyright (C) 2013 Tom Beckmann, Rico Tzschichholz
 // 
 //  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
@@ -15,39 +15,54 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // 
 
-using Clutter;
-using Meta;
-
-namespace Gala
+namespace Gala.Plugins.Zoom
 {
-	public class Zooming : Object
+	public class Main : Gala.Plugin
 	{
-		Plugin plugin;
-		
 		const uint MOUSE_POLL_TIME = 50;
+
+		Gala.WindowManager? wm = null;
+
 		uint mouse_poll_timer = 0;
 		float current_zoom = 1.0f;
-		
-		public Zooming (Plugin _plugin)
+
+		public override void initialize (Gala.WindowManager wm)
 		{
-			plugin = _plugin;
+			this.wm = wm;
+			var display = wm.get_screen ().get_display ();
+			var schema = new GLib.Settings (Config.SCHEMA + ".keybindings");
+
+			display.add_keybinding ("zoom-in", schema, 0, zoom_in);
+			display.add_keybinding ("zoom-out", schema, 0, zoom_out);
 		}
-		
-		~Zooming ()
+
+		public override void destroy ()
 		{
+			if (wm == null)
+				return;
+
+			var display = wm.get_screen ().get_display ();
+
+			display.remove_keybinding ("zoom-in");
+			display.remove_keybinding ("zoom-out");
+
 			if (mouse_poll_timer > 0)
 				Source.remove (mouse_poll_timer);
 			mouse_poll_timer = 0;
 		}
-		
-		public void zoom_in () {
+
+		void zoom_in (Meta.Display display, Meta.Screen screen,
+			Meta.Window? window, X.Event event, Meta.KeyBinding binding)
+		{
 			zoom (true);
 		}
-		
-		public void zoom_out () {
+
+		void zoom_out (Meta.Display display, Meta.Screen screen,
+			Meta.Window? window, X.Event event, Meta.KeyBinding binding)
+		{
 			zoom (false);
 		}
-		
+
 		void zoom (bool @in)
 		{
 			// Nothing to do if zooming out of our bounds is requested
@@ -56,7 +71,7 @@
 			else if (current_zoom >= 2.5f && @in)
 				return;
 			
-			var wins = Compositor.get_window_group_for_screen (plugin.get_screen ());
+			var wins = wm.ui_group;
 			
 			// Add timer to poll current mouse position to reposition window-group
 			// to show requested zoomed area
@@ -67,12 +82,12 @@
 				wins.scale_center_x = mx;
 				wins.scale_center_y = my;
 				
-				mouse_poll_timer = Clutter.Threads.Timeout.add (MOUSE_POLL_TIME, () => {
+				mouse_poll_timer = Timeout.add (MOUSE_POLL_TIME, () => {
 					client_pointer.get_position (null, out mx, out my);
 					if (wins.scale_center_x == mx && wins.scale_center_y == my)
 						return true;
 					
-					wins.animate (AnimationMode.LINEAR, MOUSE_POLL_TIME, scale_center_x : mx, scale_center_y : my);
+					wins.animate (Clutter.AnimationMode.LINEAR, MOUSE_POLL_TIME, scale_center_x : mx, scale_center_y : my);
 					
 					return true;
 				});
@@ -87,7 +102,7 @@
 					Source.remove (mouse_poll_timer);
 				mouse_poll_timer = 0;
 				
-				wins.animate (AnimationMode.EASE_OUT_CUBIC, 300, scale_x : 1.0f, scale_y : 1.0f).completed.connect (() => {
+				wins.animate (Clutter.AnimationMode.EASE_OUT_CUBIC, 300, scale_x : 1.0f, scale_y : 1.0f).completed.connect (() => {
 					wins.scale_center_x = 0.0f;
 					wins.scale_center_y = 0.0f;
 				});
@@ -95,7 +110,19 @@
 				return;
 			}
 			
-			wins.animate (AnimationMode.EASE_OUT_CUBIC, 300, scale_x : current_zoom, scale_y : current_zoom);
+			wins.animate (Clutter.AnimationMode.EASE_OUT_CUBIC, 300, scale_x : current_zoom, scale_y : current_zoom);
 		}
 	}
 }
+
+public Gala.PluginInfo register_plugin ()
+{
+	return Gala.PluginInfo () {
+		name = "Zoom",
+		author = "Gala Developers",
+		plugin_type = typeof (Gala.Plugins.Zoom.Main),
+		provides = Gala.PluginFunction.ADDITION,
+		load_priority = Gala.LoadPriority.IMMEDIATE
+	};
+}
+

=== added file 'plugins/zoom/Makefile.am'
--- plugins/zoom/Makefile.am	1970-01-01 00:00:00 +0000
+++ plugins/zoom/Makefile.am	2014-04-06 18:03:36 +0000
@@ -0,0 +1,58 @@
+include $(top_srcdir)/Makefile.common
+
+VAPIDIR = $(top_srcdir)/vapi
+
+BUILT_SOURCES = libgala_zoom_la_vala.stamp
+
+libgala_zoom_la_LTLIBRARIES = libgala-zoom.la
+
+libgala_zoom_ladir = $(pkglibdir)/plugins
+
+libgala_zoom_la_LDFLAGS = \
+	$(PLUGIN_LDFLAGS) \
+	$(GALA_CORE_LDFLAGS) \
+	$(top_builddir)/lib/libgala.la \
+	$(NULL)
+
+libgala_zoom_la_CFLAGS = \
+	$(GALA_CORE_CFLAGS) \
+	-include config.h \
+	-w \
+	-I$(top_builddir)/lib \
+	$(NULL)
+
+libgala_zoom_la_VALAFLAGS = \
+	$(GALA_CORE_VALAFLAGS) \
+	$(top_builddir)/lib/gala.vapi \
+	--vapidir $(VAPIDIR) \
+	$(VAPIDIR)/config.vapi \
+	$(NULL)
+
+libgala_zoom_la_LIBADD = \
+	$(GALA_CORE_LIBS) \
+	$(NULL)
+
+libgala_zoom_la_VALASOURCES = \
+	Main.vala \
+	$(NULL)
+
+nodist_libgala_zoom_la_SOURCES = \
+	$(BUILT_SOURCES) \
+	$(libgala_zoom_la_VALASOURCES:.vala=.c) \
+	$(NULL)
+
+libgala_zoom_la_vala.stamp: $(libgala_zoom_la_VALASOURCES)
+	$(AM_V_VALA)$(VALAC) \
+		$(libgala_zoom_la_VALAFLAGS) \
+		-C \
+		$(filter %.vala %.c,$^)
+	$(AM_V_at)touch $@
+
+CLEANFILES = \
+	$(nodist_libgala_zoom_la_SOURCES) \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(libgala_zoom_la_VALASOURCES) \
+	$(NULL)
+

=== added directory 'po'
=== removed directory 'po'
=== removed file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2012-05-20 13:20:38 +0000
+++ po/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-include (Translations)
-add_translations_directory ("agenda")
-add_translations_catalog ("agenda"
-    ../src
-)

=== added file 'po/POTFILES.in'
=== modified file 'src/Background/Background.vala'
--- src/Background/Background.vala	2014-03-06 21:21:43 +0000
+++ src/Background/Background.vala	2014-04-06 18:03:36 +0000
@@ -17,7 +17,6 @@
 
 namespace Gala
 {
-#if HAS_MUTTER38
 	/**
 	 * Group that holds a pattern at the very bottom and then an image showing the
 	 * current wallpaper above (and one more additional image for transitions).
@@ -199,6 +198,5 @@
 			return GDesktop.BackgroundStyle.NONE;
 		}
 	}
-#endif
 }
 

=== modified file 'src/Background/BackgroundCache.vala'
--- src/Background/BackgroundCache.vala	2013-11-22 20:14:24 +0000
+++ src/Background/BackgroundCache.vala	2014-04-06 18:03:36 +0000
@@ -17,7 +17,6 @@
 
 namespace Gala
 {
-#if HAS_MUTTER38
 	public class BackgroundCache : Object
 	{
 		struct WaitingCallback
@@ -114,6 +113,5 @@
 			return content;
 		}
 	}
-#endif
 }
 

=== modified file 'src/Background/BackgroundManager.vala'
--- src/Background/BackgroundManager.vala	2014-03-05 22:21:28 +0000
+++ src/Background/BackgroundManager.vala	2014-04-06 18:03:36 +0000
@@ -17,7 +17,6 @@
 
 namespace Gala
 {
-#if HAS_MUTTER38
 	public class BackgroundManager : Meta.BackgroundGroup
 	{
 		public Meta.Screen screen { get; construct; }
@@ -69,6 +68,5 @@
 			changed ();
 		}
 	}
-#endif
 }
 

=== modified file 'src/Background/SlideShow.vala'
--- src/Background/SlideShow.vala	2013-11-27 18:50:56 +0000
+++ src/Background/SlideShow.vala	2014-04-06 18:03:36 +0000
@@ -17,7 +17,6 @@
 
 namespace Gala
 {
-#if HAS_MUTTER38
 	public class SlideShow : Meta.BackgroundGroup
 	{
 		const double ANIMATION_OPACITY_STEP_INCREMENT = 4.0;
@@ -158,6 +157,5 @@
 			queue_update_animation ();
 		}
 	}
-#endif
 }
 

=== modified file 'src/Background/SystemBackground.vala'
--- src/Background/SystemBackground.vala	2013-11-22 20:14:24 +0000
+++ src/Background/SystemBackground.vala	2014-04-06 18:03:36 +0000
@@ -17,7 +17,6 @@
 
 namespace Gala
 {
-#if HAS_MUTTER38
 	public class SystemBackground : Meta.BackgroundActor
 	{
 		public SystemBackground ()
@@ -34,6 +33,5 @@
 			});
 		}
 	}
-#endif
 }
 

=== removed file 'src/Config.vala.cmake'
--- src/Config.vala.cmake	2012-07-23 15:51:59 +0000
+++ src/Config.vala.cmake	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-//
-//  Copyright (C) 2011 Tom Beckmann
-//
-//  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 3 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, see <http://www.gnu.org/licenses/>.
-//
-
-namespace Config {
-	public const string DATADIR = "@DATADIR@";
-	public const string PKGDATADIR = "@PKGDATADIR@";
-	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
-	public const string RELEASE_NAME = "@RELEASE_NAME@";
-	public const string VERSION = "@VERSION@";
-	public const string VERSION_INFO = "@VERSION_INFO@";
-	public const string PLUGINDIR = "@PLUGINDIR@";
-	public const string SCHEMA = "org.pantheon.desktop.gala";
-}

=== modified file 'src/DBus.vala'
--- src/DBus.vala	2014-03-17 22:44:47 +0000
+++ src/DBus.vala	2014-04-06 18:03:36 +0000
@@ -21,12 +21,12 @@
 	public class DBus
 	{
 		static DBus? instance;
-		static Plugin plugin;
+		static WindowManager wm;
 		
 		[DBus (visibile = false)]
-		public static void init (Plugin _plugin)
+		public static void init (WindowManager _wm)
 		{
-			plugin = _plugin;
+			wm = _wm;
 			
 			Bus.own_name (BusType.SESSION, "org.pantheon.gala", BusNameOwnerFlags.NONE,
 				(connection) => {
@@ -43,20 +43,17 @@
 		
 		private DBus ()
 		{
-#if HAS_MUTTER38
-			if (plugin.background_group != null)
-				(plugin.background_group as BackgroundManager).changed.connect (() => background_changed ());
+			if (wm.background_group != null)
+				(wm.background_group as BackgroundManager).changed.connect (() => background_changed ());
 			else
 				assert_not_reached ();
-#endif
 		}
 		
 		public void perform_action (ActionType type)
 		{
-			plugin.perform_action (type);
+			wm.perform_action (type);
 		}
 
-#if HAS_MUTTER38
 		const double SATURATION_WEIGHT = 1.5;
 		const double WEIGHT_THRESHOLD = 1.0;
 
@@ -104,7 +101,7 @@
 			int reference_x, int reference_y, int reference_width, int reference_height)
 			throws DBusError
 		{
-			var background = plugin.background_group.get_child_at_index (monitor);
+			var background = wm.background_group.get_child_at_index (monitor);
 			if (background == null)
 				throw new DBusError.INVALID_ARGS ("Invalid monitor requested");
 
@@ -224,6 +221,5 @@
 
 			return { rTotal, gTotal, bTotal, mean, variance };
 		}
-#endif
 	}
 }

=== renamed file 'src/Utils.vala' => 'src/InternalUtils.vala'
--- src/Utils.vala	2013-07-14 17:20:53 +0000
+++ src/InternalUtils.vala	2014-04-06 18:03:36 +0000
@@ -21,7 +21,7 @@
 
 namespace Gala
 {
-	public class Utils
+	public class InternalUtils
 	{
 		/*
 		 * Reload shadow settings
@@ -57,154 +57,6 @@
 			factory.set_params ("modal_dialog", false, shadow);
 		}
 		
-		// Cache xid:pixbuf and icon:pixbuf pairs to provide a faster way aquiring icons
-		static Gee.HashMap<string, Gdk.Pixbuf> xid_pixbuf_cache;
-		static Gee.HashMap<string, Gdk.Pixbuf> icon_pixbuf_cache;
-		static uint cache_clear_timeout = 0;
-		
-		static construct
-		{
-			xid_pixbuf_cache = new Gee.HashMap<string, Gdk.Pixbuf> ();
-			icon_pixbuf_cache = new Gee.HashMap<string, Gdk.Pixbuf> ();
-		}
-		
-		/**
-		 * Clean icon caches
-		 */
-		static void clean_icon_cache (uint32[] xids)
-		{
-			var list = xid_pixbuf_cache.keys.to_array ();
-			var pixbuf_list = icon_pixbuf_cache.values.to_array ();
-			var icon_list = icon_pixbuf_cache.keys.to_array ();
-
-			foreach (var xid_key in list) {
-				var xid = (uint32)uint64.parse (xid_key.split ("::")[0]);
-				if (!(xid in xids)) {
-					var pixbuf = xid_pixbuf_cache.get (xid_key);
-					for (var j = 0; j < pixbuf_list.length; j++) {
-						if (pixbuf_list[j] == pixbuf) {
-							xid_pixbuf_cache.unset (icon_list[j]);
-						}
-					}
-
-					xid_pixbuf_cache.unset (xid_key);
-				}
-			}
-		}
-		
-		public static void request_clean_icon_cache (uint32[] xids)
-		{
-			if (cache_clear_timeout > 0)
-				GLib.Source.remove (cache_clear_timeout);
-			
-			cache_clear_timeout = Timeout.add_seconds (30, () => {
-				cache_clear_timeout = 0;
-				Idle.add (() => {
-					clean_icon_cache (xids);
-					return false;
-				});
-				return false;
-			});
-		}
-		
-		/**
-		 * returns a pixbuf for the application of this window or a default icon
-		 **/
-		public static Gdk.Pixbuf get_icon_for_window (Window window, int size)
-		{
-			Gdk.Pixbuf? result = null;
-			
-			var xid = (uint32)window.get_xwindow ();
-			var xid_key = "%u::%i".printf (xid, size);
-			
-			if ((result = xid_pixbuf_cache.get (xid_key)) != null)
-				return result;
-			
-			var app = Bamf.Matcher.get_default ().get_application_for_xid (xid);
-			result = get_icon_for_application (app, size);
-			
-			xid_pixbuf_cache.set (xid_key, result);
-			
-			return result;
-		}
-		
-		/**
-		 * returns a pixbuf for this application or a default icon
-		 **/
-		public static Gdk.Pixbuf get_icon_for_application (Bamf.Application app, int size)
-		{
-			Gdk.Pixbuf? image = null;
-			bool not_cached = false;
-			
-			string? icon = null;
-			string? icon_key = null;
-			
-			if (app != null && app.get_desktop_file () != null) {
-				try {
-					var appinfo = new DesktopAppInfo.from_filename (app.get_desktop_file ());
-					if (appinfo != null) {
-						icon = Plank.Drawing.DrawingService.get_icon_from_gicon (appinfo.get_icon ());
-						icon_key = "%s::%i".printf (icon, size);
-						if ((image = icon_pixbuf_cache.get (icon_key)) == null) {
-							image = Plank.Drawing.DrawingService.load_icon (icon, size, size);
-							not_cached = true;
-						}
-					}
-				} catch (Error e) {
-					warning (e.message);
-				}
-			}
-			
-			if (image == null) {
-				try {
-					unowned Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default ();
-					icon = "application-default-icon";
-					icon_key = "%s::%i".printf (icon, size);
-					if ((image = icon_pixbuf_cache.get (icon_key)) == null) {
-						image = icon_theme.load_icon (icon, size, 0);
-						not_cached = true;
-					}
-				} catch (Error e) {
-					warning (e.message);
-				}
-			}
-			
-			if (image == null) {
-				icon = "";
-				icon_key = "::%i".printf (size);
-				if ((image = icon_pixbuf_cache.get (icon_key)) == null) {
-					image = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, size, size);
-					image.fill (0x00000000);
-					not_cached = true;
-				}
-			}
-			
-			if (size != image.width || size != image.height)
-				image = Plank.Drawing.DrawingService.ar_scale (image, size, size);
-			
-			if (not_cached)
-				icon_pixbuf_cache.set (icon_key, image);
-			
-			return image;
-		}
-		
-		/**
-		 * get the next window that should be active on a workspace right now
-		 **/
-		public static Window get_next_window (Meta.Workspace workspace, bool backward=false)
-		{
-			var screen = workspace.get_screen ();
-			var display = screen.get_display ();
-			
-			var window = display.get_tab_next (Meta.TabList.NORMAL, screen, 
-				screen.get_active_workspace (), null, backward);
-			
-			if (window == null)
-				window = display.get_tab_current (Meta.TabList.NORMAL, screen, workspace);
-			
-			return window;
-		}
-		
 		/**
 		 * set the area where clutter can receive events
 		 **/
@@ -243,59 +95,16 @@
 					Util.empty_stage_input_region (screen);
 					return;
 			}
+
+			// add plugin's requested areas
+			if (area == InputArea.FULLSCREEN || area == InputArea.HOT_CORNER) {
+				foreach (var rect in PluginManager.get_default ().regions) {
+					rects += rect;
+				}
+			}
 			
 			var xregion = X.Fixes.create_region (display.get_xdisplay (), rects);
 			Util.set_stage_input_region (screen, xregion);
 		}
-		
-		/**
-		 * get the number of toplevel windows on a workspace
-		 **/
-		public static uint get_n_windows (Workspace workspace)
-		{
-			var n = 0;
-			foreach (var window in workspace.list_windows ()) {
-				if (window.is_on_all_workspaces ())
-					continue;
-				if (window.window_type == WindowType.NORMAL ||
-					window.window_type == WindowType.DIALOG ||
-					window.window_type == WindowType.MODAL_DIALOG)
-					n ++;
-			}
-		
-			return n;
-		}
-		
-		static Gtk.CssProvider fallback_style = null;
-		
-		public static Gtk.CssProvider get_default_style ()
-		{
-			if (fallback_style == null) {
-				fallback_style = new Gtk.CssProvider ();
-				try {
-					fallback_style.load_from_path (Config.PKGDATADIR + "/gala.css");
-				} catch (Error e) { warning (e.message); }
-			}
-			
-			return fallback_style;
-		}
-
-		public static void get_window_frame_offset (Window window, out float x, out float y, out float width, out float height)
-		{
-			var actor = window.get_compositor_private () as Clutter.Actor;
-			var frame = window.get_outer_rect ();
-			x = actor.x - frame.x;
-			y = actor.y - frame.y;
-			width = actor.width - frame.width;
-			height = actor.height - frame.height;
-		}
-
-		public static void bell (Meta.Screen screen)
-		{
-			if (Meta.Prefs.bell_is_audible ())
-				Gdk.beep ();
-			else
-				screen.get_display ().get_compositor ().flash_screen (screen);
-		}
 	}
 }

=== modified file 'src/Main.vala'
--- src/Main.vala	2013-07-14 17:20:53 +0000
+++ src/Main.vala	2014-04-06 18:03:36 +0000
@@ -38,11 +38,7 @@
 		    Meta.exit (Meta.ExitCode.ERROR);
 		}
 		
-#if HAS_MUTTER36
-		Meta.Plugin.manager_set_plugin_type (new Plugin ().get_type ());
-#else
-		Meta.Plugin.type_register (new Plugin ().get_type ());
-#endif
+		Meta.Plugin.manager_set_plugin_type (new WindowManagerGala ().get_type ());
 		
 		Meta.set_wm_name ("Mutter(Gala)");
 		

=== added file 'src/Makefile.am'
--- src/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/Makefile.am	2014-04-06 18:03:36 +0000
@@ -0,0 +1,77 @@
+include $(top_srcdir)/Makefile.common
+
+VAPIDIR = $(top_srcdir)/vapi
+
+gala_VALAFLAGS = \
+	$(GALA_CORE_VALAFLAGS) \
+	$(top_builddir)/lib/gala.vapi \
+	--vapidir $(VAPIDIR) \
+	$(VAPIDIR)/config.vapi \
+	$(VAPIDIR)/cogl-fixes.vapi \
+	$(NULL)
+
+galadir = $(bindir)
+
+BUILT_SOURCES = gala_vala.stamp
+
+gala_PROGRAMS = gala
+
+gala_CFLAGS = \
+	$(GALA_CORE_CFLAGS) \
+	-include config.h \
+	-w \
+	-DGNOME_DESKTOP_USE_UNSTABLE_API \
+	-I$(top_builddir)/lib \
+	$(NULL)
+
+gala_LDADD = \
+	-lm \
+	$(GALA_CORE_LIBS) \
+	$(top_builddir)/lib/libgala.la \
+	$(NULL)
+
+gala_VALASOURCES = \
+	DBus.vala \
+	DragDropAction.vala \
+	InternalUtils.vala \
+	Main.vala \
+	PluginManager.vala \
+	ScreenSaver.vala \
+	Settings.vala \
+	TextShadowEffect.vala \
+	WindowManager.vala \
+	Background/Background.vala \
+	Background/BackgroundCache.vala \
+	Background/BackgroundManager.vala \
+	Background/SlideShow.vala \
+	Background/SystemBackground.vala \
+	Widgets/AppIcon.vala \
+	Widgets/WindowOverview.vala \
+	Widgets/WindowSwitcher.vala \
+	Widgets/WindowThumb.vala \
+	Widgets/WorkspaceThumb.vala \
+	Widgets/WorkspaceView.vala \
+	$(NULL)
+
+nodist_gala_SOURCES = \
+	gala_vala.stamp \
+	$(gala_VALASOURCES:.vala=.c) \
+	$(NULL)
+
+gala_vala.stamp: $(gala_VALASOURCES)
+	$(AM_V_VALA)$(VALAC) \
+		$(gala_VALAFLAGS) \
+		--basedir $(srcdir) \
+		--directory $(builddir) \
+		-C \
+		$(filter %.vala %.c,$^)
+	$(AM_V_at)touch $@
+
+CLEANFILES = \
+	$(nodist_gala_SOURCES) \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(gala_VALASOURCES) \
+	$(NULL)
+

=== added file 'src/PluginManager.vala'
--- src/PluginManager.vala	1970-01-01 00:00:00 +0000
+++ src/PluginManager.vala	2014-04-06 18:03:36 +0000
@@ -0,0 +1,220 @@
+//  
+//  Copyright (C) 2014 Tom Beckmann
+// 
+//  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 3 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, see <http://www.gnu.org/licenses/>.
+// 
+
+namespace Gala
+{
+	delegate PluginInfo RegisterPluginFunction ();
+
+	public class PluginManager : Object
+	{
+		static PluginManager? instance = null;
+		public static PluginManager get_default ()
+		{
+			if (instance == null)
+				instance = new PluginManager ();
+
+			return instance;
+		}
+
+		public signal void regions_changed ();
+
+		public bool initialized { get; private set; default = false; }
+
+		public X.Xrectangle[] regions { get; private set; }
+
+		public string? window_switcher_provider { get; private set; default = null; }
+		public string? desktop_provider { get; private set; default = null; }
+		public string? window_overview_provider { get; private set; default = null; }
+		public string? workspace_view_provider { get; private set; default = null; }
+
+		HashTable<string,Plugin> plugins;
+		File plugin_dir;
+
+		WindowManager? wm = null;
+
+		Gee.LinkedList<PluginInfo?> load_later_plugins;
+
+		PluginManager ()
+		{
+			plugins = new HashTable<string,Plugin> (str_hash, str_equal);
+			load_later_plugins = new Gee.LinkedList<PluginInfo?> ();
+
+			if (!Module.supported ()) {
+				warning ("Modules are not supported on this platform");
+				return;
+			}
+
+			plugin_dir = File.new_for_path (Config.PLUGINDIR);
+			if (!plugin_dir.query_exists ())
+				return;
+
+			try {
+				var enumerator = plugin_dir.enumerate_children (FileAttribute.STANDARD_NAME +
+					"," + FileAttribute.STANDARD_CONTENT_TYPE, 0);
+				FileInfo info;
+				while ((info = enumerator.next_file ()) != null) {
+					if (info.get_content_type () == "application/x-sharedlib")
+						load_module (info.get_name ());
+				}
+			} catch (Error e) {
+				warning (e.message);
+			}
+
+			try {
+				plugin_dir.monitor_directory (FileMonitorFlags.NONE, null).changed.connect ((file, other_file, type) => {
+					if (type == FileMonitorEvent.CREATED) {
+						load_module (file.get_basename ());
+					}
+				});
+			} catch (Error e) {
+				warning (e.message);
+			}
+		}
+
+		bool load_module (string plugin_name)
+		{
+			var path = Module.build_path (plugin_dir.get_path (), plugin_name);
+			var module = Module.open (path, ModuleFlags.BIND_LOCAL);
+			if (module == null) {
+				warning (Module.error ());
+				return false;
+			}
+
+			void* function;
+			module.symbol ("register_plugin", out function);
+			if (function == null) {
+				warning ("%s failed to register: register_plugin() function not found", plugin_name);
+				return false;
+			}
+			RegisterPluginFunction register = (RegisterPluginFunction)function;
+
+			var info = register ();
+			if (info.plugin_type.is_a (typeof (Plugin)) == false) {
+				warning ("%s does not return a class of type Plugin", plugin_name);
+				return false;
+			}
+
+			if (!check_provides (info.name, info.provides)) {
+				return false;
+			}
+
+			info.module_name = plugin_name;
+			module.make_resident ();
+
+			if (info.load_priority == LoadPriority.DEFERRED && !initialized) {
+				load_later_plugins.add (info);
+			} else {
+				load_plugin_class (info);
+			}
+
+			return true;
+		}
+
+		void load_plugin_class (PluginInfo info)
+		{
+			var plugin = (Plugin)Object.@new (info.plugin_type);
+			plugins.set (info.module_name, plugin);
+
+			debug ("Loaded plugin %s (%s)", info.name, info.module_name);
+
+			if (initialized) {
+				initialize_plugin (info.module_name, plugin);
+				recalculate_regions ();
+			}
+		}
+
+		void initialize_plugin (string plugin_name, Plugin plugin)
+		{
+			plugin.initialize (wm);
+			plugin.region_changed.connect (recalculate_regions);
+		}
+
+		bool check_provides (string name, PluginFunction provides)
+		{
+			var message = "Plugins %s and %s both provide %s functionality, using first one only";
+			switch (provides) {
+				case PluginFunction.WORKSPACE_VIEW:
+					if (workspace_view_provider != null) {
+						warning (message, workspace_view_provider, name, "workspace view");
+						return false;
+					}
+					workspace_view_provider = name;
+					return true;
+				case PluginFunction.WINDOW_OVERVIEW:
+					if (window_overview_provider != null) {
+						warning (message, window_overview_provider, name, "window overview");
+						return false;
+					}
+					window_overview_provider = name;
+					return true;
+				case PluginFunction.DESKTOP:
+					if (desktop_provider != null) {
+						warning (message, desktop_provider, name, "desktop");
+						return false;
+					}
+					desktop_provider = name;
+					return true;
+				case PluginFunction.WINDOW_SWITCHER:
+					if (window_switcher_provider != null) {
+						warning (message, window_switcher_provider, name, "window switcher");
+						return false;
+					}
+					window_switcher_provider = name;
+					return true;
+			}
+
+			return true;
+		}
+
+		public void initialize (WindowManager _wm)
+		{
+			wm = _wm;
+
+			plugins.@foreach (initialize_plugin);
+			recalculate_regions ();
+
+			initialized = true;
+		}
+
+		public void load_waiting_plugins ()
+		{
+			foreach (var info in load_later_plugins) {
+				load_plugin_class (info);
+			}
+
+			load_later_plugins.clear ();
+		}
+
+		/**
+		 * Iterate over all plugins and grab their regions, update the regions
+		 * array accordingly and emit the regions_changed signal.
+		 */
+		void recalculate_regions ()
+		{
+			X.Xrectangle[] regions = {};
+
+			plugins.@foreach ((name, plugin) => {
+				foreach (var region in plugin.region)
+					regions += region;
+			});
+
+			this.regions = regions;
+			regions_changed ();
+		}
+	}
+}
+

=== modified file 'src/Widgets/WindowOverview.vala'
--- src/Widgets/WindowOverview.vala	2013-11-27 18:50:56 +0000
+++ src/Widgets/WindowOverview.vala	2014-04-06 18:03:36 +0000
@@ -29,7 +29,7 @@
 	
 	public class WindowOverview : Actor
 	{
-		Plugin plugin;
+		WindowManager wm;
 		Screen screen;
 		
 		bool ready;
@@ -39,10 +39,10 @@
 		
 		static const int PADDING = 50;
 		
-		public WindowOverview (Plugin _plugin)
+		public WindowOverview (WindowManager _wm)
 		{
-			plugin = _plugin;
-			screen = plugin.get_screen ();
+			wm = _wm;
+			screen = wm.get_screen ();
 			
 			screen.workspace_switched.connect (() => close (false));
 			
@@ -578,17 +578,12 @@
 
 			screen.window_left_monitor.connect (window_left_monitor);
 			
-#if !HAS_MUTTER38
-			Compositor.get_background_actor_for_screen (screen).
-				animate (AnimationMode.EASE_OUT_QUAD, 350, dim_factor : 0.6);
-#endif
-			
 			// sort windows by stacking order
 			var windows = screen.get_display ().sort_windows_by_stacking (used_windows);
 			
 			grab_key_focus ();
 			
-			plugin.begin_modal ();
+			wm.begin_modal ();
 			
 			visible = true;
 			
@@ -615,12 +610,7 @@
 		{
 			// see if that's happened on one of our workspaces
 			foreach (var workspace in workspaces) {
-#if HAS_MUTTER38
 				if (window.located_on_workspace (workspace)) {
-#else
-				if (window.get_workspace () == workspace || 
-					(window.is_on_all_workspaces () && window.get_screen () == workspace.get_screen ())) {
-#endif
 					remove_window (window);
 					return;
 				}
@@ -711,8 +701,8 @@
 			
 			ready = false;
 			
-			plugin.end_modal ();
-			plugin.update_input_area ();
+			wm.end_modal ();
+			wm.update_input_area ();
 			
 			foreach (var child in get_children ()) {
 				var exposed = child as WindowThumb;
@@ -720,11 +710,6 @@
 				exposed.selected.disconnect (thumb_selected);
 			}
 			
-#if !HAS_MUTTER38
-			Compositor.get_background_actor_for_screen (screen).
-				animate (AnimationMode.EASE_OUT_QUAD, 300, dim_factor : 1.0);
-#endif
-			
 			if (animate) {
 				Clutter.Threads.Timeout.add (300, () => {
 					visible = false;

=== modified file 'src/Widgets/WindowSwitcher.vala'
--- src/Widgets/WindowSwitcher.vala	2014-02-05 18:06:21 +0000
+++ src/Widgets/WindowSwitcher.vala	2014-04-06 18:03:36 +0000
@@ -22,7 +22,7 @@
 {
 	public class WindowSwitcher : Clutter.Actor
 	{
-		Gala.Plugin plugin;
+		Gala.WindowManager wm;
 		
 		Gee.ArrayList<Clutter.Clone> window_clones = new Gee.ArrayList<Clutter.Clone> ();
 		
@@ -42,9 +42,9 @@
 		//estimated value, if possible
 		float dock_width = 0.0f;
 		
-		public WindowSwitcher (Gala.Plugin _plugin)
+		public WindowSwitcher (Gala.WindowManager _wm)
 		{
-			plugin = _plugin;
+			wm = _wm;
 			
 			//pull drawing methods from libplank
 			dock_settings = new Plank.DockPreferences.with_filename (Environment.get_user_config_dir () + "/plank/dock1/settings");
@@ -131,7 +131,7 @@
 
 			closing = true;
 
-			var screen = plugin.get_screen ();
+			var screen = wm.get_screen ();
 			var workspace = screen.get_active_workspace ();
 			
 			if (dock_window != null)
@@ -164,7 +164,7 @@
 				current_window = null;
 			}
 			
-			plugin.end_modal ();
+			wm.end_modal ();
 			
 			dock.animate (AnimationMode.EASE_OUT_CUBIC, 250, width:dest_width, opacity : 0).
 				completed.connect (() => {
@@ -201,7 +201,7 @@
 		bool released = false;
 		public override bool captured_event (Clutter.Event event)
 		{
-			var screen = plugin.get_screen ();
+			var screen = wm.get_screen ();
 			var display = screen.get_display ();
 			
 			if (event.get_type () == EventType.KEY_RELEASE) {
@@ -221,9 +221,7 @@
 			var prev_win = current_window;
 			if (action == Meta.KeyBindingAction.SWITCH_GROUP ||
 				action == Meta.KeyBindingAction.SWITCH_WINDOWS || 
-#if HAS_MUTTER38
 				action == Meta.KeyBindingAction.SWITCH_APPLICATIONS ||
-#endif
 				event.get_key_symbol () == Clutter.Key.Right) {
 				
 				current_window = display.get_tab_next (Meta.TabList.NORMAL, screen, 
@@ -232,9 +230,7 @@
 				
 			} else if (action == Meta.KeyBindingAction.SWITCH_GROUP_BACKWARD ||
 				action == Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD ||
-#if HAS_MUTTER38
 				action == Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD ||
-#endif
 				event.get_key_symbol () == Clutter.Key.Left) {
 				
 				current_window = display.get_tab_next (Meta.TabList.NORMAL, screen, 
@@ -295,20 +291,15 @@
 		void window_left_monitor (int num, Meta.Window window)
 		{
 			// see if that's happened on our workspace
-			var workspace = plugin.get_screen ().get_active_workspace ();
-#if HAS_MUTTER38
+			var workspace = wm.get_screen ().get_active_workspace ();
 			if (window.located_on_workspace (workspace)) {
-#else
-			if (window.get_workspace () == workspace || 
-				(window.is_on_all_workspaces () && window.get_screen () == workspace.get_screen ())) {
-#endif
 				remove_window (window);
 			}
 		}
 		
 		void add_window (Meta.Window window)
 		{
-			var screen = plugin.get_screen ();
+			var screen = wm.get_screen ();
 			
 			if (window.get_workspace () != screen.get_active_workspace ())
 				return;
@@ -366,7 +357,7 @@
 			if (meta_win != null &&
 				!window.is_destroyed () &&
 				!meta_win.minimized &&
-				(meta_win.get_workspace () == plugin.get_screen ().get_active_workspace ()) ||
+				(meta_win.get_workspace () == wm.get_screen ().get_active_workspace ()) ||
 				meta_win.is_on_all_workspaces ())
 				window.show ();
 			
@@ -401,7 +392,7 @@
 		
 		public override void key_focus_out ()
 		{
-			close (plugin.get_screen ().get_display ().get_current_time ());
+			close (wm.get_screen ().get_display ().get_current_time ());
 		}
 		
 		public void handle_switch_windows (Meta.Display display, Meta.Screen screen, Meta.Window? window,
@@ -453,7 +444,7 @@
 			});
 			
 			closing = false;
-			plugin.begin_modal ();
+			wm.begin_modal ();
 			
 			bool backward = (binding.get_name () == "switch-windows-backward");
 			
@@ -514,7 +505,7 @@
 			Gdk.Display.get_default ().get_device_manager ().get_client_pointer ().get_state (Gdk.get_default_root_window (),
 				null, out modifiers);
 			if ((modifiers & Gdk.ModifierType.MOD1_MASK) == 0)
-				close (plugin.get_screen ().get_display ().get_current_time ());
+				close (wm.get_screen ().get_display ().get_current_time ());
 		}
 	}
 }

=== modified file 'src/Widgets/WorkspaceThumb.vala'
--- src/Widgets/WorkspaceThumb.vala	2013-11-27 18:50:56 +0000
+++ src/Widgets/WorkspaceThumb.vala	2014-04-06 18:03:36 +0000
@@ -48,12 +48,8 @@
 		Gtk.StyleContext selector_style;
 		Gtk.EventBox selector_style_widget;
 		
-#if HAS_MUTTER38
 		internal Actor wallpaper;
 		Actor wallpaper_manager;
-#else
-		internal Clone wallpaper;
-#endif
 		Clutter.Actor windows;
 		internal Clutter.Actor icons;
 		Actor indicator;
@@ -61,11 +57,7 @@
 		
 		uint hover_timer = 0;
 		
-#if HAS_MUTTER38
 		public WorkspaceThumb (Workspace _workspace, Meta.BackgroundGroup _wallpaper)
-#else
-		public WorkspaceThumb (Workspace _workspace)
-#endif
 		{
 			workspace = _workspace;
 			screen = workspace.get_screen ();
@@ -94,15 +86,11 @@
 			
 			handle_workspace_switched (-1, screen.get_active_workspace_index (), MotionDirection.LEFT);
 			
-#if HAS_MUTTER38
 			wallpaper_manager = new BackgroundManager (screen);
 			//FIXME apparently there are issues with scaling and animating the opacity. The wallpaper will
 			//      start flickering when the opacity changes. Wrapping it in a container solves this.
 			wallpaper = new Clutter.Actor ();
 			wallpaper.add_child (wallpaper_manager);
-#else
-			wallpaper = new Clone (Compositor.get_background_actor_for_screen (screen));
-#endif
 			wallpaper.x = INDICATOR_BORDER;
 			wallpaper.y = INDICATOR_BORDER;
 			wallpaper.height = THUMBNAIL_HEIGHT;
@@ -210,10 +198,8 @@
 			indicator.width = width + 2 * INDICATOR_BORDER;
 			(indicator.content as Canvas).set_size ((int)indicator.width, (int)indicator.height);
 
-#if HAS_MUTTER38
 			wallpaper_manager.scale_x = width / swidth;
 			wallpaper_manager.scale_y = THUMBNAIL_HEIGHT / sheight;
-#endif
 			wallpaper.width = width;
 			windows.width = width;
 
@@ -342,12 +328,7 @@
 		
 		void window_left_monitor (int num, Meta.Window window)
 		{
-#if HAS_MUTTER38
 			if (window.located_on_workspace (workspace))
-#else
-			if (window.get_workspace () == workspace || 
-				(window.is_on_all_workspaces () && window.get_screen () == workspace.get_screen ()))
-#endif
 				handle_window_removed (window);
 		}
 

=== modified file 'src/Widgets/WorkspaceView.vala'
--- src/Widgets/WorkspaceView.vala	2013-11-27 18:50:56 +0000
+++ src/Widgets/WorkspaceView.vala	2014-04-06 18:03:36 +0000
@@ -24,14 +24,11 @@
 		static const float VIEW_HEIGHT = 140.0f;
 		static const float SCROLL_SPEED = 30.0f;
 		
-		Gala.Plugin plugin;
+		Gala.WindowManager wm;
 		Screen screen;
 		
 		Clutter.Actor thumbnails;
 		Clutter.Actor scroll;
-#if !HAS_MUTTER38
-		Clutter.Actor click_catcher; //invisible plane that catches clicks outside the view
-#endif
 		
 		bool animating; // delay closing the popup
 		
@@ -41,10 +38,10 @@
 		Gtk.StyleContext background_style;
 		Gtk.EventBox background_style_widget;
 		
-		public WorkspaceView (Gala.Plugin _plugin)
+		public WorkspaceView (Gala.WindowManager _wm)
 		{
-			plugin = _plugin;
-			screen = plugin.get_screen ();
+			wm = _wm;
+			screen = wm.get_screen ();
 			
 			height = VIEW_HEIGHT;
 			reactive = true;
@@ -69,16 +66,6 @@
 			scroll.content = new Clutter.Canvas ();
 			(scroll.content as Clutter.Canvas).draw.connect (draw_scroll);
 			
-#if !HAS_MUTTER38
-			click_catcher = new Clutter.Actor ();
-			click_catcher.reactive = true;
-			click_catcher.button_release_event.connect ((e) => {
-				hide ();
-				return true;
-			});
-			Compositor.get_stage_for_screen (screen).add_child (click_catcher);
-#endif
-			
 			add_child (thumbnails);
 			add_child (scroll);
 			
@@ -118,11 +105,7 @@
 		void init_thumbnails ()
 		{
 			foreach (var workspace in screen.get_workspaces ()) {
-#if HAS_MUTTER38
-				var thumb = new WorkspaceThumb (workspace, plugin.background_group);
-#else
-				var thumb = new WorkspaceThumb (workspace);
-#endif
+				var thumb = new WorkspaceThumb (workspace, wm.background_group);
 				thumb.clicked.connect (hide);
 				thumb.closed.connect (remove_workspace);
 				thumb.window_on_last.connect (add_workspace);
@@ -137,13 +120,11 @@
 				add_workspace ();
 		}
 
-#if HAS_MUTTER38
 		bool outside_clicked (Clutter.ButtonEvent event)
 		{
 			hide ();
 			return true;
 		}
-#endif
 		
 		bool draw_background (Cairo.Context cr)
 		{
@@ -184,11 +165,7 @@
 		
 		void create_workspace_thumb (Meta.Workspace workspace)
 		{
-#if HAS_MUTTER38
-			var thumb = new WorkspaceThumb (workspace, plugin.background_group);
-#else
-			var thumb = new WorkspaceThumb (workspace);
-#endif
+			var thumb = new WorkspaceThumb (workspace, wm.background_group);
 			thumb.clicked.connect (hide);
 			thumb.closed.connect (remove_workspace);
 			thumb.window_on_last.connect (add_workspace);
@@ -241,28 +218,6 @@
 			}
 		}
 		
-		void switch_to_next_workspace (MotionDirection direction)
-		{
-			var display = screen.get_display ();
-			var old_index = screen.get_active_workspace_index ();
-			var neighbor = screen.get_active_workspace ().get_neighbor (direction);
-			
-			neighbor.activate (display.get_current_time ());
-			
-			// if we didnt switch, show a nudge-over animation. need to take the indices 
-			// here since the changing only applies after the animation ends
-			if (old_index == 0 && direction == MotionDirection.LEFT || 
-				old_index == screen.n_workspaces - 1 && direction == MotionDirection.RIGHT) {
-				
-				var dest = (direction == MotionDirection.LEFT ? 32.0f : -32.0f);
-				Compositor.get_window_group_for_screen (screen).animate (Clutter.AnimationMode.LINEAR, 100, x:dest);
-				Clutter.Threads.Timeout.add (210, () => {
-					Compositor.get_window_group_for_screen (screen).animate (Clutter.AnimationMode.LINEAR, 150, x:0.0f);
-					return false;
-				});
-			}
-		}
-		
 		public override void key_focus_out ()
 		{
 			hide ();
@@ -282,18 +237,18 @@
 			switch (event.keyval) {
 				case Clutter.Key.Left:
 					if ((event.modifier_state & Clutter.ModifierType.SHIFT_MASK) != 0)
-						plugin.move_window (display.get_focus_window (), MotionDirection.LEFT);
+						wm.move_window (display.get_focus_window (), MotionDirection.LEFT);
 					else
-						switch_to_next_workspace (MotionDirection.LEFT);
+						wm.switch_to_next_workspace (MotionDirection.LEFT);
 					
 					last_switch_time = current_time;
 					
 					return false;
 				case Clutter.Key.Right:
 					if ((event.modifier_state & Clutter.ModifierType.SHIFT_MASK) != 0)
-						plugin.move_window (display.get_focus_window (), MotionDirection.RIGHT);
+						wm.move_window (display.get_focus_window (), MotionDirection.RIGHT);
 					else
-						switch_to_next_workspace (MotionDirection.RIGHT);
+						wm.switch_to_next_workspace (MotionDirection.RIGHT);
 					
 					last_switch_time = current_time;
 					
@@ -403,16 +358,14 @@
 			
 			wait_one_key_release = shortcut;
 			
-			var screen = plugin.get_screen ();
+			var screen = wm.get_screen ();
 
 			visible = true;
 			grab_key_focus ();
 			
-			plugin.begin_modal ();
+			wm.begin_modal ();
 			
-#if HAS_MUTTER38
-			plugin.ui_group.button_release_event.connect (outside_clicked);
-#endif
+			wm.ui_group.button_release_event.connect (outside_clicked);
 			
 			var area = screen.get_monitor_geometry (screen.get_primary_monitor ());
 			y = area.height + area.y;
@@ -438,14 +391,6 @@
 			int swidth, sheight;
 			screen.get_size (out swidth, out sheight);
 			
-#if !HAS_MUTTER38
-			click_catcher.width = swidth;
-			click_catcher.height = sheight;
-			click_catcher.x = 0;
-			click_catcher.y = 0;
-			click_catcher.visible = true;
-#endif
-			
 			animating = true;
 			Clutter.Threads.Timeout.add (50, () => {
 				animating = false;
@@ -465,15 +410,13 @@
 			if (!visible || animating)
 				return;
 
-#if HAS_MUTTER38
-			plugin.ui_group.button_release_event.disconnect (outside_clicked);
-#endif
+			wm.ui_group.button_release_event.disconnect (outside_clicked);
 			
 			float width, height;
-			plugin.get_screen ().get_size (out width, out height);
+			wm.get_screen ().get_size (out width, out height);
 			
-			plugin.end_modal ();
-			plugin.update_input_area ();
+			wm.end_modal ();
+			wm.update_input_area ();
 			
 			animating = true;
 			animate (Clutter.AnimationMode.EASE_OUT_EXPO, 500, y : height).completed.connect (() => {
@@ -484,21 +427,10 @@
 				visible = false;
 			});
 			
-#if !HAS_MUTTER38
-			click_catcher.visible = false;
-#endif
-			
 			var wins = Compositor.get_window_group_for_screen (screen);
 			wins.detach_animation ();
 			wins.x = 0.0f;
 			wins.animate (Clutter.AnimationMode.EASE_OUT_EXPO, 500, y : 0.0f);
 		}
-		
-		public void handle_switch_to_workspace (Meta.Display display, Meta.Screen screen, Meta.Window? window,
-			X.Event event, Meta.KeyBinding binding)
-		{
-			var direction = (binding.get_name () == "switch-to-workspace-left" ? MotionDirection.LEFT : MotionDirection.RIGHT);
-			switch_to_next_workspace (direction);
-		}
 	}
 }

=== renamed file 'src/Plugin.vala' => 'src/WindowManager.vala'
--- src/Plugin.vala	2014-02-05 18:06:21 +0000
+++ src/WindowManager.vala	2014-04-06 18:03:36 +0000
@@ -19,42 +19,22 @@
 
 namespace Gala
 {
-	public enum ActionType
-	{
-		NONE = 0,
-		SHOW_WORKSPACE_VIEW,
-		MAXIMIZE_CURRENT,
-		MINIMIZE_CURRENT,
-		OPEN_LAUNCHER,
-		CUSTOM_COMMAND,
-		WINDOW_OVERVIEW,
-		WINDOW_OVERVIEW_ALL
-	}
-	
-	public enum InputArea {
-		NONE,
-		FULLSCREEN,
-		HOT_CORNER
-	}
-	
-	public class Plugin : Meta.Plugin
-	{
-		PluginInfo info;
-		
-		WindowSwitcher winswitcher;
-		WorkspaceView workspace_view;
-		Zooming zooming;
-		WindowOverview window_overview;
+	public class WindowManagerGala : Meta.Plugin, WindowManager
+	{
+		public Meta.BackgroundGroup background_group { get; protected set; }
+		public Clutter.Actor ui_group { get; protected set; }
+		public Clutter.Stage stage { get; protected set; }
+		
+		Meta.PluginInfo info;
+		
+		WindowSwitcher? winswitcher = null;
+		WorkspaceView? workspace_view = null;
+		WindowOverview? window_overview = null;
 
 		// used to detect which corner was used to trigger an action
 		Clutter.Actor? last_hotcorner;
 		ScreenSaver? screensaver;
 		
-#if HAS_MUTTER38
-		public Meta.BackgroundGroup background_group { get; private set; }
-		public Clutter.Actor ui_group { get; private set; }
-#endif
-		
 		Window? moving; //place for the window that is being moved over
 		
 		int modal_count = 0; //count of modal modes overlaying each other
@@ -64,10 +44,10 @@
 		Gee.HashSet<Meta.WindowActor> unmaximizing = new Gee.HashSet<Meta.WindowActor> ();
 		Gee.HashSet<Meta.WindowActor> mapping = new Gee.HashSet<Meta.WindowActor> ();
 		Gee.HashSet<Meta.WindowActor> destroying = new Gee.HashSet<Meta.WindowActor> ();
-		
-		public Plugin ()
+
+		public WindowManagerGala ()
 		{
-			info = PluginInfo () {name = "Gala", version = Config.VERSION, author = "Gala Developers",
+			info = Meta.PluginInfo () {name = "Gala", version = Config.VERSION, author = "Gala Developers",
 				license = "GPLv3", description = "A nice elementary window manager"};
 			
 			Prefs.set_ignore_request_hide_titlebar (true);
@@ -80,19 +60,15 @@
 		
 		public override void start ()
 		{
-#if HAS_MUTTER38
 			Util.later_add (LaterType.BEFORE_REDRAW, show_stage);
 		}
 		
 		bool show_stage ()
 		{
-#endif
 			var screen = get_screen ();
 			
 			DBus.init (this);
-#if HAS_MUTTER38
 			BackgroundCache.init (screen);
-#endif
 			
 			// Due to a bug which enables access to the stage when using multiple monitors
 			// in the screensaver, we have to listen for changes and make sure the input area
@@ -101,9 +77,12 @@
 				screensaver = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.ScreenSaver",
 					"/org/gnome/ScreenSaver");
 				screensaver.active_changed.connect (update_input_area);
-			} catch (Error e) { warning (e.message); }
+			} catch (Error e) {
+				screensaver = null;
+				warning (e.message);
+			}
 			
-			var stage = Compositor.get_stage_for_screen (screen) as Clutter.Stage;
+			stage = Compositor.get_stage_for_screen (screen) as Clutter.Stage;
 			
 			var color = BackgroundSettings.get_default ().primary_color;
 			stage.background_color = Clutter.Color.from_string (color);
@@ -111,7 +90,6 @@
 			if (Prefs.get_dynamic_workspaces ())
 				screen.override_workspace_layout (ScreenCorner.TOPLEFT, false, 1, -1);
 			
-#if HAS_MUTTER38
 			/* our layer structure, copied from gnome-shell (from bottom to top):
 			 * stage
 			 * + system background
@@ -138,38 +116,13 @@
 			background_group = new BackgroundManager (screen);
 			window_group.add_child (background_group);
 			window_group.set_child_below_sibling (background_group, null);
-#endif
-
-			workspace_view = new WorkspaceView (this);
-			workspace_view.visible = false;
-			
-			winswitcher = new WindowSwitcher (this);
-			
-			zooming = new Zooming (this);
-			window_overview = new WindowOverview (this);
-			
-#if HAS_MUTTER38
-			ui_group.add_child (workspace_view);
-			ui_group.add_child (winswitcher);
-			ui_group.add_child (window_overview);
 
 			var top_window_group = Compositor.get_top_window_group_for_screen (screen);
 			stage.remove_child (top_window_group);
 			ui_group.add_child (top_window_group);
-#else
-			stage.add_child (workspace_view);
-			stage.add_child (winswitcher);
-			stage.add_child (window_overview);
-#endif
 			
 			/*keybindings*/
 			
-			screen.get_display ().add_keybinding ("expose-windows", KeybindingSettings.get_default ().schema, 0, () => {
-				window_overview.open (true);
-			});
-			screen.get_display ().add_keybinding ("expose-all-windows", KeybindingSettings.get_default ().schema, 0, () => {
-				window_overview.open (true, true);
-			});
 			screen.get_display ().add_keybinding ("switch-to-workspace-first", KeybindingSettings.get_default ().schema, 0, () => {
 				screen.get_workspace_by_index (0).activate (screen.get_display ().get_current_time ());
 			});
@@ -188,12 +141,6 @@
 				window.change_workspace (workspace);
 				workspace.activate_with_focus (window, screen.get_display ().get_current_time ());
 			});
-			screen.get_display ().add_keybinding ("zoom-in", KeybindingSettings.get_default ().schema, 0, () => {
-				zooming.zoom_in ();
-			});
-			screen.get_display ().add_keybinding ("zoom-out", KeybindingSettings.get_default ().schema, 0, () => {
-				zooming.zoom_out ();
-			});
 			screen.get_display ().add_keybinding ("cycle-workspaces-next", KeybindingSettings.get_default ().schema, 0, () => {
 				cycle_workspaces (1);
 			});
@@ -222,24 +169,10 @@
 				} catch (Error e) { warning (e.message); }
 			});
 			
-			KeyBinding.set_custom_handler ("show-desktop", () => {
-				workspace_view.show (true);
-			});
-			
-#if HAS_MUTTER38
-			//FIXME we have to investigate this. Apparently alt-tab is now bound to switch-applications
-			// instead of windows, which we should probably handle too
-			KeyBinding.set_custom_handler ("switch-applications", winswitcher.handle_switch_windows);
-			KeyBinding.set_custom_handler ("switch-applications-backward", winswitcher.handle_switch_windows);
-#else
-			KeyBinding.set_custom_handler ("switch-windows", winswitcher.handle_switch_windows);
-			KeyBinding.set_custom_handler ("switch-windows-backward", winswitcher.handle_switch_windows);
-#endif
-			
 			KeyBinding.set_custom_handler ("switch-to-workspace-up", () => {});
 			KeyBinding.set_custom_handler ("switch-to-workspace-down", () => {});
-			KeyBinding.set_custom_handler ("switch-to-workspace-left", workspace_view.handle_switch_to_workspace);
-			KeyBinding.set_custom_handler ("switch-to-workspace-right", workspace_view.handle_switch_to_workspace);
+			KeyBinding.set_custom_handler ("switch-to-workspace-left", handle_switch_to_workspace);
+			KeyBinding.set_custom_handler ("switch-to-workspace-right", handle_switch_to_workspace);
 			
 			KeyBinding.set_custom_handler ("move-to-workspace-up", () => {});
 			KeyBinding.set_custom_handler ("move-to-workspace-down", () => {});
@@ -250,8 +183,8 @@
 			KeyBinding.set_custom_handler ("switch-group-backward", () => {});
 			
 			/*shadows*/
-			Utils.reload_shadow ();
-			ShadowSettings.get_default ().notify.connect (Utils.reload_shadow);
+			InternalUtils.reload_shadow ();
+			ShadowSettings.get_default ().notify.connect (InternalUtils.reload_shadow);
 			
 			/*hot corner, getting enum values from GraniteServicesSettings did not work, so we use GSettings directly*/
 			configure_hotcorners ();
@@ -259,14 +192,56 @@
 			
 			BehaviorSettings.get_default ().schema.changed.connect ((key) => update_input_area ());
 
-#if HAS_MUTTER38
+			// initialize plugins and add default components if no plugin overrides them
+			var plugin_manager = PluginManager.get_default ();
+			plugin_manager.initialize (this);
+			plugin_manager.regions_changed.connect (update_input_area);
+
+			if (plugin_manager.workspace_view_provider == null) {
+				workspace_view = new WorkspaceView (this);
+				workspace_view.visible = false;
+				ui_group.add_child (workspace_view);
+				
+				KeyBinding.set_custom_handler ("show-desktop", () => {
+					workspace_view.show (true);
+				});
+			}
+
+			if (plugin_manager.window_switcher_provider == null) {
+				winswitcher = new WindowSwitcher (this);