diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,15 @@
+This package wraps the venerable eggtraymanager code, which implements
+the freedesktop.org
+[system tray protocol](http://standards.freedesktop.org/systemtray-spec/systemtray-spec-0.2.html).
+The code seems to have originated somewhere in the GNOME project a
+long time ago; I took it from
+[trayer-srg](https://github.com/sargon/trayer-srg/).  The only change
+I made was to cast a few `long` variables in parameters to `uint64_t`
+to make interoperability with Haskell easier.
+
+By itself, this code is not a system tray widget.  It is, however, an
+integral part of one.  This package exports a simple GObject (for use
+with gtk2hs) that emits events when system tray events occur.  A
+system tray widget would listen for these events and respond.  See the
+haddock documentation for details.
+
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/gtk-traymanager.cabal b/gtk-traymanager.cabal
new file mode 100644
--- /dev/null
+++ b/gtk-traymanager.cabal
@@ -0,0 +1,33 @@
+name: gtk-traymanager
+version: 0.1.0
+synopsis: A wrapper around the eggtraymanager library for Linux system trays
+license: LGPL-2.1
+license-file: LICENSE
+author: Tristan Ravitch
+maintainer: travitch@cs.wisc.edu
+category: Graphics
+build-type: Simple
+cabal-version: >=1.10
+extra-source-files: README.md
+stability: experimental
+homepage: http://github.com/travitch/gtk-traymanager
+description: This package provides a wrapper around the prolific eggtraymanager code.
+             Note that it is *NOT* itself a system tray widget, though it is a very
+             convenient utility for implementing one.  This package adopts the style
+             of gtk2hs and is designed to work well with it.
+
+
+library
+  default-language: Haskell2010
+  exposed-modules: Graphics.UI.Gtk.Misc.TrayManager
+  build-depends: gtk >= 0.12 && < 0.13, glib >= 0.12 && < 0.13, base > 3 && < 5
+  pkgconfig-depends: gtk+-2.0, x11
+  hs-source-dirs: src
+  c-sources: src/c/eggtraymanager.c, src/c/eggmarshalers.c, src/c/gdk-helper.c
+  ghc-options: -Wall
+  cc-options: -g
+  ghc-prof-options: -auto-all
+
+source-repository head
+  type: git
+  location: git://github.com/travitch/gtk-traymanager.git
diff --git a/src/Graphics/UI/Gtk/Misc/TrayManager.hs b/src/Graphics/UI/Gtk/Misc/TrayManager.hs
new file mode 100644
--- /dev/null
+++ b/src/Graphics/UI/Gtk/Misc/TrayManager.hs
@@ -0,0 +1,240 @@
+{-# LANGUAGE ForeignFunctionInterface, EmptyDataDecls #-}
+-- | This module implements a TrayManager - an integral part of a
+-- Linux system tray widget, though it is not itself a widget.  This
+-- package exports a single GObject (for use with gtk2hs) that
+-- implements the freedesktop.org system tray specification (it
+-- handles receiving events and translating them into convenient
+-- signals, along with the messy work of dealing with XEMBED).
+--
+-- The basic usage of the object is to:
+--
+-- 1. Instantiate the object with 'trayManagerNew'
+--
+-- 2. Have it manage a specific screen with 'trayManagerManageScreen'
+--
+-- 3. Set up handlers for the events exposed by the tray (e.g., 'trayIconAdded').
+--
+-- As an example, a functional system tray widget looks something like:
+--
+-- > import Graphics.UI.Gtk
+-- > import Graphics.UI.Gtk.Misc.TrayManager
+-- > systrayNew = do
+-- >   box <- hBoxNew False 5
+-- >   trayManager <- rayManagerNew
+-- >   Just screen <- screenGetDefault
+-- >   trayManagerManageScreen trayManager screen
+-- >   on trayManager trayIconAdded $ \w -> do
+-- >     widgetShowAll w
+-- >     boxPackStart box w PackNatural 0
+--
+-- Note that the widgets made available in the event handlers are not
+-- shown by default; you need to explicitly show them if you want that
+-- (and you probably do).
+module Graphics.UI.Gtk.Misc.TrayManager (
+  -- * Types
+  TrayManager,
+  TrayManagerChild,
+  TrayManagerClass,
+  castToTrayManager,
+  toTrayManager,
+  gTypeTrayManager,
+
+  -- * Functions
+  trayManagerCheckRunning,
+  trayManagerNew,
+  trayManagerManageScreen,
+  trayManagerGetChildTitle,
+
+  -- * Signals
+  trayIconAdded,
+  trayIconRemoved,
+  trayMessageSent,
+  trayMessageCanceled,
+  trayLostSelection
+  ) where
+
+import Graphics.UI.Gtk hiding ( after )
+import Graphics.UI.Gtk.Abstract.Object ( makeNewObject )
+import Graphics.UI.GtkInternals
+import System.Glib.GError ( failOnGError )
+import System.Glib.GObject
+import System.Glib.GType
+import System.Glib.UTFString ( peekUTFString )
+
+import Control.Monad ( liftM )
+
+import Foreign
+import Foreign.C.String ( CString, peekCString )
+import Foreign.C.Types
+import Unsafe.Coerce ( unsafeCoerce )
+
+newtype TrayManager = TrayManager (ForeignPtr TrayManager)
+                    deriving (Eq, Ord)
+type TrayManagerChild = Ptr EggTrayManagerChild
+
+-- Empty data tags to classify some foreign pointers
+data EggTrayManager
+data EggTrayManagerChild
+
+foreign import ccall "egg_tray_manager_check_running"
+  c_egg_tray_manager_check_running :: Ptr Screen -> IO CInt
+
+trayManagerCheckRunning :: Screen -> IO Bool
+trayManagerCheckRunning gdkScreen = do
+  let ptrScreen = unsafeCoerce gdkScreen :: ForeignPtr Screen
+  withForeignPtr ptrScreen $ \realPtr -> do
+    res <- c_egg_tray_manager_check_running realPtr
+    return (res /= 0)
+
+mkTrayManager :: (ForeignPtr TrayManager -> TrayManager, FinalizerPtr a)
+mkTrayManager = (TrayManager, objectUnrefFromMainloop)
+
+unTrayManager :: TrayManager -> ForeignPtr TrayManager
+unTrayManager (TrayManager o) = o
+
+class GObjectClass o => TrayManagerClass o
+toTrayManager :: TrayManagerClass o => o -> TrayManager
+toTrayManager = unsafeCastGObject . toGObject
+
+instance TrayManagerClass TrayManager
+instance ObjectClass TrayManager
+instance GObjectClass TrayManager where
+  toGObject = GObject . castForeignPtr . unTrayManager
+  unsafeCastGObject = TrayManager . castForeignPtr . unGObject
+
+castToTrayManager :: GObjectClass o => o -> TrayManager
+castToTrayManager = castTo gTypeTrayManager "TrayManager"
+
+foreign import ccall "egg_tray_manager_get_type"
+  c_egg_tray_manager_get_type :: CULong
+
+gTypeTrayManager :: GType
+gTypeTrayManager = fromIntegral c_egg_tray_manager_get_type
+
+foreign import ccall "egg_tray_manager_new"
+  c_egg_tray_manager_new :: IO (Ptr EggTrayManager)
+
+trayManagerNew :: IO TrayManager
+trayManagerNew =
+  makeNewObject mkTrayManager $ liftM (castPtr :: Ptr EggTrayManager -> Ptr TrayManager) $
+    c_egg_tray_manager_new
+  -- tm <- c_egg_tray_manager_new
+  -- return (unsafeCoerce tm)
+
+foreign import ccall "egg_tray_manager_manage_screen"
+  c_egg_tray_manager_manage_screen :: Ptr EggTrayManager -> Ptr Screen -> IO CInt
+
+trayManagerManageScreen :: TrayManager -> Screen -> IO Bool
+trayManagerManageScreen trayManager screen = do
+  let ptrManager = unsafeCoerce trayManager :: ForeignPtr EggTrayManager
+      ptrScreen = unsafeCoerce screen :: ForeignPtr Screen
+  res <- withForeignPtr ptrManager $ \realManager -> do
+    withForeignPtr ptrScreen $ \realScreen -> do
+      c_egg_tray_manager_manage_screen realManager realScreen
+  return (res /= 0)
+
+foreign import ccall "egg_tray_manager_get_child_title"
+  c_egg_tray_manager_get_child_title :: Ptr EggTrayManager -> Ptr EggTrayManagerChild -> IO (Ptr CChar)
+
+
+trayManagerGetChildTitle :: TrayManager -> TrayManagerChild -> IO String
+trayManagerGetChildTitle trayManager child = do
+  let ptrManager = unsafeCoerce trayManager :: ForeignPtr EggTrayManager
+  res <- withForeignPtr ptrManager $ \realManager -> do
+    c_egg_tray_manager_get_child_title realManager child
+  peekCString res
+
+-- | The signal emitted when a new tray icon is added.  These are
+-- delivered even for systray icons that already exist when the tray
+-- manager is created.
+trayIconAdded :: (TrayManagerClass self) => Signal self (Widget -> IO ())
+trayIconAdded = Signal (connect_OBJECT__NONE "tray_icon_added")
+
+-- | This signal is emitted when a tray icon is removed by its parent
+-- application.  No action is really necessary here (the icon is
+-- removed without any intervention).  You could do something here if
+-- you wanted, though.
+trayIconRemoved :: (TrayManagerClass self) => Signal self (Widget -> IO ())
+trayIconRemoved = Signal (connect_OBJECT__NONE "tray_icon_removed")
+
+-- | This signal is emitted when the application that displayed an
+-- icon wants a semi-persistent notification displayed for its icon.
+-- The standard doesn't seem to require that these be honored.
+trayMessageSent :: (TrayManagerClass self) => Signal self (Widget -> String -> Int64 -> Int64 -> IO ())
+trayMessageSent = Signal (connect_OBJECT_STRING_INT64_INT64__NONE "message_sent")
+
+-- | Similarly, the applciation can send this to cancel a previous
+-- persistent message.
+trayMessageCanceled :: (TrayManagerClass self) => Signal self (Widget -> Int64 -> IO ())
+trayMessageCanceled = Signal (connect_OBJECT_INT64__NONE "message_canceled")
+
+-- | ??
+trayLostSelection :: (TrayManagerClass self) => Signal self (IO ())
+trayLostSelection = Signal (connect_NONE__NONE "lost_selection")
+
+
+-- Boilerplate stolen from gtk to make this library compatible.  These
+-- functions aren't exported at all so I just copied them.
+
+-- stolen from gtk
+castTo :: (GObjectClass obj, GObjectClass obj') => GType -> String -> (obj -> obj')
+castTo gtype objTypeName obj =
+  case toGObject obj of
+    gobj@(GObject objFPtr)
+      | typeInstanceIsA ((unsafeForeignPtrToPtr.castForeignPtr) objFPtr) gtype
+                  -> unsafeCastGObject gobj
+      | otherwise -> error $ "Cannot cast object to " ++ objTypeName
+
+connect_OBJECT__NONE ::
+  (GObjectClass a', GObjectClass obj) => SignalName ->
+  ConnectAfter -> obj ->
+  (a' -> IO ()) ->
+  IO (ConnectId obj)
+connect_OBJECT__NONE signal after obj user =
+  connectGeneric signal after obj action
+  where action :: Ptr GObject -> Ptr GObject -> IO ()
+        action _ obj1 =
+          failOnGError $
+          makeNewGObject (GObject, objectUnrefFromMainloop) (return obj1) >>= \obj1' ->
+          user (unsafeCastGObject obj1')
+
+connect_NONE__NONE ::
+  GObjectClass obj => SignalName ->
+  ConnectAfter -> obj ->
+  (IO ()) ->
+  IO (ConnectId obj)
+connect_NONE__NONE signal after obj user =
+  connectGeneric signal after obj action
+  where action :: Ptr GObject -> IO ()
+        action _ =
+          failOnGError $
+          user
+
+connect_OBJECT_INT64__NONE :: (GObjectClass a', GObjectClass obj)
+                              => SignalName
+                              -> ConnectAfter
+                              -> obj
+                              -> (a' -> Int64 -> IO ())
+                              -> IO (ConnectId obj)
+connect_OBJECT_INT64__NONE signal after obj user =
+  connectGeneric signal after obj action
+  where
+    action :: Ptr GObject -> Ptr GObject -> Int64 -> IO ()
+    action _ obj1 int2 =
+      failOnGError $ makeNewGObject (GObject, objectUnrefFromMainloop) (return obj1) >>= \obj1' ->
+        user (unsafeCastGObject obj1') int2
+
+connect_OBJECT_STRING_INT64_INT64__NONE :: (GObjectClass a', GObjectClass obj)
+                                           => SignalName
+                                           -> ConnectAfter
+                                           -> obj
+                                           -> (a' -> String -> Int64 -> Int64 -> IO ())
+                                           -> IO (ConnectId obj)
+connect_OBJECT_STRING_INT64_INT64__NONE signal after obj user =
+  connectGeneric signal after obj action
+  where
+    action :: Ptr GObject -> Ptr GObject -> CString -> Int64 -> Int64 -> IO ()
+    action _ obj1 str2 int3 int4 =
+      failOnGError $ makeNewGObject (GObject, objectUnrefFromMainloop) (return obj1) >>= \obj1' ->
+        peekUTFString str2 >>= \str2' ->
+          user (unsafeCastGObject obj1') str2' int3 int4
diff --git a/src/c/eggmarshalers.c b/src/c/eggmarshalers.c
new file mode 100644
--- /dev/null
+++ b/src/c/eggmarshalers.c
@@ -0,0 +1,163 @@
+#include <glib-object.h>
+#include <stdint.h>
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* VOID:OBJECT,OBJECT (eggmarshalers.list:1) */
+void
+_egg_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                  GValue       *return_value,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint,
+                                  gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_OBJECT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+
+/* VOID:OBJECT,STRING,LONG,LONG (eggmarshalers.list:2) */
+void
+_egg_marshal_VOID__OBJECT_STRING_LONG_LONG (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG) (gpointer     data1,
+                                                              gpointer     arg_1,
+                                                              gpointer     arg_2,
+                                                              int64_t        arg_3,
+                                                              int64_t        arg_4,
+                                                              gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_string (param_values + 2),
+      (int64_t)g_marshal_value_peek_long (param_values + 3),
+      (int64_t)g_marshal_value_peek_long (param_values + 4),
+            data2);
+}
+
+/* VOID:OBJECT,LONG (eggmarshalers.list:3) */
+void
+_egg_marshal_VOID__OBJECT_LONG (GClosure     *closure,
+                                GValue       *return_value,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint,
+                                gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_LONG) (gpointer     data1,
+                                                  gpointer     arg_1,
+                                                  int64_t        arg_2,
+                                                  gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_LONG callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_LONG) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+      (int64_t)g_marshal_value_peek_long (param_values + 2),
+            data2);
+}
+
diff --git a/src/c/eggtraymanager.c b/src/c/eggtraymanager.c
new file mode 100644
--- /dev/null
+++ b/src/c/eggtraymanager.c
@@ -0,0 +1,595 @@
+/* eggtraymanager.c
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <string.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtkinvisible.h>
+#include <gtk/gtksocket.h>
+#include <gtk/gtkwindow.h>
+#include "eggtraymanager.h"
+#include "eggmarshalers.h"
+#include "panel.h"
+#include "gdk-helper.h"
+
+/* Signals */
+enum
+{
+  TRAY_ICON_ADDED,
+  TRAY_ICON_REMOVED,
+  MESSAGE_SENT,
+  MESSAGE_CANCELLED,
+  LOST_SELECTION,
+  LAST_SIGNAL
+};
+
+typedef struct
+{
+  long id, len;
+  long remaining_len;
+  
+  long timeout;
+  Window window;
+  char *str;
+} PendingMessage;
+
+static GObjectClass *parent_class = NULL;
+static guint manager_signals[LAST_SIGNAL] = { 0 };
+
+#define SYSTEM_TRAY_REQUEST_DOCK    0
+#define SYSTEM_TRAY_BEGIN_MESSAGE   1
+#define SYSTEM_TRAY_CANCEL_MESSAGE  2
+
+static gboolean egg_tray_manager_check_running_xscreen (Screen *xscreen);
+
+static void egg_tray_manager_init (EggTrayManager *manager);
+static void egg_tray_manager_class_init (EggTrayManagerClass *klass);
+
+static void egg_tray_manager_finalize (GObject *object);
+
+static void egg_tray_manager_unmanage (EggTrayManager *manager);
+
+GType
+egg_tray_manager_get_type (void)
+{
+  static GType our_type = 0;
+
+  if (our_type == 0)
+    {
+      static const GTypeInfo our_info =
+      {
+	sizeof (EggTrayManagerClass),
+	(GBaseInitFunc) NULL,
+	(GBaseFinalizeFunc) NULL,
+	(GClassInitFunc) egg_tray_manager_class_init,
+	NULL, /* class_finalize */
+	NULL, /* class_data */
+	sizeof (EggTrayManager),
+	0,    /* n_preallocs */
+	(GInstanceInitFunc) egg_tray_manager_init
+      };
+
+      our_type = g_type_register_static (G_TYPE_OBJECT, "EggTrayManager", &our_info, 0);
+    }
+
+  return our_type;
+
+}
+
+static void
+egg_tray_manager_init (EggTrayManager *manager)
+{
+  manager->socket_table = g_hash_table_new (NULL, NULL);
+}
+
+static void
+egg_tray_manager_class_init (EggTrayManagerClass *klass)
+{
+  GObjectClass *gobject_class;
+  
+  parent_class = g_type_class_peek_parent (klass);
+  gobject_class = (GObjectClass *)klass;
+
+  gobject_class->finalize = egg_tray_manager_finalize;
+  
+  manager_signals[TRAY_ICON_ADDED] =
+    g_signal_new ("tray_icon_added",
+		  G_OBJECT_CLASS_TYPE (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EggTrayManagerClass, tray_icon_added),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__OBJECT,
+		  G_TYPE_NONE, 1,
+		  GTK_TYPE_SOCKET);
+
+  manager_signals[TRAY_ICON_REMOVED] =
+    g_signal_new ("tray_icon_removed",
+		  G_OBJECT_CLASS_TYPE (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EggTrayManagerClass, tray_icon_removed),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__OBJECT,
+		  G_TYPE_NONE, 1,
+		  GTK_TYPE_SOCKET);
+  manager_signals[MESSAGE_SENT] =
+    g_signal_new ("message_sent",
+		  G_OBJECT_CLASS_TYPE (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EggTrayManagerClass, message_sent),
+		  NULL, NULL,
+		  _egg_marshal_VOID__OBJECT_STRING_LONG_LONG,
+		  G_TYPE_NONE, 4,
+		  GTK_TYPE_SOCKET,
+		  G_TYPE_STRING,
+		  G_TYPE_LONG,
+		  G_TYPE_LONG);
+  manager_signals[MESSAGE_CANCELLED] =
+    g_signal_new ("message_cancelled",
+		  G_OBJECT_CLASS_TYPE (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EggTrayManagerClass, message_cancelled),
+		  NULL, NULL,
+		  _egg_marshal_VOID__OBJECT_LONG,
+		  G_TYPE_NONE, 2,
+		  GTK_TYPE_SOCKET,
+		  G_TYPE_LONG);
+  manager_signals[LOST_SELECTION] =
+    g_signal_new ("lost_selection",
+		  G_OBJECT_CLASS_TYPE (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EggTrayManagerClass, lost_selection),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+
+}
+
+static void
+egg_tray_manager_finalize (GObject *object)
+{
+  EggTrayManager *manager;
+  
+  manager = EGG_TRAY_MANAGER (object);
+
+  egg_tray_manager_unmanage (manager);
+  
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+EggTrayManager *
+egg_tray_manager_new (void)
+{
+  EggTrayManager *manager;
+
+  manager = g_object_new (EGG_TYPE_TRAY_MANAGER, NULL);
+
+  return manager;
+}
+
+static gboolean
+egg_tray_manager_plug_removed (GtkSocket       *socket,
+			       EggTrayManager  *manager)
+{
+  Window *window;
+
+  window = g_object_get_data (G_OBJECT (socket), "egg-tray-child-window");
+
+  g_hash_table_remove (manager->socket_table, GINT_TO_POINTER (*window));
+  g_object_set_data (G_OBJECT (socket), "egg-tray-child-window",
+		     NULL);
+  
+  g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, socket);
+
+  /* This destroys the socket. */
+  return FALSE;
+}
+
+static void
+egg_tray_manager_handle_dock_request (EggTrayManager       *manager,
+				      XClientMessageEvent  *xevent)
+{
+  GtkWidget *socket;
+  Window *window;
+  
+  socket = gtk_socket_new ();
+  
+  /* We need to set the child window here
+   * so that the client can call _get functions
+   * in the signal handler
+   */
+  window = g_new (Window, 1);
+  *window = xevent->data.l[2];
+      
+  g_object_set_data_full (G_OBJECT (socket),
+			  "egg-tray-child-window",
+			  window, g_free);
+  g_signal_emit (manager, manager_signals[TRAY_ICON_ADDED], 0,
+		 socket);
+
+  /* Add the socket only if it's been attached */
+  if (GTK_IS_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (socket))))
+    {
+      g_signal_connect (socket, "plug_removed",
+			G_CALLBACK (egg_tray_manager_plug_removed), manager);
+      
+      gtk_socket_add_id (GTK_SOCKET (socket), xevent->data.l[2]);
+
+      g_hash_table_insert (manager->socket_table, GINT_TO_POINTER (xevent->data.l[2]), socket);
+    }
+  else
+    gtk_widget_destroy (socket);
+}
+
+static void
+pending_message_free (PendingMessage *message)
+{
+  g_free (message->str);
+  g_free (message);
+}
+
+static void
+egg_tray_manager_handle_message_data (EggTrayManager       *manager,
+				       XClientMessageEvent  *xevent)
+{
+  GList *p;
+  int len;
+  
+  /* Try to see if we can find the
+   * pending message in the list
+   */
+  for (p = manager->messages; p; p = p->next)
+    {
+      PendingMessage *msg = p->data;
+
+      if (xevent->window == msg->window)
+	{
+	  /* Append the message */
+	  len = MIN (msg->remaining_len, 20);
+
+	  memcpy ((msg->str + msg->len - msg->remaining_len),
+		  &xevent->data, len);
+	  msg->remaining_len -= len;
+
+	  if (msg->remaining_len == 0)
+	    {
+	      GtkSocket *socket;
+
+	      socket = g_hash_table_lookup (manager->socket_table, GINT_TO_POINTER (msg->window));
+
+	      if (socket)
+		{
+		  g_signal_emit (manager, manager_signals[MESSAGE_SENT], 0,
+				 socket, msg->str, msg->id, msg->timeout);
+		}
+	      manager->messages = g_list_remove_link (manager->messages,
+						      p);
+	      
+	      pending_message_free (msg);
+	    }
+
+	  return;
+	}
+    }
+}
+
+static void
+egg_tray_manager_handle_begin_message (EggTrayManager       *manager,
+				       XClientMessageEvent  *xevent)
+{
+  GList *p;
+  PendingMessage *msg;
+
+  /* Check if the same message is
+   * already in the queue and remove it if so
+   */
+  for (p = manager->messages; p; p = p->next)
+    {
+      PendingMessage *msg = p->data;
+
+      if (xevent->window == msg->window &&
+	  xevent->data.l[4] == msg->id)
+	{
+	  /* Hmm, we found it, now remove it */
+	  pending_message_free (msg);
+	  manager->messages = g_list_remove_link (manager->messages, p);
+	  break;
+	}
+    }
+
+  /* Now add the new message to the queue */
+  msg = g_new0 (PendingMessage, 1);
+  msg->window = xevent->window;
+  msg->timeout = xevent->data.l[2];
+  msg->len = xevent->data.l[3];
+  msg->id = xevent->data.l[4];
+  msg->remaining_len = msg->len;
+  msg->str = g_malloc (msg->len + 1);
+  msg->str[msg->len] = '\0';
+  manager->messages = g_list_prepend (manager->messages, msg);
+}
+
+static void
+egg_tray_manager_handle_cancel_message (EggTrayManager       *manager,
+					XClientMessageEvent  *xevent)
+{
+  GtkSocket *socket;
+  
+  socket = g_hash_table_lookup (manager->socket_table, GINT_TO_POINTER (xevent->window));
+  
+  if (socket)
+    {
+      g_signal_emit (manager, manager_signals[MESSAGE_CANCELLED], 0,
+		     socket, xevent->data.l[2]);
+    }
+}
+
+static GdkFilterReturn
+egg_tray_manager_handle_event (EggTrayManager       *manager,
+			       XClientMessageEvent  *xevent)
+{
+  switch (xevent->data.l[1])
+    {
+    case SYSTEM_TRAY_REQUEST_DOCK:
+      egg_tray_manager_handle_dock_request (manager, xevent);
+      return GDK_FILTER_REMOVE;
+
+    case SYSTEM_TRAY_BEGIN_MESSAGE:
+      egg_tray_manager_handle_begin_message (manager, xevent);
+      return GDK_FILTER_REMOVE;
+
+    case SYSTEM_TRAY_CANCEL_MESSAGE:
+      egg_tray_manager_handle_cancel_message (manager, xevent);
+      return GDK_FILTER_REMOVE;
+    default:
+      break;
+    }
+
+  return GDK_FILTER_CONTINUE;
+}
+
+static GdkFilterReturn
+egg_tray_manager_window_filter (GdkXEvent *xev, GdkEvent *event, gpointer data)
+{
+  XEvent *xevent = (GdkXEvent *)xev;
+  EggTrayManager *manager = data;
+
+  if (xevent->type == ClientMessage)
+    {
+      if (xevent->xclient.message_type == manager->opcode_atom)
+	{
+	  return egg_tray_manager_handle_event (manager, (XClientMessageEvent *)xevent);
+	}
+      else if (xevent->xclient.message_type == manager->message_data_atom)
+	{
+	  egg_tray_manager_handle_message_data (manager, (XClientMessageEvent *)xevent);
+	  return GDK_FILTER_REMOVE;
+	}
+    }
+  else if (xevent->type == SelectionClear)
+    {
+      g_signal_emit (manager, manager_signals[LOST_SELECTION], 0);
+      egg_tray_manager_unmanage (manager);
+    }
+  
+  return GDK_FILTER_CONTINUE;
+}
+
+static void
+egg_tray_manager_unmanage (EggTrayManager *manager)
+{
+  Display *display;
+  guint32 timestamp;
+  GtkWidget *invisible;
+
+  if (manager->invisible == NULL)
+    return;
+
+  invisible = manager->invisible;
+  g_assert (GTK_IS_INVISIBLE (invisible));
+  g_assert (GTK_WIDGET_REALIZED (invisible));
+  g_assert (GDK_IS_WINDOW (invisible->window));
+  
+  display = GDK_WINDOW_XDISPLAY (invisible->window);
+  
+  if (XGetSelectionOwner (display, manager->selection_atom) ==
+      GDK_WINDOW_XWINDOW (invisible->window))
+    {
+      timestamp = gdk_x11_get_server_time (invisible->window);      
+      XSetSelectionOwner (display, manager->selection_atom, None, timestamp);
+    }
+
+  gdk_window_remove_filter (invisible->window, egg_tray_manager_window_filter, manager);  
+
+  manager->invisible = NULL; /* prior to destroy for reentrancy paranoia */
+  gtk_widget_destroy (invisible);
+  g_object_unref (G_OBJECT (invisible));
+}
+
+static gboolean
+egg_tray_manager_manage_xscreen (EggTrayManager *manager, Screen *xscreen)
+{
+  GtkWidget *invisible;
+  char *selection_atom_name;
+  guint32 timestamp;
+  GdkScreen *screen;
+  
+  g_return_val_if_fail (EGG_IS_TRAY_MANAGER (manager), FALSE);
+  g_return_val_if_fail (manager->screen == NULL, FALSE);
+
+  /* If there's already a manager running on the screen
+   * we can't create another one.
+   */
+#if 0
+  if (egg_tray_manager_check_running_xscreen (xscreen))
+    return FALSE;
+#endif
+  screen = gdk_display_get_screen (gdk_x11_lookup_xdisplay (DisplayOfScreen (xscreen)),
+				   XScreenNumberOfScreen (xscreen));
+  
+  invisible = gtk_invisible_new_for_screen (screen);
+  gtk_widget_realize (invisible);
+  
+  gtk_widget_add_events (invisible, GDK_PROPERTY_CHANGE_MASK | GDK_STRUCTURE_MASK);
+
+  selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d",
+					 XScreenNumberOfScreen (xscreen));
+  manager->selection_atom = XInternAtom (DisplayOfScreen (xscreen), selection_atom_name, False);
+
+  g_free (selection_atom_name);
+  
+  timestamp = gdk_x11_get_server_time (invisible->window);
+  XSetSelectionOwner (DisplayOfScreen (xscreen), manager->selection_atom,
+		      GDK_WINDOW_XWINDOW (invisible->window), timestamp);
+
+  /* Check if we were could set the selection owner successfully */
+  if (XGetSelectionOwner (DisplayOfScreen (xscreen), manager->selection_atom) ==
+      GDK_WINDOW_XWINDOW (invisible->window))
+    {
+      XClientMessageEvent xev;
+
+      xev.type = ClientMessage;
+      xev.window = RootWindowOfScreen (xscreen);
+      xev.message_type = XInternAtom (DisplayOfScreen (xscreen), "MANAGER", False);
+
+      xev.format = 32;
+      xev.data.l[0] = timestamp;
+      xev.data.l[1] = manager->selection_atom;
+      xev.data.l[2] = GDK_WINDOW_XWINDOW (invisible->window);
+      xev.data.l[3] = 0;	/* manager specific data */
+      xev.data.l[4] = 0;	/* manager specific data */
+
+      XSendEvent (DisplayOfScreen (xscreen),
+		  RootWindowOfScreen (xscreen),
+		  False, StructureNotifyMask, (XEvent *)&xev);
+
+      manager->invisible = invisible;
+      g_object_ref (G_OBJECT (manager->invisible));
+      
+      manager->opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
+					  "_NET_SYSTEM_TRAY_OPCODE",
+					  False);
+
+      manager->message_data_atom = XInternAtom (DisplayOfScreen (xscreen),
+						"_NET_SYSTEM_TRAY_MESSAGE_DATA",
+						False);
+
+      /* Add a window filter */
+      gdk_window_add_filter (invisible->window, egg_tray_manager_window_filter, manager);
+      return TRUE;
+    }
+  else
+    {
+      gtk_widget_destroy (invisible);
+ 
+      return FALSE;
+    }
+}
+
+gboolean
+egg_tray_manager_manage_screen (EggTrayManager *manager,
+				GdkScreen      *screen)
+{
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+  g_return_val_if_fail (manager->screen == NULL, FALSE);
+
+  return egg_tray_manager_manage_xscreen (manager, 
+					  GDK_SCREEN_XSCREEN (screen));
+}
+
+static gboolean
+egg_tray_manager_check_running_xscreen (Screen *xscreen)
+{
+  Atom selection_atom;
+  char *selection_atom_name;
+
+  selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d",
+					 XScreenNumberOfScreen (xscreen));
+  selection_atom = XInternAtom (DisplayOfScreen (xscreen), selection_atom_name, False);
+  g_free (selection_atom_name);
+
+  if (XGetSelectionOwner (DisplayOfScreen (xscreen), selection_atom))
+    return TRUE;
+  else
+    return FALSE;
+}
+
+gboolean
+egg_tray_manager_check_running (GdkScreen *screen)
+{
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+
+  return egg_tray_manager_check_running_xscreen (GDK_SCREEN_XSCREEN (screen));
+}
+
+char *
+egg_tray_manager_get_child_title (EggTrayManager *manager,
+				  EggTrayManagerChild *child)
+{
+  Window *child_window;
+  Atom utf8_string, atom, type;
+  int result;
+  char *retval;
+  int format;
+  gulong nitems;
+  gulong bytes_after;
+  guchar *val;
+
+  g_return_val_if_fail (EGG_IS_TRAY_MANAGER (manager), NULL);
+  g_return_val_if_fail (GTK_IS_SOCKET (child), NULL);
+  
+  child_window = g_object_get_data (G_OBJECT (child),
+				    "egg-tray-child-window");
+
+  utf8_string = XInternAtom (gdk_helper_display(), "UTF8_STRING", False);
+  atom = XInternAtom (gdk_helper_display(), "_NET_WM_NAME", False);
+
+  gdk_error_trap_push ();
+
+  result = XGetWindowProperty (gdk_helper_display(),
+			       *child_window,
+			       atom,
+			       0, G_MAXLONG,
+			       False, utf8_string,
+			       &type, &format, &nitems,
+			       &bytes_after, (guchar **)&val);
+  
+  if (gdk_error_trap_pop () || result != Success)
+    return NULL;
+
+  if (type != utf8_string ||
+      format != 8 ||
+      nitems == 0)
+    {
+      if (val)
+	XFree (val);
+      return NULL;
+    }
+
+  if (!g_utf8_validate ((const gchar*) val, nitems, NULL))
+    {
+      XFree (val);
+      return NULL;
+    }
+
+  retval = g_strndup ((const gchar*) val, nitems);
+
+  XFree (val);
+
+  return retval;
+
+}
diff --git a/src/c/gdk-helper.c b/src/c/gdk-helper.c
new file mode 100644
--- /dev/null
+++ b/src/c/gdk-helper.c
@@ -0,0 +1,7 @@
+#include <gdk/gdkx.h>
+
+#include "gdk-helper.h"
+
+Display* gdk_helper_display() {                                                  
+  return gdk_x11_display_get_xdisplay(gdk_display_get_default());
+}
