docs: Fix URL to Desktop Notification Spec

Fixes #29
Releasing version 0.8.1
2022-09-04 11:59:49 +02:00 · 2022-07-17 15:00:39 +02:00 · 2022-07-17 14:58:13 +02:00 · 2022-07-14 17:18:41 +02:00 · 2022-07-14 17:18:25 +02:00 · 2022-06-07 03:18:38 +02:00
76 changed files with 11776 additions and 4698 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,37 @@
 variables:
  DEBIAN_FRONTEND: noninteractive
 stages:
  - build
 build:ubuntu:
  stage: build
  image: ubuntu:devel
  before_script:
    - apt-get update &&
    - apt-get install -q -y --no-install-recommends
        gobject-introspection
        gtk-doc-tools
        libgdk-pixbuf2.0-dev
        libgirepository1.0-dev
        libglib2.0-dev
        libgtk-3-dev
        libpopt-dev
        xmlto
        ninja-build
        python3-pip
        python3-setuptools
        xsltproc
        docbook-xsl-ns
    - pip3 install meson
  script:
    - meson _build -Ddocbook_docs=enabled
    - ninja -C _build install
  artifacts:
    expose_as: "Build artifacts"
    paths:
      - _build/docs/notification-spec.html
      - _build/docs/reference/html
      - _build/docs/reference/html/index.html
      - _build/meson-logs
--- a/20
+++ b/20
@ -1,3 +1,17 @@
-Christian Hammond <chipx86@chipx86.com>
+Developers:
-Mike Hearn <mike@navi.cx>
+
-John (J5) Palmieri <johnp@redhat.com>
+	Christian Hammond <chipx86@chipx86.com>
 	Mike Hearn <mike@navi.cx>
 	John (J5) Palmieri <johnp@redhat.com>
 Patch Writers:
 	Duarte Henriques <duarte.henriques@gmail.com>
 	Rodney Dawes <dobey@novell.com>
 	Tom Parker <debian@tevp.net>
 	jensgr@gmx.net
 	M.S.
 	mderezynski
 	Ed Catmur <ed@catmur.co.uk>
 	Lucas Rocha
--- a/379
+++ b/379
@ -1,379 +0,0 @@
 Fri Dec 09 2005  John (J5) Palmieri <johnp@redhat.com>
 	* libnotify/notifymarshal.[c|h]: new files where GLib callback
 	marshalers are added
 	* libnotify/notifynotification.c (notify_notifiaction_init): Add a 
 	marshaller for signals with uint, string parameters
 	(_gslist_to_string_array): new internal method that coverts
 	a GSList to a NULL terminated array of strings
 	(_notify_notification_show_internal): send the actions list as an
 	array of strings, not a GSList which does not work with the bindings
 	* libnotify/Makefile.am: notifymarshal.[c|h] added
 	* tests/test-multi-actions.c: working example of using actions
 Fri Dec 02 2005  John (J5) Palmieri <johnp@redhat.com>
 	* libnotify/notifynotification.c (notify_notification_add_action):
 	implement adding actions
 	(_action_signal_handler): handle actions coming from the server
 	(notify_notifcation_clear_actions): new method for clearning out
 	the actions list and hash
 Fri Dec 02 2005  John (J5) Palmieri <johnp@redhat.com>
 	* libnotify/notifynotification.c (notify_notification_show_and_forget):
 	new method that shows and then unrefs the NotifyNotification object.
 	use this if you just want to fire off a quick notification.
 	* various compiler warning cleanups
 Fri Dec 02 2005  John (J5) Palmieri <johnp@redhat.com>
 	* libnotify/notifynotification.c (SIGNAL_TYPE_CLOSED): "closed" glib
 	signal added
 	(notify_notification_clear_hints): New API for clearing out the 
 	hints hash
 	(notify_notification_ref, notify_notification_unref): removed - use
 	g_object_ref/unref
 	* tests/*: Various changes to the test binaries
 Thu Nov 10 14:00:00 EST 2005  John (J5) Palmieri <johnp@redhat.com>
 	* Complete rewrite and first import to libnotify-ng module in SVN
 Mon Jul 04 02:13:56 PDT 2005  Christian Hammond <chipx86@chipx86.com>
 	* tests/Makefile.am:
 	* tests/test-markup.c:
 	A tests/test-xy-stress.c:
 	* configure.ac:
 	  - Conditionally build gdk-dependent test apps if we have gdk.
 	  - Added a X, Y stress test that will be used to help test
 	    accurately positioning the arrows.
 Thu Jun 30 21:09:18 PDT 2005  Christian Hammond <chipx86@chipx86.com>
 	* tests/Makefile.am:
 	  - Don't install the test programs during make install.
 Thu Jun 30 21:03:30 PDT 2005  Christian Hammond <chipx86@chipx86.com>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	* tests/test-animation.c:
 	* tests/test-basic.c:
 	* tests/test-default-action.c:
 	* tests/test-error.c:
 	* tests/test-image.c:
 	* tests/test-markup.c:
 	* tests/test-multi-actions.c:
 	* tests/test-replace.c:
 	* tools/notify-send.c:
 	  - Added support for hints in the API.
 Mon Jun 20 06:13:02 PDT 2005  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Be a little better at not crashing. Just a bit better. There's
 	    still another crash I'm trying to track down.
 Mon Jun 20 04:53:29 PDT 2005  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Close the right container in D-BUS 0.3x.
 Mon Jun 20 02:49:27 PDT 2005  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/Makefile.am:
 	A libnotify/dbus-compat.h:
 	  - Add dbus-compat.h.
 Mon Jun 20 02:43:26 PDT 2005  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* configure.ac:
 	  - Add support for compiling under D-BUS 0.3x. Actually running
 	    has not yet been tested!
 Fri Apr 01 09:21:26 PST 2005  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Updated to work with 0.6 of the notification spec.
 Sat Nov 06 15:40:48 PST 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.h:
 	  - Move our TODO list to the Doxygen @todo commands, so we'll get it
 	    in a nice little page of its own in the API docs.
 Sat Nov 06 15:35:52 PST 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.h:
 	  - Move the emacs mode string out of the Doxygen comment and into its
 	    own.
 Sat Nov 06 15:11:53 PST 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.h:
 	A Doxyfile.in:
 	* Makefile.am:
 	* configure.ac:
 	  - Add a Doxyfile.in and update things so we can get doxygen
 	    docs.
 Wed Nov 03 23:39:23 PST 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Use glib's memory allocation stuff instead of libc's.
 Wed Nov 03 23:34:10 PST 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	* tests/test-animation.c:
 	* tests/test-image.c:
 	  - Patch from Mike Hearn to do a bunch of stuff, like handling icons
 	    and animations better.
 Wed Nov 03 01:19:42 PST 2004  Christian Hammond <chipx86@gnupdate.org>
 	* configure.ac:
 	A libnotify.spec.in:
 	  - Fix make distcheck.
 Wed Sep 29 22:34:03 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* tools/notify-send.c:
 	  - Don't flush the D-BUS connection, and make sure we disconnect from it.
 Wed Sep 29 21:53:15 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	* tests/test-animation.c:
 	* tests/test-basic.c:
 	* tests/test-default-action.c:
 	* tests/test-error.c:
 	* tests/test-image.c:
 	* tests/test-markup.c:
 	* tests/test-multi-actions.c:
 	* tests/test-replace.c:
 	* tools/notify-send.c:
 	  - Updated to match the spec.
 Sat Sep 25 12:59:26 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* tests/test-animation.c:
 	* tests/test-default-action.c:
 	  - Fixed to compile.
 Wed Sep 01 00:39:23 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* docs/ChangeLog:
 	* SPECIFICATION:
 	  - Moved specification documentation.
 	  - Moved specification ChangeLog.
 Wed Sep 01 00:30:53 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* docs/notification-spec.xml:
 	  - Finishing adding the rest of the signals to the spec.
 Sun Aug 29 22:27:42 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	A docs/notification-spec.ps:
 	A docs/notification-spec.xml:
 	  - Added the notification spec in docbook format. It's not finished.
 	    I'm just tired of working on it.
 Wed Jul 14 02:11:48 GMT 2004  Mike Hearn  <mike@navi.cx>
 	* libnotify/notify.c: Use pointers instead of GINT_TO_POINTER
 	* tools/test-replace.c: Test replacing notifications
 Tue Jul 13 23:58:54 GMT 2004  Mike Hearn  <mike@navi.cx>
 	* SPECIFICATION: CloseNotification sends NotificationClosed signal.
 Mon Jul  5 00:12:03 GMT 2004  Mike Hearn  <mike@navi.cx>
 	* tools/notify-send.c (main): Treat expiry times < current time
 	  as timeouts from current instant
 Sun Jul  4 22:54:44 GMT 2004  Mike Hearn  <mike@navi.cx>
 	* libnotify/notify.c: Use a direct hash rather than an int hash
 Sun Jul 04 14:32:46 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Don't make IDs of 0 bad. They just want to be loved, too.
 Sun Jul 04 14:08:59 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	* tools/notify-send.c:
 	* SPECIFICATION:
 	  - Changed timeouts to expire times.
 	  - Install notify-send.
 Sun Jul 04 13:46:32 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* tools/notify-send.c:
 	  - Don't initialize the library until we're ready to talk to it.
 Sun Jul 04 13:34:14 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* SPECIFICATION:
 	  - Added the urgency level to the spec, and made it a byte.
 Sun Jul 04 13:28:51 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	A tools/:
 	R tests/:
 	* Makefile.am:
 	* configure.ac:
 	  - Renamed tests to tools.
 Sun Jul 04 13:28:00 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* tests/Makefile.am:
 	A tests/notify-send.c:
 	  - Added the notify-send tool.
 Sat Jul 03 12:35:35 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Added support for GetCapabilities.
 Sat Jul 03 12:27:58 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Add support for GetServerInformation.
 Sat Jul 03 12:21:05 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Remove the application info sent on calls to Notify for now,
 	    until/if something gets added to the spec about it.
 Sat Jul 03 12:14:48 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Removed the last of the request implementation.
 	  - More work toward migrating the code to the specification.
 	  - Simplified the action implementation a little bit.
 Sat Jul 03 11:26:03 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Cleaned up some things and updated some stuff to be compliant with
 	    the spec. More will come soon.
 Thu Jul  1 23:46:28 GMT 2004  Mike Hearn  <mike@navi.cx>
 	* SPECIFICATION: Add info on icons/sounds, add some
 	  protocol requests. Change "buttons" in the overview to "actions".
 Wed Jun 30 14:03:51 GMT 2004  Mike Hearn  <mike@navi.cx>
 	* SPECIFICATION: Initial version
 Wed Jun 30 13:28:18 GMT 2004  Mike Hearn  <mike@navi.cx>
 	* libnotify/notify.[ch]: Add file variables for emacs to match
 	  the settings Christian is using.
 Wed Jun 30 02:53:36 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Free up the handle memory for a closed notification.
 Tue Jun 29 19:33:43 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Due to the new icon struct, a lot of redundant functions have now
 	    been removed.
 Tue Jun 29 19:26:58 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Added a NotifyIcon struct and the beginnings of the API.
 Tue Jun 29 18:49:38 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Replaced the guint32 ID numbers that were passed around to represent
 	    notifications and requests and replaced them with an opaque data
 	    structure that abstracts that and other stuff.
 Tue Jun 29 18:21:05 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Changed 8 space to 4 space tabs.
 Tue Jun 29 14:49:51 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Patch by Mike Hearn to add a print_error() function for dumping
 	    extra info when we have an error.
 Sun Jun 27 21:50:33 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* configure.ac:
 	  - Pass 0.0.1 as the version number to AC_INIT().
 Sun Jun 27 21:39:13 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Added support for the NotificationClosed and RequestClosed signals,
 	    along with request callbacks. I wonder if any of this works.
 Sun Jun 27 20:23:00 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Keep track of request IDs so that we can do callback stuff in a bit.
 Sun Jun 27 20:02:09 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Send the list of button texts as a string array, rather than appending
 	    each one individually.
 Sun Jun 27 18:30:19 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Split notify_close() into notify_close_notification() and
 	    notify_close_request().
 	  - Implement notify_send_request() and
 	    notify_send_request_with_icon_data(), and add versions of those
 	    functions that take a va_list for the buttons.
 Sun Jun 27 16:46:32 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Added a utility function for doing most of the D-BUS message
 	    creation.
 	  - Implemented notify_close_notification() and notify_close_request().
 Sun Jun 27 16:38:42 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	  - Make sure we include our config.h if we have one.
 Sun Jun 27 16:37:30 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 	* libnotify/notify.c:
 	* libnotify/notify.h:
 	  - Added the initial header file and connection code.
--- a/Doxyfile.in
+++ b/Doxyfile.in
--- a/229
+++ b/229
@ -1,229 +0,0 @@
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
 Foundation, Inc.
   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
   These are generic installation instructions.
   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 only 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.  If you're
     using `csh' on an old version of System V, you might need to type
     `sh ./configure' instead to prevent `csh' from trying to execute
     `configure' itself.
     Running `configure' takes awhile.  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.
  4. Type `make install' to install the programs and any data files and
     documentation.
  5. 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.
 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=c89 CFLAGS=-O2 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 must use a version of `make' that
 supports the `VPATH' variable, such as 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 `..'.
   If you have to use a `make' that does not support the `VPATH'
 variable, you have 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.
 Installation Names
 ==================
   By default, `make install' will install the package's files in
 `/usr/local/bin', `/usr/local/man', etc.  You can specify an
 installation prefix other than `/usr/local' by giving `configure' the
 option `--prefix=PATH'.
   You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
 give `configure' the option `--exec-prefix=PATH', the package will use
 PATH as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
   In addition, if you use an unusual directory layout you can give
 options like `--bindir=PATH' 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.
   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'.
 Optional Features
 =================
   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.
 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 `--target=TYPE' option 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
 will cause the specified gcc to be used as the C compiler (unless it is
 overridden in the site shell script).
 `configure' Invocation
 ======================
   `configure' recognizes the following options to control how it
 operates.
 `--help'
 `-h'
     Print a summary of the options to `configure', and exit.
 `--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.
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
--- a/Makefile.am
+++ b/Makefile.am
@ -1,24 +0,0 @@
 SUBDIRS = libnotify tools tests
 pcdata_DATA = libnotify.pc
 pcdatadir = $(libdir)/pkgconfig
 EXTRA_DIST = \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	Doxyfile.in \
 	autogen.sh \
 	configure.ac \
 	libnotify.pc.in \
 	libnotify.spec.in
 dist-hook: libnotify.spec
 	cp libnotify.spec $(distdir)
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 doxygen:
 	@echo "Running doxygen..."
 	@doxygen Doxyfile
--- a/275
+++ b/275
@ -0,0 +1,275 @@
 New in 0.8.1
 ============
 * Keep version of bindings at 0.7 (#27) [Marco]
 Contributors:
  Marco Trevisan
 New in 0.8.0
 ============
 * Use Desktop Portal Notification when running confined (snap and flatpak)
  Now the library acts like a wrapper in such scenario, with some limited
  capabilities, but this will enforce security and user control over the
  allowed notifications. [Marco]
 * notify-send: Handles SIGINT gracefully, closing waiting notification [Marco]
 * Use NotifyClosedReason enum as closed reason return value [Marco]
 * Bump dependency on GLib 2.38 [Marco]
 * Various introspection docs improvements and fixes [Marco]
 Contributors:
  Marco Trevisan
 New in 0.7.12
 =============
 * docs/notify-send: Add --transient option to manpage [Marco]
 * notify-send: Move server capabilities check to a separate function [Marco]
 * notify-send: Add debug message about server not supporting persistence
  [Marco]
 * notification: Include sender-pid hint by default if not provided [Marco]
 * Delete unused notifynotification.xml [Patrick; !25]
 * notification: Bookend calling NotifyActionCallback with temporary ref
  [Logan; #25, !26]
 Contributors:
  Marco Trevisan, Patrick Griffis, Logan Rathbone
 New in 0.7.11
 =============
 * Fix potential build errors with old glib version we require
 * notify-send: Add support for boolean hints
 * notify-send: Support passing any hint value, by parsing variant strings
 * notify-send: Add explicit option to create transient notifications
 Contributors:
  Marco Trevisan
 New in 0.7.10
 =============
 * notify-send: Support commas in icon filenames [Thorsten; !15]
 * notify-send: Give failing exit code if showing notification fails [Ray, !13]
 * notify-send: Support for replacing an existing notification [Paul; !17]
 * notify-send: Add option to wait until notification has been closed [Ben; !18]
 * notify-send: Add support for notification actions and responses [Ben; !18]
 * notification: Send the application ID when possible [Corentin; !1]
 * notification: Use g_memdup2 when available [Marco; !22]
 * notification: Improve SNAP detection and confined desktop ID [Marco; !23]
 * notification: Add support for getting actions activation token [Marco; !24]
 * notify: Use application ID if any to set the fallback app name [Marco; !18]
 * Build fixes and improvements [Marco; !22]
 * Docs updates [Boris, David; !14, !20]
 Contributors:
  Marco Trevisan, Boris Shtrasman, Matthias Sweertvaegher, Thorsten Wißmann,
  Ray Strode, Maximiliano Sandoval R, David King, Corentin Noël, Paul Collins,
  Matthias Sweertvaegher, Ben Blain
 New in 0.7.9
 ============
 * Fixed linking in darwin [Iain, Marco; !5]
 * Added man page for notify-send [Jan; !6]
 * Dropped autotools [Jan; !11]
 Contributors:
  Iain Lane, Jan Tojnar, Marco Trevisan
 New in 0.7.8
 ============
 * Support meson build system [Marco; !3]
 * notify-send: Support full URLs as hint values [Marco; !4]
 * Mic. bug fixes [Ting-Wei, Florian; #760438, !8]
 Contributors:
  Emmanuele Bassi, Abderrahim Kitouni, Ting-Wei Lan, Iain Lane, Florian Müllner,
  Jan Tojnar, Marco Trevisan (Treviño), Marco Trevisan
 New in 0.7.7
 ============
 - Introspection fixes (Evan Nemerson)
 - Allow to disable tests at build time (Quentin Glidic)
 New in 0.7.6
 ============
 - Fix annotation for add_action (Giovanni Campagna)
 - Clarify documentation for set-timeout (Matthias Clasen)
 New in 0.7.5
 ============
 - Build fixes (Colin Walters)
 - Documentation improvements (Javier Jardón)
 - Spec clarifications (Matthias Clasen)
 New in 0.7.4
 ============
 - Improve documentation of supported image data formats (Colin Walters)
 - Honor aclocal flags (Craig Keogh)
 - Update autotools configuration (Javier Jardón)
 - Test notification removal (William Jon McCann)
 NEW in 0.7.3:
 ==============
 - Add a way to change the application name for
  individual notifications (Richard Hughes)
 NEW in 0.7.2:
 ==============
 - Add a way to change the application name (William Jon McCann)
 - Mark image_path as deprecated (William Jon McCann)
 - Allow properties to be set in any order (Matthias Clasen)
 NEW in 0.7.1:
 ==============
 - Don't export private symbols (Emilio Pozuelo Monfort)
 - Introspection support and annotations (Jonathan Matthew, Martin Pitt)
 - Documentation cleanups and fixes (Javier Jardón)
 - Ref the pixbuf passed to set_image_from_pixbuf (Guillaume Desmottes)
 - Add tests for new capabilities and hints (William Jon McCann)
 - Update spec to mention "persistence" and "action-icons" server
   capability and "action-icons", "transient" and "resident" hints.
   Bump spec version to 1.2  (William Jon McCann)
 NEW in 0.7.0:
 ==============
 - Remove the ability to attach notifications to widgets or positions
 - Add a test for the persistence server capability
 - Port to use GBus instead of dbus-glib (Christian Persch)
 - Add a macro to get library version number
 - Remove GTK+ dependency from library
 - Port tests to GTK+ 3
 NEW in 0.6.0:
 ==============
 The 0.5.1 release included changes that should not have been made on a
 stable branch.  It should have been a 0.6 series release.  So here it is.
 - Fixed #623096 Fix notify_get_server_info results
 NEW in 0.5.1:
 ==============
 - Remove explicit GTK+ 2.x linking, so that libnotify can link against
  both GTK+ 2.x or GTK+ 3.x
 NEW in 0.5.0:
 ==============
 - Support for version 1.1 of notification spec (Aurélien Gâteau, A. Walton)
 - Fixed #608089, Applications aborted at finalizing when the dbus session is being closed. (William Jon McCann)
 - Fixed #608082, Arabic text is misplaced in bubbles (RTL) (William Jon McCann)
 - Fixed #608086, wrong return value of notify_init() (William Jon McCann)
 - Fixed #612720, Does not compile with -DGSEAL_ENABLE (William Jon McCann)
 - Fixed #613999, Use g_strcompress in notify-send to parse \n from command line (William Jon McCann)
 - Fixed #610880, lazily initialize the daemon (Martin Pitt)
 version 0.4.5 (20-November-2008):
 	* Added GObject property accessors for notification IDs. Patch by Lucas
 	  Rocha.
 	* Added support for sending the closed reason in the "closed" signal
 	  handler. (Ticket #139)
 	* Added support for sending the status icon XID to the notification
 	  daemon. This will allow better position tracking for context
 	  notifications. Patch by Colin Walters.
 	* Fixed a breakage where we were including gtkversion.h directly.
 version 0.4.4 (27-February-2007):
 	* Fixed a bug where a notification's ID could be reset when a different
 	  notification was closed. Patch by jylefort. (Bug #94)
 	* Fixed a crash when the D-BUS proxy was not being freed on notify_uninit,
 	  which was problematic when used in a loadable module. (Bug #92)
 	* Fixed a crash when a signal handler for the notification's closed signal
 	  caused the notification to be destroyed. (Bug #116)
 	* Fixed memory leaks when creating notifications. (Bug #112)
 	* Fixed potential memory leaks where the function passed to
 	  notify_notification_add_action to free the user data was not being
 	  called. (Bug #119)
 version 0.4.3 (8-October-2006):
 	* Fixed the raw image data support to send the correct array type.
 	  Patch by mderezynski. (Bug #68)
 	* Fixed configure.ac to check for the required version of glib (2.6).
 	  Patch by compnerd. (Bug #69)
 	* Fixed invalid notification IDs when notify_notification_show() is called
 	  on a notification that had already been closed or had expired. Now,
 	  the notification will receive a new ID. Patch by Ed Catmur. (Bug #78)
 	* Fixed the property change notification used when setting a GtkStatusIocn.
 	  It was emitting "attach-icon" but should have been emitted "status-icon".
 	  (Bug #81)
 	* Fixed an invalid assertion in notify_notification_new_with_status_icon.
 	  Patch by lucasr. (Bug #85)
 	* notify_uninit is no longer called automatically at exit. Applications
 	  and libraries should do this manually. Patch by berndth. (Bug #86)
 version 0.4.2 (17-June-2006):
 	* Add G_BEGIN_DECLS and G_END_DECLS to notify.h, so that libnotify can
 	  be used in C++ applications properly.
 version 0.4.1 (17-June-2006):
 	* Added support for attaching to a GtkStatusIcon. Patch by chpe. (Bug #60)
 	* Added GObject properties to NotifyNotification. Patch by chpe. (Bug #60)
 	* Added API documentation, accessible through devhelp.
 	* Fixed up libnotify.pc to support dependencies correctly. (Bug #58)
 	* Fixed notify_uninit() to properly set _initted to FALSE after being
 	  called. (Bug #56)
 version 0.4.0 (26-April-2006):
 	* Patch by M.S. to switch notify-send to use GOption instead of popt,
 	  to add -v, --version, -h, and --hint options, and to rename
 	  -T, --type to -c, --category. This also fixes assertions when calling
 	  notify-send "". (Bug #41)
 	* Fixed the short flag for --type to be -T in notify-send. (Bug #18)
 	* Fixed the help in notify-send to indicate that --expire-timeout
 	  requires milliseconds, not seconds. (Bug #28)
 	* Fixed some C99 usage. Patch by jensgr. (Bug #44)
 	* Fixed notify-send on PPC.
 version 0.3.2 (23-January-2006):
 	* Added back notify_get_server_info() and notify_get_server_caps().
 	* Fixed to work with D-BUS 0.36 and higher. However, it's best to note
 	  that due to bugs in versions of the D-BUS GLib bindings before 0.60,
 	  raw image data cannot be sent in notifications. A warning will be
 	  outputted to the console.
 	* Added assertions to all of the API functions so that invalid data passed
 	  won't crash the calling program.
 	* Added automatic notification removal for non-expiring notifications and
 	  notifications with actions when the calling application closes.
 	* Fixed issues where the header files couldn't always be included in
 	  some programs.
 	* Fixed a lot of compiler errors and warnings.
 	* Fixed C99 usage.
 	* Added the ability to set user data on action callbacks on a per-action
 	  basis.
 	* Fixed notify-send to work without crashing.
 	* Fixed the library to send messages appropriate to the D-BUS
 	  specification.
 	* Cleaned up the API a lot.
 	* Renamed NOTIFY_TIMEOUT_* to NOTIFY_EXPIRES_*.
 	* Removed notify_notification_show_and_forget().
 	* Internal changes to remove the number of DBusGProxy connections, and
 	  make sure it's initialized before using any D-BUS GValue-related code.
 	  This fixes raw image sending.
 version 0.3.0:
 	* First release of the new GObject based API and simpler wire protocol
 version 0.2.3:
 	* Fix notify-send to work with icon parameters (bug #4308)
 version 0.2.2 (10-August-2005):
 	* Fixed many run-time issues with PPC and AMD64 (Martin Pitt)
 version 0.2.1 (28-July-2005):
 	* Fixed hint support for D-BUS 0.3x.
 version 0.2.0 (28-July-2005):
 	* Initial public release.
--- a/README.md
+++ b/README.md
@ -0,0 +1,20 @@
 # libnotify
 ## Description
 libnotify is a library for sending desktop notifications to a notification
 daemon, as defined in the [org.freedesktop.Notifications][fdo-spec] Desktop
 Specification. These notifications can be used to inform the user about an event
 or display some form of information without getting in the user's way.
 It is also a simple wrapper to send cross-desktop Notifications for sandboxed
 applications using the [XDG Portal Notification API][portal].
 ## Notice
 For GLib based applications the [GNotification][gnotif] API should be used
 instead.
 [fdo-spec]: https://specifications.freedesktop.org/notification-spec/notification-spec-latest.html
 [gnotif]: https://docs.gtk.org/gio/class.Notification.html
 [portal]: https://github.com/flatpak/xdg-desktop-portal/blob/main/data/org.freedesktop.portal.Notification.xml
--- a/autogen.sh
+++ b/autogen.sh
@ -1,58 +0,0 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 DIE=0
 PACKAGE=libnotify
 echo "Generating configuration files for $PACKAGE, please wait..."
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PACKAGE."
 	echo "Download the appropriate package for your distribution,"
 	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
 	DIE=1
 }
 (libtool --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PACKAGE."
 	echo "Download the appropriate package for your distribution,"
 	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
 	DIE=1
 }
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have automake installed to compile $PACKAGE."
 	echo "Download the appropriate package for your distribution,"
 	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
 	DIE=1
 }
 [ $DIE -eq 1 ] && exit 1;
 echo "  libtoolize --copy --force"
 libtoolize --copy --force
 echo "  aclocal $ACLOCAL_FLAGS"
 aclocal $ACLOCAL_FLAGS
 echo "  autoheader"
 autoheader
 echo "  automake --add-missing"
 automake --add-missing
 echo "  autoconf"
 autoconf
 if [ -x config.status -a -z "$*" ]; then
 	./config.status --recheck
 else
 	if test -z "$*"; then
 		echo "I am going to run ./configure with no arguments - if you wish"
 		echo "to pass any to it, please specify them on the $0  command line."
 		echo "If you do not wish to run ./configure, press  Ctrl-C now."
 		trap 'echo "configure aborted" ; exit 0' 1 2 15
 		sleep 1
 	fi
 	./configure "$@";
 fi
--- a/config.h.meson
+++ b/config.h.meson
@ -0,0 +1,4 @@
 /* config.h.meson */
 /* Version number of package */
 #mesondefine VERSION
--- a/configure.ac
+++ b/configure.ac
@ -1,156 +0,0 @@
 dnl Process this file with autoconf to create configure.
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
 AC_INIT(libnotify, 0.3.0, chipx86@gnupdate.org)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 AC_COPYRIGHT([Copyright 2004 Christian Hammond])
 dnl ################################################################
 dnl # Version information
 dnl ################################################################
 LIBGALAGO_MAJOR_VERSION=0
 LIBGALAGO_MINOR_VERSION=3
 LIBGALAGO_MICRO_VERSION=0
 LIBGALAGO_DEVEL_VERSION=0
 LIBGALAGO_VERSION=$LIBGALAGO_MAJOR_VERSION.$LIBGALAGO_MINOR_VERSION.$LIBGALAGO_MICRO_VERSION
 if test "x$LIBGALAGO_DEVEL_VERSION" != "x0"; then
 	if test "x$LIBGALAGO_MICRO_VERSION" = "x0"; then
 		LIBGALAGO_MICRO_VERSION=$LIBGALAGO_DEVEL_VERSION
 		LIBGALAGO_VERSION=$LIBGALAGO_MAJOR_VERSION.$LIBGALAGO_MINOR_VERSION.$LIBGALAGO_DEVEL_VERSION
 	else
 		LIBGALAGO_VERSION=$LIBGALAGO_VERSION.$LIBGALAGO_DEVEL_VERSION
 	fi
 fi
 AC_DEFINE_UNQUOTED(LIBGALAGO_MAJOR_VERSION, $LIBGALAGO_MAJOR_VERSION,
 	[libnotify major version.])
 AC_DEFINE_UNQUOTED(LIBGALAGO_MINOR_VERSION, $LIBGALAGO_MINOR_VERSION,
 	[libnotify minor version.])
 AC_DEFINE_UNQUOTED(LIBGALAGO_MICRO_VERSION, $LIBGALAGO_MICRO_VERSION,
 	[libnotify micro version.])
 AC_DEFINE_UNQUOTED(LIBGALAGO_VERSION, "$LIBGALAGO_VERSION",
 	[libnotify version.])
 dnl ################################################################
 dnl # libtool versioning
 dnl ################################################################
 dnl #
 dnl # +1 :  0 : +1   == new interface that does not break old one.
 dnl # +1 :  0 :  0   == removed an interface. Breaks old apps.
 dnl #  ? : +1 :  ?   == internal changes that doesn't break anything.
 dnl #
 dnl # CURRENT : REVISION : AGE
 dnl #
 LT_CURRENT=0
 LT_REVISION=0
 LT_AGE=0
 LT_RELEASE=$LIBGALAGO_MAJOR_VERSION.$LIBGALAGO_MINOR_VERSION.$LIBGALAGO_MICRO_VERSION
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 dnl ################################################################
 dnl # Initialize automake
 dnl ################################################################
 VERSION=$LIBGALAGO_VERSION
 PACKAGE=libnotify
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 dnl ################################################################
 dnl # Specify a header configuration file
 dnl ################################################################
 AM_CONFIG_HEADER(config.h)
 dnl ################################################################
 dnl # Check for some standard stuff.
 dnl ################################################################
 AC_PROG_CC
 #AC_ARG_PROGRAM
 AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_EXEEXT
 AM_PROG_LIBTOOL
 AC_CHECK_LIB([popt], [poptGetArg], , AC_MSG_ERROR([Popt is required]))
 pkg_modules="gtk+-2.0 >= 2.2.2 glib-2.0 >= 2.2.2, dbus-1 >= 0.35, dbus-glib-1 >= 0.35"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 gdk_modules="gdk-2.0 gdk-pixbuf-2.0"
 PKG_CHECK_MODULES(GDK, [$gdk_modules], have_gdk=yes,
 [
 	have_gdk=no
 	AC_WARN("Some test apps will not be built")
 ])
 AM_CONDITIONAL(HAVE_GDK, test "x$have_gdk" = "xyes")
 AC_SUBST(GDK_CFLAGS)
 AC_SUBST(GDK_LIBS)
 dnl
 dnl Check the D-BUS version.
 dnl
 AC_MSG_CHECKING([dbus version])
 DBUS_VERSION=`$PKG_CONFIG --modversion dbus-1`
 DBUS_MAJOR_VER=`echo $DBUS_VERSION | cut -d. -f 1`
 DBUS_MINOR_VER=`echo $DBUS_VERSION | cut -d. -f 2`
 DBUS_MICRO_VER=`echo $DBUS_VERSION | cut -d. -f 3`
 AC_MSG_RESULT($DBUS_VERSION)
 AC_DEFINE_UNQUOTED(DBUS_MAJOR_VER, $DBUS_MAJOR_VER, [D-BUS major version.])
 AC_DEFINE_UNQUOTED(DBUS_MINOR_VER, $DBUS_MINOR_VER, [D-BUS minor version.])
 AC_DEFINE_UNQUOTED(DBUS_MICRO_VER, $DBUS_MICRO_VER, [D-BUS micro version.])
 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, ,DBUS API is subject to change)
 dnl # Use wall if we have GCC
 if test "x$GCC" = "xyes"; then
 	CFLAGS="$CFLAGS -Wall"
 fi
 AC_SUBST(CFLAGS)
 dnl ################################################################
 dnl # Output the Makefiles
 dnl ################################################################
 AC_CONFIG_FILES([
 Doxyfile
 Makefile
 libnotify.pc
 libnotify.spec
 libnotify/Makefile
 tests/Makefile
 tools/Makefile
 ])
 AC_OUTPUT
 echo
 echo $PACKAGE v$VERSION
 echo
 echo "Now type make to compile"
 echo "Then su to root and type: make install"
 echo
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@ -1,3 +1,20 @@
 Sat Aug 25 18:25:02 PDT 2007  Christian Hammond <chipx86@chipx86.com>
 	* notification-spec.xml:
 	  - Add a spec_version return value for GetServerInformation.
 	  - Bump to version 1.0. It's about time, and things are pretty solid now.
 Wed Jan 25 23:45:11 PST 2006  Christian Hammond <chipx86@chipx86.com>
 	* notification-spec.xml:
 	  - Fixed to actually be valid docbook.
 Mon Jan 23 01:18:23 PST 2006  Christian Hammond <chipx86@chipx86.com>
 	* notification-spec.xml:
 	  - Simplified the protocol. Moved around a lot of functions and data.
 	  - Bumped to version 0.9.
 Fri Apr 01 09:11:38 PST 2005  Christian Hammond <chipx86@gnupdate.org>
 	* notification-spec.xml:
--- a/docs/config.xsl
+++ b/docs/config.xsl
@ -0,0 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:fo="http://www.w3.org/1999/XSL/Format"
                version="1.0">
  <xsl:param name="html.stylesheet" select="'docbook.css'"/>
  <xsl:param name="generate.consistent.ids" select="1"/>
 </xsl:stylesheet>
--- a/docs/meson.build
+++ b/docs/meson.build
@ -0,0 +1,40 @@
 docbook_docs = get_option('docbook_docs')
 if not docbook_docs.disabled()
  xmlto = find_program('xmlto', required: docbook_docs.enabled())
  if xmlto.found()
    spec_files = ['notification-spec']
    foreach spec: spec_files
      custom_target(spec + '.html',
        output: spec + '.html',
        input: spec + '.xml',
        depend_files: 'config.xsl',
        command: [xmlto,
          'xhtml-nochunks',
          '-m', join_paths(meson.current_source_dir(), 'config.xsl'),
          '-o', '@OUTDIR@',
          '@INPUT@'
        ],
        install: true,
        install_dir: join_paths(docdir, 'spec'))
    endforeach
  endif
 endif
 if get_option('gtk_doc')
  subdir('reference')
 endif
 if get_option('man')
  manpages = ['notify-send']
  foreach page : manpages
    custom_target(page + '-man',
      input: page + '.xml',
      output: page + '.1',
      command: xsltproc_command,
      install: true,
      install_dir: man1dir)
  endforeach
 endif
--- a/docs/notification-spec.xml
+++ b/docs/notification-spec.xml
@ -1,13 +1,10 @@
 <?xml version="1.0"?>
-
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN"
                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <article id="index">
 <articleinfo>
  <title>Desktop Notifications Specification</title>
-  <releaseinfo>Version 0.5</releaseinfo>
+  <releaseinfo>Version 1.2</releaseinfo>
-  <date>2 October 2004</date>
+  <date>28 October 2010</date>
  <authorgroup>
   <author>
    <firstname>Mike</firstname>
@ -27,62 +24,24 @@
     </address>
    </affiliation>
   </author>
   <author>
    <firstname>William Jon</firstname>
    <surname>McCann</surname>
    <affiliation>
     <address>
      <email>jmccann@redhat.com</email>
     </address>
    </affiliation>
   </author>
  </authorgroup>
  <revhistory>
   <revision>
    <revnumber>0.6</revnumber>
    <date>1 April 2005</date>
    <authorinitials>cdh</authorinitials>
    <revremark>
     Updated to work with D-BUS 0.31+.
    </revremark>
   </revision>
   <revision>
    <revnumber>0.5</revnumber>
    <date>2 October 2004</date>
    <authorinitials>cdh</authorinitials>
    <revremark>
     Added a "suppress-sound" hint. Added a "sound" capability. Renamed the
     "soundfile" hint to sound-file".
    </revremark>
   </revision>
   <revision>
    <revnumber>0.4</revnumber>
    <date>29 September 2004</date>
    <authorinitials>cdh</authorinitials>
    <revremark>
     Added image support in markup, and made the restrictions on markup more
     clear. Removed the High urgency. Added new notification types. Fixed
     notification expiration.
    </revremark>
   </revision>
   <revision>
    <revnumber>0.3</revnumber>
    <date>15 September 2004</date>
    <authorinitials>cdh</authorinitials>
    <revremark>Added hint and notification type sections</revremark>
   </revision>
   <revision>
    <revnumber>0.2</revnumber>
    <date>foo</date>
    <authorinitials>mh</authorinitials>
    <revremark>Added replaces field to protocol</revremark>
   </revision>
   <revision>
    <revnumber>0.1</revnumber>
    <date>foo</date>
    <authorinitials>mh</authorinitials>
    <revremark>Initial version</revremark>
   </revision>
  </revhistory>
 </articleinfo>
 <sect1 id="introduction">
  <title>Introduction</title>
  <para>
-   This is a draft standard for a desktop notifications service, through
+   This is a draft standard for a desktop notifications service,
-   which applications can generate passive popups (sometimes known as
+   through which applications can generate passive popups to notify
-   "poptarts") to notify the user in an asynchronous manner of events.
+   the user in an asynchronous manner of events.
  </para>
  <para>
   This specification explicitly does not include other types of
@ -93,13 +52,7 @@
   Example use cases include:
  </para>
  <itemizedlist>
-   <listitem>
+   <listitem><para>Messages from chat programs</para> </listitem>
    <para>
     Presence changes in IM programs: for instance, MSN Messenger on
     Windows pioneered the use of passive popups to indicate presence
     changes.
    </para>
   </listitem>
   <listitem><para>Scheduled alarm</para></listitem>
   <listitem><para>Completed file transfer</para></listitem>
   <listitem><para>New mail notification</para></listitem>
@ -151,13 +104,6 @@
       "fredapp-email-client."
      </entry>
     </row>
     <row>
      <entry>Application Icon</entry>
      <entry>
       The application icon. This is represented either as a path or a name
       in an icon theme.
      </entry>
     </row>
     <row>
      <entry>Replaces ID</entry>
      <entry>
@ -166,16 +112,9 @@
      </entry>
     </row>
     <row>
-      <entry>Notification Type ID</entry>
+      <entry>Notification Icon</entry>
      <entry>
-       An optional ID representing the notification type. See
+        The notification icon. See <xref linkend="icons-and-images-formats"/>.
       <xref linkend="notification-types"/>.
      </entry>
     </row>
     <row>
      <entry>Urgency Level</entry>
      <entry>
       The urgency of the notification. See <xref linkend="urgency-levels"/>.
      </entry>
     </row>
     <row>
@ -204,48 +143,56 @@
       </para>
      </entry>
     </row>
     <row>
      <entry>Images</entry>
      <entry>See <xref linkend="icons"/>.</entry>
     </row>
     <row>
      <entry>Actions</entry>
      <entry>
-       The actions send a request message back to the notification client
+       <para>
-       when invoked. This functionality may not be implemented by the
+        The actions send a request message back to the notification client
-       notification server, conforming clients should check if it is available
+        when invoked. This functionality may not be implemented by the
-       before using it (see the GetCapabilities message in
+        notification server, conforming clients should check if it is available
-       <xref linkend="protocol"/>. An implementation is free to ignore any
+        before using it (see the GetCapabilities message in
-       requested by the client. As an example one possible rendering of
+        <xref linkend="protocol"/>). An implementation is free to ignore any
-       actions would be as buttons in the notification popup.
+        requested by the client. As an example one possible rendering of
        actions would be as buttons in the notification popup.
       </para>
       <para>
        Actions are sent over as a list of pairs. Each even element in the
        list (starting at index 0) represents the identifier for the action.
        Each odd element in the list is the localized string that will be
        displayed to the user.
       </para>
       <para>
        The default action (usually invoked my clicking the notification)
        should have a key named <literal>"default"</literal>. The name can
        be anything, though implementations are free not to display it.
       </para>
      </entry>
     </row>
     <row>
      <entry>Hints</entry>
      <entry>See <xref linkend="hints"/>.</entry>
     </row>
     <row>
      <entry>Expires</entry>
      <entry>
       <para>
-        A boolean flag indicating whether or not this notification should
+        Hints are a way to provide extra data to a notification server that
-        automatically expire.
+        the server may be able to make use of.
       </para>
       <para>See <xref linkend="hints"/> for a list of available hints.</para>
      </entry>
     </row>
     <row>
      <entry>Expiration Timeout</entry>
      <entry>
       <para>
-        The timeout time in seconds since the display of the notification at
+        The timeout time in milliseconds since the display of the notification
-        which the notification should automatically close. This is ignored
+        at which the notification should automatically close.
        if the expires flag is set to false.
       </para>
       <para>
-        If zero, the notification's expiration time is dependent on the
+        If -1, the notification's expiration time is dependent on the
        notification server's settings, and may vary for the type of
        notification.
       </para>
       <para>
        If 0, the notification never expires.
       </para>
      </entry>
     </row>
    </tbody>
@ -395,80 +342,76 @@
  </sect2>
 </sect1>
- <sect1 id="icons" xreflabel="Icons">
+ <sect1 id="icons-and-images" xreflabel="Icons and Images">
-  <title>Icons</title>
+  <title>Icons and Images</title>
  <para>
-   A notification can optionally include an array of images for use as an
+   A notification can optionally have an associated icon and/or image.
   icon representing the notification. The array of images specifies frames
   in an animation, which always loop. Implementations are free to ignore the
   images data, and implementations that support images need not support
   animation.
  </para>
  <para>
-   If the image array has more than one element, a "primary frame" can
+   The icon is defined by the "app_icon" parameter.
-   be specified. If not specified, it defaults to the first frame. For
+   The image can be defined by the "image-path", the "image-data" hint or the
-   implementations that support images but not animation, only the primary
+   deprecated "icon_data" hint.
   frame will be used.
  </para>
-  <para>
+  <sect2>
-   Each element of the array must have the same type as the first
+   <title>Priorities</title>
-   element. Mixtures of strings and blobs are not allowed. The element
+   <para>
-   types can be one of the following:
+    An implementation which only displays one image or icon must choose which one
    to display using the following order:
    <orderedlist>
     <listitem><para>"image-data"</para></listitem>
     <listitem><para>"image-path"</para></listitem>
     <listitem><para>app_icon parameter</para></listitem>
     <listitem><para>for compatibility reason, "icon_data"</para></listitem>
    </orderedlist>
   </para>
   <para>
    An implementation which can display both the image and icon must show the
    icon from the "app_icon" parameter and choose which image to display using
    the following order:
    <orderedlist>
     <listitem><para>"image-data"</para></listitem>
     <listitem><para>"image-path"</para></listitem>
     <listitem><para>for compatibility reason, "icon_data"</para></listitem>
    </orderedlist>
   </para>
  </sect2>
  <sect2 id="icons-and-images-formats" xreflabel="Icons and Images Formats">
   <title>Formats</title>
   <para>
    The "image-data" and "icon_data" hints should be a DBus structure
    of signature (iiibiiay).  The components of this structure are as follows:
    <orderedlist>
     <listitem><para>width (i): Width of image in pixels</para></listitem>
     <listitem><para>height (i): Height of image in pixels</para></listitem>
     <listitem><para>rowstride (i): Distance in bytes between row starts</para></listitem>
     <listitem><para>has_alpha (b): Whether the image has an alpha channel</para></listitem>
     <listitem><para>bits_per_sample (i): Must always be 8</para></listitem>
     <listitem><para>channels (i): If has_alpha is TRUE, must be 4, otherwise 3</para></listitem>
     <listitem><para>data (ay): The image data, in RGB byte order</para></listitem>
    </orderedlist>
    This image format is derived from <ulink url="http://developer.gnome.org/gdk-pixbuf/stable/">gdk-pixbuf</ulink>.
  </para>
-  <informaltable>
+   <para>
-   <tgroup cols="3">
+    The "app_icon" parameter and "image-path" hint should be either an URI
-    <thead>
+    (file:// is the only URI schema supported right now) or a name in a
-     <row>
+    freedesktop.org-compliant icon theme (not a GTK+ stock ID).
-      <entry>Element</entry>
+   </para>
-      <entry>Type</entry>
+  </sect2>
      <entry>Description</entry>
     </row>
    </thead>
    <tbody valign="top">
     <row>
      <entry>Icon Theme Name</entry>
      <entry>String</entry>
      <entry>
       Any string that does not begin with the <literal>/</literal>
       character is assumed to be an icon theme name and is looked up
       according to the spec. The best size to fit the servers chosen
       presentation will be used. This is the recommended way of specifying
       images.
      </entry>
     </row>
     <row>
      <entry>Absolute Path</entry>
      <entry>String</entry>
      <entry>
       Any string that begins with a <literal>/</literal> will be used as
       an absolute file path. Implementations should support at minimum
       files of type image/png and image/svg.
      </entry>
     </row>
     <row>
      <entry>Image Data</entry>
      <entry>Binary Data</entry>
      <entry>
       A data stream may be embedded in the message. This is assumed to be
       of type image/png.
      </entry>
     </row>
    </tbody>
   </tgroup>
  </informaltable>
 </sect1>
- <sect1 id="notification-types" xreflabel="Notification Types">
+ <sect1 id="categories" xreflabel="Categories">
-  <title>Notification Types</title>
+  <title>Categories</title>
  <para>
   Notifications can optionally have a type indicator. Although neither
   client or nor server must support this, some may choose to. Those servers
-   implementing notification types may use them to intelligently display
+   implementing categories may use them to intelligently display
   the notification in a certain way, or group notifications of similar
   types.
  </para>
  <para>
-   Notification types are in
+   Categories are in
   <literal><replaceable>class.specific</replaceable></literal> form.
   <literal>class</literal> specifies the generic type of notification, and
   <literal>specific</literal> specifies the more specific type of
@ -480,14 +423,14 @@
   <literal><replaceable>class</replaceable></literal> is acceptable.
  </para>
  <para>
-   Third parties, when defining their own notification types, should discuss
+   Third parties, when defining their own categories, should discuss
   the possibility of standardizing on the hint with other parties, preferably
   in a place such as the
   <ulink url="http://freedesktop.org/mailman/listinfo/xdg">xdg</ulink>
   mailing list at
   <ulink url="http://freedesktop.org/">freedesktop.org</ulink>. If it
   warrants a standard, it will be added to the table above. If no
-   consensus is reached, the notification type should be in the form of
+   consensus is reached, the category should be in the form of
   "<literal>x-<replaceable>vendor</replaceable>.<replaceable>class</replaceable>.<replaceable>name</replaceable></literal>."
  </para>
  <para>
@ -495,7 +438,7 @@
   More will be added in time.
  </para>
  <table>
-   <title>Notification Types</title>
+   <title>Categories</title>
   <tgroup cols="2">
    <thead>
     <row>
@ -694,6 +637,13 @@
   consensus is reached, the hint name should be in the form of
   <literal>"x-<replaceable>vendor</replaceable>-<replaceable>name</replaceable>."</literal>
  </para>
  <para>
   The value type for the hint dictionary in D-BUS is of the
   <literal>DBUS_TYPE_VARIANT</literal> container type. This allows different
   data types (string, integer, boolean, etc.) to be used for hints. When
   adding a dictionary of hints, this type must be used, rather than putting
   the actual hint value in as the dictionary value.
  </para>
  <para>
   The following table lists the standard hints as defined by this
   specification. Future hints may be proposed and added to this list
@ -707,24 +657,160 @@
      <entry>Name</entry>
      <entry>Value Type</entry>
      <entry>Description</entry>
      <entry>Spec Version</entry>
     </row>
    </thead>
    <tbody valign="top">
     <row>
      <entry><literal>"action-icons"</literal></entry>
      <entry>BOOLEAN</entry>
      <entry>
       When set, a server that has the "action-icons" capability will
       attempt to interpret any action identifier as a named icon.
       The localized display name will be used to annotate the icon
       for accessibility purposes.  The icon name should be compliant
       with the Freedesktop.org Icon Naming Specification.
      </entry>
      <entry>&gt;= 1.2</entry>
     </row>
     <row>
      <entry><literal>"category"</literal></entry>
      <entry>STRING</entry>
      <entry>
       The type of notification this is.
      </entry>
      <entry/>
     </row>
     <row>
      <entry><literal>"desktop-entry"</literal></entry>
      <entry>STRING</entry>
      <entry>
       This specifies the name of the desktop filename representing the
       calling program. This should be the same as the prefix used for the
       application's .desktop file. An example would be "rhythmbox" from
       "rhythmbox.desktop". This can be used by the daemon to retrieve the
       correct icon for the application, for logging purposes, etc.
      </entry>
      <entry/>
     </row>
     <row>
      <entry><literal>"image-data"</literal></entry>
      <entry>(iiibiiay)</entry>
      <entry>
        This is a raw data image format which describes the width, height,
        rowstride, has alpha, bits per sample, channels and image data
        respectively.
      </entry>
      <entry>&gt;= 1.2</entry>
     </row>
     <row>
      <entry><literal>"image_data"</literal></entry>
      <entry>(iiibiiay)</entry>
      <entry>
        <emphasis>Deprecated</emphasis>. Use image-data instead.
      </entry>
      <entry>= 1.1</entry>
     </row>
     <row>
      <entry><literal>"image-path"</literal></entry>
      <entry>STRING</entry>
      <entry>
        Alternative way to define the notification image. See <xref linkend="icons-and-images"/>.
      </entry>
      <entry>&gt;= 1.2</entry>
     </row>
     <row>
      <entry><literal>"image_path"</literal></entry>
      <entry>STRING</entry>
      <entry>
        <emphasis>Deprecated</emphasis>. Use image-path instead.
      </entry>
      <entry>= 1.1</entry>
     </row>
     <row>
      <entry><literal>"icon_data"</literal></entry>
      <entry>(iiibiiay)</entry>
      <entry>
        <emphasis>Deprecated</emphasis>. Use image-data instead.
      </entry>
      <entry>&lt; 1.1</entry>
     </row>
     <row>
      <entry><literal>"resident"</literal></entry>
      <entry>BOOLEAN</entry>
      <entry>
       When set the server will not automatically remove the
       notification when an action has been invoked.  The notification
       will remain resident in the server until it is explicitly
       removed by the user or by the sender.  This hint is likely only
       useful when the server has the "persistence" capability.
      </entry>
      <entry>&gt;= 1.2</entry>
     </row>
     <row>
      <entry><literal>"sound-file"</literal></entry>
-      <entry>string</entry>
+      <entry>STRING</entry>
      <entry>
       The path to a sound file to play when the notification pops up.
      </entry>
      <entry/>
     </row>
     <row>
      <entry><literal>"sound-name"</literal></entry>
      <entry>STRING</entry>
      <entry>
       A themeable named sound from the freedesktop.org
       <ulink url="http://0pointer.de/public/sound-naming-spec.html">sound naming specification</ulink>
       to play when the notification pops up. Similar to icon-name, only for
       sounds. An example would be "message-new-instant".
      </entry>
      <entry/>
     </row>
     <row>
      <entry><literal>"suppress-sound"</literal></entry>
-      <entry>boolean</entry>
+      <entry>BOOLEAN</entry>
      <entry>
       Causes the server to suppress playing any sounds, if it has that
       ability. This is usually set when the client itself is going to
       play its own sound.
      </entry>
      <entry/>
     </row>
     <row>
      <entry><literal>"transient"</literal></entry>
      <entry>BOOLEAN</entry>
      <entry>
       When set the server will treat the notification as transient
       and by-pass the server's persistence capability, if it should
       exist.
      </entry>
      <entry>&gt;= 1.2</entry>
     </row>
     <row>
      <entry><literal>"x"</literal></entry>
      <entry>INT32</entry>
      <entry>
       Specifies the X location on the screen that the notification should
       point to. The <literal>"y"</literal> hint must also be specified.
      </entry>
      <entry/>
     </row>
     <row>
      <entry><literal>"y"</literal></entry>
      <entry>INT32</entry>
      <entry>
       Specifies the Y location on the screen that the notification should
       point to. The <literal>"x"</literal> hint must also be specified.
      </entry>
      <entry/>
     </row>
     <row>
      <entry><literal>"urgency"</literal></entry>
      <entry>BYTE</entry>
      <entry>
       The urgency level.
      </entry>
      <entry/>
     </row>
    </tbody>
   </tgroup>
@ -745,7 +831,7 @@
    <title><literal>org.freedesktop.Notifications.GetCapabilities</literal></title>
    <funcsynopsis>
     <funcprototype>
-      <funcdef>STRING_ARRAY
+      <funcdef>as
       <function>org.freedesktop.Notifications.GetCapabilities</function>
      </funcdef>
      <void/>
@ -763,6 +849,14 @@
     <title>Server Capabilities</title>
     <tgroup cols="2">
      <tbody valign="top">
       <row>
        <entry><literal>"action-icons"</literal></entry>
        <entry>
         Supports using icons instead of text for displaying actions.
         Using icons for actions must be enabled on a per-notification
         basis using the "action-icons" hint.
        </entry>
       </row>
       <row>
        <entry><literal>"actions"</literal></entry>
        <entry>
@ -816,6 +910,18 @@
         server to specify both.
        </entry>
       </row>
       <row>
        <entry><literal>"persistence"</literal></entry>
        <entry>
         The server supports persistence of notifications.
         Notifications will be retained until they are acknowledged or
         removed by the user or recalled by the sender.  The presence
         of this capability allows clients to depend on the server to
         ensure a notification is seen and eliminate the need for
         the client to display a reminding function (such as a status
         icon) of its own.
        </entry>
       </row>
       <row>
        <entry><literal>"sound"</literal></entry>
        <entry>
@ -844,17 +950,13 @@
       <function>org.freedesktop.Notifications.Notify</function>
      </funcdef>
      <paramdef>STRING <parameter>app_name</parameter></paramdef>
      <paramdef>BYTE_ARRAY_OR_STRING <parameter>app_icon</parameter></paramdef>
      <paramdef>UINT32 <parameter>replaces_id</parameter></paramdef>
-      <paramdef>STRING <parameter>notification_type</parameter></paramdef>
+      <paramdef>STRING <parameter>app_icon</parameter></paramdef>
      <paramdef>BYTE <parameter>urgency_level</parameter></paramdef>
      <paramdef>STRING <parameter>summary</parameter></paramdef>
      <paramdef>STRING <parameter>body</parameter></paramdef>
-      <paramdef>ARRAY <parameter>images</parameter></paramdef>
+      <paramdef>as <parameter>actions</parameter></paramdef>
-      <paramdef>DICT <parameter>actions</parameter></paramdef>
+      <paramdef>a{sv} <parameter>hints</parameter></paramdef>
-      <paramdef>DICT <parameter>hints</parameter></paramdef>
+      <paramdef>INT32 <parameter>expire_timeout</parameter></paramdef>
      <paramdef>BOOL <parameter>expires</parameter></paramdef>
      <paramdef>UINT32 <parameter>expire_timeout</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
@ -879,15 +981,6 @@
         Can be blank.
        </entry>
       </row>
       <row>
        <entry><parameter>app_icon</parameter></entry>
        <entry>BYTE_ARRAY or STRING</entry>
        <entry>
         The optional program icon of the calling application. This is in
         the same format as an image frame. See <xref linkend="icons"/>.
         Can be an empty string, indicating no icon.
        </entry>
       </row>
       <row>
        <entry><parameter>replaces_id</parameter></entry>
        <entry>UINT32</entry>
@ -901,19 +994,13 @@
        </entry>
       </row>
       <row>
-        <entry><parameter>notification_type</parameter></entry>
+        <entry><parameter>app_icon</parameter></entry>
        <entry>STRING</entry>
        <entry>
-         The optional notification type ID, for potential server
+         The optional program icon of the calling application. See <xref linkend="icons-and-images"/>.
-         categorization and logging purposes. See
+         Can be an empty string, indicating no icon.
         <xref linkend="notification-types"/>. Can be empty.
        </entry>
       </row>
       <row>
        <entry><parameter>urgency_level</parameter></entry>
        <entry>BYTE</entry>
        <entry>The urgency level. See <xref linkend="urgency-levels"/>.</entry>
       </row>
       <row>
        <entry><parameter>summary</parameter></entry>
        <entry>STRING</entry>
@ -924,28 +1011,19 @@
        <entry>STRING</entry>
        <entry>The optional detailed body text. Can be empty.</entry>
       </row>
       <row>
        <entry><parameter>images</parameter></entry>
        <entry>ARRAY</entry>
        <entry>
         The optional array of images. See <xref linkend="icons"/>. Can
         be empty.
        </entry>
       </row>
       <row>
        <entry><parameter>actions</parameter></entry>
-        <entry>DICT</entry>
+        <entry>as</entry>
        <entry>
-         A dictionary key of actions. Each key is the localized name of the
+         Actions are sent over as a list of pairs. Each even element in
-         action, as it should appear to the user, and maps to a UINT32 value
+         the list (starting at index 0) represents the identifier for the
-         containing a program-specific action code. This code will be reported
+         action. Each odd element in the list is the localized string
-         back to the program if the action is invoked by the user. Can be
+         that will be displayed to the user.
         empty.
        </entry>
       </row>
       <row>
        <entry><parameter>hints</parameter></entry>
-        <entry>DICT</entry>
+        <entry>a{sv}</entry>
        <entry>
         Optional hints that can be passed to the server from the client
         program. Although clients and servers should never assume each other
@ -955,27 +1033,20 @@
         empty.
        </entry>
       </row>
       <row>
        <entry><parameter>expires</parameter></entry>
        <entry>BOOL</entry>
        <entry>
         A boolean flag indicating whether or not this notification should
         automatically expire.
        </entry>
       </row>
       <row>
        <entry><parameter>expire_timeout</parameter></entry>
-        <entry>UINT32</entry>
+        <entry>INT32</entry>
        <entry>
         <para>
-          The timeout time in seconds since the display of the notification at
+          The timeout time in milliseconds since the display of the notification at
-          which the notification should automatically close. This is ignored
+          which the notification should automatically close.
          if the expires flag is set to false.
         </para>
         <para>
-          If zero, the notification's expiration time is dependent on the
+          If -1, the notification's expiration time is dependent on the
          notification server's settings, and may vary for the type of
          notification.
          If 0, never expire.
         </para>
        </entry>
       </row>
@ -1033,6 +1104,7 @@
      <paramdef>out STRING <parameter>name</parameter></paramdef>
      <paramdef>out STRING <parameter>vendor</parameter></paramdef>
      <paramdef>out STRING <parameter>version</parameter></paramdef>
      <paramdef>out STRING <parameter>spec_version</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
@ -1068,6 +1140,11 @@
        <entry>STRING</entry>
        <entry>The server's version number.</entry>
       </row>
       <row>
        <entry><parameter>spec_version</parameter></entry>
        <entry>STRING</entry>
        <entry>The specification version the server is compliant with.</entry>
       </row>
      </tbody>
     </tgroup>
    </table>
@ -1138,8 +1215,7 @@
       <function>org.freedesktop.Notifications.ActionInvoked</function>
      </funcdef>
      <paramdef>UINT32 <parameter>id</parameter></paramdef>
-<!--  <paramdef>BOOL <parameter>default_action</parameter></paramdef> -->
+      <paramdef>STRING <parameter>action_key</parameter></paramdef>
      <paramdef>UINT32 <parameter>action_id</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
@ -1177,30 +1253,12 @@
         The ID of the notification emitting the ActionInvoked signal.
        </entry>
       </row>
 <!--
       <row>
-        <entry><parameter>default_action</parameter></entry>
+        <entry><parameter>action_key</parameter></entry>
-        <entry>BOOL</entry>
+        <entry>STRING</entry>
        <entry>
-         <constant>TRUE</constant> if the default action was invoked.
+         The key of the action invoked. These match the keys sent over
-         The default action is often a click on the notification. If this
+         in the list of actions.
         is <constant>TRUE</constant>, the <parameter>action_id</parameter>
         parameter is ignored.
        </entry>
       </row>
 -->
       <row>
        <entry><parameter>action_id</parameter></entry>
        <entry>UINT32</entry>
        <entry>
         The ID of the action invoked. A value of 0 means that the default
         action was invoked, i.e., clicking the notification itself.
         IDs greater than zero are the action IDs as defined by the
         calling application.
 <!--
         This is ignored if
         <parameter>default_action</parameter> is <constant>TRUE</constant>.
 -->
        </entry>
       </row>
      </tbody>
@ -1214,6 +1272,65 @@
     </para>
    </note>
   </sect3>
   <sect3 id="signal-activation-token">
    <title><literal>org.freedesktop.Notifications.ActivationToken</literal></title>
    <funcsynopsis>
     <funcprototype>
      <funcdef>
       <function>org.freedesktop.Notifications.ActivationToken</function>
      </funcdef>
      <paramdef>UINT32 <parameter>id</parameter></paramdef>
      <paramdef>STRING <parameter>activation_token</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
     This signal can be emitted before a <literal>ActionInvoked</literal>
     signal. It carries an activation token that can be used to activate a
     toplevel.
    </para>
    <table>
     <title>ActivationToken Parameters</title>
     <tgroup cols="2">
      <thead>
       <row>
        <entry>Name</entry>
        <entry>Type</entry>
        <entry>Description</entry>
       </row>
      </thead>
      <tbody valign="top">
       <row>
        <entry><parameter>id</parameter></entry>
        <entry>UINT32</entry>
        <entry>
         The ID of the notification emitting the <literal>ActionInvoked</literal>
         signal.
        </entry>
       </row>
       <row>
        <entry><parameter>activation_token</parameter></entry>
        <entry>STRING</entry>
        <entry>
         An activation token. This can be either an X11-style startup ID (see
         <ulink url="https://specifications.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup notification protocol</ulink>)
         or a
         <ulink url="https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tree/main/staging/xdg-activation">Wayland xdg-activation</ulink>
         token.
        </entry>
       </row>
      </tbody>
     </tgroup>
    </table>
    <note>
     <para>
      Clients should not assume the server will generate this signal. Some
      servers may not support user interaction at all, or may not support
      the concept of being able to generate an activation token for a
      notification.
     </para>
    </note>
   </sect3>
  </sect2>
 </sect1>
 </article>
--- a/docs/notify-send.xml
+++ b/docs/notify-send.xml
@ -0,0 +1,138 @@
 <refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xmlns:xlink="http://www.w3.org/1999/xlink">
  <info>
    <date>November 2005</date>
    <productname>libnotify</productname>
    <authorgroup>
      <author>
        <personname>Andre Filipe de Assuncao e Brito</personname>
        <email>decko@noisemakers.org</email>
        <contrib>Original author</contrib>
      </author>
      <author>
        <personname>Paul van Tilburg</personname>
        <email>paulvt@debian.org</email>
        <contrib>Original author</contrib>
      </author>
      <author>
        <personname>Riccardo Setti</personname>
        <email>giskard@debian.org</email>
        <contrib>Original author</contrib>
      </author>
    </authorgroup>
  </info>
  <refmeta>
    <refentrytitle>notify-send</refentrytitle>
    <manvolnum>1</manvolnum>
    <refmiscinfo class="manual">User Commands</refmiscinfo>
  </refmeta>
  <refnamediv>
    <refname>notify-send</refname>
    <refpurpose>a program to send desktop notifications</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
    <cmdsynopsis>
      <command>notify-send</command>
      <arg choice="opt">
        <replaceable>OPTIONS</replaceable>
      </arg>
      <arg choice="req">
        <replaceable>summary</replaceable>
      </arg>
      <arg choice="opt">
        <replaceable>body</replaceable>
      </arg>
    </cmdsynopsis>
  </refsynopsisdiv>
  <refsection>
    <info><title>Description</title></info>
    <para>With <command>notify-send</command> you can send desktop notifications to the user via a notification daemon from the command line. These notifications can be used to inform the user about an event or display some form of information without getting in the user’s way.</para>
  </refsection>
  <refsection>
    <info><title>Options</title></info>
    <variablelist>
      <varlistentry>
        <term><option>-?</option>, <option>--help</option></term>
        <listitem>
          <para>Show help and exit.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-a</option>, <option>--app-name</option>=<replaceable>APP_NAME</replaceable></term>
        <listitem>
          <para>Specifies the app name for the notification.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-A</option>, <option>--action</option>=[<replaceable>NAME</replaceable>=]<replaceable>Text...</replaceable></term>
        <listitem>
          <para>Specifies the actions to display to the user. Implies <option>--wait</option> to wait for user input. May be set multiple times. The <replaceable>NAME</replaceable> of the action is output to <literal>stdout</literal>. If <replaceable>NAME</replaceable> is not specified, the numerical index of the option is used (starting with <literal>1</literal>).</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-u</option>, <option>--urgency</option>=<replaceable>LEVEL</replaceable></term>
        <listitem>
          <para>Specifies the urgency level (<literal>low</literal>, <literal>normal</literal>, <literal>critical</literal>).</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-t</option>, <option>--expire-time</option>=<replaceable>TIME</replaceable>
        </term>
        <listitem>
          <para>The duration, in milliseconds, for the notification to appear on screen.</para>
          <para>Not all implementations use this parameter. GNOME Shell and Notify OSD always ignore it, while Plasma ignores it for notifications with the critical urgency level.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-i</option>, <option>--icon</option>=<replaceable>ICON</replaceable>
        </term>
        <listitem>
          <para>Specifies an icon filename or stock icon to display.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-c</option>, <option>--category</option>=<replaceable>TYPE</replaceable>[,<replaceable>TYPE</replaceable>…]
        </term>
        <listitem>
          <para>Specifies the notification category.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-h</option>, <option>--hint</option>=<replaceable>TYPE</replaceable>:<replaceable>NAME</replaceable>:<replaceable>VALUE</replaceable> </term>
        <listitem>
          <para>Specifies basic extra data to pass. Valid types are <literal>BOOLEAN</literal>, <literal>INT</literal>, <literal>DOUBLE</literal>, <literal>STRING</literal>, <literal>BYTE</literal> and <literal>VARIANT</literal>.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-p</option>, <option>--print-id</option></term>
        <listitem>
          <para>Print the notification ID.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-r</option>, <option>--replace-id</option>=<replaceable>REPLACE_ID</replaceable></term>
        <listitem>
          <para>The ID of the notification to replace.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-w</option>, <option>--wait</option></term>
          <listitem>
            <para>Wait for the notification to be closed before exiting. If the <option>expire-time</option> is set, it will be used as the maximum waiting time.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><option>-e</option>, <option>--transient</option></term>
          <listitem>
            <para>Show a transient notification. Transient notifications by-pass the server's persistence capability, if any. And so it won't be preserved until the user acknowledges it.</para>
        </listitem>
      </varlistentry>
    </variablelist>
  </refsection>
  <refsection>
    <info><title>See also</title></info>
    <para>The Desktop Notification Spec on <link xlink:href="https://specifications.freedesktop.org/notification-spec/">https://specifications.freedesktop.org/notification-spec/</link>.</para>
  </refsection>
 </refentry>
--- a/docs/reference/libnotify-docs.sgml
+++ b/docs/reference/libnotify-docs.sgml
@ -0,0 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>Libnotify Reference Manual</title>
    <releaseinfo>
      The latest version of this documentation can be found on-line at
      <ulink role="online-location" url="http://developer.gnome.org/libnotify/unstable/">http://developer.gnome.org/libnotify/unstable/</ulink>.
    </releaseinfo>
  </bookinfo>
  <chapter>
    <title>Libnotify</title>
    <xi:include href="xml/notify.xml"/>
    <xi:include href="xml/notification.xml"/>
  </chapter>
  <index id="api-index-full">
    <title id="index-all">Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index id="api-index-deprecated" role="deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/docs/reference/libnotify-overrides.txt
+++ b/docs/reference/libnotify-overrides.txt
--- a/docs/reference/libnotify-sections.txt
+++ b/docs/reference/libnotify-sections.txt
@ -0,0 +1,54 @@
 <SECTION>
 <FILE>notification</FILE>
 NOTIFY_EXPIRES_DEFAULT
 NOTIFY_EXPIRES_NEVER
 <TITLE>NotifyNotification</TITLE>
 NotifyNotification
 NotifyClosedReason
 NotifyUrgency
 NotifyActionCallback
 NOTIFY_ACTION_CALLBACK
 notify_notification_new
 notify_notification_update
 notify_notification_show
 notify_notification_set_app_name
 notify_notification_set_timeout
 notify_notification_set_category
 notify_notification_set_urgency
 notify_notification_set_icon_from_pixbuf
 notify_notification_set_image_from_pixbuf
 notify_notification_set_hint
 notify_notification_set_hint_int32
 notify_notification_set_hint_uint32
 notify_notification_set_hint_double
 notify_notification_set_hint_string
 notify_notification_set_hint_byte
 notify_notification_set_hint_byte_array
 notify_notification_clear_hints
 notify_notification_add_action
 notify_notification_clear_actions
 notify_notification_close
 notify_notification_get_activation_token
 notify_notification_get_closed_reason
 <SUBSECTION Standard>
 NotifyNotificationPrivate
 NOTIFY_NOTIFICATION
 NOTIFY_IS_NOTIFICATION
 NOTIFY_TYPE_NOTIFICATION
 notify_notification_get_type
 NOTIFY_NOTIFICATION_CLASS
 NOTIFY_IS_NOTIFICATION_CLASS
 NOTIFY_NOTIFICATION_GET_CLASS
 </SECTION>
 <SECTION>
 <FILE>notify</FILE>
 notify_init
 notify_uninit
 notify_is_initted
 notify_get_app_name
 notify_set_app_name
 notify_get_server_caps
 notify_get_server_info
 </SECTION>
--- a/docs/reference/libnotify.types
+++ b/docs/reference/libnotify.types
@ -0,0 +1,3 @@
 #include <libnotify/notify.h>
 notify_notification_get_type
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@ -0,0 +1,10 @@
 gnome.gtkdoc(meson.project_name(),
  mode: 'sgml',
  main_sgml: meson.project_name() + '-docs.sgml',
  src_dir: join_paths(meson.source_root(), meson.project_name()),
  dependencies: libnotify_dep,
  gobject_typesfile: meson.project_name() + '.types',
  ignore_headers: ['notify-enum-types.h', 'notify-marshal.h', 'internal.h'],
  scan_args: [ '--deprecated-guards=LIBNOTIFY_DISABLE_DEPRECATED' ],
  install: true,
 )
--- a/docs/releases/notification-spec-0.3.xml
+++ b/docs/releases/notification-spec-0.3.xml
@ -0,0 +1,977 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <article id="index">
 <articleinfo>
  <title>Desktop Notifications Specification</title>
  <releaseinfo>Version 0.3</releaseinfo>
  <date>15 September 2004</date>
  <authorgroup>
   <author>
    <firstname>Mike</firstname>
    <surname>Hearn</surname>
    <affiliation>
     <address>
      <email>mike@navi.cx</email>
     </address>
    </affiliation>
   </author>
   <author>
    <firstname>Christian</firstname>
    <surname>Hammond</surname>
    <affiliation>
     <address>
      <email>chipx86@chipx86.com</email>
     </address>
    </affiliation>
   </author>
  </authorgroup>
  <revhistory>
   <revision>
    <revnumber>0.3</revnumber>
    <date>15 September 2004</date>
    <authorinitials>cdh</authorinitials>
    <revremark>Added hint and notification type sections</revremark>
   </revision>
   <revision>
    <revnumber>0.2</revnumber>
    <date>foo</date>
    <authorinitials>mh</authorinitials>
    <revremark>Added replaces field to protocol</revremark>
   </revision>
   <revision>
    <revnumber>0.1</revnumber>
    <date>foo</date>
    <authorinitials>mh</authorinitials>
    <revremark>Initial version</revremark>
   </revision>
  </revhistory>
 </articleinfo>
 <sect1 id="introduction">
  <title>Introduction</title>
  <para>
   This is a draft standard for a desktop notifications service, through
   which applications can generate passive popups (sometimes known as
   "poptarts") to notify the user in an asynchronous manner of events.
  </para>
  <para>
   This specification explicitly does not include other types of
   notification presentation such as modal message boxes, window manager
   decorations or window list annotations.
  </para>
  <para>
   Example use cases include:
  </para>
  <itemizedlist>
   <listitem>
    <para>
     Presence changes in IM programs: for instance, MSN Messenger on
     Windows pioneered the use of passive popups to indicate presence
     changes.
    </para>
   </listitem>
   <listitem><para>Scheduled alarm</para></listitem>
   <listitem><para>Completed file transfer</para></listitem>
   <listitem><para>New mail notification</para></listitem>
   <listitem><para>Low disk space/battery warnings</para></listitem>
  </itemizedlist>
 </sect1>
 <sect1 id="basic-design">
  <title>Basic Design</title>
  <para>
   In order to ensure that multiple notifications can easily be
   displayed at once, and to provide a convenient implementation, all
   notifications are controlled by a single session-scoped service which
   exposes a D-BUS interface.
  </para>
  <para>
   On startup, a conforming implementation should take the
   <literal>org.freedesktop.Notifications</literal> service on
   the session bus. This service will be referred to as the "notification
   server" or just "the server" in this document. It can optionally be
   activated automatically by the bus process, however this is not required
   and notification server clients must not assume that it is available.
  </para>
  <para>
   The server should implement the
   <literal>org.freedesktop.Notifications</literal> interface on
   an object with the path <literal>"/org/freedesktop/Notifications"</literal>.
   This is the only interface required by this version of the specification.
  </para>
  <para>
   A notification has the following components:
  </para>
  <table>
   <title>Notification Components</title>
   <tgroup cols="2">
    <thead>
     <row>
      <entry>Component</entry>
      <entry>Description</entry>
     </row>
    </thead>
    <tbody valign="top">
     <row>
      <entry>Application Name</entry>
      <entry>
       This is the optional name of the application sending the notification.
       This should be the application's formal name, rather than some sort
       of ID. An example would be "FredApp E-Mail Client," rather than
       "fredapp-email-client."
      </entry>
     </row>
     <row>
      <entry>Application Icon</entry>
      <entry>
       The application icon. This is represented either as a path or a name
       in an icon theme.
      </entry>
     </row>
     <row>
      <entry>Replaces ID</entry>
      <entry>
       An optional ID of an existing notification that this
       notification is intended to replace.
      </entry>
     </row>
     <row>
      <entry>Notification Type ID</entry>
      <entry>
       An optional ID representing the notification type. See
       <xref linkend="notification-types"/>.
      </entry>
     </row>
     <row>
      <entry>Urgency Level</entry>
      <entry>
       The urgency of the notification. See <xref linkend="urgency-levels"/>.
      </entry>
     </row>
     <row>
      <entry>Summary</entry>
      <entry>
       This is a single line overview of the notification. For instance,
       "You have mail" or "A friend has come online". It should generally
       not be longer than 40 characters, though this is not a requirement,
       and server implementations should word wrap if necessary. The summary
       must be encoded using UTF-8.
      </entry>
     </row>
     <row>
      <entry>Body</entry>
      <entry>
       <para>
        This is a multi-line body of text. Each line is a paragraph, server
        implementations are free to word wrap them as they see fit.
       </para>
       <para>
        The text may contain simple markup as specified in
        <xref linkend="markup"/>. It must be encoded using UTF-8.
       </para>
       <para>
        If the body is omitted just the summary is displayed.
       </para>
      </entry>
     </row>
     <row>
      <entry>Images</entry>
      <entry>See <xref linkend="icons"/>.</entry>
     </row>
     <row>
      <entry>Actions</entry>
      <entry>
       The actions send a request message back to the notification client
       when invoked. This functionality may not be implemented by the
       notification server, conforming clients should check if it is available
       before using it (see the GetCapabilities message in
       <xref linkend="protocol"/>. An implementation is free to ignore any
       requested by the client. As an example one possible rendering of
       actions would be as buttons in the notification popup.
      </entry>
     </row>
     <row>
      <entry>Hints</entry>
      <entry>See <xref linkend="hints"/>.</entry>
     </row>
     <row>
      <entry>Expiration Time</entry>
      <entry>
       <para>
        The timestamp in seconds since the epoch that the notification should
        close. For example, if one wishes to have an expiration of 5 seconds
        from now, they must grab the current timestamp and add 5 seconds to it.
       </para>
       <para>
        If zero, the notification's expiration time is dependent on the
        notification server's settings, and may vary for the type of
        notification.
       </para>
      </entry>
     </row>
    </tbody>
   </tgroup>
  </table>
  <para>
   Each notification displayed is allocated a unique ID by the server.
   This is unique within the session. While the notification server is
   running, the ID will not be recycled unless the capacity of a uint32 is
   exceeded.
  </para>
  <para>
   This can be used to hide the notification before the expiration time
   is reached. It can also be used to atomically replace the notification
   with another. This allows you to (for instance) modify the contents of
   a notification while it's on-screen.
  </para>
 </sect1>
 <sect1 id="backwards-compat" xreflabel="Backwards Compatibility">
  <title>Backwards Compatibility</title>
  <para>
   Clients should try and avoid making assumptions about the presentation and
   abilities of the notification server. The message content is the most
   important thing.
  </para>
  <para>
   Clients can check with the server what capabilities are supported
   using the <literal>GetCapabilities</literal> message. See
   <xref linkend="protocol"/>.
  </para>
  <para>
   If a client requires a response from a passive popup, it should be
   coded such that a non-focus-stealing message box can be used in the
   case that the notification server does not support this feature.
  </para>
 </sect1>
 <sect1 id="markup" xreflabel="Markup">
  <title>Markup</title>
  <para>
   Body text may contain markup. The markup is XML-based, and consists
   of a small subset of HTML along with a few additional tags.
  </para>
  <para>
   The following tags should be supported by the notification server.
   Though it is optional, it is recommended. Notification servers that do
   not support these tags should filter them out.
  </para>
  <informaltable>
   <tgroup cols="2">
    <tbody valign="top">
     <row>
      <entry>
       <sgmltag class="starttag">b</sgmltag> ...
       <sgmltag class="endtag">b</sgmltag>
      </entry>
      <entry>Bold</entry>
     </row>
     <row>
      <entry>
       <sgmltag class="starttag">i</sgmltag> ...
       <sgmltag class="endtag">i</sgmltag>
      </entry>
      <entry>Italic</entry>
     </row>
     <row>
      <entry>
       <sgmltag class="starttag">u</sgmltag> ...
       <sgmltag class="endtag">u</sgmltag>
      </entry>
      <entry>Underline</entry>
     </row>
     <row>
      <entry>
       <sgmltag class="starttag">a href="..."</sgmltag> ...
       <sgmltag class="endtag">a</sgmltag>
      </entry>
      <entry>Hyperlink</entry>
     </row>
    </tbody>
   </tgroup>
  </informaltable>
  <para>
   <remark>
    What else do we want here? We're going to want more tags
    for sure.
   </remark>
  </para>
 </sect1>
 <sect1 id="icons" xreflabel="Icons">
  <title>Icons</title>
  <para>
   A notification can optionally include an array of images. The array of
   images specifies frames in an animation, which always loop.
   Implementations are free to ignore the images data, and implementations
   that support images need not support animation.
  </para>
  <para>
   If the image array has more than one element, a "primary frame" can
   be specified. If not specified, it defaults to the first frame. For
   implementations that support images but not animation, only the primary
   frame will be used.
  </para>
  <para>
   Each element of the array must have the same type as the first
   element. Mixtures of strings and blobs are not allowed. The element
   types can be one of the following:
  </para>
  <informaltable>
   <tgroup cols="3">
    <thead>
     <row>
      <entry>Element</entry>
      <entry>Type</entry>
      <entry>Description</entry>
     </row>
    </thead>
    <tbody valign="top">
     <row>
      <entry>Icon Theme Name</entry>
      <entry>String</entry>
      <entry>
       Any string that does not begin with the <literal>/</literal>
       character is assumed to be an icon theme name and is looked up
       according to the spec. The best size to fit the servers chosen
       presentation will be used. This is the recommended way of specifying
       images.
      </entry>
     </row>
     <row>
      <entry>Absolute Path</entry>
      <entry>String</entry>
      <entry>
       Any string that begins with a <literal>/</literal> will be used as
       an absolute file path. Implementations should support at minimum
       files of type image/png and image/svg.
      </entry>
     </row>
     <row>
      <entry>Image Data</entry>
      <entry>Binary Data</entry>
      <entry>
       A data stream may be embedded in the message. This is assumed to be
       of type image/png.
      </entry>
     </row>
    </tbody>
   </tgroup>
  </informaltable>
 </sect1>
 <sect1 id="notification-types" xreflabel="Notification Types">
  <title>Notification Types</title>
  <para>
   Notifications can optionally have a type indicator. Although neither
   client or nor server must support this, some may choose to. Those servers
   implementing notification types may use them to intelligently display
   the notification in a certain way, or group notifications of similar
   types.
  </para>
  <para>
   The following table lists standard notifications as defined by this spec.
   More will be added in time.
  </para>
  <table>
   <title>Notification Types</title>
   <tgroup cols="2">
    <thead>
     <row>
      <entry>Type</entry>
      <entry>Description</entry>
     </row>
    </thead>
    <tbody valign="top">
     <row>
      <entry><literal>"email"</literal></entry>
      <entry>An e-mail notification.</entry>
     </row>
     <row>
      <entry><literal>"im"</literal></entry>
      <entry>A new IM notification.</entry>
     </row>
     <row>
      <entry><literal>"device"</literal></entry>
      <entry>A device-related notification, such as a USB device being
             plugged in or unplugged.</entry>
     </row>
     <row>
      <entry><literal>"presence"</literal></entry>
      <entry>A presence change, such as a user going online or offline.</entry>
     </row>
     <row>
      <entry><literal>"transfer-complete"</literal></entry>
      <entry>A file transfer or download complete notification.</entry>
     </row>
    </tbody>
   </tgroup>
  </table>
  <para>
   Third parties, when defining their own notification types, should discuss
   the possibility of standardizing on the hint with other parties, preferably
   in a place such as the
   <ulink url="http://freedesktop.org/mailman/listinfo/xdg">xdg</ulink>
   mailing list at
   <ulink url="http://freedesktop.org/">freedesktop.org</ulink>. If it
   warrants a standard, it will be added to the table above. If no
   consensus is reached, the notification type should be in the form of
   <literal>"x-<replaceable>vendor</replaceable>-<replaceable>name</replaceable>."</literal>
  </para>
 </sect1>
 <sect1 id="urgency-levels" xreflabel="Urgency Levels">
  <title>Urgency Levels</title>
  <para>
   Notifications have an urgency level associated with them. This defines
   the importance of the notification. For example, "Your computer is on
   fire" would be a critical urgency. "Joe Bob signed on" would be a low
   urgency.
  </para>
  <para>Urgency levels are defined as follows:</para>
  <table>
   <title>Urgency Levels</title>
   <tgroup cols="2">
    <thead>
     <row>
      <entry>Type</entry>
      <entry>Description</entry>
     </row>
    </thead>
    <tbody valign="top">
     <row>
      <entry>0</entry>
      <entry>Low</entry>
     </row>
     <row>
      <entry>1</entry>
      <entry>Medium (Normal)</entry>
     </row>
     <row>
      <entry>2</entry>
      <entry>High</entry>
     </row>
     <row>
      <entry>3</entry>
      <entry>Critical</entry>
     </row>
    </tbody>
   </tgroup>
  </table>
  <para>
   Developers must use their own judgement when deciding the urgency of a
   notification. Typically, if the majority of programs are using the same
   level for a specific type of urgency, other applications should follow
   them.
  </para>
  <para>
   For the most part, server implementations may use urgency information
   how they see fit. The one exception is the Critical notification.
   As Critical notifications are things that the user will most likely want
   to know about, they should not be closed until the user dismisses them.
  </para>
 </sect1>
 <sect1 id="hints" xreflabel="Hints">
  <title>Hints</title>
  <para>
   Hints are a way to provide extra data to a notification server that
   the server may be able to make use of.
  </para>
  <para>
   Neither clients nor notification servers are required to support any
   hints. Both sides should assume that hints are not passed, and should
   ignore any hints they do not understand.
  </para>
 <!--
  <para>
   The following table lists the standard hints as defined by this
   specification. Future hints may be proposed and added to this list
   over time. Once again, implementations are not required to support these.
  </para>
  <table>
   <title>Standard Hints</title>
   <tgroup cols="2">
    <thead>
     <row>
      <entry>Name</entry>
      <entry>Value Type</entry>
      <entry>Description</entry>
     </row>
    </thead>
    <tbody valign="top">
     <row>
      <entry><literal>"winid"</literal></entry>
      <entry>UINT32</entry>
      <entry>
       The Window ID that sent the notification. This may be used,
       for example, to flash the window.
      </entry>
     </row>
    </tbody>
   </tgroup>
  </table>
 -->
  <para>
   Third parties, when defining their own hints, should discuss the
   possibility of standardizing on the hint with other parties, preferably
   in a place such as the
   <ulink url="http://freedesktop.org/mailman/listinfo/xdg">xdg</ulink>
   mailing list at
   <ulink url="http://freedesktop.org/">freedesktop.org</ulink>. If it
   warrants a standard, it will be added to the table above. If no
   consensus is reached, the hint name should be in the form of
   <literal>"x-<replaceable>vendor</replaceable>-<replaceable>name</replaceable>."</literal>
  </para>
 </sect1>
 <sect1 id="protocol" xreflabel="Protocol">
  <title>D-BUS Protocol</title>
  <para>
   The following messages <emphasis>must</emphasis> be supported by all
   implementations.
  </para>
  <sect2 id="commands">
   <title>Message commands</title>
   <sect3 id="command-get-capabilities">
    <title><literal>org.freedesktop.Notifications.GetCapabilities</literal></title>
    <funcsynopsis>
     <funcprototype>
      <funcdef>STRING_ARRAY
       <function>org.freedesktop.Notifications.GetCapabilities</function>
      </funcdef>
      <void/>
     </funcprototype>
    </funcsynopsis>
    <para>
     This message takes no parameters.
    </para>
    <para>
     It returns an array of strings. Each string describes an optional
     capability implemented by the server. The following values are
     defined by this spec:
    </para>
    <table>
     <title>Server Capabilities</title>
     <tgroup cols="2">
      <tbody valign="top">
       <row>
        <entry><literal>"body"</literal></entry>
        <entry>
         Supports body text. Some implementations may only show the
         summary (for instance, onscreen displays, marquee/scrollers)
        </entry>
       </row>
       <row>
        <entry><literal>"markup"</literal></entry>
        <entry>
         Supports markup in the body text. If marked up text is sent
         to a server that does not give this cap, the markup will show
         through as regular text so must be stripped clientside.
        </entry>
       </row>
       <row>
        <entry><literal>"static-image"</literal></entry>
        <entry>
         Supports display of exactly 1 frame of any given image array.
         This value is mutually exclusive with
         <literal>"multi-image"</literal>, it is a protocol error for the
         server to specify both.
        </entry>
       </row>
       <row>
        <entry><literal>"multi-image"</literal></entry>
        <entry>
         The server will render an animation of all the frames in a given
         image array. The client may still specify multiple frames even if
         this cap and/or static-image is missing, however the server is
         free to ignore them and use only the primary frame.
        </entry>
       </row>
       <row>
        <entry><literal>"actions"</literal></entry>
        <entry>
         The server will provide the specified actions to the user. Even if
         this cap is missing, actions may still be specified by the client,
         however the server is free to ignore them.
        </entry>
       </row>
      </tbody>
     </tgroup>
    </table>
    <para>
     New vendor-specific caps may be specified as long as they start with
     <literal>"x-<replaceable>vendor</replaceable>"</literal>. For instance,
     <literal>"x-gnome-foo-cap"</literal>. Capability names must not
     contain spaces. They are limited to alpha-numeric characters and dashes
     (<literal>"-"</literal>).
    </para>
   </sect3>
   <sect3 id="command-notify">
    <title><literal>org.freedesktop.Notifications.Notify</literal></title>
    <funcsynopsis>
     <funcprototype>
      <funcdef>UINT32
       <function>org.freedesktop.Notifications.Notify</function>
      </funcdef>
      <paramdef>STRING_OR_NIL <parameter>app_name</parameter></paramdef>
      <paramdef>BYTE_ARRAY_OR_STRING_OR_NIL <parameter>app_icon</parameter></paramdef>
      <paramdef>UINT32_OR_NIL <parameter>replaces_id</parameter></paramdef>
      <paramdef>STRING_OR_NIL <parameter>notification_type</parameter></paramdef>
      <paramdef>BYTE <parameter>urgency_level</parameter></paramdef>
      <paramdef>STRING <parameter>summary</parameter></paramdef>
      <paramdef>STRING_OR_NIL <parameter>body</parameter></paramdef>
      <paramdef>ARRAY <parameter>images</parameter></paramdef>
      <paramdef>DICT_OR_NIL <parameter>actions</parameter></paramdef>
      <paramdef>DICT_OR_NIL <parameter>hints</parameter></paramdef>
      <paramdef>UINT32_OR_NIL <parameter>expire_time</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
     Sends a notification to the notification server.
    </para>
    <table>
     <title>Notify Parameters</title>
     <tgroup cols="3">
      <thead>
       <row>
        <entry>Name</entry>
        <entry>Type</entry>
        <entry>Description</entry>
       </row>
      </thead>
      <tbody valign="top">
       <row>
        <entry><parameter>app_name</parameter></entry>
        <entry>STRING or NIL</entry>
        <entry>
         The optional name of the application sending the notification.
        </entry>
       </row>
       <row>
        <entry><parameter>app_icon</parameter></entry>
        <entry>BYTE_ARRAY or STRING or NIL</entry>
        <entry>
         The optional program icon of the calling application. This is in
         the same format as an image frame. See <xref linkend="icons"/>.
        </entry>
       </row>
       <row>
        <entry><parameter>replaces_id</parameter></entry>
        <entry>UINT32 or NIL</entry>
        <entry>
         The optional notification ID that this notification replaces. The
         server must atomically (ie with no flicker or other visual cues)
         replace the given notification with this one. This allows clients to
         effectively modify the notification while it's active.
        </entry>
       </row>
       <row>
        <entry><parameter>notification_type</parameter></entry>
        <entry>STRING or NIL</entry>
        <entry>
         The optional notification type ID, for potential server
         categorization and logging purposes. See
         <xref linkend="notification-types"/>.
        </entry>
       </row>
       <row>
        <entry><parameter>urgency_level</parameter></entry>
        <entry>BYTE</entry>
        <entry>The urgency level. See <xref linkend="urgency-levels"/>.</entry>
       </row>
       <row>
        <entry><parameter>summary</parameter></entry>
        <entry>STRING</entry>
        <entry>The summary text briefly describing the notification.</entry>
       </row>
       <row>
        <entry><parameter>body</parameter></entry>
        <entry>STRING or NIL</entry>
        <entry>The optional detailed body text.</entry>
       </row>
       <row>
        <entry><parameter>images</parameter></entry>
        <entry>ARRAY or NIL</entry>
        <entry>
         The optional array of images. See <xref linkend="icons"/>.
        </entry>
       </row>
       <row>
        <entry><parameter>actions</parameter></entry>
        <entry>DICT or NIL</entry>
        <entry>
         A dictionary key of actions. Each key is the localized name of the
         action, as it should appear to the user, and maps to a UINT32 value
         containing a program-specific action code. This code will be reported
         back to the program if the action is invoked by the user.
        </entry>
       </row>
       <row>
        <entry><parameter>hints</parameter></entry>
        <entry>DICT or NIL</entry>
        <entry>
         Optional hints that can be passed to the server from the client
         program. Although clients and servers should never assume each other
         supports any specific hints, they can be used to pass along
         information, such as the process PID or window ID, that the server
         may be able to make use of. See <xref linkend="hints"/>.
        </entry>
       </row>
       <row>
        <entry><parameter>expire_time</parameter></entry>
        <entry>UINT32 or NIL</entry>
        <entry>
         The notification time-out time, represented as UNIX-time (seconds
         since the epoch). If this is NIL, the notification
         will never time out, and will only be closed when an action is
         invoked. If non-NIL, this will specify a time at which the notification
         will be automatically closed. If zero, the server's default
         expiration time will be used.
        </entry>
       </row>
      </tbody>
     </tgroup>
    </table>
    <para>
     If <parameter>replaces_id</parameter> is NIL, the return value is a
     UINT32 that represent the notification. It is unique, and will not be
     reused unless a <constant>MAXINT</constant> number of notifications
     have been generated. An acceptable implementation may just use an
     incrementing counter for the ID. The returned ID is always greater than
     zero. Servers must make sure not to return zero as an ID.
    </para>
    <para>
     If <parameter>replaces_id</parameter> is not NIL, the returned value
     is the same value as <parameter>replaces_id</parameter>.
    </para>
   </sect3>
   <sect3 id="command-close-notification">
    <title><literal>org.freedesktop.Notifications.CloseNotification</literal></title>
    <funcsynopsis>
     <funcprototype>
      <funcdef>void
       <function>org.freedesktop.Notifications.CloseNotification</function>
      </funcdef>
      <paramdef>UINT32 id</paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
     Causes a notification to be forcefully closed and removed from the user's
     view. It can be used, for example, in the event that what the
     notification pertains to is no longer relevant, or to cancel a
     notification with no expiration time.
    </para>
    <para>
     The <literal>NotificationClosed</literal> signal is emitted by this
     method.
    </para>
    <para>
     If the notification no longer exists, an empty D-BUS Error message is
     sent back.
    </para>
   </sect3>
   <sect3 id="command-get-server-information">
    <title><literal>org.freedesktop.Notifications.GetServerInformation</literal></title>
    <funcsynopsis>
     <funcprototype>
      <funcdef>
       void
       <function>org.freedesktop.Notifications.GetServerInformation</function>
      </funcdef>
      <paramdef>out STRING <parameter>name</parameter></paramdef>
      <paramdef>out STRING <parameter>vendor</parameter></paramdef>
      <paramdef>out STRING <parameter>version</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
     This message returns the information on the server. Specifically,
     the server name, vendor, and version number.
    </para>
    <table>
     <title>GetServerInformation Return Values</title>
     <tgroup cols="2">
      <thead>
       <row>
        <entry>Name</entry>
        <entry>Type</entry>
        <entry>Description</entry>
       </row>
      </thead>
      <tbody valign="top">
       <row>
        <entry><parameter>name</parameter></entry>
        <entry>STRING</entry>
        <entry>The product name of the server.</entry>
       </row>
       <row>
        <entry><parameter>vendor</parameter></entry>
        <entry>STRING</entry>
        <entry>
         The vendor name. For example, "KDE," "GNOME,"
         "freedesktop.org," or "Microsoft."
        </entry>
       </row>
       <row>
        <entry><parameter>version</parameter></entry>
        <entry>STRING</entry>
        <entry>The server's version number.</entry>
       </row>
      </tbody>
     </tgroup>
    </table>
   </sect3>
  </sect2>
  <sect2 id="signals">
   <title>Signals</title>
   <sect3 id="signal-notification-closed">
    <title><literal>org.freedesktop.Notifications.NotificationClosed</literal></title>
    <funcsynopsis>
     <funcprototype>
      <funcdef>
       <function>org.freedesktop.Notifications.NotificationClosed</function>
      </funcdef>
      <paramdef>UINT32 <parameter>id</parameter></paramdef>
      <paramdef>UINT32 <parameter>reason</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
     A completed notification is one that has timed out, or has been
     dismissed by the user.
    </para>
    <table>
     <title>NotificationClosed Parameters</title>
     <tgroup cols="2">
      <thead>
       <row>
        <entry>Name</entry>
        <entry>Type</entry>
        <entry>Description</entry>
       </row>
      </thead>
      <tbody valign="top">
       <row>
        <entry><parameter>id</parameter></entry>
        <entry>UINT32</entry>
        <entry>The ID of the notification that was closed.</entry>
       </row>
       <row>
        <entry><parameter>reason</parameter></entry>
        <entry>UINT32</entry>
        <entry>
         <para>The reason the notification was closed.</para>
         <para>1 - The notification expired.</para>
         <para>2 - The notification was dismissed by the user.</para>
         <para>3 - The notification was closed by a call to
               <literal>CloseNotification</literal>.</para>
         <para>4 - Undefined/reserved reasons.</para>
        </entry>
       </row>
      </tbody>
     </tgroup>
    </table>
    <para>
     The ID specified in the signal is invalidated
     <emphasis>before</emphasis> the signal is sent and may not be used
     in any further communications with the server.
    </para>
   </sect3>
   <sect3 id="signal-action-invoked">
    <title><literal>org.freedesktop.Notifications.ActionInvoked</literal></title>
    <funcsynopsis>
     <funcprototype>
      <funcdef>
       <function>org.freedesktop.Notifications.ActionInvoked</function>
      </funcdef>
      <paramdef>UINT32 <parameter>id</parameter></paramdef>
 <!--  <paramdef>BOOL <parameter>default_action</parameter></paramdef> -->
      <paramdef>UINT32 <parameter>action_id</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
     This signal is emitted when one of the following occurs:
    </para>
    <itemizedlist>
     <listitem>
      <para>
       The user performs some global "invoking" action upon a notification.
       For instance, clicking somewhere on the notification itself.
      </para>
     </listitem>
     <listitem>
      <para>
       The user invokes a specific action as specified in the original
       Notify request. For example, clicking on an action button.
      </para>
     </listitem>
    </itemizedlist>
    <table>
     <title>ActionInvoked Parameters</title>
     <tgroup cols="2">
      <thead>
       <row>
        <entry>Name</entry>
        <entry>Type</entry>
        <entry>Description</entry>
       </row>
      </thead>
      <tbody valign="top">
       <row>
        <entry><parameter>id</parameter></entry>
        <entry>UINT32</entry>
        <entry>
         The ID of the notification emitting the ActionInvoked signal.
        </entry>
       </row>
 <!--
       <row>
        <entry><parameter>default_action</parameter></entry>
        <entry>BOOL</entry>
        <entry>
         <constant>TRUE</constant> if the default action was invoked.
         The default action is often a click on the notification. If this
         is <constant>TRUE</constant>, the <parameter>action_id</parameter>
         parameter is ignored.
        </entry>
       </row>
 -->
       <row>
        <entry><parameter>action_id</parameter></entry>
        <entry>UINT32</entry>
        <entry>
         The ID of the action invoked. A value of 0 means that the default
         action was invoked, i.e., clicking the notification itself.
         IDs greater than zero are the action IDs as defined by the
         calling application.
 <!--
         This is ignored if
         <parameter>default_action</parameter> is <constant>TRUE</constant>.
 -->
        </entry>
       </row>
      </tbody>
     </tgroup>
    </table>
    <note>
     <para>
      Clients should not assume the server will generate this signal. Some
      servers may not support user interaction at all, or may not support
      the concept of being able to "invoke" a notification.
     </para>
    </note>
   </sect3>
  </sect2>
 </sect1>
 </article>
--- a/docs/releases/notification-spec-0.4.xml
+++ b/docs/releases/notification-spec-0.4.xml
--- a/docs/releases/notification-spec-0.6.xml
+++ b/docs/releases/notification-spec-0.6.xml
--- a/docs/releases/notification-spec-0.7.xml
+++ b/docs/releases/notification-spec-0.7.xml
--- a/docs/releases/notification-spec-0.9.xml
+++ b/docs/releases/notification-spec-0.9.xml
@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <article id="index">
 <articleinfo>
  <title>Desktop Notifications Specification</title>
-  <releaseinfo>Version 0.7</releaseinfo>
+  <releaseinfo>Version 0.9</releaseinfo>
-  <date>28 July 2005</date>
+  <date>15 January 2006</date>
  <authorgroup>
   <author>
    <firstname>Mike</firstname>
@ -26,6 +26,16 @@
   </author>
  </authorgroup>
  <revhistory>
   <revision>
    <revnumber>0.9</revnumber>
    <date>15 January 2006</date>
    <authorinitials>cdh</authorinitials>
    <revremark>
     Clarify the naming for the application IDs.
     Put back a number of things that probably shouldn't have been removed
     from the spec.
    </revremark>
   </revision>
   <revision>
    <revnumber>0.8</revnumber>
    <date>23 September 2005</date>
@ -174,11 +184,11 @@
      </entry>
     </row>
     <row>
-      <entry>Application Icon</entry>
+      <entry>Notification Icon</entry>
      <entry>
-       The application icon. This is represented either as a URI 
+       The notification icon. This is represented either as a URI
-       (file:// is the only location supported right now) 
+       (file:// is the only URI schema supported right now) or a name in
-       or a name in an icon theme.
+       a freedesktop.org-compliant icon theme (not a GTK+ stock ID).
      </entry>
     </row>
     <row>
@ -210,48 +220,74 @@
     <row>
      <entry>Actions</entry>
      <entry>
-       The actions send a request message back to the notification client
+       <para>
-       when invoked. This functionality may not be implemented by the
+        The actions send a request message back to the notification client
-       notification server, conforming clients should check if it is available
+        when invoked. This functionality may not be implemented by the
-       before using it (see the GetCapabilities message in
+        notification server, conforming clients should check if it is available
-       <xref linkend="protocol"/>). An implementation is free to ignore any
+        before using it (see the GetCapabilities message in
-       requested by the client. As an example one possible rendering of
+        <xref linkend="protocol"/>). An implementation is free to ignore any
-       actions would be as buttons in the notification popup.
+        requested by the client. As an example one possible rendering of
-
+        actions would be as buttons in the notification popup.
-       Actions are sent over as a list of pairs.  Each even element in the list 
+       </para>
-       (starting at index 0) represents the identifier for the action.  Each odd
+       <para>
-       element in the list is the localized string that will be displayed to the user.
+        Actions are sent over as a list of pairs. Each even element in the
        list (starting at index 0) represents the identifier for the action.
        Each odd element in the list is the localized string that will be
        displayed to the user.
       </para>
       <para>
        The default action (usually invoked my clicking the notification)
        should have a key named <literal>"default"</literal>. The name can
        be anything, though implementations are free not to display it.
       </para>
      </entry>
     </row>
     <row>
      <entry>Hints</entry>
-      <entry><para>See <xref linkend="hints"/>.</para></entry>
+      <entry>
-
+       <para>See <xref linkend="hints"/>.</para>
-      <para>Beyond the core protocol is the hints table.  A couple of core elements have
+       <para>
-      been moved to hints mostly because in a huge number of cases their default values
+        Beyond the core protocol is the hints table. A couple of core
-      would be sufficent.  The elements moved to hints are:</para>
+        elements have been moved to hints mostly because in a huge number
-      <para>
+        of cases their default values would be sufficent. The elements moved
-      * Category ID - An optional ID representing the type of notification (the name has
+        to hints are:
-        been changed from Notification Type ID in pervious versions). See <xref linkend="categories"/>.</para>
+       </para>
-      <para>
+       <segmentedlist>
-      * Urgency Level - The urgency of the notification. See <xref linkend="urgency-levels"/>. 
+        <title>Elements Moved to Hints</title>
-        (Defaults to 1 - Normal)</para>
+        <segtitle>Element</segtitle>
-      <para>
+        <segtitle>Description</segtitle>
-      * Icon Data - Instead of overloading the icon field we now have an icon_data field that 
+        <seglistitem>
-        is used when icon is blank.</para>
+         <seg>Category ID</seg>
         <seg>An optional ID representing the type of notification (the name
              has been changed from Notification Type ID in pervious versions).
              See <xref linkend="categories"/>.</seg>
        </seglistitem>
        <seglistitem>
         <seg>Urgency Level</seg>
         <seg>The urgency of the notification. See
              <xref linkend="urgency-levels"/>. (Defaults to 1 - Normal)</seg>
        </seglistitem>
        <seglistitem>
         <seg>Icon Data</seg>
         <seg>Instead of overloading the icon field we now have an icon_data
              field that is used when icon is blank.</seg>
        </seglistitem>
       </segmentedlist>
      </entry>
     </row>
     <row>
      <entry>Expiration Timeout</entry>
      <entry>
       <para>
-        The timeout time in milliseconds since the display of the notification at
+        The timeout time in milliseconds since the display of the notification
-        which the notification should automatically close. 
+        at which the notification should automatically close.
       </para>
       <para>
        If -1, the notification's expiration time is dependent on the
        notification server's settings, and may vary for the type of
        notification.
-
+       </para>
       <para>
        If 0, the notification never expires.
       </para>
      </entry>
@ -406,13 +442,13 @@
 <sect1 id="icons" xreflabel="Icons">
  <title>Icons</title>
  <para>
-   A notification can optionaly have an icon specified by the Application Icon 
+   A notification can optionally have an icon specified by the Notification
-   field or by the icon_data hints field. 
+   Icon field or by the icon_data hint.
  </para>
  <para>
-    The icon_data field should be a raw image data structure of signature (iiibiiay) 
+   The icon_data field should be a raw image data structure of signature
-    which describes the width, height, rowstride, has alpha, bits per sample, channels 
+   (iiibiiay) which describes the width, height, rowstride, has alpha, bits
-    and image data respectively.
+   per sample, channels and image data respectively.
  </para>
 </sect1>
@ -690,12 +726,23 @@
      </entry>
     </row>
     <row>
-      <entry><literal>"image_data"</literal></entry>
+      <entry><literal>"desktop-entry"</literal></entry>
      <entry>string</entry>
      <entry>
       This specifies the name of the desktop filename representing the
       calling program. This should be the same as the prefix used for the
       application's .desktop file. An example would be "rhythmbox" from
       "rhythmbox.desktop". This can be used by the daemon to retrieve the
       correct icon for the application, for logging purposes, etc.
      </entry>
     </row>
     <row>
      <entry><literal>"icon_data"</literal></entry>
      <entry>(iiibiiay)</entry>
      <entry>
-        This is a raw data image format which describes the width, height, rowstride, 
+        This is a raw data image format which describes the width, height,
-        has alpha, bits per sample, channels and image data respectively. We use this
+        rowstride, has alpha, bits per sample, channels and image data
-        value if the icon field is left blank.
+        respectively. We use this value if the icon field is left blank.
      </entry>
     </row>
     <row>
@ -913,9 +960,10 @@
        <entry><parameter>actions</parameter></entry>
        <entry>ARRAY</entry>
        <entry>
-         Actions are sent over as a list of pairs.  Each even element in the list 
+         Actions are sent over as a list of pairs. Each even element in
-         (starting at index 0) represents the identifier for the action.  Each odd
+         the list (starting at index 0) represents the identifier for the
-         element in the list is the localized string that will be displayed to the user.
+         action. Each odd element in the list is the localized string
         that will be displayed to the user.
        </entry>
       </row>
       <row>
@ -1106,8 +1154,7 @@
       <function>org.freedesktop.Notifications.ActionInvoked</function>
      </funcdef>
      <paramdef>UINT32 <parameter>id</parameter></paramdef>
-<!--  <paramdef>BOOL <parameter>default_action</parameter></paramdef> -->
+      <paramdef>STRING <parameter>action_key</parameter></paramdef>
      <paramdef>UINT32 <parameter>action_id</parameter></paramdef>
     </funcprototype>
    </funcsynopsis>
    <para>
@ -1145,30 +1192,12 @@
         The ID of the notification emitting the ActionInvoked signal.
        </entry>
       </row>
 <!--
       <row>
-        <entry><parameter>default_action</parameter></entry>
+        <entry><parameter>action_key</parameter></entry>
-        <entry>BOOL</entry>
+        <entry>STRING</entry>
        <entry>
-         <constant>TRUE</constant> if the default action was invoked.
+         The key of the action invoked. These match the keys sent over
-         The default action is often a click on the notification. If this
+         in the list of actions.
         is <constant>TRUE</constant>, the <parameter>action_id</parameter>
         parameter is ignored.
        </entry>
       </row>
 -->
       <row>
        <entry><parameter>action_id</parameter></entry>
        <entry>UINT32</entry>
        <entry>
         The ID of the action invoked. A value of 0 means that the default
         action was invoked, i.e., clicking the notification itself.
         IDs greater than zero are the action IDs as defined by the
         calling application.
 <!--
         This is ignored if
         <parameter>default_action</parameter> is <constant>TRUE</constant>.
 -->
        </entry>
       </row>
      </tbody>
--- a/docs/releases/notification-spec-1.0.xml
+++ b/docs/releases/notification-spec-1.0.xml
--- a/libnotify.doap
+++ b/libnotify.doap
@ -0,0 +1,29 @@
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
         xmlns:foaf="http://xmlns.com/foaf/0.1/"
         xmlns:gnome="http://api.gnome.org/doap-extensions#"
         xmlns="http://usefulinc.com/ns/doap#">
  <name xml:lang="en">Desktop notification library</name>
  <shortname>libnotify</shortname>
  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
  <programming-language>C</programming-language>
  <shortdesc xml:lang="en">libnotify is a library for sending desktop notifications</shortdesc>
  <description>Library to send desktop notifications that follows the FDO
 specifications:
  https://gitlab.freedesktop.org/xdg/xdg-specs/-/blob/master/notification/notification-spec.xml</description>
  <maintainer>
    <foaf:Person>
      <foaf:name>Marco Trevisan</foaf:name>
      <foaf:mbox rdf:resource="mailto:mail@3v1n0.net" />
      <gnome:userid>marcotrevi</gnome:userid>
    </foaf:Person>
  </maintainer>
  <maintainer>
    <foaf:Person>
      <foaf:name>Logan Rathbone</foaf:name>
      <foaf:mbox rdf:resource="mailto:poprocks@gmail.com" />
      <gnome:userid>larathbone</gnome:userid>
    </foaf:Person>
  </maintainer>
 </Project>
--- a/libnotify.pc.in
+++ b/libnotify.pc.in
@ -1,11 +0,0 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 Name: libnotify
 Description: Notifications Library
 Version: @VERSION@
 Libs: -L${libdir} -lnotify @PACKAGE_LIBS@
 Cflags: -I${includedir} @PACKAGE_CFLAGS@
--- a/libnotify.spec.in
+++ b/libnotify.spec.in
--- a/libnotify/Makefile.am
+++ b/libnotify/Makefile.am
@ -1,24 +0,0 @@
 notifyincdir = $(includedir)/libnotify
 lib_LTLIBRARIES = libnotify.la
 notifyinc_HEADERS = 		\
 	notify.h		\
 	notifynotification.h	\
 	notifycommon.h		\
 	notifymarshal.h
 libnotify_la_SOURCES = 		\
 	dbus-compat.h 		\
 	notify.c		\
 	notifynotification.c	\
 	notifymarshal.c
 libnotify_la_LIBADD = \
 	$(PACKAGE_LIBS)
 libnotify_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 INCLUDES = \
 	$(PACKAGE_CFLAGS)
--- a/libnotify/Makefile.in
+++ b/libnotify/Makefile.in
@ -1,508 +0,0 @@
 # Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 # 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
@SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = libnotify
 DIST_COMMON = $(notifyinc_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    *) f=$$p;; \
  esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(notifyincdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libnotify_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libnotify_la_OBJECTS = notify.lo notifynotification.lo \
 	notifymarshal.lo
 libnotify_la_OBJECTS = $(am_libnotify_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libnotify_la_SOURCES)
 DIST_SOURCES = $(libnotify_la_SOURCES)
 notifyincHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(notifyinc_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GDK_CFLAGS = @GDK_CFLAGS@
 GDK_LIBS = @GDK_LIBS@
 HAVE_GDK_FALSE = @HAVE_GDK_FALSE@
 HAVE_GDK_TRUE = @HAVE_GDK_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
 PACKAGE_LIBS = @PACKAGE_LIBS@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 notifyincdir = $(includedir)/libnotify
 lib_LTLIBRARIES = libnotify.la
 notifyinc_HEADERS = \
 	notify.h		\
 	notifynotification.h	\
 	notifycommon.h		\
 	notifymarshal.h
 libnotify_la_SOURCES = \
 	dbus-compat.h 		\
 	notify.c		\
 	notifynotification.c	\
 	notifymarshal.c
 libnotify_la_LIBADD = \
 	$(PACKAGE_LIBS)
 libnotify_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 INCLUDES = \
 	$(PACKAGE_CFLAGS)
 all: all-am
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libnotify/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  libnotify/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
 	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
 	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libnotify.la: $(libnotify_la_OBJECTS) $(libnotify_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libnotify_la_LDFLAGS) $(libnotify_la_OBJECTS) $(libnotify_la_LIBADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 distclean-compile:
 	-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notifymarshal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notifynotification.Plo@am__quote@
 .c.o:
@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 .c.lo:
@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 mostlyclean-libtool:
 	-rm -f *.lo
 clean-libtool:
 	-rm -rf .libs _libs
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 install-notifyincHEADERS: $(notifyinc_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(notifyincdir)" || $(mkdir_p) "$(DESTDIR)$(notifyincdir)"
 	@list='$(notifyinc_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
 	  echo " $(notifyincHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(notifyincdir)/$$f'"; \
 	  $(notifyincHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(notifyincdir)/$$f"; \
 	done
 uninstall-notifyincHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(notifyinc_HEADERS)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(notifyincdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(notifyincdir)/$$f"; \
 	done
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(notifyincdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
 dvi: dvi-am
 dvi-am:
 html: html-am
 info: info-am
 info-am:
 install-data-am: install-notifyincHEADERS
 install-exec-am: install-libLTLIBRARIES
 install-info: install-info-am
 install-man:
 installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-am
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 pdf: pdf-am
 pdf-am:
 ps: ps-am
 ps-am:
 uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	uninstall-notifyincHEADERS
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am \
 	install-libLTLIBRARIES install-man install-notifyincHEADERS \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-info-am uninstall-libLTLIBRARIES \
 	uninstall-notifyincHEADERS
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/libnotify/dbus-compat.h
+++ b/libnotify/dbus-compat.h
@ -1,144 +0,0 @@
 /**
 * @file libnotify/dbus-compat.h Private D-BUS Compatibility API
 *
 * @Copyright (C) 2005 Christian Hammond.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #ifndef _NOTIFY_DBUS_COMPAT_H_
 #define _NOTIFY_DBUS_COMPAT_H_
 #define NOTIFY_CHECK_DBUS_VERSION(major, minor) \
 	(DBUS_MAJOR_VER > (major) || \
 	 (DBUS_MAJOR_VER == (major) && DBUS_MINOR_VER >= (minor)))
 #if NOTIFY_CHECK_DBUS_VERSION(0, 30)
 # define _notify_dbus_message_iter_append_byte(iter, val) \
 	dbus_message_iter_append_basic((iter), DBUS_TYPE_BYTE, &(val))
 # define _notify_dbus_message_iter_append_boolean(iter, val) \
 	dbus_message_iter_append_basic((iter), DBUS_TYPE_BOOLEAN, &(val))
 # define _notify_dbus_message_iter_append_string(iter, val) \
 	dbus_message_iter_append_basic((iter), DBUS_TYPE_STRING, &(val))
 # define _notify_dbus_message_iter_append_int32(iter, val) \
 	dbus_message_iter_append_basic((iter), DBUS_TYPE_INT32, &(val))
 # define _notify_dbus_message_iter_append_uint32(iter, val) \
 	dbus_message_iter_append_basic((iter), DBUS_TYPE_UINT32, &(val))
 # define _notify_dbus_message_iter_append_double(iter, val) \
 	dbus_message_iter_append_basic((iter), DBUS_TYPE_DOUBLE, &(val))
 # define _notify_dbus_message_iter_append_byte_array(iter, data, len) \
 	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_BYTE, &(data), \
 										 (len))
 # define _notify_dbus_message_iter_append_boolean_array(iter, data, len) \
 	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_BOOLEAN, &(data), \
 										 (len))
 # define _notify_dbus_message_iter_append_int32_array(iter, data, len) \
 	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_INT32, &(data), \
 										 (len))
 # define _notify_dbus_message_iter_append_uint32_array(iter, data, len) \
 	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_UINT32, &(data), \
 										 (len))
 # define _notify_dbus_message_iter_append_string_array(iter, data, len) \
 	dbus_message_iter_append_fixed_array((iter), DBUS_TYPE_STRING, \
 										 &(data), (len))
 # define _notify_dbus_message_iter_get_byte(iter, retvar) \
 	dbus_message_iter_get_basic((iter), &(retvar))
 # define _notify_dbus_message_iter_get_boolean(iter, retvar) \
 	dbus_message_iter_get_basic((iter), &(retvar))
 # define _notify_dbus_message_iter_get_string(iter, retvar) \
 	dbus_message_iter_get_basic((iter), &(retvar))
 # define _notify_dbus_message_iter_get_int32(iter, retvar) \
 	dbus_message_iter_get_basic((iter), &(retvar))
 # define _notify_dbus_message_iter_get_uint32(iter, retvar) \
 	dbus_message_iter_get_basic((iter), &(retvar))
 # define _notify_dbus_message_iter_get_double(iter, retvar) \
 	dbus_message_iter_get_basic((iter), &(retvar))
 # define _notify_dbus_message_iter_get_byte_array \
 	dbus_message_iter_get_fixed_array
 # define _notify_dbus_message_iter_get_boolean_array \
 	dbus_message_iter_get_fixed_array
 # define _notify_dbus_message_iter_get_int32_array \
 	dbus_message_iter_get_fixed_array
 # define _notify_dbus_message_iter_get_uint32_array \
 	dbus_message_iter_get_fixed_array
 # define _notify_dbus_message_iter_get_string_array(iter, array, num_items) \
 	dbus_message_iter_get_fixed_array((iter), (array), (num_items))
 #else /* D-BUS < 0.30 */
 # define DBUS_INTERFACE_DBUS        DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS
 # define DBUS_SERVICE_DBUS          DBUS_SERVICE_ORG_FREEDESKTOP_DBUS
 # define DBUS_PATH_DBUS             DBUS_PATH_ORG_FREEDESKTOP_DBUS
 # define DBUS_ERROR_SERVICE_UNKNOWN DBUS_ERROR_SERVICE_DOES_NOT_EXIST
 # define dbus_bus_start_service_by_name dbus_bus_activate_service
 # define dbus_message_iter_close_container(iter, container_iter)
 # define dbus_message_iter_init_append(msg, iter) \
 	dbus_message_iter_init(msg, iter)
 # define _notify_dbus_message_iter_append_byte(iter, val) \
 	dbus_message_iter_append_byte((iter), (val))
 # define _notify_dbus_message_iter_append_boolean(iter, val) \
 	dbus_message_iter_append_boolean((iter), (val))
 # define _notify_dbus_message_iter_append_string(iter, val) \
 	dbus_message_iter_append_string((iter), (val))
 # define _notify_dbus_message_iter_append_int32(iter, val) \
 	dbus_message_iter_append_int32((iter), (val))
 # define _notify_dbus_message_iter_append_uint32(iter, val) \
 	dbus_message_iter_append_uint32((iter), (val))
 # define _notify_dbus_message_iter_append_double(iter, val) \
 	dbus_message_iter_append_double((iter), (val))
 # define _notify_dbus_message_iter_append_byte_array(iter, data, len) \
 	dbus_message_iter_append_byte_array((iter), (data), (len))
 # define _notify_dbus_message_iter_append_boolean_array(iter, data, len) \
 	dbus_message_iter_append_boolean_array((iter), (data), (len))
 # define _notify_dbus_message_iter_append_int32_array(iter, data, len) \
 	dbus_message_iter_append_int32_array((iter), (data), (len))
 # define _notify_dbus_message_iter_append_uint32_array(iter, data, len) \
 	dbus_message_iter_append_uint32_array((iter), (data), (len))
 # define _notify_dbus_message_iter_append_string_array(iter, data, len) \
 	dbus_message_iter_append_string_array((iter), (const char **)(data), (len))
 # define _notify_dbus_message_iter_get_byte(iter, retvar) \
 	retvar = dbus_message_iter_get_byte((iter))
 # define _notify_dbus_message_iter_get_boolean(iter, retvar) \
 	retvar = dbus_message_iter_get_boolean((iter))
 # define _notify_dbus_message_iter_get_string(iter, retvar) \
 	retvar = dbus_message_iter_get_string((iter))
 # define _notify_dbus_message_iter_get_int32(iter, retvar) \
 	retvar = dbus_message_iter_get_int32((iter))
 # define _notify_dbus_message_iter_get_uint32(iter, retvar) \
 	retvar = dbus_message_iter_get_uint32((iter))
 # define _notify_dbus_message_iter_get_double(iter, retvar) \
 	retvar = dbus_message_iter_get_double((iter))
 # define _notify_dbus_message_iter_get_byte_array(iter, data, len) \
 	dbus_message_iter_get_byte_array((iter), (data), (len))
 # define _notify_dbus_message_iter_get_boolean_array(iter, data, len) \
 	dbus_message_iter_get_boolean_array((iter), (data), (len))
 # define _notify_dbus_message_iter_get_int32_array(iter, data, len) \
 	dbus_message_iter_get_int32_array((iter), (data), (len))
 # define _notify_dbus_message_iter_get_uint32_array(iter, data, len) \
 	dbus_message_iter_get_uint32_array((iter), (data), (len))
 # define _notify_dbus_message_iter_get_string_array(iter, data, len) \
 	dbus_message_iter_get_string_array((iter), (data), (len))
 #endif
 #endif /* NOTIFY_DBUS_COMPAT_H_ */
--- a/libnotify/internal.h
+++ b/libnotify/internal.h
@ -0,0 +1,53 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file libnotify/internal.h Internal definitions
 *
 * @Copyright (C) 2006 Christian Hammond
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #ifndef _LIBNOTIFY_INTERNAL_H_
 #define _LIBNOTIFY_INTERNAL_H_
 #define NOTIFY_DBUS_NAME           "org.freedesktop.Notifications"
 #define NOTIFY_DBUS_CORE_INTERFACE "org.freedesktop.Notifications"
 #define NOTIFY_DBUS_CORE_OBJECT    "/org/freedesktop/Notifications"
 #define NOTIFY_PORTAL_DBUS_NAME           "org.freedesktop.portal.Desktop"
 #define NOTIFY_PORTAL_DBUS_CORE_INTERFACE "org.freedesktop.portal.Notification"
 #define NOTIFY_PORTAL_DBUS_CORE_OBJECT    "/org/freedesktop/portal/desktop"
 G_BEGIN_DECLS
 GDBusProxy      * _notify_get_proxy                         (GError **error);
 void            _notify_cache_add_notification              (NotifyNotification       *n);
 void            _notify_cache_remove_notification           (NotifyNotification       *n);
 gint            _notify_notification_get_timeout            (const NotifyNotification *n);
 gboolean        _notify_notification_has_nondefault_actions (const NotifyNotification *n);
 gboolean        _notify_check_spec_version                  (int major, int minor);
 const char     * _notify_get_snap_name                      (void);
 const char     * _notify_get_snap_path                      (void);
 const char     * _notify_get_snap_app                       (void);
 const char     * _notify_get_flatpak_app                    (void);
 gboolean        _notify_uses_portal_notifications           (void);
 G_END_DECLS
 #endif /* _LIBNOTIFY_INTERNAL_H_ */
--- a/libnotify/libnotify.map
+++ b/libnotify/libnotify.map
@ -0,0 +1,6 @@
 {
 global:
    notify_*;
 local:
    *;
 };
--- a/libnotify/meson.build
+++ b/libnotify/meson.build
@ -0,0 +1,86 @@
 libnotify_includesubdir = meson.project_name()
 libnotify_includedir = join_paths(includedir, libnotify_includesubdir)
 headers = [
  'notify.h',
  'notification.h',
 ]
 sources = [
  'notify.c',
  'notification.c',
 ]
 features_data = configuration_data()
 features_data.set('LIBNOTIFY_MAJOR_VERSION', VERSION_ARRAY[0])
 features_data.set('LIBNOTIFY_MINOR_VERSION', VERSION_ARRAY[1])
 features_data.set('LIBNOTIFY_MICRO_VERSION', VERSION_ARRAY[2])
 headers += configure_file(
  input: 'notify-features.h.in',
  output: 'notify-features.h',
  configuration: features_data)
 enum_types = gnome.mkenums_simple('@0@-enum-types'.format(LIBNAME),
  sources : headers,
  install_header: true,
  install_dir: libnotify_includedir
 )
 marshal = gnome.genmarshal('@0@-marshal'.format(LIBNAME),
  prefix: '@0@_marshal'.format(LIBNAME),
  sources: '@0@-marshal.list'.format(LIBNAME),
 )
 libnotify_cflags = [
  '-DG_LOG_DOMAIN="libnotify"',
 ]
 mapfile = meson.project_name() + '.map'
 libnotify_ldflags = cc.get_supported_link_arguments([
  '-Wl,--version-script,'+join_paths(meson.current_source_dir(), mapfile),
 ])
 notify_dep = declare_dependency(
  include_directories: default_includes,
  dependencies: libnotify_deps,
  compile_args: libnotify_cflags,
  sources: headers + [enum_types[1]] + [marshal[1]],
  link_args: libnotify_ldflags,
 )
 libnotify_lib = shared_library(LIBNAME,
  dependencies: notify_dep,
  sources: sources + enum_types + marshal,
  version: '@0@.@1@.@2@'.format(LT_CURRENT, LT_REVISION, LT_AGE),
  soversion: LT_CURRENT,
  install: true,
 )
 libnotify_dep = declare_dependency(
  dependencies: notify_dep,
  link_with: libnotify_lib
 )
 pkgconfig.generate(libnotify_lib,
  name: meson.project_name(),
  libraries: libnotify_deps,
  description: 'Notifications Library',
 )
 introspection = get_option('introspection')
 g_ir_scanner = find_program('g-ir-scanner', required: introspection.enabled())
 if g_ir_scanner.found() and not introspection.disabled()
  gnome.generate_gir(libnotify_lib,
    sources: headers + sources + enum_types,
    namespace: 'Notify',
    nsversion: MODULE_VERSION,
    export_packages: meson.project_name(),
    includes: ['GLib-2.0', 'GdkPixbuf-2.0'],
    extra_args: '--c-include=@0@/@1@.h'.format(meson.project_name(), LIBNAME),
    install: true
  )
 endif
 install_headers(headers, subdir: libnotify_includesubdir)
--- a/libnotify/notification.c
+++ b/libnotify/notification.c
--- a/libnotify/notification.h
+++ b/libnotify/notification.h
@ -0,0 +1,220 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * Copyright (C) 2006 Christian Hammond
 * Copyright (C) 2006 John Palmieri
 * Copyright (C) 2010 Red Hat, Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #ifndef _NOTIFY_NOTIFICATION_H_
 #define _NOTIFY_NOTIFICATION_H_
 #include <glib.h>
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 G_BEGIN_DECLS
 /**
 * NOTIFY_EXPIRES_DEFAULT:
 *
 * The default expiration time on a notification.
 */
 #define NOTIFY_EXPIRES_DEFAULT -1
 /**
 * NOTIFY_EXPIRES_NEVER:
 *
 * The notification never expires. It stays open until closed by the calling API
 * or the user.
 */
 #define NOTIFY_EXPIRES_NEVER    0
 #define NOTIFY_TYPE_NOTIFICATION         (notify_notification_get_type ())
 #define NOTIFY_NOTIFICATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NOTIFY_TYPE_NOTIFICATION, NotifyNotification))
 #define NOTIFY_NOTIFICATION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NOTIFY_TYPE_NOTIFICATION, NotifyNotificationClass))
 #define NOTIFY_IS_NOTIFICATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NOTIFY_TYPE_NOTIFICATION))
 #define NOTIFY_IS_NOTIFICATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NOTIFY_TYPE_NOTIFICATION))
 #define NOTIFY_NOTIFICATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NOTIFY_TYPE_NOTIFICATION, NotifyNotificationClass))
 typedef struct _NotifyNotification NotifyNotification;
 typedef struct _NotifyNotificationClass NotifyNotificationClass;
 typedef struct _NotifyNotificationPrivate NotifyNotificationPrivate;
 /**
 * NotifyNotification:
 *
 * A passive pop-up notification.
 */
 struct _NotifyNotification
 {
        /*< private >*/
        GObject                    parent_object;
        NotifyNotificationPrivate *priv;
 };
 struct _NotifyNotificationClass
 {
        GObjectClass    parent_class;
        /* Signals */
        void            (*closed) (NotifyNotification *notification);
 };
 /**
 * NotifyUrgency:
 * @NOTIFY_URGENCY_LOW: Low urgency. Used for unimportant notifications.
 * @NOTIFY_URGENCY_NORMAL: Normal urgency. Used for most standard notifications.
 * @NOTIFY_URGENCY_CRITICAL: Critical urgency. Used for very important notifications.
 *
 * The urgency level of the notification.
 */
 typedef enum
 {
        NOTIFY_URGENCY_LOW,
        NOTIFY_URGENCY_NORMAL,
        NOTIFY_URGENCY_CRITICAL,
 } NotifyUrgency;
 /**
 * NotifyClosedReason:
 * @NOTIFY_CLOSED_REASON_UNSET: Notification not closed.
 * @NOTIFY_CLOSED_REASON_EXPIRED: Timeout has expired.
 * @NOTIFY_CLOSED_REASON_DISMISSED: It has been dismissed by the user.
 * @NOTIFY_CLOSED_REASON_API_REQUEST: It has been closed by a call to
 *   notify_notification_close().
 * @NOTIFY_CLOSED_REASON_UNDEFIEND: Closed by undefined/reserved reasons.
 *
 * The reason for which the notification has been closed.
 *
 * Since: 0.8.0
 */
 typedef enum
 {
        NOTIFY_CLOSED_REASON_UNSET = -1,
        NOTIFY_CLOSED_REASON_EXPIRED = 1,
        NOTIFY_CLOSED_REASON_DISMISSED = 2,
        NOTIFY_CLOSED_REASON_API_REQUEST = 3,
        NOTIFY_CLOSED_REASON_UNDEFIEND = 4,
 } NotifyClosedReason;
 /**
 * NotifyActionCallback:
 * @notification: a #NotifyActionCallback notification
 * @action: (transfer none): The activated action name
 * @user_data: (nullable) (transfer none): User provided data
 *
 * An action callback function.
 */
 typedef void    (*NotifyActionCallback) (NotifyNotification *notification,
                                         char               *action,
                                         gpointer            user_data);
 /**
 * NOTIFY_ACTION_CALLBACK:
 * @func: The function to cast.
 *
 * A convenience macro for casting a function to a #NotifyActionCallback. This
 * is much like G_CALLBACK().
 */
 #define NOTIFY_ACTION_CALLBACK(func) ((NotifyActionCallback)(func))
 GType               notify_notification_get_type             (void);
 NotifyNotification *notify_notification_new                  (const char         *summary,
                                                              const char         *body,
                                                              const char         *icon);
 gboolean            notify_notification_update                (NotifyNotification *notification,
                                                               const char         *summary,
                                                               const char         *body,
                                                               const char         *icon);
 gboolean            notify_notification_show                  (NotifyNotification *notification,
                                                               GError            **error);
 void                notify_notification_set_timeout           (NotifyNotification *notification,
                                                               gint                timeout);
 void                notify_notification_set_category          (NotifyNotification *notification,
                                                               const char         *category);
 void                notify_notification_set_urgency           (NotifyNotification *notification,
                                                               NotifyUrgency       urgency);
 void                notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
                                                               GdkPixbuf          *pixbuf);
 #ifndef LIBNOTIFY_DISABLE_DEPRECATED
 void                notify_notification_set_icon_from_pixbuf  (NotifyNotification *notification,
                                                               GdkPixbuf          *icon);
 void                notify_notification_set_hint_int32        (NotifyNotification *notification,
                                                               const char         *key,
                                                               gint                value);
 void                notify_notification_set_hint_uint32       (NotifyNotification *notification,
                                                               const char         *key,
                                                               guint               value);
 void                notify_notification_set_hint_double       (NotifyNotification *notification,
                                                               const char         *key,
                                                               gdouble             value);
 void                notify_notification_set_hint_string       (NotifyNotification *notification,
                                                               const char         *key,
                                                               const char         *value);
 void                notify_notification_set_hint_byte         (NotifyNotification *notification,
                                                               const char         *key,
                                                               guchar              value);
 void                notify_notification_set_hint_byte_array   (NotifyNotification *notification,
                                                               const char         *key,
                                                               const guchar       *value,
                                                               gsize               len);
 #endif
 void                notify_notification_set_hint              (NotifyNotification *notification,
                                                               const char         *key,
                                                               GVariant           *value);
 void                notify_notification_set_app_name          (NotifyNotification *notification,
                                                               const char         *app_name);
 void                notify_notification_clear_hints           (NotifyNotification *notification);
 void                notify_notification_add_action            (NotifyNotification *notification,
                                                               const char         *action,
                                                               const char         *label,
                                                               NotifyActionCallback callback,
                                                               gpointer            user_data,
                                                               GFreeFunc           free_func);
 const char         *notify_notification_get_activation_token  (NotifyNotification *notification);
 void                notify_notification_clear_actions         (NotifyNotification *notification);
 gboolean            notify_notification_close                 (NotifyNotification *notification,
                                                               GError            **error);
 gint                notify_notification_get_closed_reason     (const NotifyNotification *notification);
 G_END_DECLS
 #endif /* NOTIFY_NOTIFICATION_H */
--- a/libnotify/notify-features.h.in
+++ b/libnotify/notify-features.h.in
@ -0,0 +1,41 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
 *
 * Copyright (C) 2010 Red Hat, Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #ifndef __NOTIFY_VERSION_H__
 #define __NOTIFY_VERSION_H__
 /* compile time version
 */
 #define NOTIFY_VERSION_MAJOR    (@LIBNOTIFY_MAJOR_VERSION@)
 #define NOTIFY_VERSION_MINOR    (@LIBNOTIFY_MINOR_VERSION@)
 #define NOTIFY_VERSION_MICRO    (@LIBNOTIFY_MICRO_VERSION@)
 /* check whether a version equal to or greater than
 * major.minor.micro is present.
 */
 #define NOTIFY_CHECK_VERSION(major,minor,micro) \
    (NOTIFY_VERSION_MAJOR > (major) || \
     (NOTIFY_VERSION_MAJOR == (major) && NOTIFY_VERSION_MINOR > (minor)) || \
     (NOTIFY_VERSION_MAJOR == (major) && NOTIFY_VERSION_MINOR == (minor) && \
      NOTIFY_VERSION_MICRO >= (micro)))
 #endif /* __NOTIFY_VERSION_H__ */
--- a/libnotify/notify-marshal.list
+++ b/libnotify/notify-marshal.list
@ -0,0 +1,2 @@
 VOID:UINT,UINT
 VOID:UINT,STRING
--- a/libnotify/notify.c
+++ b/libnotify/notify.c
@ -1,9 +1,9 @@
-/* -*- mode: c-mode; tab-width: 4; indent-tabs-mode: t; -*- */
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 /**
 * @file libnotify/notify.c Notifications library
 *
- * @Copyright (C) 2004 Christian Hammond <chipx86@chipx86.com>
+ * Copyright (C) 2004-2006 Christian Hammond <chipx86@chipx86.com>
- * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
+ * Copyright (C) 2004-2006 Mike Hearn <mike@navi.cx>
 * Copyright (C) 2010 Red Hat, Inc.
 * Copyright © 2010 Christian Persch
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@ -21,88 +21,663 @@
 * Boston, MA  02111-1307, USA.
 */
-#ifdef HAVE_CONFIG_H
+#include "config.h"
 # include "config.h"
 #endif
 #ifndef DBUS_API_SUBJECT_TO_CHANGE
 # define DBUS_API_SUBJECT_TO_CHANGE 1
 #endif
 #include "notify.h"
 #include "dbus-compat.h"
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
-static gboolean _initted = FALSE;
+#include <glib.h>
-static gchar *_app_name = NULL;
+#include <gio/gio.h>
 #ifdef __GNUC__
 #  define format_func __attribute__((format(printf, 1, 2)))
 #else /* no format string checking with this compiler */
 #  define format_func
 #endif
-static void format_func
+#include "notify.h"
-print_error (char *message, ...)
+#include "internal.h"
 #include "notify-marshal.h"
 /**
 * SECTION:notify
 * @Short_description: Notification API
 * @Title: notify
 */
 static gboolean         _initted = FALSE;
 static char            *_app_name = NULL;
 static char            *_snap_name = NULL;
 static char            *_snap_app = NULL;
 static char            *_flatpak_app = NULL;
 static GDBusProxy      *_proxy = NULL;
 static GList           *_active_notifications = NULL;
 static int              _spec_version_major = 0;
 static int              _spec_version_minor = 0;
 static int              _portal_version = 0;
 gboolean
 _notify_check_spec_version (int major,
                            int minor)
 {
-  char buf[1024];
+       if (_spec_version_major > major)
-  va_list args;
+               return TRUE;
-
+       if (_spec_version_major < major)
-  va_start (args, message);
+               return FALSE;
-  vsnprintf (buf, sizeof (buf), message, args);
+       return _spec_version_minor >= minor;
  va_end (args);
  fprintf (stderr, "%s(%d): libnotify: %s",
 	   (getenv ("_") ? getenv ("_") : ""), getpid (), buf);
 }
 static gboolean
 _notify_get_server_info (char **ret_name,
                         char **ret_vendor,
                         char **ret_version,
                         char **ret_spec_version,
                         GError **error)
 {
        GDBusProxy *proxy;
        GVariant   *result;
        proxy = _notify_get_proxy (error);
        if (proxy == NULL) {
                return FALSE;
        }
        if (_notify_uses_portal_notifications ()) {
                if (ret_name) {
                        *ret_name = g_strdup ("Portal Notification");
                }
                if (ret_vendor) {
                        *ret_vendor = g_strdup ("Freedesktop");
                }
                if (ret_version) {
                        *ret_version = g_strdup_printf ("%u", _portal_version);
                }
                if (ret_spec_version) {
                        *ret_spec_version = g_strdup ("1.2");
                }
                return TRUE;
        }
        result = g_dbus_proxy_call_sync (proxy,
                                         "GetServerInformation",
                                         g_variant_new ("()"),
                                         G_DBUS_CALL_FLAGS_NONE,
                                         -1 /* FIXME shorter timeout? */,
                                         NULL,
                                         error);
        if (result == NULL) {
                return FALSE;
        }
        if (!g_variant_is_of_type (result, G_VARIANT_TYPE ("(ssss)"))) {
                g_variant_unref (result);
                g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
                             "Unexpected reply type");
                return FALSE;
        }
        g_variant_get (result, "(ssss)",
                       ret_name,
                       ret_vendor,
                       ret_version,
                       ret_spec_version);
        g_variant_unref (result);
        return TRUE;
 }
 static gboolean
 _notify_update_spec_version (GError **error)
 {
       char *spec_version;
       if (!_notify_get_server_info (NULL, NULL, NULL, &spec_version, error)) {
               return FALSE;
       }
       sscanf (spec_version,
               "%d.%d",
               &_spec_version_major,
               &_spec_version_minor);
       g_free (spec_version);
       return TRUE;
 }
 static gboolean
 set_app_name (const char *app_name)
 {
        g_return_val_if_fail (app_name != NULL, FALSE);
        g_return_val_if_fail (*app_name != '\0', FALSE);
        g_free (_app_name);
        _app_name = g_strdup (app_name);
        return TRUE;
 }
 /**
 * notify_set_app_name:
 * @app_name: The name of the application
 *
 * Sets the application name.
 *
 */
 void
 notify_set_app_name (const char *app_name)
 {
        set_app_name (app_name);
 }
 /**
 * notify_init:
 * @app_name: (nullable): The name of the application initializing libnotify.
 *
 * Initialized libnotify. This must be called before any other functions.
 *
 * Starting from 0.8, if the provided @app_name is %NULL, libnotify will
 * try to figure it out from the running application.
 * Before it was not allowed, and was causing libnotify not to be initialized.
 *
 * Returns: %TRUE if successful, or %FALSE on error.
 */
 gboolean
 notify_init (const char *app_name)
 {
-  g_return_val_if_fail (app_name != NULL, FALSE);
+        if (_initted)
-  g_return_val_if_fail (*app_name != '\0', FALSE);
+                return TRUE;
-  if (_initted)
+        if (app_name == NULL) {
-    return TRUE;
+                GApplication *application;
-  _app_name = g_strdup (app_name);
+                app_name = _notify_get_snap_app ();
                if (app_name == NULL) {
                        app_name = _notify_get_flatpak_app ();
                }
-  g_type_init ();
+                if (app_name == NULL &&
                    (application = g_application_get_default ())) {
                        app_name = g_application_get_application_id (application);
                }
        }
-#ifdef HAVE_ATEXIT
+        if (!set_app_name (app_name)) {
-  atexit (notify_uninit);
+                return FALSE;
-#endif /* HAVE_ATEXIT */
+        }
-  _initted = TRUE;
+        _initted = TRUE;
-  return TRUE;
+        return TRUE;
 }
-const gchar *
+static void
-_notify_get_app_name (void)
+_initialize_snap_names (void)
 {
-  return _app_name;
+        gchar *cgroup_contents = NULL;
        gchar *found_snap_name = NULL;
        gchar **lines;
        gint i;
        if (!g_file_get_contents ("/proc/self/cgroup", &cgroup_contents,
                                  NULL, NULL)) {
                g_free (cgroup_contents);
                return;
        }
        lines = g_strsplit (cgroup_contents, "\n", -1);
        g_free (cgroup_contents);
        for (i = 0; lines[i]; ++i) {
                gchar **parts = g_strsplit (lines[i], ":", 3);
                gchar *basename;
                gchar **ns;
                guint ns_length;
                if (g_strv_length (parts) != 3) {
                        g_strfreev (parts);
                        continue;
                }
                basename = g_path_get_basename (parts[2]);
                g_strfreev (parts);
                if (!basename) {
                        continue;
                }
                ns = g_strsplit (basename, ".", -1);
                ns_length = g_strv_length (ns);
                g_free (basename);
                if (ns_length < 2 || !g_str_equal (ns[0], "snap")) {
                        g_strfreev (ns);
                        continue;
                }
                if (_snap_name == NULL) {
                        g_free (found_snap_name);
                        found_snap_name = g_strdup (ns[1]);
                }
                if (ns_length < 3) {
                        g_strfreev (ns);
                        continue;
                }
                if (_snap_name == NULL) {
                        _snap_name = found_snap_name;
                        found_snap_name = NULL;
                        g_debug ("SNAP name: %s", _snap_name);
                }
                if (g_str_equal (ns[1], _snap_name)) {
                        _snap_app = g_strdup (ns[2]);
                        g_strfreev (ns);
                        break;
                }
                g_strfreev (ns);
        }
        if (_snap_name == NULL && found_snap_name != NULL) {
                _snap_name = found_snap_name;
                found_snap_name = NULL;
                g_debug ("SNAP name: %s", _snap_name);
        }
        if (_snap_app == NULL) {
                _snap_app = g_strdup (_snap_name);
        }
        g_debug ("SNAP app: %s", _snap_app);
        g_strfreev (lines);
        g_free (found_snap_name);
 }
-void
+const char *
-notify_uninit (void)
+_notify_get_snap_path (void)
 {
        static const char *snap_path = NULL;
        static gsize snap_path_set = FALSE;
-  if (_app_name != NULL)
+        if (g_once_init_enter (&snap_path_set)) {
-    {
+                snap_path = g_getenv ("SNAP");
      g_free (_app_name);
      _app_name = NULL;
    }
-  /* TODO: keep track of all notifications and destroy them here? */
+                if (!snap_path || *snap_path == '\0' ||
                    !strchr (snap_path, G_DIR_SEPARATOR)) {
                        snap_path = NULL;
                } else {
                        g_debug ("SNAP path: %s", snap_path);
                }
                g_once_init_leave (&snap_path_set, TRUE);
        }
        return snap_path;
 }
 const char *
 _notify_get_snap_name (void)
 {
        static gsize snap_name_set = FALSE;
        if (g_once_init_enter (&snap_name_set)) {
                if (!_snap_name) {
                        const char *snap_name_env = g_getenv ("SNAP_NAME");
                        if (!snap_name_env || *snap_name_env == '\0')
                                snap_name_env = NULL;
                        _snap_name = g_strdup (snap_name_env);
                        g_debug ("SNAP name: %s", _snap_name);
                }
                g_once_init_leave (&snap_name_set, TRUE);
        }
        return _snap_name;
 }
 const char *
 _notify_get_snap_app (void)
 {
        static gsize snap_app_set = FALSE;
        if (g_once_init_enter (&snap_app_set)) {
                _initialize_snap_names ();
                g_once_init_leave (&snap_app_set, TRUE);
        }
        return _snap_app;
 }
 const char *
 _notify_get_flatpak_app (void)
 {
        static gsize flatpak_app_set = FALSE;
        if (g_once_init_enter (&flatpak_app_set)) {
                GKeyFile *info = g_key_file_new ();
                if (g_key_file_load_from_file (info, "/.flatpak-info",
                                               G_KEY_FILE_NONE, NULL)) {
                        const char *group = "Application";
                        if (g_key_file_has_group (info, "Runtime")) {
                                group = "Runtime";
                        }
                        _flatpak_app = g_key_file_get_string (info, group,
                                                              "name", NULL);
                }
                g_key_file_free (info);
                g_once_init_leave (&flatpak_app_set, TRUE);
        }
        return _flatpak_app;
 }
 static gboolean
 _notify_is_running_under_flatpak (void)
 {
        return !!_notify_get_flatpak_app ();
 }
 static gboolean
 _notify_is_running_under_snap (void)
 {
        return !!_notify_get_snap_app ();
 }
 static gboolean
 _notify_is_running_in_sandbox (void)
 {
        static gsize use_portal = 0;
        enum {
                IGNORE_PORTAL = 1,
                TRY_USE_PORTAL = 2,
                FORCE_PORTAL = 3
        };
        if (g_once_init_enter (&use_portal)) {
                if (G_UNLIKELY (g_getenv ("NOTIFY_IGNORE_PORTAL"))) {
                        g_once_init_leave (&use_portal, IGNORE_PORTAL);
                } else if (G_UNLIKELY (g_getenv ("NOTIFY_FORCE_PORTAL"))) {
                        g_once_init_leave (&use_portal, FORCE_PORTAL);
                } else {
                        g_once_init_leave (&use_portal, TRY_USE_PORTAL);
                }
        }
        if (use_portal == IGNORE_PORTAL) {
                return FALSE;
        }
        return use_portal == FORCE_PORTAL ||
               _notify_is_running_under_flatpak () ||
               _notify_is_running_under_snap ();
 }
 gboolean
 _notify_uses_portal_notifications (void)
 {
        return _portal_version != 0;
 }
 /**
 * notify_get_app_name:
 *
 * Gets the application name registered.
 *
 * Returns: The registered application name, passed to notify_init().
 */
 const char *
 notify_get_app_name (void)
 {
        return _app_name;
 }
 /**
 * notify_uninit:
 *
 * Uninitialized libnotify.
 *
 * This should be called when the program no longer needs libnotify for
 * the rest of its lifecycle, typically just before exitting.
 */
 void
 notify_uninit (void)
 {
        GList *l;
        if (!_initted) {
                return;
        }
        if (_app_name != NULL) {
                g_free (_app_name);
                _app_name = NULL;
        }
        for (l = _active_notifications; l != NULL; l = l->next) {
                NotifyNotification *n = NOTIFY_NOTIFICATION (l->data);
                if (_notify_notification_get_timeout (n) == 0 ||
                    _notify_notification_has_nondefault_actions (n)) {
                        notify_notification_close (n, NULL);
                }
        }
        if (_proxy != NULL) {
            g_object_unref (_proxy);
            _proxy = NULL;
        }
        g_free (_snap_name);
        _snap_name = NULL;
        g_free (_snap_app);
        _snap_app = NULL;
        g_free (_flatpak_app);
        _flatpak_app = NULL;
        _initted = FALSE;
 }
 /**
 * notify_is_initted:
 *
 * Gets whether or not libnotify is initialized.
 *
 * Returns: %TRUE if libnotify is initialized, or %FALSE otherwise.
 */
 gboolean
 notify_is_initted (void)
 {
-  return _initted;
+        return _initted;
 }
 GDBusProxy *
 _get_portal_proxy (GError **error)
 {
        GError *local_error = NULL;
        GDBusProxy *proxy;
        GVariant *res;
        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                               G_DBUS_PROXY_FLAGS_NONE,
                                               NULL,
                                               NOTIFY_PORTAL_DBUS_NAME,
                                               NOTIFY_PORTAL_DBUS_CORE_OBJECT,
                                               NOTIFY_PORTAL_DBUS_CORE_INTERFACE,
                                               NULL,
                                               &local_error);
        if (proxy == NULL) {
                g_debug ("Failed to get portal proxy: %s", local_error->message);
                g_clear_error (&local_error);
                return NULL;
        }
        res = g_dbus_proxy_get_cached_property (proxy, "version");
        if (!res) {
                g_object_unref (proxy);
                return NULL;
        }
        _portal_version = g_variant_get_uint32 (res);
        g_assert (_portal_version > 0);
        g_warning ("Running in confined mode, using Portal notifications. "
                   "Some features and hints won't be supported");
        g_variant_unref (res);
        return proxy;
 }
 /*
 * _notify_get_proxy:
 * @error: (allow-none): a location to store a #GError, or %NULL
 *
 * Synchronously creates the #GDBusProxy for the notification service,
 * and caches the result.
 *
 * Returns: the #GDBusProxy for the notification service, or %NULL on error
 */
 GDBusProxy *
 _notify_get_proxy (GError **error)
 {
        if (_proxy != NULL)
                return _proxy;
        if (_notify_is_running_in_sandbox ()) {
                _proxy = _get_portal_proxy (error);
                if (_proxy != NULL) {
                        goto out;
                }
        }
        _proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                                G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
                                                NULL,
                                                NOTIFY_DBUS_NAME,
                                                NOTIFY_DBUS_CORE_OBJECT,
                                                NOTIFY_DBUS_CORE_INTERFACE,
                                                NULL,
                                                error);
 out:
        if (_proxy == NULL) {
                return NULL;
        }
        if (!_notify_update_spec_version (error)) {
               g_object_unref (_proxy);
               _proxy = NULL;
               return NULL;
        }
        g_object_add_weak_pointer (G_OBJECT (_proxy), (gpointer *) &_proxy);
        return _proxy;
 }
 /**
 * notify_get_server_caps:
 *
 * Synchronously queries the server for its capabilities and returns them in a #GList.
 *
 * Returns: (transfer full) (element-type utf8): a #GList of server capability strings. Free
 *   the list elements with g_free() and the list itself with g_list_free().
 */
 GList *
 notify_get_server_caps (void)
 {
        GDBusProxy *proxy;
        GVariant   *result;
        char      **cap, **caps;
        GList      *list = NULL;
        proxy = _notify_get_proxy (NULL);
        if (proxy == NULL) {
                g_warning ("Failed to connect to proxy");
                return NULL;
        }
        if (_notify_uses_portal_notifications ()) {
                list = g_list_prepend (list, g_strdup ("actions"));
                list = g_list_prepend (list, g_strdup ("body"));
                list = g_list_prepend (list, g_strdup ("body-images"));
                list = g_list_prepend (list, g_strdup ("icon-static"));
                return list;
        }
        result = g_dbus_proxy_call_sync (proxy,
                                         "GetCapabilities",
                                         g_variant_new ("()"),
                                         G_DBUS_CALL_FLAGS_NONE,
                                         -1 /* FIXME shorter timeout? */,
                                         NULL,
                                         NULL);
        if (result == NULL) {
                return NULL;
        }
        if (!g_variant_is_of_type (result, G_VARIANT_TYPE ("(as)"))) {
                g_variant_unref (result);
                return NULL;
        }
        g_variant_get (result, "(^as)", &caps);
        for (cap = caps; *cap != NULL; cap++) {
                list = g_list_prepend (list, *cap);
        }
        g_free (caps);
        g_variant_unref (result);
        return g_list_reverse (list);
 }
 /**
 * notify_get_server_info:
 * @ret_name: (out) (allow-none) (transfer full): a location to store the server name, or %NULL
 * @ret_vendor: (out) (allow-none) (transfer full): a location to store the server vendor, or %NULL
 * @ret_version: (out) (allow-none) (transfer full): a location to store the server version, or %NULL
 * @ret_spec_version: (out) (allow-none) (transfer full): a location to store the version the service is compliant with, or %NULL
 *
 * Synchronously queries the server for its information, specifically, the name, vendor,
 * server version, and the version of the notifications specification that it
 * is compliant with.
 *
 * Returns: %TRUE if successful, and the variables passed will be set, %FALSE
 *          on error. The returned strings must be freed with g_free
 */
 gboolean
 notify_get_server_info (char **ret_name,
                        char **ret_vendor,
                        char **ret_version,
                        char **ret_spec_version)
 {
        return _notify_get_server_info (ret_name, ret_vendor, ret_version, ret_spec_version, NULL);
 }
 void
 _notify_cache_add_notification (NotifyNotification *n)
 {
        _active_notifications = g_list_prepend (_active_notifications, n);
 }
 void
 _notify_cache_remove_notification (NotifyNotification *n)
 {
        _active_notifications = g_list_remove (_active_notifications, n);
 }
--- a/libnotify/notify.h
+++ b/libnotify/notify.h
@ -1,8 +1,7 @@
-/* -*- mode: c-mode; tab-width: 4; indent-tabs-mode: t; -*- */
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 /**
 * @file libnotify/notify.h Notifications library
 *
- * @Copyright (C) 2004 Christian Hammond
+ * Copyright (C) 2004-2006 Christian Hammond
 * Copyright (C) 2010 Red Hat, Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@ -18,51 +17,33 @@
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 *
 * @todo We talk about URIs, but they are actually file paths not URIs
 * @todo Un-glibify?
 */
 #ifndef _LIBNOTIFY_NOTIFY_H_
 #define _LIBNOTIFY_NOTIFY_H_
 #include <glib.h>
 #include <time.h>
-#include "notifycommon.h"
+#include <libnotify/notification.h>
-#include "notifynotification.h"
+#include <libnotify/notify-enum-types.h>
 #include <libnotify/notify-features.h>
-/**************************************************************************/
+G_BEGIN_DECLS
 /** @name libnotify Base API                                              */
 /**************************************************************************/
 /*@{*/
-/**
+gboolean        notify_init (const char *app_name);
- * Initializes the notifications library.
+void            notify_uninit (void);
- *
+gboolean        notify_is_initted (void);
 * @param app_name The application name.
 *
 * @return TRUE if the library initialized properly and a connection to a
 *         notification server was made.
 */
 gboolean notify_init(const char *app_name);
-/**
+const char     *notify_get_app_name (void);
- * Uninitializes the notifications library.
+void            notify_set_app_name (const char *app_name);
 *
 * This will be automatically called on exit unless previously called.
 */
 void notify_uninit(void);
-/**
+GList          *notify_get_server_caps (void);
 * Returns whether or not the notification library is initialized.
 *
 * @return TRUE if the library is initialized, or FALSE.
 */
 gboolean notify_is_initted(void);
-const gchar *_notify_get_app_name(void);
+gboolean        notify_get_server_info (char **ret_name,
-/*@}*/
+                                        char **ret_vendor,
                                        char **ret_version,
                                        char **ret_spec_version);
 G_END_DECLS
 #endif /* _LIBNOTIFY_NOTIFY_H_ */
--- a/libnotify/notifycommon.h
+++ b/libnotify/notifycommon.h
@ -1,23 +0,0 @@
 #ifndef _LIBNOTIFY_NOTIFY_COMMON_H_
 #define _LIBNOTIFY_NOTIFY_COMMON_H_
 #include <glib.h>
 #define NOTIFY_TIMEOUT_DEFAULT -1
 #define NOTIFY_TIMEOUT_NEVER 0
 #define NOTIFY_DBUS_NAME           "org.freedesktop.Notifications"
 #define NOTIFY_DBUS_CORE_INTERFACE "org.freedesktop.Notifications"
 #define NOTIFY_DBUS_CORE_OBJECT    "/org/freedesktop/Notifications"
 /**
 * Notification urgency levels.
 */
 typedef enum
 {
 	NOTIFY_URGENCY_LOW,       /**< Low urgency.      */
 	NOTIFY_URGENCY_NORMAL,    /**< Normal urgency.   */
 	NOTIFY_URGENCY_CRITICAL,  /**< Critical urgency. */
 } NotifyUrgency;
 #endif /* _LIBNOTIFY_NOTIFY_H_ */
--- a/libnotify/notifymarshal.c
+++ b/libnotify/notifymarshal.c
@ -1,56 +0,0 @@
 /*
 * This program 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 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
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with main.c; if not, write to:
 *            The Free Software Foundation, Inc.,
 *            59 Temple Place - Suite 330,
 *            Boston,  MA  02111-1307, USA.
 */
 #include "notifymarshal.h" 
 void
 _notify_marshal_VOID__UINT_STRING (GClosure     *closure,
                               GValue       *return_value,
                               guint         n_param_values,
                               const GValue *param_values,
                               gpointer      invocation_hint,
                               gpointer      marshal_data)
 {
  typedef void (*GMarshalFunc_VOID__UINT_STRING)  (gpointer     data1,
                                                   gpointer     arg_1,
                                                   gpointer     arg_2,
                                                   gpointer     data2);
  register GMarshalFunc_VOID__UINT_STRING 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__UINT_STRING) (marshal_data ? marshal_data : cc->callback);
  callback (data1,
            g_value_get_uint (param_values + 1),
            g_value_get_string (param_values + 2),
            data2);
 }
--- a/libnotify/notifymarshal.h
+++ b/libnotify/notifymarshal.h
@ -1,36 +0,0 @@
 /*
 * This program 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 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
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with main.c; if not, write to:
 *            The Free Software Foundation, Inc.,
 *            59 Temple Place - Suite 330,
 *            Boston,  MA  02111-1307, USA.
 */
 #ifndef __notify_marshal_MARSHAL_H__
 #define __notify_marshal_MARSHAL_H__
 #include <glib-object.h>
 G_BEGIN_DECLS
 void
 _notify_marshal_VOID__UINT_STRING (GClosure     *closure,
                                   GValue       *return_value,
                                   guint         n_param_values,
                                   const GValue *param_values,
                                   gpointer      invocation_hint,
                                   gpointer      marshal_data);
 G_END_DECLS
 #endif
--- a/libnotify/notifynotification.c
+++ b/libnotify/notifynotification.c
@ -1,936 +0,0 @@
 /*
 * This program 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 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
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with main.c; if not, write to:
 *            The Free Software Foundation, Inc.,
 *            59 Temple Place - Suite 330,
 *            Boston,  MA  02111-1307, USA.
 */
 #include "config.h"
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include "notify.h"
 #include "notifynotification.h"
 #include "notifymarshal.h"
 static void notify_notification_class_init (NotifyNotificationClass * klass);
 static void notify_notification_init (NotifyNotification * sp);
 static void notify_notification_finalize (GObject * object);
 static void _close_signal_handler (DBusGProxy *proxy,
                                   guint32 id, 
                                   NotifyNotification *notification); 
 static void _action_signal_handler (DBusGProxy *proxy,
                                    guint32 id,
                                    gchar *action, 
                                    NotifyNotification *notification); 
 struct NotifyNotificationPrivate
 {
  guint32 id;
  gchar *summary;
  gchar *message;
  /*NULL to use icon data
     anything else to have server lookup icon */
  gchar *icon_name;
    /*-1 = use server default
       0 = never timeout
      >0 = Number of milliseconds before we timeout
    */
  gint timeout;
  GSList *actions;
  GHashTable *action_map;
  GHashTable *hints;
  GtkWidget *attached_widget;
  gint widget_old_x;
  gint widget_old_y;
  gpointer user_data;
  GDestroyNotify user_data_free_func;
  gboolean updates_pending;
  DBusGProxy *proxy;
 };
 typedef enum
 {
  SIGNAL_TYPE_CLOSED, 
  LAST_SIGNAL
 } NotifyNotificationSignalType;
 typedef struct
 {
  NotifyNotification *object;
 } NotifyNotificationSignal;
 static guint notify_notification_signals[LAST_SIGNAL] = { 0 }; 
 static GObjectClass *parent_class = NULL;
 GType
 notify_notification_get_type ()
 {
  static GType type = 0;
  if (type == 0)
    {
      static const GTypeInfo our_info = {
 	sizeof (NotifyNotificationClass),
 	NULL,
 	NULL,
 	(GClassInitFunc) notify_notification_class_init,
 	NULL,
 	NULL,
 	sizeof (NotifyNotification),
 	0,
 	(GInstanceInitFunc) notify_notification_init,
      };
      type = g_type_register_static (G_TYPE_OBJECT,
 				     "NotifyNotification", &our_info, 0);
    }
  return type;
 }
 static void
 notify_notification_class_init (NotifyNotificationClass * klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  parent_class = g_type_class_peek_parent (klass);
  object_class->finalize = notify_notification_finalize;
  /* Create signals here: */
     notify_notification_signals[SIGNAL_TYPE_CLOSED] = 
       g_signal_new ("closed",
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_FIRST,
                     G_STRUCT_OFFSET (NotifyNotificationClass, closed),
                     NULL, NULL, 
                     g_cclosure_marshal_VOID__VOID,
                     G_TYPE_NONE,
                     0);
  dbus_g_object_register_marshaller (_notify_marshal_VOID__UINT_STRING, 
                                     G_TYPE_NONE, 
                                     G_TYPE_UINT,
                                     G_TYPE_STRING, 
                                     G_TYPE_INVALID);
 }
 static void
 _g_value_free (GValue * value)
 {
  g_value_unset (value);
  g_free (value);
 }
 static void
 notify_notification_init (NotifyNotification * obj)
 {
  obj->priv = g_new0 (NotifyNotificationPrivate, 1);
  obj->priv->id = 0;
  obj->priv->summary = NULL;
  obj->priv->message = NULL;
  obj->priv->icon_name = NULL;
  obj->priv->timeout = NOTIFY_TIMEOUT_DEFAULT;
  obj->priv->actions = NULL;
  obj->priv->hints = g_hash_table_new_full (g_str_hash,
 					    g_str_equal,
 					    g_free,
 					    (GDestroyNotify) _g_value_free);
  obj->priv->action_map = g_hash_table_new_full (g_str_hash,
                                                 g_str_equal,
                                                 g_free,
                                                 NULL);
  obj->priv->attached_widget = NULL;
  obj->priv->user_data = NULL;
  obj->priv->user_data_free_func = NULL;
  obj->priv->updates_pending = FALSE;
  obj->priv->widget_old_x = 0;
  obj->priv->widget_old_y = 0;
  obj->priv->proxy = NULL;
 }
 static void
 notify_notification_finalize (GObject * object)
 {
  NotifyNotification *obj;
  NotifyNotificationPrivate *priv;
  obj = NOTIFY_NOTIFICATION (object);
  priv = obj->priv;
  g_free (priv->summary);
  g_free (priv->message);
  g_free (priv->icon_name);
  if (priv->actions != NULL)
    {
      g_slist_foreach (priv->actions, (GFunc) g_free, NULL);
      g_slist_free (priv->actions);
    }
  if (priv->action_map != NULL)
    g_hash_table_destroy (priv->action_map);
  if (priv->hints != NULL)
    g_hash_table_destroy (priv->hints);
  if (priv->attached_widget != NULL)
    gtk_widget_unref (priv->attached_widget);
  if (priv->user_data_free_func != NULL)
    priv->user_data_free_func (priv->user_data);
  dbus_g_proxy_disconnect_signal (priv->proxy, "NotificationClosed", 
                                  (GCallback) _close_signal_handler, 
                                  object);
  dbus_g_proxy_disconnect_signal (priv->proxy, "ActionInvoked", 
                                  (GCallback) _action_signal_handler, 
                                  object);
  g_free (obj->priv);
  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 static gboolean
 _notify_notification_update_applet_hints (NotifyNotification * n)
 {
  NotifyNotificationPrivate *priv;
  gboolean update_pending;
  update_pending = FALSE;
  priv = n->priv;
  if (priv->attached_widget != NULL)
    {
      gint x, y, h, w;
      GtkWidget *widget;
      GtkRequisition requisition;
      widget = priv->attached_widget;
      gtk_widget_size_request (widget, &requisition);
      w = requisition.width;
      h = requisition.height;
      gdk_window_get_origin (widget->window, &x, &y);
      if (GTK_WIDGET_NO_WINDOW (widget))
 	{
 	  x += widget->allocation.x;
 	  y += widget->allocation.y;
 	}
      x += widget->allocation.width / 2;
      y += widget->allocation.height / 2;
      if (x != priv->widget_old_x)
 	{
 	  notify_notification_set_hint_int32 (n, "x", x);
 	  priv->widget_old_x = x;
 	  update_pending = TRUE;
 	}
      if (y != priv->widget_old_y)
 	{
 	  notify_notification_set_hint_int32 (n, "y", y);
 	  priv->widget_old_y = y;
 	  update_pending = TRUE;
 	}
    }
  return update_pending;
 }
 #if 0
 /* This is left here just incase we revisit autoupdating
   One thought would be to check for updates every time the icon
   is redrawn but we still have to deal with the race conditions
   that could occure between the server and the client so we will
   leave this alone for now.
 */
 static gboolean
 _idle_check_updates (void *user_data)
 {
  NotifyNotification *n;
  NotifyNotificationPrivate *priv;
  n = NOTIFY_NOTIFICATION (user_data);
  priv = n->priv;
  if (priv->is_visible)
    {
      priv->updates_pending = _notify_notification_update_applet_hints (n);
      if (priv->updates_pending)
 	{
 	  /* Try again if we fail on next idle */
 	  priv->updates_pending = !notify_notification_show (n, NULL);
 	}
    }
  else
    {
      priv->updates_pending = FALSE;
    }
  n = NOTIFY_NOTIFICATION (user_data);
  priv = n->priv;
  return TRUE;
 }
 #endif
 GdkFilterReturn
 _catch (GdkXEvent * xevent, GdkEvent * event, gpointer data)
 {
  static int i = 1;
  printf ("here, %i\n", i);
  i++;
  return GDK_FILTER_CONTINUE;
 }
 NotifyNotification *
 notify_notification_new (const gchar * summary,
 			 const gchar * message,
 			 const gchar * icon, GtkWidget * attach)
 {
  NotifyNotification *obj;
  g_assert (summary != NULL);
  g_assert (message != NULL);
  obj = NOTIFY_NOTIFICATION (g_object_new (NOTIFY_TYPE_NOTIFICATION, NULL));
  obj->priv->summary = g_strdup (summary);
  obj->priv->message = g_strdup (message);
  obj->priv->icon_name = g_strdup (icon);
  if (attach != NULL)
    {
      gtk_widget_ref (attach);
      obj->priv->attached_widget = attach;
    }
  return obj;
 }
 gboolean
 notify_notification_update (NotifyNotification * notification,
 			    const gchar * summary,
 			    const gchar * message, const gchar * icon)
 {
  NotifyNotificationPrivate *priv;
  priv = notification->priv;
  g_free (priv->summary);
  g_free (priv->message);
  g_free (priv->icon_name);
  priv->summary = g_strdup (summary);
  priv->message = g_strdup (message);
  priv->icon_name = g_strdup (icon);
  priv->updates_pending = TRUE;
  /*TODO: return false on OOM */
  return TRUE;
 }
 void
 notify_notification_attach_to_widget (NotifyNotification * notification,
 				      GtkWidget * attach)
 {
  NotifyNotificationPrivate *priv;
  priv = notification->priv;
  if (priv->attached_widget != NULL)
    gtk_widget_unref (priv->attached_widget);
  if (attach != NULL)
    priv->attached_widget = gtk_widget_ref (attach);
  else
    priv->attached_widget = NULL;
 }
 gboolean
 notify_notification_set_user_data (NotifyNotification * notification,
 				   void *user_data, GFreeFunc free_func)
 {
  NotifyNotificationPrivate *priv;
  priv = notification->priv;
  if (priv->user_data)
    if (priv->user_data_free_func)
      priv->user_data_free_func (priv->user_data);
  priv->user_data = user_data;
  priv->user_data_free_func = priv->user_data;
  /* TODO: return FALSE on OOM */
  return TRUE;
 }
 static void 
 _close_signal_handler (DBusGProxy *proxy, 
                       guint32 id, 
                       NotifyNotification *notification) 
 {
  printf ("Got the NotificationClosed signal (id = %i, notification->id = %i)\n"
 , id, notification->priv->id);
  if (id == notification->priv->id)
      g_signal_emit (notification, 
                     notify_notification_signals[SIGNAL_TYPE_CLOSED], 
                     0);
 }
 static void 
 _action_signal_handler (DBusGProxy *proxy, 
                        guint32 id, 
                        gchar *action,
                        NotifyNotification *notification) 
 {
  g_assert (NOTIFY_IS_NOTIFICATION (notification));
  if (id == notification->priv->id)
    {
      NotifyActionCallback callback;
      callback = (NotifyActionCallback) g_hash_table_lookup (notification->priv->action_map,
                                                             action);
      if (callback == NULL)
        g_warning ("Recieved unknown action %s", action);
      else
        callback (notification, action);
    }
 }
 static gchar **
 _gslist_to_string_array (GSList *list)
 {
  GSList *element;
  GArray *a;
  gsize len;
  gchar **result;
  len = g_slist_length (list);
  a = g_array_sized_new (TRUE, FALSE, sizeof (gchar *), len);
  element = list;
  while (element != NULL)
    {
      g_array_append_val (a, element->data); 
      element = g_slist_next (element);
    }
    result = (gchar **)g_array_free (a, FALSE);
    return result;
 }
 static gboolean
 _notify_notification_show_internal (NotifyNotification *notification, 
                                    GError **error,
                                    gboolean ignore_reply)
 {
  NotifyNotificationPrivate *priv;
  GError *tmp_error;
  gchar **action_array;
  int i;
  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
  priv = notification->priv;
  tmp_error = NULL;
  if (priv->proxy == NULL)
    {
      DBusGConnection *bus;
      bus = dbus_g_bus_get (DBUS_BUS_SESSION, &tmp_error);
      if (tmp_error != NULL)
 	{
 	  g_propagate_error (error, tmp_error);
 	  return FALSE;
 	}
      priv->proxy = dbus_g_proxy_new_for_name (bus,
 					       NOTIFY_DBUS_NAME,
 					       NOTIFY_DBUS_CORE_OBJECT,
 					       NOTIFY_DBUS_CORE_INTERFACE);
      dbus_g_proxy_add_signal (priv->proxy, "NotificationClosed",
                               G_TYPE_UINT, G_TYPE_INVALID);
      dbus_g_proxy_connect_signal (priv->proxy, "NotificationClosed", 
                               (GCallback) _close_signal_handler, 
                               notification, NULL);
      dbus_g_proxy_add_signal (priv->proxy, "ActionInvoked",
                               G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
      dbus_g_proxy_connect_signal (priv->proxy, "ActionInvoked", 
                               (GCallback) _action_signal_handler, 
                               notification, NULL);
      dbus_g_connection_unref (bus);
    }
  /*if attached to a widget modify x and y in hints */
  _notify_notification_update_applet_hints (notification);
  action_array = _gslist_to_string_array (priv->actions);
  /*TODO: make this nonblocking */
  if (!ignore_reply)
    dbus_g_proxy_call (priv->proxy, "Notify", &tmp_error,
 		     G_TYPE_STRING, _notify_get_app_name (),
 		     G_TYPE_STRING,
 		     (priv->icon_name != NULL) ? priv->icon_name : "",
 		     G_TYPE_UINT, priv->id, G_TYPE_STRING, priv->summary,
 		     G_TYPE_STRING, priv->message,
 		     G_TYPE_STRV,
 		     action_array, dbus_g_type_get_map ("GHashTable",
 							 G_TYPE_STRING,
 							 G_TYPE_VALUE),
 		     priv->hints, G_TYPE_INT, priv->timeout, G_TYPE_INVALID,
 		     G_TYPE_UINT, &priv->id, G_TYPE_INVALID);
  else
    dbus_g_proxy_call_no_reply (priv->proxy, "Notify",
 		     G_TYPE_STRING, _notify_get_app_name (),
 		     G_TYPE_STRING,
 		     (priv->icon_name != NULL) ? priv->icon_name : "",
 		     G_TYPE_UINT, priv->id, G_TYPE_STRING, priv->summary,
 		     G_TYPE_STRING, priv->message,
 		     G_TYPE_STRV,
 		     action_array, dbus_g_type_get_map ("GHashTable",
 							 G_TYPE_STRING,
 							 G_TYPE_VALUE),
 		     priv->hints, G_TYPE_INT, priv->timeout, G_TYPE_INVALID);
  /*don't free the elements because they are owned by priv->actions */
  g_free (action_array);
  if (tmp_error != NULL)
    {
      g_propagate_error (error, tmp_error);
      return FALSE;
    }
  return TRUE;
 }
 gboolean
 notify_notification_show (NotifyNotification *notification, GError **error)
 {
  return _notify_notification_show_internal (notification, error, FALSE);
 }
 gboolean
 notify_notification_show_and_forget (NotifyNotification *notification, GError **error)
 {
  gboolean result;
  result =  _notify_notification_show_internal (notification, error, TRUE);
  g_object_unref (G_OBJECT (notification));
  return result;
 }
 void
 notify_notification_set_timeout (NotifyNotification * notification,
 				 gint timeout)
 {
  notification->priv->timeout = timeout;
 }
 gboolean
 notify_notification_set_category (NotifyNotification * notification,
 				  const char *category)
 {
  return notify_notification_set_hint_string (notification,
 					      "category", category);
 }
 gboolean
 notify_notification_set_urgency (NotifyNotification * notification,
 				 NotifyUrgency l)
 {
  return notify_notification_set_hint_byte (notification,
 					    "urgency", (guchar) l);
 }
 static gboolean
 _gvalue_array_append_int (GValueArray * array, gint i)
 {
  GValue *value;
  value = g_new0 (GValue, 1);
  if (!value)
    return FALSE;
  g_value_init (value, G_TYPE_INT);
  g_value_set_int (value, i);
  g_value_array_append (array, value);
  return TRUE;
 }
 static gboolean
 _gvalue_array_append_bool (GValueArray * array, gboolean b)
 {
  GValue *value;
  value = g_new0 (GValue, 1);
  if (!value)
    return FALSE;
  g_value_init (value, G_TYPE_BOOLEAN);
  g_value_set_boolean (value, b);
  g_value_array_append (array, value);
  return TRUE;
 }
 static gboolean
 _gvalue_array_append_byte_array (GValueArray * array,
 				 guchar * bytes, gsize len)
 {
  GArray *byte_array;
  GValue *value;
  byte_array = g_array_sized_new (FALSE, FALSE, sizeof (guchar), len);
  if (!byte_array)
    return FALSE;
  byte_array = g_array_append_vals (byte_array, bytes, len);
  value = g_new0 (GValue, 1);
  if (!value)
    {
      g_array_free (byte_array, TRUE);
      return FALSE;
    }
  g_value_init (value, dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR));
  g_value_set_boxed_take_ownership (value, byte_array);
  g_value_array_append (array, value);
  return TRUE;
 }
 gboolean
 notify_notification_set_icon_data_from_pixbuf (NotifyNotification *
 					       notification, GdkPixbuf * icon)
 {
  gint width;
  gint height;
  gint rowstride;
  gboolean alpha;
  gint bits_per_sample;
  gint n_channels;
  guchar *image;
  gsize image_len;
  gchar *key_dup;
  GValueArray *image_struct;
  GValue *value;
  NotifyNotificationPrivate *priv;
  priv = notification->priv;
  width = gdk_pixbuf_get_width (icon);
  height = gdk_pixbuf_get_height (icon);
  rowstride = gdk_pixbuf_get_rowstride (icon);
  n_channels = gdk_pixbuf_get_n_channels (icon);
  bits_per_sample = gdk_pixbuf_get_bits_per_sample (icon);
  alpha = gdk_pixbuf_get_has_alpha (icon);
  image_len =
    (height - 1) * rowstride +
    width * ((n_channels * bits_per_sample + 7) / 8);
  image = gdk_pixbuf_get_pixels (icon);
  image_struct = g_value_array_new (8);
  if (!image_struct)
    goto fail;
  _gvalue_array_append_int (image_struct, width);
  _gvalue_array_append_int (image_struct, height);
  _gvalue_array_append_int (image_struct, rowstride);
  _gvalue_array_append_bool (image_struct, alpha);
  _gvalue_array_append_int (image_struct, bits_per_sample);
  _gvalue_array_append_int (image_struct, n_channels);
  _gvalue_array_append_byte_array (image_struct, image, image_len);
  value = g_new0 (GValue, 1);
  if (!value)
    goto fail;
  g_value_init (value, G_TYPE_VALUE_ARRAY);
  g_value_set_boxed (value, image_struct);
  key_dup = g_strdup ("icon_data");
  if (!key_dup)
    goto fail;
  g_hash_table_insert (priv->hints, key_dup, value);
  return TRUE;
 fail:
  if (image_struct != NULL)
    g_value_array_free (image_struct);
  return FALSE;
 }
 gboolean
 notify_notification_set_hint_int32 (NotifyNotification * notification,
 				    const gchar * key, gint value)
 {
  NotifyNotificationPrivate *priv;
  GValue *hint_value;
  gchar *key_dup;
  priv = notification->priv;
  hint_value = g_new0 (GValue, 1);
  g_value_init (hint_value, G_TYPE_INT);
  g_value_set_int (hint_value, value);
  key_dup = g_strdup (key);
  g_hash_table_insert (priv->hints, key_dup, hint_value);
  /* TODO: return FALSE on OOM */
  return TRUE;
 }
 gboolean
 notify_notification_set_hint_double (NotifyNotification * notification,
 				     const gchar * key, gdouble value)
 {
  NotifyNotificationPrivate *priv;
  GValue *hint_value;
  gchar *key_dup;
  priv = notification->priv;
  hint_value = g_new0 (GValue, 1);
  g_value_init (hint_value, G_TYPE_FLOAT);
  g_value_set_float (hint_value, value);
  key_dup = g_strdup (key);
  g_hash_table_insert (priv->hints, key_dup, hint_value);
  /* TODO: return FALSE on OOM */
  return TRUE;
 }
 gboolean
 notify_notification_set_hint_byte (NotifyNotification * notification,
 				   const gchar * key, guchar value)
 {
  NotifyNotificationPrivate *priv;
  GValue *hint_value;
  gchar *key_dup;
  priv = notification->priv;
  hint_value = g_new0 (GValue, 1);
  g_value_init (hint_value, G_TYPE_UCHAR);
  g_value_set_uchar (hint_value, value);
  key_dup = g_strdup (key);
  g_hash_table_insert (priv->hints, key_dup, hint_value);
  /* TODO: return FALSE on OOM */
  return TRUE;
 }
 gboolean
 notify_notification_set_hint_byte_array (NotifyNotification * notification,
 					 const gchar * key,
 					 const guchar * value, gsize len)
 {
  NotifyNotificationPrivate *priv;
  GValue *hint_value;
  gchar *key_dup;
  GArray *byte_array;
  priv = notification->priv;
  byte_array = g_array_sized_new (FALSE, FALSE, sizeof (guchar), len);
  byte_array = g_array_append_vals (byte_array, value, len);
  hint_value = g_new0 (GValue, 1);
  g_value_init (hint_value,
 		dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR));
  g_value_set_boxed_take_ownership (hint_value, byte_array);
  key_dup = g_strdup (key);
  g_hash_table_insert (priv->hints, key_dup, hint_value);
  /* TODO: return FALSE on OOM */
  return TRUE;
 }
 gboolean
 notify_notification_set_hint_string (NotifyNotification * notification,
 				     const gchar * key, const gchar * value)
 {
  NotifyNotificationPrivate *priv;
  GValue *hint_value;
  gchar *key_dup;
  priv = notification->priv;
  hint_value = g_new0 (GValue, 1);
  g_value_init (hint_value, G_TYPE_STRING);
  g_value_set_string (hint_value, value);
  key_dup = g_strdup (key);
  g_hash_table_insert (priv->hints, key_dup, hint_value);
  /* TODO: return FALSE on OOM */
  return TRUE;
 }
 static gboolean
 _remove_all (void)
 {
  return TRUE;
 }
 void 
 notify_notification_clear_hints (NotifyNotification *notification)
 {
  g_hash_table_foreach_remove (notification->priv->hints,
                               (GHRFunc) _remove_all, NULL);
 }
 void
 notify_notification_clear_actions (NotifyNotification *notification)
 {
  g_hash_table_foreach_remove (notification->priv->action_map, (GHRFunc) _remove_all, NULL);
  if (notification->priv->actions != NULL)
    {
      g_slist_foreach (notification->priv->actions, (GFunc) g_free, NULL);
      g_slist_free (notification->priv->actions);
    }
  notification->priv->actions = NULL;
 }
 gboolean
 notify_notification_add_action (NotifyNotification *notification,
 				const char *action,
 				const char *label,
 				NotifyActionCallback callback)
 {
  NotifyNotificationPrivate *priv;
  priv = notification->priv;
  priv->actions = g_slist_append (priv->actions, g_strdup (action));
  priv->actions = g_slist_append (priv->actions, g_strdup (label));
  g_hash_table_insert (priv->action_map, g_strdup (action), callback);
  return FALSE;
 }
 gboolean
 notify_notification_close (NotifyNotification * notification, GError ** error)
 {
  NotifyNotificationPrivate *priv;
  GError *tmp_error;
  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
  priv = notification->priv;
  tmp_error = NULL;
  if (priv->proxy == NULL)
    {
      DBusGConnection *bus;
      bus = dbus_g_bus_get (DBUS_BUS_SESSION, &tmp_error);
      if (tmp_error != NULL)
 	{
 	  g_propagate_error (error, tmp_error);
 	  return FALSE;
 	}
      priv->proxy = dbus_g_proxy_new_for_name (bus,
 					       NOTIFY_DBUS_NAME,
 					       NOTIFY_DBUS_CORE_OBJECT,
 					       NOTIFY_DBUS_CORE_INTERFACE);
      dbus_g_connection_unref (bus);
    }
  dbus_g_proxy_call (priv->proxy, "CloseNotification", &tmp_error,
 		     G_TYPE_UINT, priv->id, G_TYPE_INVALID, G_TYPE_INVALID);
  if (tmp_error != NULL)
    {
      g_propagate_error (error, tmp_error);
      return FALSE;
    }
  return TRUE;
 }
--- a/libnotify/notifynotification.h
+++ b/libnotify/notifynotification.h
@ -1,125 +0,0 @@
 /*
 * This program 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 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
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with main.c; if not, write to:
 *            The Free Software Foundation, Inc.,
 *            59 Temple Place - Suite 330,
 *            Boston,  MA  02111-1307, USA.
 */
 #ifndef NOTIFY_NOTIFICATION_H
 #define NOTIFY_NOTIFICATION_H
 #include "config.h"
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include "notifycommon.h"
 G_BEGIN_DECLS
 #define NOTIFY_TYPE_NOTIFICATION         (notify_notification_get_type ())
 #define NOTIFY_NOTIFICATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NOTIFY_TYPE_NOTIFICATION, NotifyNotification))
 #define NOTIFY_NOTIFICATION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NOTIFY_TYPE_NOTIFICATION, NotifyNotificationClass))
 #define NOTIFY_IS_NOTIFICATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NOTIFY_TYPE_NOTIFICATION))
 #define NOTIFY_IS_NOTIFICATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NOTIFY_TYPE_NOTIFICATION))
 #define NOTIFY_NOTIFICATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NOTIFY_TYPE_NOTIFICATION, NotifyNotificationClass))
 typedef struct NotifyNotificationPrivate NotifyNotificationPrivate;
 typedef struct {
 	GObject parent;
 	NotifyNotificationPrivate *priv;
 } NotifyNotification;
 typedef struct {
 	GObjectClass parent_class;
 	/* Add Signal Functions Here */
 	void (*closed) (void);
 } NotifyNotificationClass;
 typedef void (*NotifyActionCallback )(NotifyNotification *, gchar *);
 GType notify_notification_get_type();
 NotifyNotification *notify_notification_new (const gchar *summary,
                                             const gchar *message,
                                             const gchar *icon,
                                             GtkWidget *attach);
 gboolean notify_notification_update (NotifyNotification *notification,
                                     const gchar *summary,
                                     const gchar *message,
                                     const gchar *icon);
 void notify_notification_attach_to_widget (NotifyNotification *notification,
                                           GtkWidget *attach);
 gboolean notify_notification_set_user_data (NotifyNotification *notification,
                                            void *user_data,
                                            GFreeFunc free_func);
 gboolean notify_notification_show (NotifyNotification *notification, 
                                   GError **error);
 gboolean notify_notification_show_and_forget (NotifyNotification *notification, 
                                              GError **error);
 void notify_notification_set_timeout (NotifyNotification *notification,
                                      gint timeout);
 gboolean notify_notification_set_category (NotifyNotification *notification,
                                           const char *category);
 gboolean notify_notification_set_urgency (NotifyNotification *notification,
                                          NotifyUrgency l);
 gboolean notify_notification_set_icon_data_from_pixbuf (NotifyNotification *notification,
                                                        GdkPixbuf *icon);
 gboolean notify_notification_set_hint_int32 (NotifyNotification *notification,
                                             const gchar *key,
                                             gint value);
 gboolean notify_notification_set_hint_double (NotifyNotification *notification,
                                              const gchar *key,
                                              gdouble value);
 gboolean notify_notification_set_hint_string (NotifyNotification *notification,
                                              const gchar *key,
                                              const gchar *value);
 gboolean notify_notification_set_hint_byte (NotifyNotification *notification,
                                            const gchar *key,
                                            guchar value);
 gboolean notify_notification_set_hint_byte_array (
                                         NotifyNotification *notification,
                                         const gchar *key,
                                         const guchar *value,
                                         gsize len);
 void notify_notification_clear_hints (NotifyNotification *notification);
 gboolean notify_notification_add_action (NotifyNotification *notification,
                                         const char *action,
                                         const char *label,
                                         NotifyActionCallback callback);
 void notify_notification_clear_actions (NotifyNotification *notification);                                
 gboolean notify_notification_close  (NotifyNotification *notification, 
                                     GError **error); 
 NotifyNotification *notify_notification_ref (NotifyNotification *notification);
 void notify_notification_unref (NotifyNotification *notification);
 #endif /* NOTIFY_NOTIFICATION_H */
--- a/libnotify/notifynotification.xml
+++ b/libnotify/notifynotification.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <node name="/org/freedesktop/Notification">
  <interface name="org.freedesktop.NotificationListener">
  </interface>
 </node>
--- a/meson.build
+++ b/meson.build
@ -0,0 +1,85 @@
 project('libnotify',
  'c',
  version: '0.8.1',
  meson_version: '>= 0.47.0')
 gnome = import('gnome')
 pkgconfig = import('pkgconfig')
 cc = meson.get_compiler('c')
 ################################################################
 # libtool versioning
 ################################################################
 #
 # +1 :  0 : +1   == new interface that does not break old one.
 # +1 :  0 :  0   == removed an interface. Breaks old apps.
 #  ? : +1 :  ?   == internal changes that doesn't break anything.
 #
 # CURRENT : REVISION : AGE
 #
 LT_CURRENT=4
 LT_REVISION=0
 LT_AGE=0
 API_VERSION = 7
 VERSION_ARRAY = meson.project_version().split('.')
 # Minor version is hardcoded until we have a real API break
 MODULE_VERSION = '@0@.@1@'.format(VERSION_ARRAY[0], API_VERSION)
 LIBNAME = meson.project_name().split('lib')[1]
 default_includes = include_directories('.')
 prefix = get_option('prefix')
 includedir = join_paths(prefix, get_option('includedir'))
 docdir = join_paths(prefix, get_option('datadir'), 'doc', meson.project_name())
 man1dir = join_paths(prefix, get_option('mandir'), 'man1')
 libnotify_deps = []
 extra_deps = []
 glib_req_version = '>= 2.38.0'
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
 glib_dep = dependency('glib-2.0', version: glib_req_version)
 gio_dep = dependency('gio-2.0', version: glib_req_version)
 gtk_dep = dependency('gtk+-3.0', version: '>= 2.90', required: get_option('tests'))
 libnotify_deps = [gdk_pixbuf_dep, gio_dep, glib_dep]
 tests_deps = [gtk_dep]
 conf = configuration_data()
 conf.set_quoted('VERSION', meson.project_version())
 configure_file(input: 'config.h.meson',
  output : 'config.h',
  configuration : conf)
 if get_option('man')
  xsltproc = find_program('xsltproc', required: true)
  stylesheet = 'http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl'
  xsltproc_command = [
    xsltproc,
    '--nonet',
    '--stringparam', 'man.output.quietly', '1',
    '--stringparam', 'funcsynopsis.style', 'ansi',
    '--stringparam', 'man.th.extra1.suppress', '1',
    '-o', '@OUTPUT@',
    stylesheet,
    '@INPUT@',
  ]
  testrun = run_command(xsltproc, '--nonet', stylesheet, check: false)
  if testrun.returncode() != 0
    error('DocBook stylesheet for generating man pages not found, you need to install docbook-xsl-ns or similar package.')
  endif
 endif
 subdir('libnotify')
 subdir('tools')
 subdir('docs')
 if get_option('tests')
  subdir('tests')
 endif
--- a/meson_options.txt
+++ b/meson_options.txt
@ -0,0 +1,20 @@
 option('tests',
  type: 'boolean',
  value: true,
  description: 'Build tests')
 option('introspection',
  type: 'feature',
  value: 'enabled',
  description: 'Enable GObject introspection')
 option('man',
  type: 'boolean',
  value: true,
  description: 'Enable generating the manual page (depends on xsltproc)')
 option('gtk_doc',
  type: 'boolean',
  value: true,
  description: 'Enable generating the API reference (depends on GTK-Doc)')
 option('docbook_docs',
  type: 'feature',
  value: 'auto',
  description: 'Build DocBook documentation (requires xmlto)')
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -1,50 +0,0 @@
 if HAVE_GDK
 gdk_tests = \
 	test-xy-stress
 test_xy_stress_SOURCES = test-xy-stress.c
 else
 gdk_tests =
 endif
 noinst_PROGRAMS = \
 	test-replace \
 	test-replace-widget \
 	test-default-action \
 	test-multi-actions \
 	test-image \
 	test-basic \
 	test-error \
 	test-markup \
 	test-xy \
 	$(gdk_tests)
 common_ldflags = \
 	$(top_builddir)/libnotify/libnotify.la \
 	$(PACKAGE_LIBS) \
 	$(GDK_LIBS)
 test_replace_SOURCES = test-replace.c
 test_replace_LDADD  = $(common_ldflags)
 test_replace_widget_SOURCES = test-replace-widget.c
 test_replace_widget_LDADD  = $(common_ldflags)
 test_default_action_SOURCES = test-default-action.c
 test_default_action_LDADD  = $(common_ldflags)
 test_multi_actions_SOURCES = test-multi-actions.c
 test_multi_actions_LDADD  = $(common_ldflags)
 test_image_SOURCES = test-image.c
 test_image_LDADD  = $(common_ldflags)
 test_basic_SOURCES = test-basic.c
 test_basic_LDADD = $(common_ldflags)
 test_error_SOURCES = test-error.c
 test_error_LDADD = $(common_ldflags)
 test_markup_SOURCES = test-markup.c
 test_markup_LDADD = $(common_ldflags)
 test_xy_SOURCES = test-xy.c
 test_xy_LDADD = $(common_ldflags)
 test_xy_stress_LDADD = $(common_ldflags)
 INCLUDES = $(PACKAGE_CFLAGS) $(GDK_CFLAGS)
--- a/tests/meson.build
+++ b/tests/meson.build
@ -0,0 +1,28 @@
 test_progs = [
  'replace',
  'replace-widget',
  'server-info',
  'default-action',
  'multi-actions',
  'action-icons',
  'image',
  'basic',
  'error',
  'markup',
  'persistence',
  'removal',
  'resident',
  'rtl',
  'size-changes',
  'transient',
  'urgency',
  'xy',
  'xy-actions',
  'xy-stress',
 ]
 foreach tprog: test_progs
  executable('test-' + tprog, ['test-' + tprog + '.c'],
    dependencies: [libnotify_dep, tests_deps],
  )
 endforeach
--- a/tests/test-action-icons.c
+++ b/tests/test-action-icons.c
@ -0,0 +1,133 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or(at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 static GMainLoop *loop;
 static void
 previous_callback (NotifyNotification *n,
                   const char         *action)
 {
        g_assert (action != NULL);
        g_assert (strcmp (action, "media-skip-backward") == 0);
        printf ("You clicked Previous\n");
        notify_notification_close (n, NULL);
        g_main_loop_quit (loop);
 }
 static void
 pause_callback (NotifyNotification *n,
                const char         *action)
 {
        g_assert (action != NULL);
        g_assert (strcmp (action, "media-playback-pause") == 0);
        printf ("You clicked Pause\n");
        notify_notification_close (n, NULL);
        g_main_loop_quit (loop);
 }
 static void
 next_callback (NotifyNotification *n,
               const char         *action)
 {
        g_assert (action != NULL);
        g_assert (strcmp (action, "media-skip-forward") == 0);
        printf ("You clicked Next\n");
        notify_notification_close (n, NULL);
        g_main_loop_quit (loop);
 }
 int
 main (int argc, char **argv)
 {
        NotifyNotification *n;
        if (!notify_init ("Action Icon Test"))
                exit (1);
        loop = g_main_loop_new (NULL, FALSE);
        n = notify_notification_new ("Music Player",
                                     "Some solid funk",
                                     NULL);
        notify_notification_set_hint (n, "action-icons", g_variant_new_boolean (TRUE));
        notify_notification_add_action (n,
                                        "media-skip-backward",
                                        "Previous",
                                        (NotifyActionCallback) previous_callback,
                                        NULL,
                                        NULL);
        notify_notification_add_action (n,
                                        "media-playback-pause",
                                        "Pause",
                                        (NotifyActionCallback) pause_callback,
                                        NULL,
                                        NULL);
        notify_notification_add_action (n,
                                        "media-skip-forward",
                                        "Next",
                                        (NotifyActionCallback) next_callback,
                                        NULL,
                                        NULL);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        n = notify_notification_new ("Music Player",
                                     "Shouldn't have icons",
                                     NULL);
        notify_notification_set_hint (n, "action-icons", g_variant_new_boolean (FALSE));
        notify_notification_add_action (n,
                                        "media-skip-backward",
                                        "Previous",
                                        (NotifyActionCallback) previous_callback,
                                        NULL,
                                        NULL);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_main_loop_run (loop);
        return 0;
 }
--- a/tests/test-basic.c
+++ b/tests/test-basic.c
@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-basic.c Unit test: basics
 *
 * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
@ -23,20 +24,51 @@
 #include <stdio.h>
 #include <unistd.h>
-int main() {
+int
-	NotifyNotification *n;
+main ()
 {
        NotifyNotification *n;
-	notify_init("Basics");
+        notify_init ("Basics");
-	n = notify_notification_new ("Summary", 
+        /* Long summary */
        n = notify_notification_new ("Summary that is very long 8374983278r32j4 rhjjfh dw8f 43jhf 8ds7 ur2389f jdbjkt h8924yf jkdbjkt 892hjfiHER98HEJIF BDSJHF hjdhF JKLH 890YRHEJHFU 89HRJKSHdd dddd ddddd dddd ddddd dddd ddddd dddd dddd ddd ddd dddd Fdd d ddddd dddddddd ddddddddhjkewdkjsjfjk sdhkjf hdkj dadasdadsa adsd asd sd saasd fadskfkhsjf hsdkhfkshfjkhsd kjfhsjdkhfj ksdhfkjshkjfsd sadhfjkhaskd jfhsdajkfhkjs dhfkjsdhfkjs adhjkfhasdkj fhdsakjhfjk asdhkjkfhd akfjshjfsk afhjkasdhf jkhsdaj hf kjsdfahkfh sakjhfksdah kfdashkjf ksdahfj shdjdh",
                                     "Content",
                                     NULL);
        notify_notification_set_timeout (n, 3000);      //3 seconds
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_object_unref (G_OBJECT (n));
        /* Long message */
        n = notify_notification_new ("Summary",
                                     "Content that is very long 8374983278r32j4 rhjjfh dw8f 43jhf 8ds7 ur2389f jdbjkt h8924yf jkdbjkt 892hjfiHER98HEJIF BDSJHF hjdhF JKLH 890YRHEJHFU 89HRJKSHdd dddd ddddd dddd ddddd dddd ddddd dddd dddd ddd ddd dddd Fdd d ddddd dddddddd ddddddddhjkewdkjsjfjk sdhkjf hdkj dadasdadsa adsd asd sd saasd fadskfkhsjf hsdkhfkshfjkhsd kjfhsjdkhfj ksdhfkjshkjfsd sadhfjkhaskd jfhsdajkfhkjs dhfkjsdhfkjs adhjkfhasdkj fhdsakjhfjk asdhkjkfhd akfjshjfsk afhjkasdhf jkhsdaj hf kjsdfahkfh sakjhfksdah kfdashkjf ksdahfj shdjdh",
-                                     NULL, NULL);
+                                     NULL);
-        notify_notification_set_timeout (n, 3000); //3 seconds
+        notify_notification_set_timeout (n, 3000);      //3 seconds
-	if (!notify_notification_show_and_forget (n, NULL)) {
+        if (!notify_notification_show (n, NULL)) {
-		fprintf(stderr, "failed to send notification\n");
+                fprintf (stderr, "failed to send notification\n");
-		return 1;
+                return 1;
-	}
+        }
-	return 0;
+        g_object_unref (G_OBJECT (n));
        /* Summary only */
        n = notify_notification_new ("Summary only there is no message content",
                                     NULL,
                                     NULL);
        notify_notification_set_timeout (n, NOTIFY_EXPIRES_NEVER);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_object_unref (G_OBJECT (n));
        return 0;
 }
--- a/tests/test-default-action.c
+++ b/tests/test-default-action.c
@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-default-action.c Unit test: default action
 *
 * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
@ -26,48 +27,48 @@
 #include <assert.h>
 #include <string.h>
 #define DBUS_API_SUBJECT_TO_CHANGE 1
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 static GMainLoop *loop;
-static void callback(NotifyNotification *n, const char *action, void *user_data)
+static void
 callback (NotifyNotification *n,
          const char         *action,
          void               *user_data)
 {
-	assert (action != NULL);
+        printf ("callback\n");
        assert (action != NULL);
        assert (strcmp ("default", action) == 0);
-	notify_notification_close (n, NULL);
+        notify_notification_close (n, NULL);
-	g_main_loop_quit(loop);
+        g_main_loop_quit (loop);
 }
 int
-main()
+main ()
 {
        NotifyNotification *n;
-	if (!notify_init("Default Action Test")) exit(1);
+        if (!notify_init ("Default Action Test"))
                exit (1);
-	DBusConnection *conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+        loop = g_main_loop_new (NULL, FALSE);
 	loop = g_main_loop_new(NULL, FALSE);
-	dbus_connection_setup_with_g_main(conn, NULL);
+        n = notify_notification_new ("Matt is online", "", NULL);
        notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT);
        notify_notification_add_action (n,
                                        "default",
                                        "Do Default Action",
                                        (NotifyActionCallback) callback,
                                        NULL,
                                        NULL);
        notify_notification_set_category (n, "presence.online");
-        n = notify_notification_new ("Matt is online", "", NULL, NULL);
+        if (!notify_notification_show (n, NULL)) {
-        notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER);
+                fprintf (stderr, "failed to send notification\n");
-        notify_notification_add_action (n, "default", "Do Default Action", callback); 
+                return 1;
-	notify_notification_set_category (n, "presence.online");
+        }
-	if (!notify_notification_show (n, NULL)) {
+        g_main_loop_run (loop);
 		fprintf(stderr, "failed to send notification\n");
 		return 1;
 	}
-	g_main_loop_run(loop);
+        return 0;
 	return 0;
 }
--- a/tests/test-error.c
+++ b/tests/test-error.c
@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-default-action.c Unit test: error handling
 *
 * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
@ -23,26 +24,24 @@
 #include <stdio.h>
 #include <unistd.h>
-int main() {
+int
-	NotifyNotification *n;
+main ()
 {
        NotifyNotification *n;
-	g_type_init ();
+        notify_init ("Error Handling");
-	notify_init("Error Handling");
+        n = notify_notification_new ("Summary", "Content", NULL);
        notify_notification_set_timeout (n, 3000);      //3 seconds
-	n = notify_notification_new ("Summary", 
+        /* TODO: Create an error condition */
                                     "Content",
                                     NULL, NULL);
        notify_notification_set_timeout (n, 3000); //3 seconds
 	/* TODO: Create an error condition */
-	if (!notify_notification_show (n, NULL)) {
+        if (!notify_notification_show (n, NULL)) {
-		fprintf(stderr, "failed to send notification\n");
+                fprintf (stderr, "failed to send notification\n");
-		return 1;
+                return 1;
-	}
+        }
-	return 0;
+        return 0;
 }
--- a/tests/test-gir.py
+++ b/tests/test-gir.py
@ -0,0 +1,55 @@
 #!/usr/bin/python
 # @file tests/test-gir.py Unit test: Test GI repository
 #
 # @Copyright (C) 2010 Canonical Ltd.
 # Author: Martin Pitt <martin.pitt@ubuntu.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA  02111-1307, USA.
 import os
 # use our local typelib
 os.environ['GI_TYPELIB_PATH'] = 'libnotify:' + os.environ.get('GI_TYPELIB_PATH', '')
 from gi.repository import Notify
 assert Notify.is_initted() == False
 Notify.init('test')
 assert Notify.is_initted() == True
 print 'server info:', Notify.get_server_info()
 print 'server capabilities:', Notify.get_server_caps()
 n = Notify.Notification.new('title', None, None)
 n.show()
 n = Notify.Notification.new('title', 'text', None)
 n.show()
 n = Notify.Notification.new('title', 'text', 'gtk-ok')
 n.show()
 n.update('New Title', None, None)
 n.show()
 n.update('Newer Title', 'New Body', None)
 n.show()
 def callback():
    print 'Do it! Callback'
 n = Notify.Notification.new('Action', 'Here we go!', 'gtk-alert')
 n.add_action('doit', 'Do it!', callback, None, None)
 n.show()
--- a/tests/test-image.c
+++ b/tests/test-image.c
@ -1,12 +1,13 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-image.c Unit test: images
 *
- * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
+ * @Copyright(C) 2004 Mike Hearn <mike@navi.cx>
 *
 * 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.
+ * 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
@ -30,84 +31,76 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #define DBUS_API_SUBJECT_TO_CHANGE 1
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-GMainLoop *loop;
+GMainLoop          *loop;
 NotifyNotification *n;
-int main(int argc, char *argv[]) {
+int
-	char file[PATH_MAX];
+main (int argc, char *argv[])
-	int size;
+{
-        char *uri;
+        char           *file;
-	GdkPixbuf *icon;
+        char           *uri;
-	gchar *buf;
+        GdkPixbuf      *pixbuf;
 	gsize buf_size;
 	GtkWidget *helper;
-	gtk_init (&argc, &argv);
+        gtk_init (&argc, &argv);
-	if (!notify_init("Images Test")) exit(1);
+        if (!notify_init ("Images Test"))
                exit (1);
-	n = notify_notification_new ("Icon Test", "Testing stock icon", "stock_help", NULL);
+        /* Stock icon */
        n = notify_notification_new ("Icon Test",
                                     "Testing stock icon",
                                     "appointment-new");
-        notify_notification_set_hint_int32 (n, "x", 300);
+        if (!notify_notification_show (n, NULL)) {
-        notify_notification_set_hint_int32 (n, "y", 24);
+                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
-        notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER);
+        g_object_unref (G_OBJECT (n));
 	if (!notify_notification_show (n, NULL)) {
 		fprintf(stderr, "failed to send notification\n");
 		return 1;
 	}
-	g_usleep (5000000); //5 seconds
+        file = g_get_current_dir ();
        uri = g_strdup_printf ("file://%s/%s",
                               file,
                               "dewdop_leaf.jpg");
-	size = readlink("/proc/self/cwd", file, PATH_MAX - 1);
+        g_free (file);
-	file[size] = '\0';
+        printf ("sending %s\n", uri);
        uri = g_strdup_printf ("file://%s/%s", file, "applet-critical.png");
-	printf("sending %s\n", uri);
+        /* URIs */
        n = notify_notification_new ("Alert!",
                                     "Testing URI icons",
                                     uri);
-	notify_notification_update (n, "Alert!", "Testing URI icons", uri);
+        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
-	if (!notify_notification_show (n, NULL)) {
+        g_object_unref (G_OBJECT (n));
 		fprintf(stderr, "failed to send notification\n");
 		return 1;
 	}
-	g_usleep (5000000); //5 seconds
+        /* Raw image */
        n = notify_notification_new ("Raw image test",
                                     "Testing sending raw pixbufs",
                                     NULL);
        pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_for_screen (gdk_screen_get_default ()),
                                           "folder-open",
                                           48,
                                           GTK_ICON_LOOKUP_USE_BUILTIN,
                                           NULL);
        if (pixbuf == NULL) {
                fprintf (stderr, "failed to render pixbuf\n");
                return 1;
        }
-	notify_notification_update (n, "Raw image test", "Testing sending raw pixbufs", NULL);
+        notify_notification_set_image_from_pixbuf (n, pixbuf);
        g_object_unref (pixbuf);
-	/* This is just a hack to get a stock icon's pixbuf
+        if (!notify_notification_show (n, NULL)) {
-	   in a realworld app if you were sending bitmapped data
+                fprintf (stderr, "failed to send notification\n");
-	   you would know the file location and open it up with
+                return 1;
-	   a method that could generate a bmp for you*/
+        }
 	helper = gtk_button_new();
 	icon = gtk_widget_render_icon (helper,
 	                              GTK_STOCK_DIALOG_QUESTION,
 	                              GTK_ICON_SIZE_DIALOG,
 	                              "");
-
+        return 0;
 	notify_notification_set_icon_data_from_pixbuf (n, 
 	                                               icon);
 	if (!notify_notification_show (n, NULL)) {
 		fprintf(stderr, "failed to send notification\n");
 		return 1;
 	}
 	gtk_widget_destroy (helper);
 	g_object_unref ((GObject *)icon);
 	g_usleep (5000000); //5 seconds
 	return 0;
 }
--- a/tests/test-markup.c
+++ b/tests/test-markup.c
@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-markup.c Unit test: markup
 *
 * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
@ -23,21 +24,23 @@
 #include <stdio.h>
 #include <unistd.h>
-int main() {
+int
-	NotifyNotification *n;
+main ()
 {
        NotifyNotification *n;
-	notify_init("Markup");
+        notify_init ("Markup");
-	n = notify_notification_new ("Summary", 
+        n = notify_notification_new ("Summary",
-	                             "Some <b>bold</b>, <u>underlined</u>, <i>italic</i>, "
+                                     "Some <b>bold</b>, <u>underlined</u>, <i>italic</i>, "
-	                             "<a href='http://www.google.com'>linked</a> text",
+                                     "<a href='http://www.google.com'>linked</a> text",
-                                     NULL, NULL);
+                                     NULL);
-        notify_notification_set_timeout (n, 3000); //3 seconds
+        notify_notification_set_timeout (n, 3000);      //3 seconds
-	if (!notify_notification_show (n, NULL)) {
+        if (!notify_notification_show (n, NULL)) {
-		fprintf(stderr, "failed to send notification\n");
+                fprintf (stderr, "failed to send notification\n");
-		return 1;
+                return 1;
-	}
+        }
-	return 0;
+        return 0;
 }
--- a/tests/test-multi-actions.c
+++ b/tests/test-multi-actions.c
@ -1,12 +1,13 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-multi-actions.c Unit test: multiple actions
 *
- * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
+ * @Copyright(C) 2004 Mike Hearn <mike@navi.cx>
 *
 * 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.
+ * 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
@ -23,82 +24,97 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#define DBUS_API_SUBJECT_TO_CHANGE 1
+static GMainLoop *loop;
-#include <glib.h>
+static void
-#include <dbus/dbus.h>
+help_callback (NotifyNotification *n,
-#include <dbus/dbus-glib.h>
+               const char         *action)
 #include <dbus/dbus-glib-lowlevel.h>
 GMainLoop *loop;
 static void help_callback(NotifyNotification *n, const char *action)
 {
-	assert( action != NULL ); 
+        g_assert (action != NULL);
-	assert( strcmp (action, "help") == 0 );
+        g_assert (strcmp (action, "help") == 0);
-	printf("You clicked Help\n");
+        printf ("You clicked Help\n");
-	notify_notification_close(n, NULL);
+        notify_notification_close (n, NULL);
-	g_main_loop_quit(loop);
+        g_main_loop_quit (loop);
 }
-static void ignore_callback(NotifyNotification *n, const char *action)
+static void
 ignore_callback (NotifyNotification *n,
                 const char         *action)
 {
-	assert( action != NULL ); 
+        g_assert (action != NULL);
-	assert( strcmp (action, "ignore") == 0 );
+        g_assert (strcmp (action, "ignore") == 0);
-	printf("You clicked Ignore\n");
+        printf ("You clicked Ignore\n");
-	notify_notification_close(n, NULL);
+        notify_notification_close (n, NULL);
-	g_main_loop_quit(loop);
+        g_main_loop_quit (loop);
 }
 static void
 empty_callback (NotifyNotification *n,
                const char         *action)
 {
        g_assert (action != NULL);
        g_assert (strcmp (action, "empty") == 0);
        printf ("You clicked Empty Trash\n");
        notify_notification_close (n, NULL);
        g_main_loop_quit (loop);
 }
-static void empty_callback(NotifyNotification *n, const char *action)
+int
 main (int argc, char **argv)
 {
 	assert( action != NULL ); 
 	assert( strcmp (action, "empty") == 0 );
 	printf("You clicked Empty Trash\n");
 	notify_notification_close(n, NULL);
 	g_main_loop_quit(loop);
 }
 int main() {
        NotifyNotification *n;
-	if (!notify_init("Multi Action Test")) exit(1);
+        if (!notify_init ("Multi Action Test"))
                exit (1);
-	DBusConnection *conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+        loop = g_main_loop_new (NULL, FALSE);
 	loop = g_main_loop_new(NULL, FALSE);
-	dbus_connection_setup_with_g_main(conn, NULL);
+        n = notify_notification_new ("Low disk space",
        n = notify_notification_new ("Low disk space", 
                                     "You can free up some disk space by "
                                     "emptying the trash can.",
-                                     NULL, NULL);
+                                     "drive-harddisk-symbolic");
-        notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER);
+        notify_notification_set_hint (n, "transient", g_variant_new_boolean (TRUE));
-        notify_notification_add_action (n, "help", "Help", help_callback);
+        notify_notification_set_urgency (n, NOTIFY_URGENCY_CRITICAL);
-        notify_notification_add_action (n, "ignore", "Ignore", ignore_callback);
+        notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT);
-        notify_notification_add_action (n, "empty", "Empty Trash", empty_callback);
+        notify_notification_add_action (n,
-	notify_notification_set_category (n, "device");
+                                        "help",
                                        "Help",
                                        (NotifyActionCallback) help_callback,
                                        NULL,
                                        NULL);
        notify_notification_add_action (n,
                                        "ignore",
                                        "Ignore",
                                        (NotifyActionCallback)
                                        ignore_callback,
                                        NULL,
                                        NULL);
        notify_notification_add_action (n,
                                        "empty",
                                        "Empty Trash",
                                        (NotifyActionCallback) empty_callback,
                                        NULL,
                                        NULL);
        notify_notification_set_category (n, "device");
-	if (!notify_notification_show (n, NULL)) {
+        if (!notify_notification_show (n, NULL)) {
-		fprintf(stderr, "failed to send notification\n");
+                fprintf (stderr, "failed to send notification\n");
-		return 1;
+                return 1;
-	}
+        }
-	g_main_loop_run(loop);
+        g_main_loop_run (loop);
-	return 0;
+        return 0;
 }
--- a/tests/test-persistence.c
+++ b/tests/test-persistence.c
@ -0,0 +1,94 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or(at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 static gboolean
 server_has_persistence (void)
 {
        gboolean has;
        GList   *caps;
        GList   *l;
        caps = notify_get_server_caps ();
        if (caps == NULL) {
                fprintf (stderr, "Failed to receive server caps.\n");
                return FALSE;
        }
        l = g_list_find_custom (caps, "persistence", (GCompareFunc)strcmp);
        has = l != NULL;
        g_list_foreach (caps, (GFunc) g_free, NULL);
        g_list_free (caps);
        return has;
 }
 static void
 install_callback (NotifyNotification *n,
                  const char         *action)
 {
        g_assert (action != NULL);
        g_assert (strcmp (action, "install") == 0);
        printf ("You clicked Install\n");
        gtk_main_quit ();
 }
 int
 main (int argc, char *argv[])
 {
        NotifyNotification *n;
        gtk_init (&argc, &argv);
        notify_init ("Persistence Test");
        n = notify_notification_new ("Software Updates Available",
                                     "Important updates for your apps are now available.",
                                     "software-update-available-symbolic");
        notify_notification_add_action (n,
                                        "install",
                                        "Install now",
                                        (NotifyActionCallback) install_callback,
                                        NULL,
                                        NULL);
        notify_notification_set_timeout (n, 0); //don't timeout
        notify_notification_show (n, NULL);
        if (!server_has_persistence ()) {
                GtkStatusIcon *icon;
                g_message ("Server does not support persistence; using a status icon");
                icon = gtk_status_icon_new_from_icon_name ("software-update-available-symbolic");
                gtk_status_icon_set_tooltip_markup (icon, "<b>Software Updates Available</b>\nImportant updates for your apps are now available.");
                gtk_status_icon_set_visible (icon, TRUE);
        } else {
                g_message ("Server supports persistence; status icon not needed");
        }
        gtk_main ();
        return 0;
 }
--- a/tests/test-removal.c
+++ b/tests/test-removal.c
@ -0,0 +1,112 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or(at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <stdlib.h>
 #include <libnotify/notify.h>
 #include <gtk/gtk.h>
 static void
 next_callback (NotifyNotification *n,
               const char         *action)
 {
        g_assert (action != NULL);
        printf ("You clicked Next\n");
        notify_notification_close (n, NULL);
        gtk_main_quit ();
 }
 int
 main (int argc, char *argv[])
 {
        NotifyNotification *n;
        gtk_init (&argc, &argv);
        notify_init ("Urgency");
        n = notify_notification_new ("Low Urgency",
                                     "Joe signed online.",
                                     NULL);
        notify_notification_set_urgency (n, NOTIFY_URGENCY_LOW);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                exit (1);
        }
        sleep (3);
        if (!notify_notification_close (n, NULL)) {
                fprintf (stderr, "failed to remove notification\n");
                exit (1);
        }
        g_object_unref (G_OBJECT (n));
        n = notify_notification_new ("Normal Urgency",
                                     "You have a meeting in 10 minutes.",
                                     NULL);
        notify_notification_set_urgency (n, NOTIFY_URGENCY_NORMAL);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                exit (1);
        }
        sleep (3);
        if (!notify_notification_close (n, NULL)) {
                fprintf (stderr, "failed to remove notification\n");
                exit (1);
        }
        g_object_unref (G_OBJECT (n));
        n = notify_notification_new ("Critical Urgency",
                                     "This message will self-destruct in 10 seconds.",
                                     NULL);
        notify_notification_set_urgency (n, NOTIFY_URGENCY_CRITICAL);
        notify_notification_set_timeout (n, NOTIFY_EXPIRES_NEVER);
        notify_notification_add_action (n,
                                        "media-skip-forward",
                                        "Next",
                                        (NotifyActionCallback) next_callback,
                                        NULL,
                                        NULL);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                exit (1);
        }
        sleep (3);
        if (!notify_notification_close (n, NULL)) {
                fprintf (stderr, "failed to remove notification\n");
                exit (1);
        }
        gtk_main ();
        g_object_unref (G_OBJECT (n));
        return 0;
 }
--- a/tests/test-replace-widget.c
+++ b/tests/test-replace-widget.c
@ -1,62 +1,93 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or(at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 static int      count = 0;
-static int count = 0;
+static void
 on_exposed (GtkWidget      *widget,
            GdkEventExpose *ev,
            void           *user_data)
 {
        NotifyNotification *n = NOTIFY_NOTIFICATION (user_data);
-void on_exposed (GtkWidget *widget, GdkEventExpose *ev, void *user_data) {
+        g_signal_handlers_disconnect_by_func (widget, on_exposed, user_data);
    NotifyNotification *n = NOTIFY_NOTIFICATION (user_data);
-    g_signal_handlers_disconnect_by_func(widget, on_exposed, user_data);
+        notify_notification_show (n, NULL);
    notify_notification_show (n, NULL);
 }
 void on_clicked (GtkButton *button, void *user_data) {
    GError *error;
    gchar *buf;
    NotifyNotification *n = NOTIFY_NOTIFICATION (user_data);
    count++;
    buf = g_strdup_printf ("You clicked the button %i times", count);
    notify_notification_update (n, "Widget Attachment Test", 
                                buf, NULL);
    notify_notification_show (n, NULL);
    g_free (buf);
 }
-int main(int argc, char *argv[]) {
+static void
-    NotifyNotification *n;
+on_clicked (GtkButton *button,
-    GtkWidget *window;
+            void      *user_data)
-    GtkWidget *button;
+{
        gchar              *buf;
        NotifyNotification *n = NOTIFY_NOTIFICATION (user_data);
-    GError *error;
+        count++;
-    error = NULL;
+        buf = g_strdup_printf ("You clicked the button %i times", count);
        notify_notification_update (n, "Widget Attachment Test", buf, NULL);
        g_free (buf);
-    gtk_init (&argc, &argv);
+        notify_notification_show (n, NULL);
-    notify_init("Replace Test");
+}
-   
+
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+int
-    button = gtk_button_new_with_label ("click here to change notification");
+main (int argc, char *argv[])
-    gtk_container_add (GTK_CONTAINER(window), button);
+{
-
+        NotifyNotification *n;
-    gtk_widget_show_all (window);  
+        GtkWidget      *window;
-
+        GtkWidget      *button;
-
+
-    n = notify_notification_new ("Widget Attachment Test", "Button has not been clicked yet", 
+        gtk_init (&argc, &argv);
-                                  NULL,  //no icon
+        notify_init ("Replace Test");
-                                  button); //attach to button
+
-
+        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   
+        g_signal_connect (G_OBJECT (window),
-    notify_notification_set_timeout (n, 0); //don't timeout
+                          "delete_event",
-    
+                          G_CALLBACK (gtk_main_quit),
-    g_signal_connect (button, "clicked", (GCallback *)on_clicked, n);
+                          NULL);
-    g_signal_connect_after (button, "expose-event", (GCallback *)on_exposed, n);
+
-
+        button = gtk_button_new_with_label ("click here to change notification");
-    gtk_main();
+        gtk_container_add (GTK_CONTAINER (window), button);
        gtk_widget_show_all (window);
        n = notify_notification_new ("Widget Attachment Test",
                                     "Button has not been clicked yet",
                                     NULL); //no icon
        notify_notification_set_timeout (n, 0); //don't timeout
        g_signal_connect (G_OBJECT (button),
                          "clicked",
                          G_CALLBACK (on_clicked),
                          n);
        g_signal_connect_after (G_OBJECT (button),
                                "expose-event",
                                G_CALLBACK (on_exposed),
                                n);
        gtk_main ();
        return 0;
 }
--- a/tests/test-replace.c
+++ b/tests/test-replace.c
@ -1,40 +1,63 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or(at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <glib.h>
-int main() {
+int
-    NotifyNotification *n;
+main ()
-    GError *error;
+{
-    error = NULL;
+        NotifyNotification *n;
        GError             *error;
        error = NULL;
-    g_type_init ();
+        notify_init ("Replace Test");
-    notify_init("Replace Test");
+        n = notify_notification_new ("Summary",
-   
+                                     "First message",
-    n = notify_notification_new ("Summary", "First message", 
+                                     NULL);  //no icon
                                  NULL,  //no icon
                                  NULL); //don't attach to widget
-   
+        notify_notification_set_timeout (n, 0); //don't timeout
    notify_notification_set_timeout (n, 0); //don't timeout
    if (!notify_notification_show (n, &error)) {
        fprintf(stderr, "failed to send notification: %s\n", error->message);
        g_error_free (error);
        return 1;
    }
-    sleep(3);
+        if (!notify_notification_show (n, &error)) {
                fprintf (stderr, "failed to send notification: %s\n",
                         error->message);
                g_error_free (error);
                return 1;
        }
-    notify_notification_update (n, "Second Summary", 
+        sleep (3);
                                "First mesage was replaced", NULL); 
-    if (!notify_notification_show (n, &error)) {
+        notify_notification_update (n,
-        fprintf(stderr, "failed to send notification: %s\n", error->message);
+                                    "Second Summary",
-        g_error_free (error);
+                                    "First mesage was replaced",
-        return 1;
+                                    NULL);
-    }
+        notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT);
-    return 0;
+        if (!notify_notification_show (n, &error)) {
                fprintf (stderr,
                         "failed to send notification: %s\n",
                         error->message);
                g_error_free (error);
                return 1;
        }
        return 0;
 }
--- a/tests/test-resident.c
+++ b/tests/test-resident.c
@ -0,0 +1,149 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or(at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 static GMainLoop *loop;
 static int counter;
 static gboolean is_playing;
 static void
 prev_callback (NotifyNotification *n,
               const char         *action)
 {
        char *body;
        g_assert (action != NULL);
        g_assert (strcmp (action, "previous") == 0);
        printf ("You clicked Previous\n");
        body = g_strdup_printf ("Playing some fine song %d", --counter);
        notify_notification_update (n,
                                    "Music Player",
                                    body,
                                    "audio-x-generic");
        g_free (body);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send update\n");
        }
 }
 static void
 pause_callback (NotifyNotification *n,
                const char         *action)
 {
        char *body;
        g_assert (action != NULL);
        g_assert (strcmp (action, "pause") == 0);
        printf ("You clicked Play/Pause\n");
        is_playing = !is_playing;
        if (is_playing) {
                body = g_strdup_printf ("Playing some fine song %d", counter);
        } else {
                body = g_strdup_printf ("Not playing some fine song %d", counter);
        }
        notify_notification_update (n,
                                    "Music Player",
                                    body,
                                    "audio-x-generic");
        g_free (body);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send update\n");
        }
 }
 static void
 next_callback (NotifyNotification *n,
               const char         *action)
 {
        char *body;
        g_assert (action != NULL);
        g_assert (strcmp (action, "next") == 0);
        printf ("You clicked Next\n");
        body = g_strdup_printf ("Playing some fine song %d", ++counter);
        notify_notification_update (n,
                                    "Music Player",
                                    body,
                                    "audio-x-generic");
        g_free (body);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send update\n");
        }
 }
 int
 main (int argc, char **argv)
 {
        NotifyNotification *n;
        GVariant           *hint;
        if (!notify_init ("Resident Test"))
                exit (1);
        loop = g_main_loop_new (NULL, FALSE);
        counter = 0;
        is_playing = TRUE;
        n = notify_notification_new ("Music Player",
                                     "Playing some fine song",
                                     "audio-x-generic");
        hint = g_variant_new_boolean (TRUE);
        notify_notification_set_hint (n, "resident", hint);
        notify_notification_add_action (n,
                                        "previous",
                                        "Previous",
                                        (NotifyActionCallback) prev_callback,
                                        NULL,
                                        NULL);
        notify_notification_add_action (n,
                                        "pause",
                                        "Pause",
                                        (NotifyActionCallback)
                                        pause_callback,
                                        NULL,
                                        NULL);
        notify_notification_add_action (n,
                                        "next",
                                        "Next",
                                        (NotifyActionCallback) next_callback,
                                        NULL,
                                        NULL);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_main_loop_run (loop);
        return 0;
 }
--- a/tests/test-rtl.c
+++ b/tests/test-rtl.c
@ -0,0 +1,48 @@
 /*
 * @file tests/test-basic.c Unit test: basics
 *
 * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
 *
 * Test Case by Djihed Afifi <djihed@gmail.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 int
 main ()
 {
        NotifyNotification *n;
        notify_init("Basics");
        n = notify_notification_new ("اختبار",
                                     "يوفر ويكي عربآيز مناخا للنقاش وتبادل الخبرات والمعرفة حول اللغة العربية ولسانياتها ومايتعلّق بدعمها والإرتقاء بها في الحوسبة عموماً والبرمجيات الحرة على وجه الخصوص. هذا الويكي عبارة عن بيئة تعاونية تشاركية مفتوحة للجميع بدون قيود، لغتنا الجميلة بانتظار مساهمتك فلا تبخل عليها ",
                                     NULL);
        notify_notification_set_timeout (n, 3000);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_object_unref (G_OBJECT (n));
        return 0;
 }
--- a/tests/test-server-info.c
+++ b/tests/test-server-info.c
@ -0,0 +1,60 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-server-info.c Retrieves the server info and caps
 *
 * @Copyright (C) 2004 Mike Hearn <mike@navi.cx>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <stdlib.h>
 int
 main (int argc, char **argv)
 {
        GList          *l, *caps;
        char           *name, *vendor, *version, *spec_version;
        notify_init ("TestCaps");
        if (!notify_get_server_info (&name, &vendor, &version, &spec_version)) {
                fprintf (stderr, "Failed to receive server info.\n");
                exit (1);
        }
        printf ("Name:         %s\n", name);
        printf ("Vendor:       %s\n", vendor);
        printf ("Version:      %s\n", version);
        printf ("Spec Version: %s\n", spec_version);
        printf ("Capabilities:\n");
        caps = notify_get_server_caps ();
        if (caps == NULL) {
                fprintf (stderr, "Failed to receive server caps.\n");
                exit (1);
        }
        for (l = caps; l != NULL; l = l->next)
                printf ("\t%s\n", (char *) l->data);
        g_list_foreach (caps, (GFunc) g_free, NULL);
        g_list_free (caps);
        return 0;
 }
--- a/tests/test-size-changes.c
+++ b/tests/test-size-changes.c
@ -0,0 +1,84 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-size-changes.c Unit test: Notification size changes
 *
 * @Copyright (C) 2006 Christian Hammond <chipx86@chipx86.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 int
 main ()
 {
        NotifyNotification *n1, *n2, *n3;
        notify_init ("Size Changes");
        n1 = notify_notification_new ("Notification 1",
                                      "Notification number 1!",
                                      NULL);
        notify_notification_set_timeout (n1, 7000);
        if (!notify_notification_show (n1, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_object_unref (G_OBJECT (n1));
        n2 = notify_notification_new ("Notification 2",
                                      "Notification number 2!",
                                      NULL);
        notify_notification_set_timeout (n2, 7000);
        if (!notify_notification_show (n2, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        n3 = notify_notification_new ("Notification 3",
                                      "Notification number 3!",
                                      NULL);
        notify_notification_set_timeout (n3, 7000);
        if (!notify_notification_show (n3, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_object_unref (G_OBJECT (n3));
        sleep (2);
        notify_notification_update (n2,
                                    "Longer Notification 2",
                                    "This is a much longer notification.\n"
                                    "Two lines.\n"
                                    "Well, okay, three.\n" "Last one.",
                                    NULL);
        if (!notify_notification_show (n2, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        return 0;
 }
--- a/tests/test-transient.c
+++ b/tests/test-transient.c
@ -0,0 +1,52 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or(at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 static GMainLoop *loop;
 int
 main (int argc, char **argv)
 {
        NotifyNotification *n;
        GVariant           *hint;
        if (!notify_init ("Transient Test"))
                exit (1);
        loop = g_main_loop_new (NULL, FALSE);
        n = notify_notification_new ("Some transient change",
                                     "Something happened",
                                     "audio-volume-medium");
        hint = g_variant_new_boolean (TRUE);
        notify_notification_set_hint (n, "transient", hint);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_main_loop_run (loop);
        return 0;
 }
--- a/tests/test-urgency.c
+++ b/tests/test-urgency.c
@ -0,0 +1,71 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-urgency.c Unit test: urgency levels
 *
 * @Copyright(C) 2006 Christian Hammond <chipx8@chipx86.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or(at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdlib.h>
 int
 main (int argc, char *argv[])
 {
        NotifyNotification *n;
        notify_init ("Urgency");
        n = notify_notification_new ("Low Urgency",
                                     "Joe signed online.",
                                     NULL);
        notify_notification_set_urgency (n, NOTIFY_URGENCY_LOW);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                exit (1);
        }
        g_object_unref (G_OBJECT (n));
        n = notify_notification_new ("Normal Urgency",
                                     "You have a meeting in 10 minutes.",
                                     NULL);
        notify_notification_set_urgency (n, NOTIFY_URGENCY_NORMAL);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                exit (1);
        }
        g_object_unref (G_OBJECT (n));
        n = notify_notification_new ("Critical Urgency",
                                     "This message will self-destruct in 10 seconds.",
                                     NULL);
        notify_notification_set_urgency (n, NOTIFY_URGENCY_CRITICAL);
        notify_notification_set_timeout (n, 10000);     // 10 seconds
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                exit (1);
        }
        g_object_unref (G_OBJECT (n));
        return 0;
 }
--- a/tests/test-xy-actions.c
+++ b/tests/test-xy-actions.c
@ -0,0 +1,75 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-xy-actions.c Unit test: X, Y hints and actions
 *
 * @Copyright (C) 2006 Christian Hammond <chipx86@chipx86.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 */
 #include <libnotify/notify.h>
 #include <stdio.h>
 #include <unistd.h>
 static GMainLoop *loop;
 static void
 action_cb (NotifyNotification *n,
           const char         *action)
 {
        printf ("You clicked '%s'\n", action);
        g_main_loop_quit (loop);
 }
 int
 main (int argc, char **argv)
 {
        NotifyNotification *n;
        notify_init ("XY");
        loop = g_main_loop_new (NULL, FALSE);
        n = notify_notification_new ("System update available",
                                     "New system updates are available. It is "
                                     "recommended that you install the updates.",
                                     NULL);
        notify_notification_set_hint_int32 (n, "x", 600);
        notify_notification_set_hint_int32 (n, "y", 10);
        notify_notification_add_action (n,
                                        "help",
                                        "Help",
                                        (NotifyActionCallback) action_cb,
                                        NULL,
                                        NULL);
        notify_notification_add_action (n,
                                        "update",
                                        "Update",
                                        (NotifyActionCallback) action_cb,
                                        NULL,
                                        NULL);
        if (!notify_notification_show (n, NULL)) {
                fprintf (stderr, "failed to send notification\n");
                return 1;
        }
        g_main_loop_run (loop);
        return 0;
 }
--- a/tests/test-xy-stress.c
+++ b/tests/test-xy-stress.c
@ -1,16 +1,17 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-xy.c Unit test: X, Y hints
 *
- * @Copyright (C) 2005 Christian Hammond <chipx86@chipx86.com>
+ * @Copyright(C) 2005 Christian Hammond <chipx86@chipx86.com>
 *
 * 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.
+ * 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
+ * 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
@ -24,77 +25,72 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 static void
-_handle_closed (GObject *o)
+_handle_closed (GObject * obj)
 {
-  g_message ("closing");
+        g_message ("closing");
-  g_object_unref (o);
+        g_object_unref (obj);
 }
 static void
-emit_notification(int x, int y)
+emit_notification (int x, int y)
 {
-	static char buffer[BUFSIZ];
+        char               *buffer;
-	NotifyNotification *n;
+        NotifyNotification *n;
-	g_snprintf(buffer, sizeof(buffer),
+        buffer = g_strdup_printf ("This notification should point to %d, %d.",
-			   "This notification should point to %d, %d.", x, y);
+                                  x,
                                  y);
-	n = notify_notification_new ("X, Y Test", 
+        n = notify_notification_new ("X, Y Test", buffer, NULL);
-                                     buffer,
+        g_free (buffer);
                                     NULL, NULL);
-	notify_notification_set_hint_int32 (n, "x", x);
+        notify_notification_set_hint_int32 (n, "x", x);
-	notify_notification_set_hint_int32 (n, "y", y);	
+        notify_notification_set_hint_int32 (n, "y", y);
-	g_signal_connect (n, "closed", _handle_closed, NULL);
+        g_signal_connect (G_OBJECT (n),
                          "closed",
                          G_CALLBACK (_handle_closed),
                          NULL);
-	if (!notify_notification_show (n, NULL)) {
+        if (!notify_notification_show (n, NULL))
-		fprintf(stderr, "failed to send notification\n");
+                fprintf (stderr, "failed to send notification\n");
 		return 1;
 	}
 }
 static gboolean
-_popup_random_bubble (void)
+_popup_random_bubble (gpointer unused)
 {
-	GdkDisplay *display;
+        GdkDisplay     *display;
-	GdkScreen *screen;
+        GdkScreen      *screen;
-	int screen_x2, screen_y2;
+        int             screen_x2, screen_y2;
-	int x, y;
+        int             x, y;
-	display   = gdk_display_get_default();
+        display = gdk_display_get_default ();
-	screen    = gdk_display_get_default_screen(display);
+        screen = gdk_display_get_default_screen (display);
-	screen_x2 = gdk_screen_get_width(screen)  - 1;
+        screen_x2 = gdk_screen_get_width (screen) - 1;
-	screen_y2 = gdk_screen_get_height(screen) - 1;
+        screen_y2 = gdk_screen_get_height (screen) - 1;
-	x = g_random_int_range (0, screen_x2);
+        x = g_random_int_range (0, screen_x2);
-	y = g_random_int_range (0, screen_y2);
+        y = g_random_int_range (0, screen_y2);
-	emit_notification(x, y);
+        emit_notification (x, y);
-	return TRUE;
+        return TRUE;
 }
 int
-main(int argc, char **argv)
+main (int argc, char **argv)
 {
        GMainLoop *loop;
        DBusConnection *conn;
 	gdk_init(&argc, &argv);
-	notify_init("XY");
+        gdk_init (&argc, &argv);
-        conn = dbus_bus_get (DBUS_BUS_SESSION, NULL);
+        notify_init ("XY");
        dbus_connection_setup_with_g_main (conn, NULL);
        g_timeout_add (1000, _popup_random_bubble, NULL);
        loop = g_main_loop_new (NULL, FALSE);
        g_main_loop_run (loop);
        return 0;
 }
--- a/tests/test-xy.c
+++ b/tests/test-xy.c
@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 *
 * @file tests/test-xy.c Unit test: X, Y hints
 *
 * @Copyright (C) 2005 Christian Hammond <chipx86@chipx86.com>
@ -23,22 +24,24 @@
 #include <stdio.h>
 #include <unistd.h>
-int main() {
+int
-	NotifyNotification *n;
+main ()
 {
        NotifyNotification *n;
-	notify_init("XY");
+        notify_init ("XY");
-	n = notify_notification_new ("X, Y Test", 
+        n = notify_notification_new ("X, Y Test",
                                     "This notification should point to 150, 10",
-                                     NULL, NULL);
+                                     NULL);
-	notify_notification_set_hint_int32 (n, "x", 30);
+        notify_notification_set_hint_int32 (n, "x", 150);
-	notify_notification_set_hint_int32 (n, "y", 10);
+        notify_notification_set_hint_int32 (n, "y", 10);
-	if (!notify_notification_show (n, NULL)) {
+        if (!notify_notification_show (n, NULL)) {
-		fprintf(stderr, "failed to send notification\n");
+                fprintf (stderr, "failed to send notification\n");
-		return 1;
+                return 1;
-	}
+        }
-	return 0;
+        return 0;
 }
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@ -1,11 +0,0 @@
 bin_PROGRAMS = notify-send
 common_ldflags = \
 	$(top_builddir)/libnotify/libnotify.la \
 	$(PACKAGE_LIBS) \
 	-lpopt
 notify_send_SOURCES = notify-send.c
 notify_send_LDADD   = $(common_ldflags)
 INCLUDES = $(PACKAGE_CFLAGS)
--- a/tools/meson.build
+++ b/tools/meson.build
@ -0,0 +1,7 @@
 progs = ['notify-send']
 foreach prog: progs
  executable(prog, [prog + '.c'],
    dependencies: libnotify_dep,
    install: true)
 endforeach
--- a/tools/notify-send.c
+++ b/tools/notify-send.c
@ -1,144 +1,486 @@
-/**
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 * @file notify-send.c A tool for sending notifications.
 *
 * Copyright (C) 2004 Christian Hammond.
 *
- * This program is free software; you can redistribute it and/or
+ * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * modify it under the terms of the GNU Lesser General Public
- * published by the Free Software Foundation; either version 2 of
+ * License as published by the Free Software Foundation; either
- * the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
 *
- * This program is distributed in the hope that it will be useful,
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * GNU General Public License for more details.
+ * Lesser General Public License for more details.
 *
- * You should have received a copy of the GNU General Public
+ * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free
+ * License along with this library; if not, write to the
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * MA  02111-1307  USA
+ * Boston, MA  02111-1307, USA.
 */
 #include "config.h"
 #include <libnotify/notify.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <popt.h>
 #include <glib.h>
 #include <glib-unix.h>
 #include <glib/gprintf.h>
 #define N_(x) (x)
 #define GETTEXT_PACKAGE NULL
 static NotifyUrgency urgency = NOTIFY_URGENCY_NORMAL;
 static GMainLoop *loop = NULL;
 static gboolean
 g_option_arg_urgency_cb (const char *option_name,
                         const char *value,
                         gpointer    data,
                         GError    **error)
 {
        if (value != NULL) {
                if (!strcasecmp (value, "low"))
                        urgency = NOTIFY_URGENCY_LOW;
                else if (!strcasecmp (value, "normal"))
                        urgency = NOTIFY_URGENCY_NORMAL;
                else if (!strcasecmp (value, "critical"))
                        urgency = NOTIFY_URGENCY_CRITICAL;
                else {
                        *error = g_error_new (G_OPTION_ERROR,
                                              G_OPTION_ERROR_BAD_VALUE,
                                              N_("Unknown urgency %s specified. "
                                                 "Known urgency levels: low, "
                                                 "normal, critical."), value);
                        return FALSE;
                }
        }
        return TRUE;
 }
 static gboolean
 notify_notification_set_hint_variant (NotifyNotification *notification,
                                      const char         *type,
                                      const char         *key,
                                      const char         *value,
                                      GError            **error)
 {
        static gboolean conv_error = FALSE;
        if (!strcasecmp (type, "string")) {
                notify_notification_set_hint_string (notification,
                                                     key,
                                                     value);
        } else if (!strcasecmp (type, "int")) {
                if (!g_ascii_isdigit (*value))
                        conv_error = TRUE;
                else {
                        gint h_int = (gint) g_ascii_strtoull (value, NULL, 10);
                        notify_notification_set_hint_int32 (notification,
                                                            key,
                                                            h_int);
                }
        } else if (!strcasecmp (type, "double")) {
                if (!g_ascii_isdigit (*value))
                        conv_error = TRUE;
                else {
                        gdouble h_double = g_strtod (value, NULL);
                        notify_notification_set_hint_double (notification,
                                                             key, h_double);
                }
        } else if (!strcasecmp (type, "byte")) {
                gint h_byte = (gint) g_ascii_strtoull (value, NULL, 10);
                if (h_byte < 0 || h_byte > 0xFF)
                        conv_error = TRUE;
                else {
                        notify_notification_set_hint_byte (notification,
                                                           key,
                                                           (guchar) h_byte);
                }
        } else if (g_ascii_strcasecmp (type, "boolean") == 0) {
                gboolean h_boolean = FALSE;
                if (g_ascii_strcasecmp (value, "true") == 0) {
                        h_boolean = TRUE;
                } else if (g_ascii_isdigit (*value)) {
                        h_boolean = !!g_ascii_strtoull (value, NULL, 10);
                }
                notify_notification_set_hint (notification, key,
                                              g_variant_new_boolean (h_boolean));
        } else if (g_ascii_strcasecmp (type, "variant") == 0) {
                GVariant *variant = g_variant_parse (NULL, value, NULL, NULL, NULL);
                if (variant != NULL) {
                        notify_notification_set_hint (notification, key, variant);
                } else {
                        conv_error = TRUE;
                }
        } else {
                *error = g_error_new (G_OPTION_ERROR,
                                      G_OPTION_ERROR_BAD_VALUE,
                                      N_("Invalid hint type \"%s\". Valid types "
                                         "are int, double, string and byte."),
                                      type);
                return FALSE;
        }
        if (conv_error) {
                *error = g_error_new (G_OPTION_ERROR,
                                      G_OPTION_ERROR_BAD_VALUE,
                                      N_("Value \"%s\" of hint \"%s\" could not be "
                                         "parsed as type \"%s\"."), value, key,
                                      type);
                return FALSE;
        }
        return TRUE;
 }
 static void
 handle_closed (NotifyNotification *notify,
               gpointer            user_data)
 {
        g_main_loop_quit (loop);
 }
 static gboolean
 on_sigint (gpointer data)
 {
        NotifyNotification *notification = data;
        g_printerr ("Wait cancelled, closing notification\n");
        notify_notification_close (notification, NULL);
        g_main_loop_quit (loop);
        return FALSE;
 }
 static void
 handle_action (NotifyNotification *notify,
               char               *action,
               gpointer            user_data)
 {
        const char *action_name = user_data;
        const char *activation_token;
        activation_token = notify_notification_get_activation_token (notify);
        g_printf ("%s\n", action_name);
        if (activation_token) {
                g_debug ("Activation Token: %s", activation_token);
        }
        notify_notification_close (notify, NULL);
 }
 static gboolean
 on_wait_timeout (gpointer data)
 {
        fprintf (stderr, "Wait timeout expired\n");
        g_main_loop_quit (loop);
        return FALSE;
 }
 static gboolean
 server_has_capability (const gchar *capability)
 {
        GList *server_caps = notify_get_server_caps ();
        gboolean supported;
        supported = !!g_list_find_custom (server_caps,
                                          capability,
                                          (GCompareFunc) g_ascii_strcasecmp);
        g_list_foreach (server_caps, (GFunc) g_free, NULL);
        g_list_free (server_caps);
        return supported;
 }
 int
-main(int argc, const char **argv)
+main (int argc, char *argv[])
 {
-	const gchar *summary = NULL;
+        static const char  *summary = NULL;
-	const gchar *body = NULL;
+        char               *body;
-	const gchar *type = NULL;
+        static const char  *type = NULL;
-	char *urgency_str = NULL;
+        static char        *app_name = NULL;
-	gchar *icon_str = NULL;
+        static char        *icon_str = NULL;
-	gchar *icons = NULL;
+        static char       **n_text = NULL;
-	NotifyUrgency urgency = NOTIFY_URGENCY_NORMAL;
+        static char       **hints = NULL;
-	long expire_timeout = NOTIFY_TIMEOUT_DEFAULT;
+        static char       **actions = NULL;
-	char ch;
+        static char        *server_name = NULL;
-	poptContext opt_ctx;
+        static char        *server_vendor = NULL;
-	const char **args;
+        static char        *server_version = NULL;
        static char        *server_spec_version = NULL;
        static gboolean     print_id = FALSE;
        static gint         notification_id = 0;
        static gboolean     do_version = FALSE;
        static gboolean     hint_error = FALSE, show_error = FALSE;
        static gboolean     transient = FALSE;
        static gboolean     wait = FALSE;
        static glong        expire_timeout = NOTIFY_EXPIRES_DEFAULT;
        GOptionContext     *opt_ctx;
        NotifyNotification *notify;
-	GError *error = NULL;
+        GError             *error = NULL;
        gboolean            retval;
-        g_type_init (); 
+        static const GOptionEntry entries[] = {
                {"urgency", 'u', 0, G_OPTION_ARG_CALLBACK,
                 g_option_arg_urgency_cb,
                 N_("Specifies the urgency level (low, normal, critical)."),
                 N_("LEVEL")},
                {"expire-time", 't', 0, G_OPTION_ARG_INT, &expire_timeout,
                 N_
                 ("Specifies the timeout in milliseconds at which to expire the "
                  "notification."), N_("TIME")},
                {"app-name", 'a', 0, G_OPTION_ARG_STRING, &app_name,
                 N_("Specifies the app name for the icon"), N_("APP_NAME")},
                {"icon", 'i', 0, G_OPTION_ARG_FILENAME, &icon_str,
                 N_("Specifies an icon filename or stock icon to display."),
                 N_("ICON")},
                {"category", 'c', 0, G_OPTION_ARG_FILENAME, &type,
                 N_("Specifies the notification category."),
                 N_("TYPE[,TYPE...]")},
                {"transient", 'e', 0, G_OPTION_ARG_NONE, &transient,
                 N_("Create a transient notification"),
                 NULL},
                {"hint", 'h', 0, G_OPTION_ARG_FILENAME_ARRAY, &hints,
                 N_
                 ("Specifies basic extra data to pass. Valid types are boolean, int, double, string, byte and variant."),
                 N_("TYPE:NAME:VALUE")},
                {"print-id", 'p', 0, G_OPTION_ARG_NONE, &print_id,
                 N_ ("Print the notification ID."), NULL},
                {"replace-id", 'r', 0, G_OPTION_ARG_INT, &notification_id,
                 N_ ("The ID of the notification to replace."), N_("REPLACE_ID")},
                {"wait", 'w', 0, G_OPTION_ARG_NONE, &wait,
                 N_("Wait for the notification to be closed before exiting."),
                 NULL},
                {"action", 'A', 0, G_OPTION_ARG_FILENAME_ARRAY, &actions,
                 N_
                 ("Specifies the actions to display to the user. Implies --wait to wait for user input."
                 " May be set multiple times. The name of the action is output to stdout. If NAME is "
                 "not specified, the numerical index of the option is used (starting with 0)."),
                 N_("[NAME=]Text...")},
                {"version", 'v', 0, G_OPTION_ARG_NONE, &do_version,
                 N_("Version of the package."),
                 NULL},
                {G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY,
                 &n_text, NULL,
                 NULL},
                {NULL}
        };
-	struct poptOption options[] =
+        body = NULL;
 	{
 		{ "urgency", 'u', POPT_ARG_STRING | POPT_ARGFLAG_STRIP, &urgency_str,
 		  0, N_("Specifies the urgency level (low, normal, critical)."),
 		  NULL },
 		{ "expire-time", 't', POPT_ARG_INT | POPT_ARGFLAG_STRIP,
 		  &expire_timeout, 0,
 		  N_("Specifies the timeout in seconds at which to expire the "
 			 "notification."),
 		  NULL },
 		{ "icon",  'i', POPT_ARG_STRING | POPT_ARGFLAG_STRIP, &icons, 0,
 		  N_("Specifies an icon filename or stock icon to display."),
 		  N_("ICON1,ICON2,...") },
 		{ "type",  't', POPT_ARG_STRING | POPT_ARGFLAG_STRIP, &type, 0,
 		  N_("Specifies the notification type."),
 		  N_("ICON1,ICON2,...") },
 		POPT_AUTOHELP
 		POPT_TABLEEND
 	};
-	opt_ctx = poptGetContext("notify-send", argc, argv, options, 0);
+        setlocale (LC_ALL, "");
 	poptSetOtherOptionHelp(opt_ctx, "[OPTIONS]* <summary> [body]");
-	while ((ch = poptGetNextOpt(opt_ctx)) >= 0)
+        g_set_prgname (argv[0]);
-		;
+        g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
-	if (ch < -1 || (args = poptGetArgs(opt_ctx)) == NULL)
+        opt_ctx = g_option_context_new (N_("<SUMMARY> [BODY] - "
-	{
+                                           "create a notification"));
-		poptPrintUsage(opt_ctx, stderr, 0);
+        g_option_context_add_main_entries (opt_ctx, entries, GETTEXT_PACKAGE);
-		exit(1);
+        retval = g_option_context_parse (opt_ctx, &argc, &argv, &error);
-	}
+        g_option_context_free (opt_ctx);
-	if (args[0] != NULL)
+        if (!retval) {
-		summary = args[0];
+                fprintf (stderr, "%s\n", error->message);
                g_error_free (error);
                exit (1);
        }
-	if (summary == NULL)
+        if (do_version) {
-	{
+                g_printf ("%s %s\n", g_get_prgname (), VERSION);
-		poptPrintUsage(opt_ctx, stderr, 0);
+                exit (0);
-		exit(1);
+        }
 	}
-	if (args[1] != NULL)
+        if (n_text != NULL && n_text[0] != NULL && *n_text[0] != '\0')
-	{
+                summary = n_text[0];
 		body = args[1];
-		if (args[2] != NULL)
+        if (summary == NULL) {
-		{
+                fprintf (stderr, "%s\n", N_("No summary specified."));
-			poptPrintUsage(opt_ctx, stderr, 0);
+                exit (1);
-			exit(1);
+        }
 		}
 	}
-	if (icons != NULL)
+        if (n_text[1] != NULL) {
-	{
+                body = g_strcompress (n_text[1]);
 		char *c;
-		/* XXX */
+                if (n_text[2] != NULL) {
-		if ((c = strchr(icons, ',')) != NULL)
+                        fprintf (stderr, "%s\n",
-			*c = '\0';
+                                 N_("Invalid number of options."));
                        exit (1);
                }
        }
-		icon_str = icons;
+        if (!notify_init ("notify-send"))
                exit (1);
-	}
+        notify_get_server_info (&server_name,
                                &server_vendor,
                                &server_version,
                                &server_spec_version);
-	if (urgency_str != NULL)
+        g_debug ("Using sever %s %s, v%s - Supporting Notification Spec %s",
-	{
+                 server_name, server_vendor, server_version, server_spec_version);
-		if (!strcasecmp(urgency_str, "low"))
+        g_free (server_name);
-			urgency = NOTIFY_URGENCY_LOW;
+        g_free (server_vendor);
-		else if (!strcasecmp(urgency_str, "normal"))
+        g_free (server_version);
-			urgency = NOTIFY_URGENCY_NORMAL;
+        g_free (server_spec_version);
 		else if (!strcasecmp(urgency_str, "critical"))
 			urgency = NOTIFY_URGENCY_CRITICAL;
 		else
 		{
 			poptPrintHelp(opt_ctx, stderr, 0);
 			exit(1);
 		}
 	}
-	if (!notify_init("notify-send"))
+        notify = g_object_new (NOTIFY_TYPE_NOTIFICATION,
-		exit(1);
+                               "summary", summary,
                               "body", body,
                               "icon-name", icon_str,
                               "id", notification_id,
                               NULL);
        notify_notification_set_category (notify, type);
        notify_notification_set_urgency (notify, urgency);
        notify_notification_set_timeout (notify, expire_timeout);
        notify_notification_set_app_name (notify, app_name);
-	notify  = notify_notification_new (summary, body, icon_str, NULL); 
+        if (transient) {
-	notify_notification_set_category (notify, type);
+                notify_notification_set_hint (notify, "transient",
-	notify_notification_set_urgency (notify, urgency);
+                                              g_variant_new_boolean (TRUE));
 	notify_notification_set_timeout (notify, expire_timeout);
-	notify_notification_show (notify, error);
+                if (!server_has_capability ("persistence")) {
                        g_debug ("Persistence is not supported by the "
                                 "notifications server. "
                                 "All notifications are transient.");
                }
        }
-	poptFreeContext(opt_ctx);
+        g_free (body);
 	notify_uninit();
-	return 0;
+        /* Set hints */
        if (hints != NULL) {
                gint            i = 0;
                gint            l;
                char          *hint = NULL;
                char         **tokens = NULL;
                while ((hint = hints[i++])) {
                        tokens = g_strsplit (hint, ":", 3);
                        l = g_strv_length (tokens);
                        if (l != 3) {
                                fprintf (stderr, "%s\n",
                                         N_("Invalid hint syntax specified. "
                                            "Use TYPE:NAME:VALUE."));
                                hint_error = TRUE;
                        } else {
                                retval = notify_notification_set_hint_variant (notify,
                                                                               tokens[0],
                                                                               tokens[1],
                                                                               tokens[2],
                                                                               &error);
                                if (!retval) {
                                        fprintf (stderr, "%s\n", error->message);
                                        g_clear_error (&error);
                                        hint_error = TRUE;
                                }
                        }
                        g_strfreev (tokens);
                        if (hint_error)
                                break;
                }
        }
        if (actions != NULL) {
                gint i = 0;
                char *action = NULL;
                gchar **spl = NULL;
                gboolean have_actions;
                have_actions = server_has_capability ("actions");
                if (!have_actions) {
                        g_printerr (N_("Actions are not supported by this "
                                       "notifications server. "
                                       "Displaying non-interactively.\n"));
                        show_error = TRUE;
                }
                while (have_actions && (action = actions[i++])) {
                        gchar *name;
                        const gchar *label;
                        spl = g_strsplit (action, "=", 2);
                        if (g_strv_length (spl) == 1) {
                                name = g_strdup_printf ("%d", i - 1);
                                label = g_strstrip (spl[0]);
                        } else {
                                name = g_strdup (g_strstrip (spl[0]));
                                label = g_strstrip (spl[1]);
                        }
                        if (*label != '\0' && *name != '\0') {
                                notify_notification_add_action (notify,
                                                                name,
                                                                label,
                                                                handle_action,
                                                                name,
                                                                g_free);
                                wait = TRUE;
                        }
                        g_strfreev (spl);
                }
                g_strfreev (actions);
        }
        if (wait) {
                g_signal_connect (G_OBJECT (notify),
                                  "closed",
                                  G_CALLBACK (handle_closed),
                                  NULL);
                if (expire_timeout > 0) {
                        g_timeout_add (expire_timeout, on_wait_timeout, NULL);
                }
        }
        if (!hint_error) {
                retval = notify_notification_show (notify, &error);
                if (!retval) {
                        fprintf (stderr, "%s\n", error->message);
                        g_clear_error (&error);
                        show_error = TRUE;
                }
        }
        if (print_id) {
                g_object_get (notify, "id", &notification_id, NULL);
                g_printf ("%d\n", notification_id);
        }
        if (wait) {
                g_unix_signal_add (SIGINT, on_sigint, notify);
                loop = g_main_loop_new (NULL, FALSE);
                g_main_loop_run (loop);
                g_main_loop_unref (loop);
                loop = NULL;
        }
        g_object_unref (G_OBJECT (notify));
        notify_uninit ();
        if (hint_error || show_error)
                exit (1);
        return 0;
 }
		`@ -0,0 +1,3 @@`
							`#include <libnotify/notify.h>`

							`notify_notification_get_type`