moving from https://github.com/perberos/mate-desktop-environment

14 files changed, 4692 insertions, 0 deletions

diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am
new file mode 100644
index 00000000..a8b8ae2b
--- /dev/null
+++ b/libmate-panel-applet/Makefile.am
@@ -0,0 +1,143 @@
+lib_LTLIBRARIES = libmate-panel-applet-3.la
+noinst_PROGRAMS = test-dbus-applet
+
+AM_CPPFLAGS =							\
+	$(LIBMATE_PANEL_APPLET_CFLAGS)				\
+	-I$(top_builddir)/libmate-panel-applet			\
+	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
+
+libmate_panel_appletincludedir = $(includedir)/mate-panel-3.0/libmate-panel-applet
+libmate_panel_appletinclude_HEADERS =	\
+	mate-panel-applet.h			\
+	mate-panel-applet-mateconf.h		\
+	mate-panel-applet-enums.h
+
+libmate_panel_applet_3_la_SOURCES =		\
+	$(BUILT_SOURCES)		\
+	mate-panel-applet.h			\
+	mate-panel-applet.c			\
+	mate-panel-applet-factory.h		\
+	mate-panel-applet-factory.c		\
+	mate-panel-applet-mateconf.c		\
+	mate-panel-applet-mateconf.h
+
+libmate_panel_applet_3_la_LIBADD  = \
+	$(LIBMATE_PANEL_APPLET_LIBS) \
+	$(X_LIBS)
+
+libmate_panel_applet_3_la_LDFLAGS = \
+	-version-info $(LIB_MATE_PANEL_APPLET_LT_VERSION)	\
+	-no-undefined
+
+test_dbus_applet_LDADD =	\
+	$(LIBMATE_PANEL_APPLET_LIBS)	\
+	libmate-panel-applet-3.la
+
+$(libmate_panel_applet_3_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
+
+mate-panel-applet-marshal.h: mate-panel-applet-marshal.list $(GLIB_GENMARSHAL)
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=mate_panel_applet_marshal > $@
+
+mate-panel-applet-marshal.c: mate-panel-applet-marshal.list $(GLIB_GENMARSHAL)
+	$(AM_V_GEN)echo "#include \"mate-panel-applet-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) $< --body --prefix=mate_panel_applet_marshal >> $@
+
+mate_panel_applet_enum_headers = $(top_srcdir)/libmate-panel-applet/mate-panel-applet.h
+
+mate-panel-applet-enums.c: @REBUILD@ $(mate_panel_applet_enum_headers)
+	$(AM_V_GEN)glib-mkenums \
+			--fhead "#include <glib-object.h>\n" \
+			--fhead "#include \"mate-panel-applet-enums.h\"\n\n" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--fprod "\n#include \"@filename@\"\n" \
+			--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
+			--vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "  { 0, NULL, NULL }\n};\n\n" \
+			--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
+			--vtail "  static GType type = 0;\n\n" \
+			--vtail "  if (!type)\n" \
+			--vtail "    type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
+			--vtail "  return type;\n}\n\n" \
+		$(mate_panel_applet_enum_headers) > $@
+
+mate-panel-applet-enums.h: @REBUILD@ $(mate_panel_applet_enum_headers)
+	$(AM_V_GEN)glib-mkenums \
+			--fhead "#ifndef __MATE_PANEL_APPLET_ENUMS_H__\n" \
+			--fhead "#define __MATE_PANEL_APPLET_ENUMS_H__\n\n" \
+			--fhead "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n" \
+			--ftail "#ifdef __cplusplus\n}\n#endif\n\n" \
+			--ftail "#endif /* __MATE_PANEL_APPLET_ENUMS_H__ */\n" \
+			--fprod "\n/* --- @filename@ --- */" \
+			--eprod "#define PANEL_TYPE_@ENUMNAME@ @enum_name@_get_type()\n" \
+			--eprod "GType @enum_name@_get_type (void);\n" \
+		$(mate_panel_applet_enum_headers) > $@
+
+BUILT_SOURCES = \
+	mate-panel-applet-enums.c			\
+	mate-panel-applet-enums.h			\
+	mate-panel-applet-marshal.c			\
+	mate-panel-applet-marshal.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmatepanelapplet-3.0.pc
+
+appletdir       = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.panel.TestApplet.mate-panel-applet.in
+noinst_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+
+@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
+
+EXTRA_DIST =						\
+	org.mate.panel.TestApplet.mate-panel-applet.in	\
+	mate-panel-applet-marshal.list			\
+	libmatepanelapplet-3.0.pc.in			\
+	libmatepanelapplet-3.0-uninstalled.pc.in
+
+CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
+
+###############################
+# Introspection generation
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = 	\
+	mate-panel-applet.c		\
+	mate-panel-applet.h		\
+	mate-panel-applet-mateconf.c	\
+	mate-panel-applet-mateconf.h
+built_introspection_sources =	\
+	mate-panel-applet-enums.c	\
+	mate-panel-applet-enums.h
+
+MatePanelApplet-3.0.gir: libmate-panel-applet-3.la
+MatePanelApplet_3_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 MateConf-2.0
+MatePanelApplet_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
+MatePanelApplet_3_0_gir_LIBS = libmate-panel-applet-3.la
+MatePanelApplet_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources))
+# When requiring gobject-introspection 0.9.5, use this:
+#MatePanelApplet_3_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel --pkg-export=libmatepanelapplet-3.0
+MatePanelApplet_3_0_gir_SCANNERFLAGS = --strip-prefix=MatePanel --pkg-export=libmatepanelapplet-3.0
+INTROSPECTION_GIRS += MatePanelApplet-3.0.gir
+
+girdir = $(INTROSPECTION_GIRDIR)
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(INTROSPECTION_TYPELIBDIR)
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
+
+################################
+
+dist-hook:
+	cd $(distdir) ; rm -f $(CLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/libmate-panel-applet/Makefile.in b/libmate-panel-applet/Makefile.in
new file mode 100644
index 00000000..b5214eaa
--- /dev/null
+++ b/libmate-panel-applet/Makefile.in
@@ -0,0 +1,921 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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@
+
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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@
+noinst_PROGRAMS = test-dbus-applet$(EXEEXT)
+@HAVE_INTROSPECTION_TRUE@am__append_1 = MatePanelApplet-3.0.gir
+@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA)
+subdir = libmate-panel-applet
+DIST_COMMON = $(libmate_panel_appletinclude_HEADERS) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/libmatepanelapplet-3.0-uninstalled.pc.in \
+	$(srcdir)/libmatepanelapplet-3.0.pc.in TODO
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/mate-doc-utils.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = libmatepanelapplet-3.0.pc \
+	libmatepanelapplet-3.0-uninstalled.pc
+CONFIG_CLEAN_VPATH_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 = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \
+	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" \
+	"$(DESTDIR)$(libmate_panel_appletincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libmate_panel_applet_3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__objects_1 = mate-panel-applet-enums.lo \
+	mate-panel-applet-marshal.lo
+am_libmate_panel_applet_3_la_OBJECTS = $(am__objects_1) \
+	mate-panel-applet.lo mate-panel-applet-factory.lo \
+	mate-panel-applet-mateconf.lo
+libmate_panel_applet_3_la_OBJECTS =  \
+	$(am_libmate_panel_applet_3_la_OBJECTS)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+libmate_panel_applet_3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmate_panel_applet_3_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+PROGRAMS = $(noinst_PROGRAMS)
+test_dbus_applet_SOURCES = test-dbus-applet.c
+test_dbus_applet_OBJECTS = test-dbus-applet.$(OBJEXT)
+test_dbus_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	libmate-panel-applet-3.la
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(libmate_panel_applet_3_la_SOURCES) test-dbus-applet.c
+DIST_SOURCES = $(libmate_panel_applet_3_la_SOURCES) test-dbus-applet.c
+DATA = $(gir_DATA) $(noinst_DATA) $(pkgconfig_DATA) $(typelib_DATA)
+HEADERS = $(libmate_panel_appletinclude_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLOCK_CFLAGS = @CLOCK_CFLAGS@
+CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
+CLOCK_LIBS = @CLOCK_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGG_SMCLIENT_CFLAGS = @EGG_SMCLIENT_CFLAGS@
+EGG_SMCLIENT_LIBS = @EGG_SMCLIENT_LIBS@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FISH_CFLAGS = @FISH_CFLAGS@
+FISH_LIBS = @FISH_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_QUERYMODULES = @GIO_QUERYMODULES@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBMATE_PANEL_APPLET_CFLAGS = @LIBMATE_PANEL_APPLET_CFLAGS@
+LIBMATE_PANEL_APPLET_LIBS = @LIBMATE_PANEL_APPLET_LIBS@
+LIBMATE_PANEL_APPLET_MATECOMPONENT_CFLAGS = @LIBMATE_PANEL_APPLET_MATECOMPONENT_CFLAGS@
+LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS = @LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MATE_PANEL_APPLET_LT_VERSION = @LIB_MATE_PANEL_APPLET_LT_VERSION@
+LIB_MATE_PANEL_APPLET_MATECOMPONENT_LT_VERSION = @LIB_MATE_PANEL_APPLET_MATECOMPONENT_LT_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATECOMPONENT_ACT_IDLDIR = @MATECOMPONENT_ACT_IDLDIR@
+MATECOMPONENT_CFLAGS = @MATECOMPONENT_CFLAGS@
+MATECOMPONENT_IDLDIR = @MATECOMPONENT_IDLDIR@
+MATECOMPONENT_LIBS = @MATECOMPONENT_LIBS@
+MATECONFTOOL = @MATECONFTOOL@
+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+MATECORBA_IDL = @MATECORBA_IDL@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOTIFICATION_AREA_CFLAGS = @NOTIFICATION_AREA_CFLAGS@
+NOTIFICATION_AREA_LIBS = @NOTIFICATION_AREA_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANEL_CFLAGS = @PANEL_CFLAGS@
+PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE = @PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
+PANEL_LIBS = @PANEL_LIBS@
+PANEL_MODULE_MATECOMPONENT_CFLAGS = @PANEL_MODULE_MATECOMPONENT_CFLAGS@
+PANEL_MODULE_MATECOMPONENT_LIBS = @PANEL_MODULE_MATECOMPONENT_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+REBUILD = @REBUILD@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TZ_CFLAGS = @TZ_CFLAGS@
+TZ_LIBS = @TZ_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
+WNCKLET_LIBS = @WNCKLET_LIBS@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
+XRANDR_CFLAGS = @XRANDR_CFLAGS@
+XRANDR_LIBS = @XRANDR_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+appletsdir = @appletsdir@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+modulesdir = @modulesdir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+lib_LTLIBRARIES = libmate-panel-applet-3.la
+AM_CPPFLAGS = \
+	$(LIBMATE_PANEL_APPLET_CFLAGS)				\
+	-I$(top_builddir)/libmate-panel-applet			\
+	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
+libmate_panel_appletincludedir = $(includedir)/mate-panel-3.0/libmate-panel-applet
+libmate_panel_appletinclude_HEADERS = \
+	mate-panel-applet.h			\
+	mate-panel-applet-mateconf.h		\
+	mate-panel-applet-enums.h
+
+libmate_panel_applet_3_la_SOURCES = \
+	$(BUILT_SOURCES)		\
+	mate-panel-applet.h			\
+	mate-panel-applet.c			\
+	mate-panel-applet-factory.h		\
+	mate-panel-applet-factory.c		\
+	mate-panel-applet-mateconf.c		\
+	mate-panel-applet-mateconf.h
+
+libmate_panel_applet_3_la_LIBADD = \
+	$(LIBMATE_PANEL_APPLET_LIBS) \
+	$(X_LIBS)
+
+libmate_panel_applet_3_la_LDFLAGS = \
+	-version-info $(LIB_MATE_PANEL_APPLET_LT_VERSION)	\
+	-no-undefined
+
+test_dbus_applet_LDADD = \
+	$(LIBMATE_PANEL_APPLET_LIBS)	\
+	libmate-panel-applet-3.la
+
+mate_panel_applet_enum_headers = $(top_srcdir)/libmate-panel-applet/mate-panel-applet.h
+BUILT_SOURCES = \
+	mate-panel-applet-enums.c			\
+	mate-panel-applet-enums.h			\
+	mate-panel-applet-marshal.c			\
+	mate-panel-applet-marshal.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmatepanelapplet-3.0.pc
+appletdir = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.panel.TestApplet.mate-panel-applet.in
+noinst_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+EXTRA_DIST = \
+	org.mate.panel.TestApplet.mate-panel-applet.in	\
+	mate-panel-applet-marshal.list			\
+	libmatepanelapplet-3.0.pc.in			\
+	libmatepanelapplet-3.0-uninstalled.pc.in
+
+CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA) $(am__append_2)
+INTROSPECTION_GIRS = $(am__append_1)
+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+@HAVE_INTROSPECTION_TRUE@introspection_sources = \
+@HAVE_INTROSPECTION_TRUE@	mate-panel-applet.c		\
+@HAVE_INTROSPECTION_TRUE@	mate-panel-applet.h		\
+@HAVE_INTROSPECTION_TRUE@	mate-panel-applet-mateconf.c	\
+@HAVE_INTROSPECTION_TRUE@	mate-panel-applet-mateconf.h
+
+@HAVE_INTROSPECTION_TRUE@built_introspection_sources = \
+@HAVE_INTROSPECTION_TRUE@	mate-panel-applet-enums.c	\
+@HAVE_INTROSPECTION_TRUE@	mate-panel-applet-enums.h
+
+@HAVE_INTROSPECTION_TRUE@MatePanelApplet_3_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 MateConf-2.0
+@HAVE_INTROSPECTION_TRUE@MatePanelApplet_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
+@HAVE_INTROSPECTION_TRUE@MatePanelApplet_3_0_gir_LIBS = libmate-panel-applet-3.la
+@HAVE_INTROSPECTION_TRUE@MatePanelApplet_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources))
+# When requiring gobject-introspection 0.9.5, use this:
+#MatePanelApplet_3_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel --pkg-export=libmatepanelapplet-3.0
+@HAVE_INTROSPECTION_TRUE@MatePanelApplet_3_0_gir_SCANNERFLAGS = --strip-prefix=MatePanel --pkg-export=libmatepanelapplet-3.0
+@HAVE_INTROSPECTION_TRUE@girdir = $(INTROSPECTION_GIRDIR)
+@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
+@HAVE_INTROSPECTION_TRUE@typelibdir = $(INTROSPECTION_TYPELIBDIR)
+@HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libmate-panel-applet/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libmate-panel-applet/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+libmatepanelapplet-3.0.pc: $(top_builddir)/config.status $(srcdir)/libmatepanelapplet-3.0.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+libmatepanelapplet-3.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libmatepanelapplet-3.0-uninstalled.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	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
+libmate-panel-applet-3.la: $(libmate_panel_applet_3_la_OBJECTS) $(libmate_panel_applet_3_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmate_panel_applet_3_la_LINK) -rpath $(libdir) $(libmate_panel_applet_3_la_OBJECTS) $(libmate_panel_applet_3_la_LIBADD) $(LIBS)
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+test-dbus-applet$(EXEEXT): $(test_dbus_applet_OBJECTS) $(test_dbus_applet_DEPENDENCIES) 
+	@rm -f test-dbus-applet$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_dbus_applet_OBJECTS) $(test_dbus_applet_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate-panel-applet-enums.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate-panel-applet-factory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate-panel-applet-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate-panel-applet-mateconf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate-panel-applet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dbus-applet.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@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@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@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@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@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
+install-girDATA: $(gir_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
+	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \
+	done
+
+uninstall-girDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(girdir)" && rm -f $$files
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+install-typelibDATA: $(typelib_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)"
+	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibdir)" || exit $$?; \
+	done
+
+uninstall-typelibDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(typelibdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(typelibdir)" && rm -f $$files
+install-libmate_panel_appletincludeHEADERS: $(libmate_panel_appletinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libmate_panel_appletincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libmate_panel_appletincludedir)"
+	@list='$(libmate_panel_appletinclude_HEADERS)'; test -n "$(libmate_panel_appletincludedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libmate_panel_appletincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libmate_panel_appletincludedir)" || exit $$?; \
+	done
+
+uninstall-libmate_panel_appletincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libmate_panel_appletinclude_HEADERS)'; test -n "$(libmate_panel_appletincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libmate_panel_appletincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libmate_panel_appletincludedir)" && rm -f $$files
+
+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; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	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; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libmate_panel_appletincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) 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:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-girDATA \
+	install-libmate_panel_appletincludeHEADERS \
+	install-pkgconfigDATA install-typelibDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+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-girDATA uninstall-libLTLIBRARIES \
+	uninstall-libmate_panel_appletincludeHEADERS \
+	uninstall-pkgconfigDATA uninstall-typelibDATA
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \
+	dist-hook 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-dvi install-dvi-am install-exec \
+	install-exec-am install-girDATA install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-libmate_panel_appletincludeHEADERS install-man \
+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+	install-ps-am install-strip install-typelibDATA 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-girDATA \
+	uninstall-libLTLIBRARIES \
+	uninstall-libmate_panel_appletincludeHEADERS \
+	uninstall-pkgconfigDATA uninstall-typelibDATA
+
+
+$(libmate_panel_applet_3_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
+
+mate-panel-applet-marshal.h: mate-panel-applet-marshal.list $(GLIB_GENMARSHAL)
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=mate_panel_applet_marshal > $@
+
+mate-panel-applet-marshal.c: mate-panel-applet-marshal.list $(GLIB_GENMARSHAL)
+	$(AM_V_GEN)echo "#include \"mate-panel-applet-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) $< --body --prefix=mate_panel_applet_marshal >> $@
+
+mate-panel-applet-enums.c: @REBUILD@ $(mate_panel_applet_enum_headers)
+	$(AM_V_GEN)glib-mkenums \
+			--fhead "#include <glib-object.h>\n" \
+			--fhead "#include \"mate-panel-applet-enums.h\"\n\n" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--fprod "\n#include \"@filename@\"\n" \
+			--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
+			--vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "  { 0, NULL, NULL }\n};\n\n" \
+			--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
+			--vtail "  static GType type = 0;\n\n" \
+			--vtail "  if (!type)\n" \
+			--vtail "    type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
+			--vtail "  return type;\n}\n\n" \
+		$(mate_panel_applet_enum_headers) > $@
+
+mate-panel-applet-enums.h: @REBUILD@ $(mate_panel_applet_enum_headers)
+	$(AM_V_GEN)glib-mkenums \
+			--fhead "#ifndef __MATE_PANEL_APPLET_ENUMS_H__\n" \
+			--fhead "#define __MATE_PANEL_APPLET_ENUMS_H__\n\n" \
+			--fhead "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n" \
+			--ftail "#ifdef __cplusplus\n}\n#endif\n\n" \
+			--ftail "#endif /* __MATE_PANEL_APPLET_ENUMS_H__ */\n" \
+			--fprod "\n/* --- @filename@ --- */" \
+			--eprod "#define PANEL_TYPE_@ENUMNAME@ @enum_name@_get_type()\n" \
+			--eprod "GType @enum_name@_get_type (void);\n" \
+		$(mate_panel_applet_enum_headers) > $@
+
+@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
+
+###############################
+# Introspection generation
+
+-include $(INTROSPECTION_MAKEFILE)
+
+@[email protected]: libmate-panel-applet-3.la
+
+################################
+
+dist-hook:
+	cd $(distdir) ; rm -f $(CLEANFILES)
+
+-include $(top_srcdir)/git.mk
+
+# 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:
diff --git a/libmate-panel-applet/TODO b/libmate-panel-applet/TODO
new file mode 100644
index 00000000..e0384730
--- /dev/null
+++ b/libmate-panel-applet/TODO
@@ -0,0 +1,14 @@
+libmate-panel-applet todo list
+=========================
+
+	Things that need to be finished before this library can be considered
+anyway complete.
+
+	* Size negotiation. Basically make sure this works. It should be no
+	  different than the usual GtkWidget size request/allocation. The
+	  applets shouldn't be allowed to be any bigger than the panel. The
+	  other issue is with applets that want to expand to fill the available
+	  space on the panel. At the moment this is solved with getExpandFlags,
+	  but this ends up with some freaky stuff going on when you're moving
+	  applets. Maybe we should consider having a re-sizable flag which would
+	  make the applets have grabs for re-sizing.
diff --git a/libmate-panel-applet/libmatepanelapplet-3.0-uninstalled.pc.in b/libmate-panel-applet/libmatepanelapplet-3.0-uninstalled.pc.in
new file mode 100644
index 00000000..40f02130
--- /dev/null
+++ b/libmate-panel-applet/libmatepanelapplet-3.0-uninstalled.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libmate-panel-applet-3
+Description: libmate-panel-applet-3
+Requires: glib-2.0 mateconf-2.0 gtk+-2.0
+Version: @VERSION@
+Libs: ${pc_top_builddir}/${pcfiledir}/libmate-panel-applet-3.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/libmate-panel-applet/libmatepanelapplet-3.0.pc.in b/libmate-panel-applet/libmatepanelapplet-3.0.pc.in
new file mode 100644
index 00000000..97fee38a
--- /dev/null
+++ b/libmate-panel-applet/libmatepanelapplet-3.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libmate-panel-applet-3
+Description: libmate-panel-applet-3
+Requires: glib-2.0 mateconf-2.0 gtk+-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lmate-panel-applet-3
+Cflags: -I${includedir}/mate-panel-3.0/libmate-panel-applet
diff --git a/libmate-panel-applet/mate-panel-applet-factory.c b/libmate-panel-applet/mate-panel-applet-factory.c
new file mode 100644
index 00000000..96eab326
--- /dev/null
+++ b/libmate-panel-applet/mate-panel-applet-factory.c
@@ -0,0 +1,263 @@
+/*
+ * mate-panel-applet-factory.c: panel applet writing API.
+ *
+ * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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 "mate-panel-applet.h"
+
+#include "mate-panel-applet-factory.h"
+
+struct _MatePanelAppletFactory {
+	GObject    base;
+
+	gchar     *factory_id;
+	guint      n_applets;
+	GType      applet_type;
+	GClosure  *closure;
+};
+
+struct _MatePanelAppletFactoryClass {
+	GObjectClass base_class;
+};
+
+#define MATE_PANEL_APPLET_FACTORY_OBJECT_PATH  "/org/mate/panel/applet/%s"
+#define MATE_PANEL_APPLET_FACTORY_SERVICE_NAME "org.mate.panel.applet.%s"
+
+G_DEFINE_TYPE (MatePanelAppletFactory, mate_panel_applet_factory, G_TYPE_OBJECT)
+
+static void
+mate_panel_applet_factory_finalize (GObject *object)
+{
+	MatePanelAppletFactory *factory = MATE_PANEL_APPLET_FACTORY (object);
+
+	if (factory->factory_id) {
+		g_free (factory->factory_id);
+		factory->factory_id = NULL;
+	}
+
+	if (factory->closure) {
+		g_closure_unref (factory->closure);
+		factory->closure = NULL;
+	}
+
+	G_OBJECT_CLASS (mate_panel_applet_factory_parent_class)->finalize (object);
+}
+
+static void
+mate_panel_applet_factory_init (MatePanelAppletFactory *factory)
+{
+}
+
+static void
+mate_panel_applet_factory_class_init (MatePanelAppletFactoryClass *klass)
+{
+	GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
+
+	g_object_class->finalize = mate_panel_applet_factory_finalize;
+}
+
+static void
+mate_panel_applet_factory_applet_removed (MatePanelAppletFactory *factory,
+				     GObject            *applet)
+{
+	factory->n_applets--;
+	if (factory->n_applets == 0)
+		g_object_unref (factory);
+}
+
+MatePanelAppletFactory *
+mate_panel_applet_factory_new (const gchar *factory_id,
+			  GType        applet_type,
+			  GClosure    *closure)
+{
+	MatePanelAppletFactory *factory;
+
+	factory = MATE_PANEL_APPLET_FACTORY (g_object_new (PANEL_TYPE_APPLET_FACTORY, NULL));
+	factory->factory_id = g_strdup (factory_id);
+	factory->applet_type = applet_type;
+	factory->closure = g_closure_ref (closure);
+
+	return factory;
+}
+
+static void
+set_applet_constructor_properties (GObject  *applet,
+				   GVariant *props)
+{
+	GVariantIter iter;
+	GVariant    *value;
+	gchar       *key;
+
+	g_variant_iter_init (&iter, props);
+	while (g_variant_iter_loop (&iter, "{sv}", &key, &value)) {
+		switch (g_variant_classify (value)) {
+		case G_VARIANT_CLASS_UINT32: {
+			guint32 v = g_variant_get_uint32 (value);
+
+			g_object_set (applet, key, v, NULL);
+		}
+			break;
+		case G_VARIANT_CLASS_STRING: {
+			const gchar *v = g_variant_get_string (value, NULL);
+
+			g_object_set (applet, key, v, NULL);
+		}
+			break;
+		case G_VARIANT_CLASS_BOOLEAN: {
+			gboolean v = g_variant_get_boolean (value);
+
+			g_object_set (applet, key, v, NULL);
+		}
+			break;
+		default:
+			g_assert_not_reached ();
+			break;
+		}
+	}
+}
+
+
+static void
+mate_panel_applet_factory_get_applet (MatePanelAppletFactory    *factory,
+				 GDBusConnection       *connection,
+				 GVariant              *parameters,
+				 GDBusMethodInvocation *invocation)
+{
+	GObject     *applet;
+	const gchar *applet_id;
+	gint         screen_num;
+	GVariant    *props;
+	GdkScreen   *screen;
+	guint32      xid;
+	const gchar *object_path;
+
+	g_variant_get (parameters, "(&si@a{sv})", &applet_id, &screen_num, &props);
+
+	applet = g_object_new (factory->applet_type,
+			       "id", applet_id,
+			       "connection", connection,
+			       "closure", factory->closure,
+			       NULL);
+	factory->n_applets++;
+	g_object_weak_ref (applet, (GWeakNotify) mate_panel_applet_factory_applet_removed, factory);
+
+	set_applet_constructor_properties (applet, props);
+	g_variant_unref (props);
+
+	screen = screen_num != -1 ?
+		gdk_display_get_screen (gdk_display_get_default (), screen_num) :
+		gdk_screen_get_default ();
+
+	xid = mate_panel_applet_get_xid (MATE_PANEL_APPLET (applet), screen);
+	object_path = mate_panel_applet_get_object_path (MATE_PANEL_APPLET (applet));
+
+	g_dbus_method_invocation_return_value (invocation,
+					       g_variant_new ("(ou)", object_path, xid));
+}
+
+static void
+method_call_cb (GDBusConnection       *connection,
+		const gchar           *sender,
+		const gchar           *object_path,
+		const gchar           *interface_name,
+		const gchar           *method_name,
+		GVariant              *parameters,
+		GDBusMethodInvocation *invocation,
+		gpointer               user_data)
+{
+	MatePanelAppletFactory *factory = MATE_PANEL_APPLET_FACTORY (user_data);
+
+	if (g_strcmp0 (method_name, "GetApplet") == 0) {
+		mate_panel_applet_factory_get_applet (factory, connection, parameters, invocation);
+	}
+}
+
+static const gchar introspection_xml[] =
+	"<node>"
+	    "<interface name='org.mate.panel.applet.AppletFactory'>"
+	      "<method name='GetApplet'>"
+	        "<arg name='applet_id' type='s' direction='in'/>"
+	        "<arg name='screen' type='i' direction='in'/>"
+	        "<arg name='props' type='a{sv}' direction='in'/>"
+	        "<arg name='applet' type='o' direction='out'/>"
+	        "<arg name='xid' type='u' direction='out'/>"
+	      "</method>"
+	    "</interface>"
+	  "</node>";
+
+static const GDBusInterfaceVTable interface_vtable = {
+	method_call_cb,
+	NULL,
+	NULL
+};
+
+static GDBusNodeInfo *introspection_data = NULL;
+
+static void
+on_name_acquired (GDBusConnection    *connection,
+		  const gchar        *name,
+		  MatePanelAppletFactory *factory)
+{
+	gchar  *object_path;
+	GError *error = NULL;
+
+	if (!introspection_data)
+		introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
+	object_path = g_strdup_printf (MATE_PANEL_APPLET_FACTORY_OBJECT_PATH, factory->factory_id);
+	g_dbus_connection_register_object (connection,
+					   object_path,
+					   introspection_data->interfaces[0],
+					   &interface_vtable,
+					   factory, NULL,
+					   &error);
+	if (error) {
+		g_printerr ("Failed to register object %s: %s\n", object_path, error->message);
+		g_error_free (error);
+	}
+
+	g_free (object_path);
+}
+
+static void
+on_name_lost (GDBusConnection    *connection,
+	      const gchar        *name,
+	      MatePanelAppletFactory *factory)
+{
+	g_object_unref (factory);
+}
+
+gboolean
+mate_panel_applet_factory_register_service (MatePanelAppletFactory *factory)
+{
+	gchar *service_name;
+
+	service_name = g_strdup_printf (MATE_PANEL_APPLET_FACTORY_SERVICE_NAME, factory->factory_id);
+	g_bus_own_name (G_BUS_TYPE_SESSION,
+			service_name,
+			G_BUS_NAME_OWNER_FLAGS_NONE,
+			NULL,
+			(GBusNameAcquiredCallback) on_name_acquired,
+			(GBusNameLostCallback) on_name_lost,
+			factory, NULL);
+	g_free (service_name);
+
+	return TRUE;
+}
+
+
diff --git a/libmate-panel-applet/mate-panel-applet-factory.h b/libmate-panel-applet/mate-panel-applet-factory.h
new file mode 100644
index 00000000..3a643696
--- /dev/null
+++ b/libmate-panel-applet/mate-panel-applet-factory.h
@@ -0,0 +1,57 @@
+/*
+ * mate-panel-applet-factory.h: panel applet writing API.
+ *
+ * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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 MATE_PANEL_APPLET_FACTORY_H
+#define MATE_PANEL_APPLET_FACTORY_H
+
+#include <glib-object.h>
+
+#include "mate-panel-applet.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PANEL_TYPE_APPLET_FACTORY            (mate_panel_applet_factory_get_type ())
+#define MATE_PANEL_APPLET_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_APPLET_FACTORY, MatePanelAppletFactory))
+#define MATE_PANEL_APPLET_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PANEL_TYPE_APPLET_FACTORY, MatePanelAppletFactoryClass))
+#define PANEL_IS_APPLET_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_APPLET_FACTORY))
+
+typedef struct _MatePanelAppletFactory        MatePanelAppletFactory;
+typedef struct _MatePanelAppletFactoryClass   MatePanelAppletFactoryClass;
+
+GType               mate_panel_applet_factory_get_type         (void) G_GNUC_CONST;
+MatePanelAppletFactory *mate_panel_applet_factory_new              (const gchar        *applet_id,
+							   GType               applet_type,
+							   GClosure           *closure);
+gboolean            mate_panel_applet_factory_register_service (MatePanelAppletFactory *factory);
+
+/* This technically belongs to mate-panel-applet.h, but it's not something that
+ * should be public API. */
+guint32            mate_panel_applet_get_xid              (MatePanelApplet *applet,
+						      GdkScreen   *screen);
+const gchar       *mate_panel_applet_get_object_path      (MatePanelApplet *applet);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MATE_PANEL_APPLET_FACTORY_H */
diff --git a/libmate-panel-applet/mate-panel-applet-marshal.list b/libmate-panel-applet/mate-panel-applet-marshal.list
new file mode 100644
index 00000000..1693a57d
--- /dev/null
+++ b/libmate-panel-applet/mate-panel-applet-marshal.list
@@ -0,0 +1,5 @@
+VOID:ENUM,BOXED,OBJECT
+VOID:INT
+VOID:UINT
+VOID:ENUM
+BOOLEAN:STRING
diff --git a/libmate-panel-applet/mate-panel-applet-mateconf.c b/libmate-panel-applet/mate-panel-applet-mateconf.c
new file mode 100644
index 00000000..0c7f4763
--- /dev/null
+++ b/libmate-panel-applet/mate-panel-applet-mateconf.c
@@ -0,0 +1,457 @@
+/*
+ * mate-panel-applet-mateconf.c: panel applet preferences handling.
+ *
+ * Copyright (C) 2001-2003 Sun Microsystems, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ *
+ * Authors:
+ *     Mark McLoughlin <[email protected]>
+ */
+
+#include <mateconf/mateconf-client.h>
+
+#include "mate-panel-applet-mateconf.h"
+
+static MateConfClient *
+mate_panel_applet_mateconf_get_client (void)
+{
+	static MateConfClient *client = NULL;
+
+	if (!client)
+		client = mateconf_client_get_default ();
+
+	return client;
+}
+
+gchar *
+mate_panel_applet_mateconf_get_full_key (MatePanelApplet *applet,
+				 const gchar *key)
+{
+	gchar *prefs_key;
+	gchar *full_key;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
+
+	if (!key)
+		return NULL;
+
+	prefs_key = mate_panel_applet_get_preferences_key (applet);
+
+	full_key = g_strdup_printf ("%s/%s", prefs_key, key);
+
+	g_free (prefs_key);
+
+	return full_key;
+}
+
+void
+mate_panel_applet_mateconf_set_bool (MatePanelApplet  *applet,
+			     const gchar  *key,
+			     gboolean      the_bool,
+			     GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	mateconf_client_set_bool (client, full_key, the_bool, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+}
+
+void
+mate_panel_applet_mateconf_set_int (MatePanelApplet  *applet,
+			    const gchar  *key,
+			    gint          the_int,
+			    GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	mateconf_client_set_int (client, full_key, the_int, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+}
+
+void
+mate_panel_applet_mateconf_set_string (MatePanelApplet  *applet,
+			       const gchar  *key,
+			       const gchar  *the_string,
+			       GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	mateconf_client_set_string (client, full_key, the_string, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+}
+
+void
+mate_panel_applet_mateconf_set_float (MatePanelApplet  *applet,
+			      const gchar  *key,
+			      gdouble       the_float,
+			      GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	mateconf_client_set_float (client, full_key, the_float, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+}
+
+void
+mate_panel_applet_mateconf_set_list (MatePanelApplet     *applet,
+			     const gchar     *key,
+			     MateConfValueType   list_type,
+			     GSList          *list,
+			     GError         **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	mateconf_client_set_list (client, full_key, list_type, list, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+}
+
+void
+mate_panel_applet_mateconf_set_value (MatePanelApplet  *applet,
+			      const gchar  *key,
+			      MateConfValue   *value,
+			      GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	mateconf_client_set (client, full_key, value, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+}
+
+gboolean
+mate_panel_applet_mateconf_get_bool (MatePanelApplet  *applet,
+			     const gchar  *key,
+			     GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	gboolean      retval;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), FALSE);
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	retval = mateconf_client_get_bool (client, full_key, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+
+	return retval;
+}
+
+gint
+mate_panel_applet_mateconf_get_int (MatePanelApplet  *applet,
+			    const gchar  *key,
+			    GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	gint          retval;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), -1);
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	retval = mateconf_client_get_int (client, full_key, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+
+	return retval;
+}
+
+gchar *
+mate_panel_applet_mateconf_get_string (MatePanelApplet  *applet,
+			       const gchar  *key,
+			       GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	gchar        *retval;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	retval = mateconf_client_get_string (client, full_key, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+
+	return retval;
+}
+
+gdouble
+mate_panel_applet_mateconf_get_float (MatePanelApplet  *applet,
+			      const gchar  *key,
+			      GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	gdouble       retval;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), 0.0);
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	retval = mateconf_client_get_float (client, full_key, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+
+	return retval;
+}
+
+MateConfValue *
+mate_panel_applet_mateconf_get_value (MatePanelApplet  *applet,
+			      const gchar  *key,
+			      GError      **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	MateConfValue   *retval;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	retval = mateconf_client_get (client, full_key, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+
+	return retval;
+}
+
+GSList *
+mate_panel_applet_mateconf_get_list (MatePanelApplet     *applet,
+			     const gchar     *key,
+			     MateConfValueType   list_type,
+			     GError         **opt_error)
+{
+	MateConfClient  *client;
+	gchar        *full_key;
+	GSList       *retval;
+	GError      **error = NULL;
+	GError       *our_error = NULL;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	full_key = mate_panel_applet_mateconf_get_full_key (applet, key);
+
+	client = mate_panel_applet_mateconf_get_client ();
+
+	retval = mateconf_client_get_list (client, full_key, list_type, error);
+
+	g_free (full_key);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message);
+		g_error_free (our_error);
+	}
+
+	return retval;
+}
diff --git a/libmate-panel-applet/mate-panel-applet-mateconf.h b/libmate-panel-applet/mate-panel-applet-mateconf.h
new file mode 100644
index 00000000..2eb523a4
--- /dev/null
+++ b/libmate-panel-applet/mate-panel-applet-mateconf.h
@@ -0,0 +1,90 @@
+/*
+ * mate-panel-applet-mateconf.h: panel applet preferences handling.
+ *
+ * Copyright (C) 2001-2003 Sun Microsystems, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ *
+ * Authors:
+ *     Mark McLoughlin <[email protected]>
+ */
+
+#ifndef __MATE_PANEL_APPLET_MATECONF_H__
+#define __MATE_PANEL_APPLET_MATECONF_H__
+
+#include <glib.h>
+#include <mateconf/mateconf-value.h>
+
+#include <mate-panel-applet.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+gchar       *mate_panel_applet_mateconf_get_full_key (MatePanelApplet     *applet,
+					      const gchar     *key);
+
+void         mate_panel_applet_mateconf_set_bool     (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      gboolean         the_bool,
+					      GError         **opt_error);
+void         mate_panel_applet_mateconf_set_int      (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      gint             the_int,
+					      GError         **opt_error);
+void         mate_panel_applet_mateconf_set_string   (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      const gchar     *the_string,
+					      GError         **opt_error);
+void         mate_panel_applet_mateconf_set_float    (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      gdouble          the_float,
+					      GError         **opt_error);
+void         mate_panel_applet_mateconf_set_list     (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      MateConfValueType   list_type,
+					      GSList          *list,
+					      GError         **opt_error);
+void         mate_panel_applet_mateconf_set_value    (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      MateConfValue      *value,
+					      GError         **opt_error);
+
+gboolean     mate_panel_applet_mateconf_get_bool     (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      GError         **opt_error);
+gint         mate_panel_applet_mateconf_get_int      (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      GError         **opt_error);
+gchar       *mate_panel_applet_mateconf_get_string   (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      GError         **opt_error);
+gdouble      mate_panel_applet_mateconf_get_float    (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      GError         **opt_error);
+GSList      *mate_panel_applet_mateconf_get_list     (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      MateConfValueType   list_type,
+					      GError         **opt_error);
+MateConfValue  *mate_panel_applet_mateconf_get_value    (MatePanelApplet     *applet,
+					      const gchar     *key,
+					      GError         **opt_error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MATE_PANEL_APPLET_MATECONF_H__ */
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
new file mode 100644
index 00000000..5ec4c7bf
--- /dev/null
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -0,0 +1,2315 @@
+/*
+ * mate-panel-applet.c: panel applet writing library.
+ *
+ * Copyright (c) 2010 Carlos Garcia Campos <[email protected]>
+ * Copyright (C) 2001 Sun Microsystems, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ *
+ * Authors:
+ *     Mark McLoughlin <[email protected]>
+ */
+
+#ifdef HAVE_CONFIG_H
+	#include <config.h>
+#endif
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib/gi18n-lib.h>
+#include <cairo.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <mateconf/mateconf.h>
+#include <mateconf/mateconf-client.h>
+#include <X11/Xatom.h>
+
+#include "mate-panel-applet.h"
+#include "mate-panel-applet-factory.h"
+#include "mate-panel-applet-marshal.h"
+#include "mate-panel-applet-enums.h"
+
+#define MATE_PANEL_APPLET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_APPLET, MatePanelAppletPrivate))
+
+struct _MatePanelAppletPrivate {
+	GtkWidget         *plug;
+	GtkWidget         *applet;
+	MateConfClient       *client;
+	GDBusConnection   *connection;
+
+	char              *id;
+	GClosure          *closure;
+	char              *object_path;
+	guint              object_id;
+	char              *prefs_key;
+
+	GtkUIManager      *ui_manager;
+	GtkActionGroup    *applet_action_group;
+	GtkActionGroup    *panel_action_group;
+
+	MatePanelAppletFlags   flags;
+	MatePanelAppletOrient  orient;
+	guint              size;
+	char              *background;
+	GtkWidget         *background_widget;
+
+	int                previous_width;
+	int                previous_height;
+
+	int               *size_hints;
+	int                size_hints_len;
+
+	gboolean           moving_focus_out;
+
+	gboolean           locked;
+	gboolean           locked_down;
+};
+
+enum {
+	CHANGE_ORIENT,
+	CHANGE_SIZE,
+	CHANGE_BACKGROUND,
+	MOVE_FOCUS_OUT_OF_APPLET,
+	SAVE_YOURSELF,
+	LAST_SIGNAL
+};
+
+static guint mate_panel_applet_signals[LAST_SIGNAL];
+
+enum {
+	PROP_0,
+	PROP_ID,
+	PROP_CLOSURE,
+	PROP_CONNECTION,
+	PROP_PREFS_KEY,
+	PROP_ORIENT,
+	PROP_SIZE,
+	PROP_BACKGROUND,
+	PROP_FLAGS,
+	PROP_SIZE_HINTS,
+	PROP_LOCKED,
+	PROP_LOCKED_DOWN
+};
+
+static void       mate_panel_applet_handle_background   (MatePanelApplet       *applet);
+static GtkAction *mate_panel_applet_menu_get_action     (MatePanelApplet       *applet,
+						    const gchar       *action);
+static void       mate_panel_applet_menu_update_actions (MatePanelApplet       *applet);
+static void       mate_panel_applet_menu_cmd_remove     (GtkAction         *action,
+						    MatePanelApplet       *applet);
+static void       mate_panel_applet_menu_cmd_move       (GtkAction         *action,
+						    MatePanelApplet       *applet);
+static void       mate_panel_applet_menu_cmd_lock       (GtkAction         *action,
+						    MatePanelApplet       *applet);
+static void       mate_panel_applet_register_object     (MatePanelApplet       *applet);
+
+static const gchar panel_menu_ui[] =
+	"<ui>\n"
+	"  <popup name=\"MatePanelAppletPopup\" action=\"PopupAction\">\n"
+	"    <placeholder name=\"AppletItems\"/>\n"
+	"    <separator/>\n"
+	"    <menuitem name=\"RemoveItem\" action=\"Remove\"/>\n"
+	"    <menuitem name=\"MoveItem\" action=\"Move\"/>\n"
+	"    <separator/>\n"
+	"    <menuitem name=\"LockItem\" action=\"Lock\"/>\n"
+	"  </popup>\n"
+	"</ui>\n";
+
+static const GtkActionEntry menu_entries[] = {
+	{ "Remove", GTK_STOCK_REMOVE, N_("_Remove From Panel"),
+	  NULL, NULL,
+	  G_CALLBACK (mate_panel_applet_menu_cmd_remove) },
+	{ "Move", NULL, N_("_Move"),
+	  NULL, NULL,
+	  G_CALLBACK (mate_panel_applet_menu_cmd_move) }
+};
+
+static const GtkToggleActionEntry menu_toggle_entries[] = {
+	{ "Lock", NULL, N_("Loc_k To Panel"),
+	  NULL, NULL,
+	  G_CALLBACK (mate_panel_applet_menu_cmd_lock) }
+};
+
+G_DEFINE_TYPE (MatePanelApplet, mate_panel_applet, GTK_TYPE_EVENT_BOX)
+
+#define MATE_PANEL_APPLET_INTERFACE   "org.mate.panel.applet.Applet"
+#define MATE_PANEL_APPLET_OBJECT_PATH "/org/mate/panel/applet/%s/%d"
+
+static void
+mate_panel_applet_associate_schemas_in_dir (MateConfClient  *client,
+				       const gchar  *prefs_key,
+				       const gchar  *schema_dir,
+				       GError      **error)
+{
+	GSList *list, *l;
+
+	list = mateconf_client_all_entries (client, schema_dir, error);
+
+	if (*error != NULL)
+		return;
+
+	for (l = list; l; l = l->next) {
+		MateConfEntry  *entry = l->data;
+		const gchar *schema_key;
+		MateConfEntry  *applet_entry;
+		const gchar *applet_schema_key;
+		gchar       *key;
+		gchar       *tmp;
+
+		schema_key = mateconf_entry_get_key (entry);
+		tmp = g_path_get_basename (schema_key);
+
+		if (strchr (tmp, '-'))
+			g_warning ("Applet key '%s' contains a hyphen. Please "
+				   "use underscores in mateconf keys\n", tmp);
+
+		key = g_strdup_printf ("%s/%s", prefs_key, tmp);
+		g_free (tmp);
+
+		/* Associating a schema is potentially expensive, so let's try
+		 * to avoid this by doing it only when needed. So we check if
+		 * the key is already correctly associated. */
+
+		applet_entry = mateconf_client_get_entry (client, key,
+						       NULL, TRUE, NULL);
+		if (applet_entry)
+			applet_schema_key = mateconf_entry_get_schema_name (applet_entry);
+		else
+			applet_schema_key = NULL;
+
+		if (g_strcmp0 (schema_key, applet_schema_key) != 0) {
+			mateconf_engine_associate_schema (client->engine,
+						       key, schema_key, error);
+
+			if (applet_entry == NULL ||
+			    mateconf_entry_get_value (applet_entry) == NULL ||
+			    mateconf_entry_get_is_default (applet_entry)) {
+				/* unset the key: mateconf_client_get_entry()
+				 * brought an invalid entry in the client
+				 * cache, and we want to fix this */
+				mateconf_client_unset (client, key, NULL);
+			}
+		}
+
+		g_free (key);
+
+		if (applet_entry)
+			mateconf_entry_unref (applet_entry);
+		mateconf_entry_unref (entry);
+
+		if (*error) {
+			g_slist_free (list);
+			return;
+		}
+	}
+
+	g_slist_free (list);
+
+	list = mateconf_client_all_dirs (client, schema_dir, error);
+
+	for (l = list; l; l = l->next) {
+		gchar *subdir = l->data;
+		gchar *prefs_subdir;
+		gchar *schema_subdir;
+		gchar *tmp;
+
+		tmp = g_path_get_basename (subdir);
+
+		prefs_subdir  = g_strdup_printf ("%s/%s", prefs_key, tmp);
+		schema_subdir = g_strdup_printf ("%s/%s", schema_dir, tmp);
+
+		mate_panel_applet_associate_schemas_in_dir (client,
+						       prefs_subdir,
+						       schema_subdir,
+						       error);
+
+		g_free (prefs_subdir);
+		g_free (schema_subdir);
+		g_free (subdir);
+		g_free (tmp);
+
+		if (*error) {
+			g_slist_free (list);
+			return;
+		}
+	}
+
+	g_slist_free (list);
+}
+
+void
+mate_panel_applet_add_preferences (MatePanelApplet  *applet,
+			      const gchar  *schema_dir,
+			      GError      **opt_error)
+{
+	GError **error = NULL;
+	GError  *our_error = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+	g_return_if_fail (schema_dir != NULL);
+
+	if (!applet->priv->prefs_key)
+		return;
+
+	if (opt_error)
+		error = opt_error;
+	else
+		error = &our_error;
+
+	mate_panel_applet_associate_schemas_in_dir (applet->priv->client,
+					       applet->priv->prefs_key,
+					       schema_dir,
+					       error);
+
+	if (!opt_error && our_error) {
+		g_warning (G_STRLOC ": failed to add preferences from '%s' : '%s'",
+			   schema_dir, our_error->message);
+		g_error_free (our_error);
+	}
+}
+
+char *
+mate_panel_applet_get_preferences_key (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
+
+	if (!applet->priv->prefs_key)
+		return NULL;
+
+	return g_strdup (applet->priv->prefs_key);
+}
+
+static void
+mate_panel_applet_set_preferences_key (MatePanelApplet *applet,
+				  const char  *prefs_key)
+{
+	if (applet->priv->prefs_key == prefs_key)
+		return;
+
+	if (g_strcmp0 (applet->priv->prefs_key, prefs_key) == 0)
+		return;
+
+	if (applet->priv->prefs_key) {
+		mateconf_client_remove_dir (applet->priv->client,
+					 applet->priv->prefs_key,
+					 NULL);
+
+		g_free (applet->priv->prefs_key);
+		applet->priv->prefs_key = NULL;
+	}
+
+	if (prefs_key) {
+		applet->priv->prefs_key = g_strdup (prefs_key);
+
+		mateconf_client_add_dir (applet->priv->client,
+				      applet->priv->prefs_key,
+				      MATECONF_CLIENT_PRELOAD_RECURSIVE,
+				      NULL);
+	}
+
+	g_object_notify (G_OBJECT (applet), "prefs-key");
+}
+
+MatePanelAppletFlags
+mate_panel_applet_get_flags (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), MATE_PANEL_APPLET_FLAGS_NONE);
+
+	return applet->priv->flags;
+}
+
+void
+mate_panel_applet_set_flags (MatePanelApplet      *applet,
+			MatePanelAppletFlags  flags)
+{
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (applet->priv->flags == flags)
+		return;
+
+	applet->priv->flags = flags;
+
+	g_object_notify (G_OBJECT (applet), "flags");
+
+	if (applet->priv->connection) {
+		GVariantBuilder *builder;
+		GVariantBuilder *invalidated_builder;
+		GError          *error = NULL;
+
+		builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+		invalidated_builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+
+		g_variant_builder_add (builder, "{sv}", "Flags",
+				       g_variant_new_uint32 (applet->priv->flags));
+
+		g_dbus_connection_emit_signal (applet->priv->connection,
+					       NULL,
+					       applet->priv->object_path,
+					       "org.freedesktop.DBus.Properties",
+					       "PropertiesChanged",
+					       g_variant_new ("(sa{sv}as)",
+							      MATE_PANEL_APPLET_INTERFACE,
+							      builder,
+							      invalidated_builder),
+					       &error);
+		if (error) {
+			g_printerr ("Failed to send signal PropertiesChanged::Flags: %s\n",
+				    error->message);
+			g_error_free (error);
+		}
+	}
+}
+
+static void
+mate_panel_applet_size_hints_ensure (MatePanelApplet *applet,
+				int          new_size)
+{
+	if (applet->priv->size_hints && applet->priv->size_hints_len < new_size) {
+		g_free (applet->priv->size_hints);
+		applet->priv->size_hints = g_new (gint, new_size);
+	} else if (!applet->priv->size_hints) {
+		applet->priv->size_hints = g_new (gint, new_size);
+	}
+	applet->priv->size_hints_len = new_size;
+}
+
+static gboolean
+mate_panel_applet_size_hints_changed (MatePanelApplet *applet,
+				 const int   *size_hints,
+				 int          n_elements,
+				 int          base_size)
+{
+	gint i;
+
+	if (!applet->priv->size_hints)
+		return TRUE;
+
+	if (applet->priv->size_hints_len != n_elements)
+		return TRUE;
+
+	for (i = 0; i < n_elements; i++) {
+		if (size_hints[i] + base_size != applet->priv->size_hints[i])
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+void
+mate_panel_applet_set_size_hints (MatePanelApplet *applet,
+			     const int   *size_hints,
+			     int          n_elements,
+			     int          base_size)
+{
+	gint i;
+
+	/* Make sure property has really changed to avoid bus traffic */
+	if (!mate_panel_applet_size_hints_changed (applet, size_hints, n_elements, base_size))
+		return;
+
+	mate_panel_applet_size_hints_ensure (applet, n_elements);
+	for (i = 0; i < n_elements; i++)
+		applet->priv->size_hints[i] = size_hints[i] + base_size;
+
+	g_object_notify (G_OBJECT (applet), "size-hints");
+
+	if (applet->priv->connection) {
+		GVariantBuilder *builder;
+		GVariantBuilder *invalidated_builder;
+		GVariant       **children;
+		GError          *error = NULL;
+
+		builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+		invalidated_builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+
+		children = g_new (GVariant *, applet->priv->size_hints_len);
+		for (i = 0; i < n_elements; i++)
+			children[i] = g_variant_new_int32 (applet->priv->size_hints[i]);
+		g_variant_builder_add (builder, "{sv}", "SizeHints",
+				       g_variant_new_array (G_VARIANT_TYPE_INT32,
+							    children, applet->priv->size_hints_len));
+		g_free (children);
+
+		g_dbus_connection_emit_signal (applet->priv->connection,
+					       NULL,
+					       applet->priv->object_path,
+					       "org.freedesktop.DBus.Properties",
+					       "PropertiesChanged",
+					       g_variant_new ("(sa{sv}as)",
+							      MATE_PANEL_APPLET_INTERFACE,
+							      builder,
+							      invalidated_builder),
+					       &error);
+		if (error) {
+			g_printerr ("Failed to send signal PropertiesChanged::SizeHints: %s\n",
+				    error->message);
+			g_error_free (error);
+		}
+	}
+}
+
+guint
+mate_panel_applet_get_size (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), 0);
+
+	return applet->priv->size;
+}
+
+/* Applets cannot set their size, so API is not public. */
+static void
+mate_panel_applet_set_size (MatePanelApplet *applet,
+		       guint        size)
+{
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (applet->priv->size == size)
+		return;
+
+	applet->priv->size = size;
+	g_signal_emit (G_OBJECT (applet),
+		       mate_panel_applet_signals [CHANGE_SIZE],
+		       0, size);
+
+	g_object_notify (G_OBJECT (applet), "size");
+}
+
+MatePanelAppletOrient
+mate_panel_applet_get_orient (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), 0);
+
+	return applet->priv->orient;
+}
+
+/* Applets cannot set their orientation, so API is not public. */
+static void
+mate_panel_applet_set_orient (MatePanelApplet      *applet,
+			 MatePanelAppletOrient orient)
+{
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (applet->priv->orient == orient)
+		return;
+
+	applet->priv->orient = orient;
+	g_signal_emit (G_OBJECT (applet),
+		       mate_panel_applet_signals [CHANGE_ORIENT],
+		       0, orient);
+
+	g_object_notify (G_OBJECT (applet), "orient");
+}
+
+#if 0
+/* Locked should not be public API: it's not useful for applet writers to know
+ * if the applet is locked (as opposed to locked_down). */
+static gboolean
+mate_panel_applet_get_locked (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), FALSE);
+
+	return applet->priv->locked;
+}
+#endif
+
+static void
+mate_panel_applet_set_locked (MatePanelApplet *applet,
+			 gboolean     locked)
+{
+	GtkAction *action;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (applet->priv->locked == locked)
+		return;
+
+	applet->priv->locked = locked;
+
+	action = mate_panel_applet_menu_get_action (applet, "Lock");
+	g_signal_handlers_block_by_func (action,
+					 mate_panel_applet_menu_cmd_lock,
+					 applet);
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), locked);
+	g_signal_handlers_unblock_by_func (action,
+					   mate_panel_applet_menu_cmd_lock,
+					   applet);
+
+	mate_panel_applet_menu_update_actions (applet);
+
+	g_object_notify (G_OBJECT (applet), "locked");
+
+	if (applet->priv->connection) {
+		GError *error = NULL;
+
+		g_dbus_connection_emit_signal (applet->priv->connection,
+					       NULL,
+					       applet->priv->object_path,
+					       MATE_PANEL_APPLET_INTERFACE,
+					       locked ? "Lock" : "Unlock",
+					       NULL, &error);
+		if (error) {
+			g_printerr ("Failed to send signal %s: %s\n",
+				    locked ? "Lock" : "Unlock",
+				    error->message);
+			g_error_free (error);
+		}
+	}
+}
+
+gboolean
+mate_panel_applet_get_locked_down (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), FALSE);
+
+	return applet->priv->locked_down;
+}
+
+/* Applets cannot set the lockdown state, so API is not public. */
+static void
+mate_panel_applet_set_locked_down (MatePanelApplet *applet,
+			      gboolean     locked_down)
+{
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	if (applet->priv->locked_down == locked_down)
+		return;
+
+	applet->priv->locked_down = locked_down;
+	mate_panel_applet_menu_update_actions (applet);
+
+	g_object_notify (G_OBJECT (applet), "locked-down");
+}
+
+static Atom _net_wm_window_type = None;
+static Atom _net_wm_window_type_dock = None;
+static Atom _net_active_window = None;
+
+static void
+mate_panel_applet_init_atoms (Display *xdisplay)
+{
+	if (_net_wm_window_type == None)
+		_net_wm_window_type = XInternAtom (xdisplay,
+						   "_NET_WM_WINDOW_TYPE",
+						   False);
+
+	if (_net_wm_window_type_dock == None)
+		_net_wm_window_type_dock = XInternAtom (xdisplay,
+							"_NET_WM_WINDOW_TYPE_DOCK",
+							False);
+
+	if (_net_active_window == None)
+		_net_active_window = XInternAtom (xdisplay,
+						  "_NET_ACTIVE_WINDOW",
+						  False);
+}
+
+static Window
+mate_panel_applet_find_toplevel_dock_window (MatePanelApplet *applet,
+					Display	    *xdisplay)
+{
+	GtkWidget  *toplevel;
+	Window	    xwin;
+	Window	    root, parent, *child;
+	int	    num_children;
+
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (applet));
+	if (!gtk_widget_get_realized (toplevel))
+		return None;
+
+	xwin = GDK_WINDOW_XID (gtk_widget_get_window (toplevel));
+
+	child = NULL;
+	parent = root = None;
+	do {
+		Atom	type_return;
+		Atom	window_type;
+		int	format_return;
+		gulong	number_return, bytes_after_return;
+		guchar *data_return;
+
+		XGetWindowProperty (xdisplay,
+				    xwin,
+				    _net_wm_window_type,
+				    0, 1, False,
+				    XA_ATOM,
+				    &type_return, &format_return,
+				    &number_return,
+				    &bytes_after_return,
+				    &data_return);
+
+		if (type_return == XA_ATOM) {
+			window_type = *(Atom *) data_return;
+
+			XFree (data_return);
+			data_return = NULL;
+
+			if (window_type == _net_wm_window_type_dock)
+				return xwin;
+		}
+
+		if (!XQueryTree (xdisplay,
+			   xwin,
+			   &root, &parent, &child,
+			   (guint *) &num_children)) {
+			   return None;
+		}
+
+		if (child && num_children > 0)
+			XFree (child);
+
+		xwin = parent;
+
+	} while (xwin != None && xwin != root);
+
+	return None;
+}
+
+/* This function
+ *   1) Gets the window id of the panel that contains the applet
+ *	using XQueryTree and XGetWindowProperty to find an ancestor
+ *	window with the _NET_WM_WINDOW_TYPE_DOCK window type.
+ *   2) Sends a _NET_ACTIVE_WINDOW message to get that panel focused
+ */
+void
+mate_panel_applet_request_focus (MatePanelApplet	 *applet,
+			    guint32	  timestamp)
+{
+	GdkScreen  *screen;
+	GdkWindow  *root;
+	GdkDisplay *display;
+	Display	   *xdisplay;
+	Window	    dock_xwindow;
+	Window	    xroot;
+	XEvent	    xev;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	screen	= gtk_widget_get_screen (GTK_WIDGET (applet));
+	root	= gdk_screen_get_root_window (screen);
+	display = gdk_screen_get_display (screen);
+
+	xdisplay = GDK_DISPLAY_XDISPLAY (display);
+	xroot	 = GDK_WINDOW_XWINDOW (root);
+
+	mate_panel_applet_init_atoms (xdisplay);
+
+	dock_xwindow = mate_panel_applet_find_toplevel_dock_window (applet, xdisplay);
+	if (dock_xwindow == None)
+		return;
+
+	xev.xclient.type	 = ClientMessage;
+	xev.xclient.serial	 = 0;
+	xev.xclient.send_event	 = True;
+	xev.xclient.window	 = dock_xwindow;
+	xev.xclient.message_type = _net_active_window;
+	xev.xclient.format	 = 32;
+	xev.xclient.data.l[0]	 = 1; /* requestor type; we're an app, I guess */
+	xev.xclient.data.l[1]	 = timestamp;
+	xev.xclient.data.l[2]	 = None; /* "currently active window", supposedly */
+	xev.xclient.data.l[3]	 = 0;
+	xev.xclient.data.l[4]	 = 0;
+
+	XSendEvent (xdisplay,
+		    xroot, False,
+		    SubstructureRedirectMask | SubstructureNotifyMask,
+		    &xev);
+}
+
+static GtkAction *
+mate_panel_applet_menu_get_action (MatePanelApplet *applet,
+			      const gchar *action)
+{
+	return gtk_action_group_get_action (applet->priv->panel_action_group, action);
+}
+
+static void
+mate_panel_applet_menu_update_actions (MatePanelApplet *applet)
+{
+	gboolean locked = applet->priv->locked;
+	gboolean locked_down = applet->priv->locked_down;
+
+	g_object_set (mate_panel_applet_menu_get_action (applet, "Lock"),
+		      "visible", !locked_down, NULL);
+	g_object_set (mate_panel_applet_menu_get_action (applet, "Move"),
+		      "sensitive", !locked,
+		      "visible", !locked_down,
+		      NULL);
+	g_object_set (mate_panel_applet_menu_get_action (applet, "Remove"),
+		      "sensitive", !locked,
+		      "visible", !locked_down,
+		      NULL);
+}
+
+static void
+mate_panel_applet_menu_cmd_remove (GtkAction   *action,
+			      MatePanelApplet *applet)
+{
+	GError *error = NULL;
+
+	if (!applet->priv->connection)
+		return;
+
+	g_dbus_connection_emit_signal (applet->priv->connection,
+				       NULL,
+				       applet->priv->object_path,
+				       MATE_PANEL_APPLET_INTERFACE,
+				       "RemoveFromPanel",
+				       NULL, &error);
+	if (error) {
+		g_printerr ("Failed to send signal RemoveFromPanel: %s\n",
+			    error->message);
+		g_error_free (error);
+	}
+}
+
+static void
+mate_panel_applet_menu_cmd_move (GtkAction   *action,
+			    MatePanelApplet *applet)
+{
+	GError *error = NULL;
+
+	if (!applet->priv->connection)
+		return;
+
+	g_dbus_connection_emit_signal (applet->priv->connection,
+				       NULL,
+				       applet->priv->object_path,
+				       MATE_PANEL_APPLET_INTERFACE,
+				       "Move",
+				       NULL, &error);
+	if (error) {
+		g_printerr ("Failed to send signal RemoveFromPanel: %s\n",
+			    error->message);
+		g_error_free (error);
+	}
+}
+
+static void
+mate_panel_applet_menu_cmd_lock (GtkAction   *action,
+			    MatePanelApplet *applet)
+{
+	gboolean locked;
+
+	locked = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+	mate_panel_applet_set_locked (applet, locked);
+}
+
+void
+mate_panel_applet_setup_menu (MatePanelApplet    *applet,
+			 const gchar    *xml,
+			 GtkActionGroup *applet_action_group)
+{
+	gchar  *new_xml;
+	GError *error = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+	g_return_if_fail (xml != NULL);
+
+	if (applet->priv->applet_action_group)
+		return;
+
+	applet->priv->applet_action_group = g_object_ref (applet_action_group);
+	gtk_ui_manager_insert_action_group (applet->priv->ui_manager,
+					    applet_action_group, 0);
+
+	new_xml = g_strdup_printf ("<ui><popup name=\"MatePanelAppletPopup\" action=\"AppletItems\">"
+				   "<placeholder name=\"AppletItems\">%s\n</placeholder>\n"
+				   "</popup></ui>\n", xml);
+	gtk_ui_manager_add_ui_from_string (applet->priv->ui_manager, new_xml, -1, &error);
+	g_free (new_xml);
+	gtk_ui_manager_ensure_update (applet->priv->ui_manager);
+	if (error) {
+		g_warning ("Error merging menus: %s\n", error->message);
+		g_error_free (error);
+	}
+}
+
+void
+mate_panel_applet_setup_menu_from_file (MatePanelApplet    *applet,
+				   const gchar    *filename,
+				   GtkActionGroup *applet_action_group)
+{
+	gchar  *xml = NULL;
+	GError *error = NULL;
+
+	if (g_file_get_contents (filename, &xml, NULL, &error)) {
+		mate_panel_applet_setup_menu (applet, xml, applet_action_group);
+	} else {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
+
+	g_free (xml);
+}
+
+static void
+mate_panel_applet_finalize (GObject *object)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (object);
+
+	if (applet->priv->connection) {
+		if (applet->priv->object_id)
+			g_dbus_connection_unregister_object (applet->priv->connection,
+							     applet->priv->object_id);
+		applet->priv->object_id = 0;
+		g_object_unref (applet->priv->connection);
+		applet->priv->connection = NULL;
+	}
+
+	if (applet->priv->object_path) {
+		g_free (applet->priv->object_path);
+		applet->priv->object_path = NULL;
+	}
+
+	mate_panel_applet_set_preferences_key (applet, NULL);
+
+	if (applet->priv->client)
+		g_object_unref (applet->priv->client);
+	applet->priv->client = NULL;
+
+	if (applet->priv->applet_action_group) {
+		g_object_unref (applet->priv->applet_action_group);
+		applet->priv->applet_action_group = NULL;
+	}
+
+	if (applet->priv->panel_action_group) {
+		g_object_unref (applet->priv->panel_action_group);
+		applet->priv->panel_action_group = NULL;
+	}
+
+	if (applet->priv->ui_manager) {
+		g_object_unref (applet->priv->ui_manager);
+		applet->priv->ui_manager = NULL;
+	}
+
+	g_free (applet->priv->size_hints);
+	g_free (applet->priv->prefs_key);
+	g_free (applet->priv->background);
+	g_free (applet->priv->id);
+
+	/* closure is owned by the factory */
+	applet->priv->closure = NULL;
+
+	G_OBJECT_CLASS (mate_panel_applet_parent_class)->finalize (object);
+}
+
+static gboolean
+container_has_focusable_child (GtkContainer *container)
+{
+	GtkWidget *child;
+	GList *list;
+	GList *t;
+	gboolean retval = FALSE;
+
+	list = gtk_container_get_children (container);
+
+	for (t = list; t; t = t->next) {
+		child = GTK_WIDGET (t->data);
+		if (gtk_widget_get_can_focus (child)) {
+			retval = TRUE;
+			break;
+		} else if (GTK_IS_CONTAINER (child)) {
+			retval = container_has_focusable_child (GTK_CONTAINER (child));
+			if (retval)
+				break;
+		}
+	}
+	g_list_free (list);
+	return retval;
+}
+
+static void
+mate_panel_applet_position_menu (GtkMenu   *menu,
+			    int       *x,
+			    int       *y,
+			    gboolean  *push_in,
+			    GtkWidget *widget)
+{
+	MatePanelApplet    *applet;
+	GtkAllocation   allocation;
+	GtkRequisition  requisition;
+	GdkScreen      *screen;
+	int             menu_x = 0;
+	int             menu_y = 0;
+	int             pointer_x;
+	int             pointer_y;
+
+	g_return_if_fail (PANEL_IS_APPLET (widget));
+
+	applet = MATE_PANEL_APPLET (widget);
+
+	screen = gtk_widget_get_screen (widget);
+
+	gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
+	gdk_window_get_origin (gtk_widget_get_window (widget),
+			       &menu_x, &menu_y);
+	gtk_widget_get_pointer (widget, &pointer_x, &pointer_y);
+
+	gtk_widget_get_allocation (widget, &allocation);
+
+	menu_x += allocation.x;
+	menu_y += allocation.y;
+
+	if (applet->priv->orient == MATE_PANEL_APPLET_ORIENT_UP ||
+	    applet->priv->orient == MATE_PANEL_APPLET_ORIENT_DOWN) {
+		if (gtk_widget_get_direction (GTK_WIDGET (menu)) != GTK_TEXT_DIR_RTL) {
+			if (pointer_x < allocation.width &&
+			    requisition.width < pointer_x)
+				menu_x += MIN (pointer_x,
+					       allocation.width - requisition.width);
+		} else {
+			menu_x += allocation.width - requisition.width;
+			if (pointer_x > 0 && pointer_x < allocation.width &&
+			    pointer_x < allocation.width - requisition.width) {
+				menu_x -= MIN (allocation.width - pointer_x,
+					       allocation.width - requisition.width);
+			}
+		}
+		menu_x = MIN (menu_x, gdk_screen_get_width (screen) - requisition.width);
+
+		if (menu_y > gdk_screen_get_height (screen) / 2)
+			menu_y -= requisition.height;
+		else
+			menu_y += allocation.height;
+	} else  {
+		if (pointer_y < allocation.height &&
+		    requisition.height < pointer_y)
+			menu_y += MIN (pointer_y, allocation.height - requisition.height);
+		menu_y = MIN (menu_y, gdk_screen_get_height (screen) - requisition.height);
+
+		if (menu_x > gdk_screen_get_width (screen) / 2)
+			menu_x -= requisition.width;
+		else
+			menu_x += allocation.width;
+
+	}
+
+	*x = menu_x;
+	*y = menu_y;
+	*push_in = TRUE;
+}
+
+static void
+mate_panel_applet_menu_popup (MatePanelApplet *applet,
+			 guint        button,
+			 guint32      time)
+{
+	GtkWidget *menu;
+
+	menu = gtk_ui_manager_get_widget (applet->priv->ui_manager,
+					  "/MatePanelAppletPopup");
+	gtk_menu_popup (GTK_MENU (menu),
+			NULL, NULL,
+			(GtkMenuPositionFunc) mate_panel_applet_position_menu,
+			applet,
+			button, time);
+}
+
+static gboolean
+mate_panel_applet_can_focus (GtkWidget *widget)
+{
+	/*
+	 * A MatePanelApplet widget can focus if it has a tooltip or it does
+	 * not have any focusable children.
+	 */
+	if (gtk_widget_get_has_tooltip (widget))
+		return TRUE;
+
+	if (!PANEL_IS_APPLET (widget))
+		return FALSE;
+
+	return !container_has_focusable_child (GTK_CONTAINER (widget));
+}
+
+/* Taken from libmatecomponentui/matecomponent/matecomponent-plug.c */
+static gboolean
+mate_panel_applet_button_event (GtkWidget      *widget,
+			   GdkEventButton *event)
+{
+	GdkWindow *window;
+	GdkWindow *socket_window;
+	XEvent     xevent;
+
+	if (!gtk_widget_is_toplevel (widget))
+		return FALSE;
+
+	window = gtk_widget_get_window (widget);
+	socket_window = gtk_plug_get_socket_window (GTK_PLUG (widget));
+
+	if (event->type == GDK_BUTTON_PRESS) {
+		xevent.xbutton.type = ButtonPress;
+
+		/* X does an automatic pointer grab on button press
+		 * if we have both button press and release events
+		 * selected.
+		 * We don't want to hog the pointer on our parent.
+		 */
+		gdk_display_pointer_ungrab
+			(gtk_widget_get_display (widget),
+			 GDK_CURRENT_TIME);
+	} else {
+		xevent.xbutton.type = ButtonRelease;
+	}
+
+	xevent.xbutton.display     = GDK_WINDOW_XDISPLAY (window);
+	xevent.xbutton.window      = GDK_WINDOW_XWINDOW (socket_window);
+	xevent.xbutton.root        = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window
+							 (gdk_drawable_get_screen (window)));
+	/*
+	 * FIXME: the following might cause
+	 *        big problems for non-GTK apps
+	 */
+	xevent.xbutton.x           = 0;
+	xevent.xbutton.y           = 0;
+	xevent.xbutton.x_root      = 0;
+	xevent.xbutton.y_root      = 0;
+	xevent.xbutton.state       = event->state;
+	xevent.xbutton.button      = event->button;
+	xevent.xbutton.same_screen = TRUE; /* FIXME ? */
+
+	gdk_error_trap_push ();
+
+	XSendEvent (GDK_WINDOW_XDISPLAY (window),
+		    GDK_WINDOW_XWINDOW (socket_window),
+		    False, NoEventMask, &xevent);
+
+	gdk_flush ();
+	gdk_error_trap_pop ();
+
+	return TRUE;
+}
+
+static gboolean
+mate_panel_applet_button_press (GtkWidget      *widget,
+			   GdkEventButton *event)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
+
+	if (!container_has_focusable_child (GTK_CONTAINER (applet))) {
+		if (!gtk_widget_has_focus (widget)) {
+			gtk_widget_set_can_focus (widget, TRUE);
+			gtk_widget_grab_focus (widget);
+		}
+	}
+
+	if (event->button == 3) {
+		mate_panel_applet_menu_popup (applet, event->button, event->time);
+
+		return TRUE;
+	}
+
+	return mate_panel_applet_button_event (applet->priv->plug, event);
+}
+
+static gboolean
+mate_panel_applet_button_release (GtkWidget      *widget,
+			     GdkEventButton *event)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
+
+	return mate_panel_applet_button_event (applet->priv->plug, event);
+}
+
+static gboolean
+mate_panel_applet_popup_menu (GtkWidget *widget)
+{
+	mate_panel_applet_menu_popup (MATE_PANEL_APPLET (widget), 3, GDK_CURRENT_TIME);
+
+	return TRUE;
+}
+
+static void
+mate_panel_applet_size_request (GtkWidget *widget, GtkRequisition *requisition)
+{
+	int focus_width = 0;
+
+	GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->size_request (widget,
+								    requisition);
+
+	if (!mate_panel_applet_can_focus (widget))
+		return;
+
+	/*
+	 * We are deliberately ignoring focus-padding here to
+	 * save valuable panel real estate.
+	 */
+	gtk_widget_style_get (widget,
+			      "focus-line-width", &focus_width,
+			      NULL);
+
+	requisition->width  += 2 * focus_width;
+	requisition->height += 2 * focus_width;
+}
+
+static void
+mate_panel_applet_size_allocate (GtkWidget     *widget,
+			    GtkAllocation *allocation)
+{
+	GtkAllocation  child_allocation;
+	GtkBin        *bin;
+	GtkWidget     *child;
+	int            border_width;
+	int            focus_width = 0;
+	MatePanelApplet   *applet;
+
+	if (!mate_panel_applet_can_focus (widget)) {
+		GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->size_allocate (widget, allocation);
+	} else {
+		/*
+		 * We are deliberately ignoring focus-padding here to
+		 * save valuable panel real estate.
+		 */
+		gtk_widget_style_get (widget,
+				      "focus-line-width", &focus_width,
+				      NULL);
+
+		border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+		gtk_widget_set_allocation (widget, allocation);
+		bin = GTK_BIN (widget);
+
+		child_allocation.x = focus_width;
+		child_allocation.y = focus_width;
+
+		child_allocation.width  = MAX (allocation->width  - border_width * 2, 0);
+		child_allocation.height = MAX (allocation->height - border_width * 2, 0);
+
+		if (gtk_widget_get_realized (widget))
+			gdk_window_move_resize (gtk_widget_get_window (widget),
+						allocation->x + border_width,
+						allocation->y + border_width,
+						child_allocation.width,
+						child_allocation.height);
+
+		child_allocation.width  = MAX (child_allocation.width  - 2 * focus_width, 0);
+		child_allocation.height = MAX (child_allocation.height - 2 * focus_width, 0);
+
+		child = gtk_bin_get_child (bin);
+		if (child)
+			gtk_widget_size_allocate (child, &child_allocation);
+	}
+
+	applet = MATE_PANEL_APPLET (widget);
+
+	if (applet->priv->previous_height != allocation->height ||
+	    applet->priv->previous_width  != allocation->width) {
+		applet->priv->previous_height = allocation->height;
+		applet->priv->previous_width = allocation->width;
+
+		mate_panel_applet_handle_background (applet);
+	}
+}
+
+static gboolean mate_panel_applet_expose(GtkWidget* widget, GdkEventExpose* event)
+{
+	GtkAllocation allocation;
+	int border_width;
+	int focus_width = 0;
+	int x, y, width, height;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (widget), FALSE);
+	g_return_val_if_fail (event != NULL, FALSE);
+
+	GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->expose_event(widget, event);
+
+        if (!gtk_widget_has_focus (widget))
+		return FALSE;
+
+	gtk_widget_get_allocation(widget, &allocation);
+
+	/*
+	 * We are deliberately ignoring focus-padding here to
+	 * save valuable panel real estate.
+	 */
+	gtk_widget_style_get (widget,
+		"focus-line-width", &focus_width,
+		NULL);
+
+	border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
+	x = allocation.x;
+	y = allocation.y;
+
+	width  = allocation.width  - 2 * border_width;
+	height = allocation.height - 2 * border_width;
+
+	gtk_paint_focus (gtk_widget_get_style (widget),
+			 gtk_widget_get_window (widget),
+			 gtk_widget_get_state (widget),
+			 &event->area, widget, "mate_panel_applet",
+			 x, y, width, height);
+
+	return FALSE;
+}
+
+static gboolean
+mate_panel_applet_focus (GtkWidget        *widget,
+		    GtkDirectionType  dir)
+{
+	gboolean ret;
+	GtkWidget *previous_focus_child;
+	MatePanelApplet *applet;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (widget), FALSE);
+
+	applet = MATE_PANEL_APPLET (widget);
+	if (applet->priv->moving_focus_out) {
+		/*
+		 * Applet will retain focus if there is nothing else on the
+		 * panel to get focus
+		 */
+		applet->priv->moving_focus_out = FALSE;
+		return FALSE;
+	}
+
+	previous_focus_child = gtk_container_get_focus_child (GTK_CONTAINER (widget));
+	if (!previous_focus_child && !gtk_widget_has_focus (widget)) {
+		if (gtk_widget_get_has_tooltip (widget)) {
+			gtk_widget_set_can_focus (widget, TRUE);
+			gtk_widget_grab_focus (widget);
+			gtk_widget_set_can_focus (widget, FALSE);
+			return TRUE;
+		}
+	}
+	ret = GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->focus (widget, dir);
+
+	if (!ret && !previous_focus_child) {
+		if (!gtk_widget_has_focus (widget))  {
+			/*
+			 * Applet does not have a widget which can focus so set
+			 * the focus on the applet unless it already had focus
+			 * because it had a tooltip.
+			 */
+			gtk_widget_set_can_focus (widget, TRUE);
+			gtk_widget_grab_focus (widget);
+			gtk_widget_set_can_focus (widget, FALSE);
+			ret = TRUE;
+		}
+	}
+
+	return ret;
+}
+
+static gboolean
+mate_panel_applet_parse_color (const gchar *color_str,
+			  GdkColor    *color)
+{
+	int r, g, b;
+
+	g_assert (color_str && color);
+
+	if (sscanf (color_str, "%4x%4x%4x", &r, &g, &b) != 3)
+		return FALSE;
+
+	color->red   = r;
+	color->green = g;
+	color->blue  = b;
+
+	return TRUE;
+}
+
+static gboolean
+mate_panel_applet_parse_pixmap_str (const char *str,
+			       GdkNativeWindow *xid,
+			       int             *x,
+			       int             *y)
+{
+	char **elements;
+	char  *tmp;
+
+	g_return_val_if_fail (str != NULL, FALSE);
+	g_return_val_if_fail (xid != NULL, FALSE);
+	g_return_val_if_fail (x != NULL, FALSE);
+	g_return_val_if_fail (y != NULL, FALSE);
+
+	elements = g_strsplit (str, ",", -1);
+
+	if (!elements)
+		return FALSE;
+
+	if (!elements [0] || !*elements [0] ||
+	    !elements [1] || !*elements [1] ||
+	    !elements [2] || !*elements [2])
+		goto ERROR_AND_FREE;
+
+	*xid = strtol (elements [0], &tmp, 10);
+	if (tmp == elements [0])
+		goto ERROR_AND_FREE;
+
+	*x   = strtol (elements [1], &tmp, 10);
+	if (tmp == elements [1])
+		goto ERROR_AND_FREE;
+
+	*y   = strtol (elements [2], &tmp, 10);
+	if (tmp == elements [2])
+		goto ERROR_AND_FREE;
+
+ 	g_strfreev (elements);
+	return TRUE;
+
+ ERROR_AND_FREE:
+ 	g_strfreev (elements);
+	return FALSE;
+}
+
+static GdkPixmap *
+mate_panel_applet_get_pixmap (MatePanelApplet     *applet,
+			 GdkNativeWindow  xid,
+			 int              x,
+			 int              y)
+{
+	gboolean         display_grabbed;
+	GdkPixmap       *pixmap;
+	GdkDisplay      *display;
+	GdkPixmap       *retval;
+	GdkWindow       *window;
+	int              width;
+	int              height;
+	cairo_t         *cr;
+	cairo_pattern_t *pattern;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
+
+	if (!gtk_widget_get_realized (GTK_WIDGET (applet)))
+		return NULL;
+
+	display = gdk_display_get_default ();
+	display_grabbed = FALSE;
+
+	window = gtk_widget_get_window (GTK_WIDGET (applet));
+
+	pixmap = gdk_pixmap_lookup_for_display (display, xid);
+	if (pixmap)
+		g_object_ref (pixmap);
+	else {
+		display_grabbed = TRUE;
+		gdk_x11_display_grab (display);
+		pixmap = gdk_pixmap_foreign_new_for_display (display, xid);
+	}
+
+	/* This can happen if the user changes the background very fast.
+	 * We'll get the next update, so it's not a big deal. */
+	if (pixmap == NULL) {
+		if (display_grabbed)
+			gdk_x11_display_ungrab (display);
+		return NULL;
+	}
+
+	#if GTK_CHECK_VERSION(3, 0, 0)
+		width = gdk_window_get_width(window);
+		height = gdk_window_get_height(window);
+	#else
+		gdk_drawable_get_size(GDK_DRAWABLE(window), &width, &height);
+	#endif
+
+	retval = gdk_pixmap_new (window, width, height, -1);
+
+	/* the pixmap has no colormap, and we need one */
+	gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap),
+				   gdk_drawable_get_colormap (window));
+
+	cr = gdk_cairo_create (GDK_DRAWABLE (retval));
+	gdk_cairo_set_source_pixmap (cr, pixmap, -x, -y);
+	pattern = cairo_get_source (cr);
+	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+
+	cairo_rectangle (cr, 0, 0, width, height);
+	cairo_fill (cr);
+
+	cairo_destroy (cr);
+
+	g_object_unref (pixmap);
+
+	if (display_grabbed)
+		gdk_x11_display_ungrab (display);
+
+	return retval;
+}
+
+static MatePanelAppletBackgroundType
+mate_panel_applet_handle_background_string (MatePanelApplet  *applet,
+				       GdkColor     *color,
+				       GdkPixmap   **pixmap)
+{
+	MatePanelAppletBackgroundType   retval;
+	char                      **elements;
+
+	retval = PANEL_NO_BACKGROUND;
+
+	if (!gtk_widget_get_realized (GTK_WIDGET (applet)) || !applet->priv->background)
+		return retval;
+
+	elements = g_strsplit (applet->priv->background, ":", -1);
+
+	if (elements [0] && !strcmp (elements [0], "none" )) {
+		retval = PANEL_NO_BACKGROUND;
+
+	} else if (elements [0] && !strcmp (elements [0], "color")) {
+		g_return_val_if_fail (color != NULL, PANEL_NO_BACKGROUND);
+
+		if (!elements [1] || !mate_panel_applet_parse_color (elements [1], color)) {
+
+			g_warning ("Incomplete '%s' background type received", elements [0]);
+			g_strfreev (elements);
+			return PANEL_NO_BACKGROUND;
+		}
+
+		retval = PANEL_COLOR_BACKGROUND;
+
+	} else if (elements [0] && !strcmp (elements [0], "pixmap")) {
+		GdkNativeWindow pixmap_id;
+		int             x, y;
+
+		g_return_val_if_fail (pixmap != NULL, PANEL_NO_BACKGROUND);
+
+		if (!mate_panel_applet_parse_pixmap_str (elements [1], &pixmap_id, &x, &y)) {
+			g_warning ("Incomplete '%s' background type received: %s",
+				   elements [0], elements [1]);
+
+			g_strfreev (elements);
+			return PANEL_NO_BACKGROUND;
+		}
+
+		*pixmap = mate_panel_applet_get_pixmap (applet, pixmap_id, x, y);
+		if (!*pixmap) {
+			g_warning ("Failed to get pixmap %s", elements [1]);
+			g_strfreev (elements);
+			return PANEL_NO_BACKGROUND;
+		}
+
+		retval = PANEL_PIXMAP_BACKGROUND;
+	} else
+		g_warning ("Unknown background type received");
+
+	g_strfreev (elements);
+
+	return retval;
+}
+
+MatePanelAppletBackgroundType
+mate_panel_applet_get_background (MatePanelApplet *applet,
+			     GdkColor *color,
+			     GdkPixmap **pixmap)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), PANEL_NO_BACKGROUND);
+
+	/* initial sanity */
+	if (pixmap != NULL)
+		*pixmap = NULL;
+	if (color != NULL)
+		memset (color, 0, sizeof (GdkColor));
+
+	return mate_panel_applet_handle_background_string (applet, color, pixmap);
+}
+
+static void
+mate_panel_applet_set_background_string (MatePanelApplet *applet,
+				    const gchar *background)
+{
+	if (applet->priv->background == background)
+		return;
+
+	if (g_strcmp0 (applet->priv->background, background) == 0)
+		return;
+
+	if (applet->priv->background)
+		g_free (applet->priv->background);
+	applet->priv->background = background ? g_strdup (background) : NULL;
+	mate_panel_applet_handle_background (applet);
+
+	g_object_notify (G_OBJECT (applet), "background");
+}
+
+static void
+mate_panel_applet_update_background_for_widget (GtkWidget                 *widget,
+					   MatePanelAppletBackgroundType  type,
+					   GdkColor                  *color,
+					   GdkPixmap                 *pixmap)
+{
+	GtkRcStyle *rc_style;
+	GtkStyle   *style;
+
+	/* reset style */
+	gtk_widget_set_style (widget, NULL);
+	rc_style = gtk_rc_style_new ();
+	gtk_widget_modify_style (widget, rc_style);
+	g_object_unref (rc_style);
+
+	switch (type) {
+	case PANEL_NO_BACKGROUND:
+		break;
+	case PANEL_COLOR_BACKGROUND:
+		gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, color);
+		break;
+	case PANEL_PIXMAP_BACKGROUND:
+		style = gtk_style_copy (gtk_widget_get_style (widget));
+		if (style->bg_pixmap[GTK_STATE_NORMAL])
+			g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]);
+		style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap);
+		gtk_widget_set_style (widget, style);
+		g_object_unref (style);
+		break;
+	default:
+		g_assert_not_reached ();
+		break;
+	}
+}
+
+static void
+mate_panel_applet_handle_background (MatePanelApplet *applet)
+{
+	MatePanelAppletBackgroundType  type;
+	GdkColor                   color;
+	GdkPixmap                 *pixmap;
+
+	type = mate_panel_applet_get_background (applet, &color, &pixmap);
+
+	if (applet->priv->background_widget)
+		mate_panel_applet_update_background_for_widget (applet->priv->background_widget,
+							   type, &color, pixmap);
+
+	switch (type) {
+	case PANEL_NO_BACKGROUND:
+		g_signal_emit (G_OBJECT (applet),
+			       mate_panel_applet_signals [CHANGE_BACKGROUND],
+			       0, PANEL_NO_BACKGROUND, NULL, NULL);
+		break;
+	case PANEL_COLOR_BACKGROUND:
+		g_signal_emit (G_OBJECT (applet),
+			       mate_panel_applet_signals [CHANGE_BACKGROUND],
+			       0, PANEL_COLOR_BACKGROUND, &color, NULL);
+		break;
+	case PANEL_PIXMAP_BACKGROUND:
+		g_signal_emit (G_OBJECT (applet),
+			       mate_panel_applet_signals [CHANGE_BACKGROUND],
+			       0, PANEL_PIXMAP_BACKGROUND, NULL, pixmap);
+
+		g_object_unref (pixmap);
+		break;
+	default:
+		g_assert_not_reached ();
+		break;
+	}
+}
+
+static void
+mate_panel_applet_realize (GtkWidget *widget)
+{
+	GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->realize (widget);
+
+	if (MATE_PANEL_APPLET (widget)->priv->background)
+		mate_panel_applet_handle_background (MATE_PANEL_APPLET (widget));
+}
+
+static void
+mate_panel_applet_move_focus_out_of_applet (MatePanelApplet      *applet,
+				       GtkDirectionType  dir)
+{
+	GtkWidget *toplevel;
+
+	applet->priv->moving_focus_out = TRUE;
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (applet));
+	g_return_if_fail (toplevel);
+
+	gtk_widget_child_focus (toplevel, dir);
+	applet->priv->moving_focus_out = FALSE;
+}
+
+static void
+mate_panel_applet_get_property (GObject    *object,
+			   guint       prop_id,
+			   GValue     *value,
+			   GParamSpec *pspec)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (object);
+
+	switch (prop_id) {
+	case PROP_ID:
+		g_value_set_string (value, applet->priv->id);
+		break;
+	case PROP_CLOSURE:
+		g_value_set_pointer (value, applet->priv->closure);
+		break;
+	case PROP_CONNECTION:
+		g_value_set_object (value, applet->priv->connection);
+		break;
+	case PROP_PREFS_KEY:
+		g_value_set_string (value, applet->priv->prefs_key);
+		break;
+	case PROP_ORIENT:
+		g_value_set_uint (value, applet->priv->orient);
+		break;
+	case PROP_SIZE:
+		g_value_set_uint (value, applet->priv->size);
+		break;
+	case PROP_BACKGROUND:
+		g_value_set_string (value, applet->priv->background);
+		break;
+	case PROP_FLAGS:
+		g_value_set_uint (value, applet->priv->flags);
+		break;
+	case PROP_SIZE_HINTS: {
+		GVariant **children;
+		GVariant  *variant;
+		gint       i;
+
+		children = g_new (GVariant *, applet->priv->size_hints_len);
+		for (i = 0; i < applet->priv->size_hints_len; i++)
+			children[i] = g_variant_new_int32 (applet->priv->size_hints[i]);
+		variant = g_variant_new_array (G_VARIANT_TYPE_INT32,
+					       children, applet->priv->size_hints_len);
+		g_free (children);
+		g_value_set_pointer (value, variant);
+	}
+		break;
+	case PROP_LOCKED:
+		g_value_set_boolean (value, applet->priv->locked);
+		break;
+	case PROP_LOCKED_DOWN:
+		g_value_set_boolean (value, applet->priv->locked_down);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+	}
+}
+
+static void
+mate_panel_applet_set_property (GObject      *object,
+			   guint         prop_id,
+			   const GValue *value,
+			   GParamSpec   *pspec)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (object);
+
+	switch (prop_id) {
+	case PROP_ID:
+		applet->priv->id = g_value_dup_string (value);
+		break;
+	case PROP_CLOSURE:
+		applet->priv->closure = g_value_get_pointer (value);
+		g_closure_set_marshal (applet->priv->closure,
+				       mate_panel_applet_marshal_BOOLEAN__STRING);
+		break;
+	case PROP_CONNECTION:
+		applet->priv->connection = g_value_dup_object (value);
+		break;
+	case PROP_PREFS_KEY:
+		mate_panel_applet_set_preferences_key (applet, g_value_get_string (value));
+		break;
+	case PROP_ORIENT:
+		mate_panel_applet_set_orient (applet, g_value_get_uint (value));
+		break;
+	case PROP_SIZE:
+		mate_panel_applet_set_size (applet, g_value_get_uint (value));
+		break;
+	case PROP_BACKGROUND:
+		mate_panel_applet_set_background_string (applet, g_value_get_string (value));
+		break;
+	case PROP_FLAGS:
+		mate_panel_applet_set_flags (applet, g_value_get_uint (value));
+		break;
+	case PROP_SIZE_HINTS: {
+		const int *size_hints;
+		gsize      n_elements;
+
+		size_hints = g_variant_get_fixed_array (g_value_get_pointer (value),
+							&n_elements, sizeof (gint32));
+		mate_panel_applet_set_size_hints (applet, size_hints, n_elements, 0);
+	}
+		break;
+	case PROP_LOCKED:
+		mate_panel_applet_set_locked (applet, g_value_get_boolean (value));
+		break;
+	case PROP_LOCKED_DOWN:
+		mate_panel_applet_set_locked_down (applet, g_value_get_boolean (value));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+	}
+}
+
+static void
+add_tab_bindings (GtkBindingSet   *binding_set,
+		  GdkModifierType  modifiers,
+		  GtkDirectionType direction)
+{
+	gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
+				      "move_focus_out_of_applet", 1,
+				      GTK_TYPE_DIRECTION_TYPE, direction);
+	gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
+				      "move_focus_out_of_applet", 1,
+				      GTK_TYPE_DIRECTION_TYPE, direction);
+}
+
+static void
+mate_panel_applet_setup (MatePanelApplet *applet)
+{
+	GValue   value = {0, };
+	GArray  *params;
+	gint     i;
+	gboolean ret;
+
+	g_assert (applet->priv->id != NULL &&
+		  applet->priv->closure != NULL);
+
+	params = g_array_sized_new (FALSE, TRUE, sizeof (GValue), 2);
+	value.g_type = 0;
+	g_value_init (&value, G_TYPE_OBJECT);
+	g_value_set_object (&value, G_OBJECT (applet));
+	g_array_append_val (params, value);
+
+	value.g_type = 0;
+	g_value_init (&value, G_TYPE_STRING);
+	g_value_set_string (&value, applet->priv->id);
+	g_array_append_val (params, value);
+
+	value.g_type = 0;
+	g_value_init (&value, G_TYPE_BOOLEAN);
+
+	g_closure_invoke (applet->priv->closure,
+			  &value, params->len,
+			  (GValue *) params->data,
+			  NULL);
+
+	for (i = 0; i < params->len; i++)
+		g_value_unset (&g_array_index (params, GValue, i));
+	g_array_free (params, TRUE);
+
+	ret = g_value_get_boolean (&value);
+	g_value_unset (&value);
+
+	if (!ret) { /* FIXME */
+		g_warning ("need to free the control here");
+
+		return;
+	}
+}
+
+static void
+mate_panel_applet_init (MatePanelApplet *applet)
+{
+	applet->priv = MATE_PANEL_APPLET_GET_PRIVATE (applet);
+
+	applet->priv->flags  = MATE_PANEL_APPLET_FLAGS_NONE;
+	applet->priv->orient = MATE_PANEL_APPLET_ORIENT_UP;
+	applet->priv->size   = 24;
+
+	applet->priv->client = mateconf_client_get_default ();
+
+	applet->priv->panel_action_group = gtk_action_group_new ("PanelActions");
+	gtk_action_group_set_translation_domain (applet->priv->panel_action_group, GETTEXT_PACKAGE);
+	gtk_action_group_add_actions (applet->priv->panel_action_group,
+				      menu_entries,
+				      G_N_ELEMENTS (menu_entries),
+				      applet);
+	gtk_action_group_add_toggle_actions (applet->priv->panel_action_group,
+					     menu_toggle_entries,
+					     G_N_ELEMENTS (menu_toggle_entries),
+					     applet);
+
+	applet->priv->ui_manager = gtk_ui_manager_new ();
+	gtk_ui_manager_insert_action_group (applet->priv->ui_manager,
+					    applet->priv->panel_action_group, 1);
+	gtk_ui_manager_add_ui_from_string (applet->priv->ui_manager,
+					   panel_menu_ui, -1, NULL);
+
+
+
+
+	applet->priv->plug = gtk_plug_new (0);
+	g_signal_connect_swapped (G_OBJECT (applet->priv->plug), "embedded",
+				  G_CALLBACK (mate_panel_applet_setup),
+				  applet);
+
+	gtk_widget_set_events (GTK_WIDGET (applet),
+			       GDK_BUTTON_PRESS_MASK |
+			       GDK_BUTTON_RELEASE_MASK);
+
+	gtk_container_add (GTK_CONTAINER (applet->priv->plug), GTK_WIDGET (applet));
+}
+
+static void mate_panel_applet_constructed(GObject* object)
+{
+	MatePanelApplet* applet = MATE_PANEL_APPLET(object);
+
+	/* Voy a renombrar la clase para que se pueda tener compatibilidad con todos
+	 * los estilos visuales de GTK2
+	 *
+	 * Issue #27
+	 */
+	gtk_widget_set_name(GTK_WIDGET(applet), "PanelApplet");
+
+	mate_panel_applet_register_object (applet);
+}
+
+static void
+mate_panel_applet_class_init (MatePanelAppletClass *klass)
+{
+	GObjectClass   *gobject_class = (GObjectClass *) klass;
+	GtkObjectClass *object_class = (GtkObjectClass *) klass;
+	GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
+	GtkBindingSet *binding_set;
+
+	gobject_class->get_property = mate_panel_applet_get_property;
+	gobject_class->set_property = mate_panel_applet_set_property;
+	gobject_class->constructed = mate_panel_applet_constructed;
+	klass->move_focus_out_of_applet = mate_panel_applet_move_focus_out_of_applet;
+
+	widget_class->button_press_event = mate_panel_applet_button_press;
+	widget_class->button_release_event = mate_panel_applet_button_release;
+	widget_class->size_request = mate_panel_applet_size_request;
+	widget_class->size_allocate = mate_panel_applet_size_allocate;
+	widget_class->expose_event = mate_panel_applet_expose;
+	widget_class->focus = mate_panel_applet_focus;
+	widget_class->realize = mate_panel_applet_realize;
+	widget_class->popup_menu = mate_panel_applet_popup_menu;
+
+	gobject_class->finalize = mate_panel_applet_finalize;
+
+	g_type_class_add_private (klass, sizeof (MatePanelAppletPrivate));
+
+	g_object_class_install_property (gobject_class,
+					 PROP_ID,
+					 g_param_spec_string ("id",
+							      "Id",
+							      "The Applet identifier",
+							      NULL,
+							      G_PARAM_CONSTRUCT_ONLY |
+							      G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_CLOSURE,
+					 g_param_spec_pointer ("closure",
+							       "GClosure",
+							       "The Applet closure",
+							       G_PARAM_CONSTRUCT_ONLY |
+							       G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_CONNECTION,
+					 g_param_spec_object ("connection",
+							      "Connection",
+							      "The DBus Connection",
+							      G_TYPE_DBUS_CONNECTION,
+							      G_PARAM_CONSTRUCT_ONLY |
+							      G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_PREFS_KEY,
+					 g_param_spec_string ("prefs-key",
+							      "PrefsKey",
+							      "MateConf Preferences Key",
+							      NULL,
+							      G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_ORIENT,
+					 g_param_spec_uint ("orient",
+							    "Orient",
+							    "Panel Applet Orientation",
+							    0, G_MAXUINT, 0, /* FIXME */
+							    G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_SIZE,
+					 g_param_spec_uint ("size",
+							    "Size",
+							    "Panel Applet Size",
+							    0, G_MAXUINT, 0,
+							    G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_BACKGROUND,
+					 g_param_spec_string ("background",
+							      "Background",
+							      "Panel Applet Background",
+							      NULL,
+							      G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_FLAGS,
+					 g_param_spec_uint ("flags",
+							    "Flags",
+							    "Panel Applet flags",
+							    0, G_MAXUINT, 0, /* FIXME */
+							    G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_SIZE_HINTS,
+					 /* FIXME: value_array? */
+					 g_param_spec_pointer ("size-hints",
+							       "SizeHints",
+							       "Panel Applet Size Hints",
+							       G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_LOCKED,
+					 g_param_spec_boolean ("locked",
+							       "Locked",
+							       "Whether Panel Applet is locked",
+							       FALSE,
+							       G_PARAM_READWRITE));
+	g_object_class_install_property (gobject_class,
+					 PROP_LOCKED_DOWN,
+					 g_param_spec_boolean ("locked-down",
+							       "LockedDown",
+							       "Whether Panel Applet is locked down",
+							       FALSE,
+							       G_PARAM_READWRITE));
+
+	mate_panel_applet_signals [CHANGE_ORIENT] =
+                g_signal_new ("change_orient",
+                              G_TYPE_FROM_CLASS (klass),
+                              G_SIGNAL_RUN_LAST,
+                              G_STRUCT_OFFSET (MatePanelAppletClass, change_orient),
+                              NULL,
+			      NULL,
+                              mate_panel_applet_marshal_VOID__UINT,
+                              G_TYPE_NONE,
+			      1,
+			      G_TYPE_UINT);
+
+	mate_panel_applet_signals [CHANGE_SIZE] =
+                g_signal_new ("change_size",
+                              G_TYPE_FROM_CLASS (klass),
+                              G_SIGNAL_RUN_LAST,
+                              G_STRUCT_OFFSET (MatePanelAppletClass, change_size),
+                              NULL,
+			      NULL,
+                              mate_panel_applet_marshal_VOID__INT,
+                              G_TYPE_NONE,
+			      1,
+			      G_TYPE_INT);
+
+	mate_panel_applet_signals [CHANGE_BACKGROUND] =
+                g_signal_new ("change_background",
+                              G_TYPE_FROM_CLASS (klass),
+                              G_SIGNAL_RUN_LAST,
+                              G_STRUCT_OFFSET (MatePanelAppletClass, change_background),
+                              NULL,
+			      NULL,
+                              mate_panel_applet_marshal_VOID__ENUM_BOXED_OBJECT,
+                              G_TYPE_NONE,
+			      3,
+			      PANEL_TYPE_MATE_PANEL_APPLET_BACKGROUND_TYPE,
+			      GDK_TYPE_COLOR,
+			      GDK_TYPE_PIXMAP);
+
+	mate_panel_applet_signals [MOVE_FOCUS_OUT_OF_APPLET] =
+                g_signal_new ("move_focus_out_of_applet",
+                              G_TYPE_FROM_CLASS (klass),
+                              G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                              G_STRUCT_OFFSET (MatePanelAppletClass, move_focus_out_of_applet),
+                              NULL,
+			      NULL,
+                              mate_panel_applet_marshal_VOID__ENUM,
+                              G_TYPE_NONE,
+			      1,
+			      GTK_TYPE_DIRECTION_TYPE);
+
+	binding_set = gtk_binding_set_by_class (object_class);
+	add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
+	add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+	add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
+	add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+}
+
+GtkWidget* mate_panel_applet_new(void)
+{
+	MatePanelApplet* applet = g_object_new(PANEL_TYPE_APPLET, NULL);
+
+	return GTK_WIDGET(applet);
+}
+
+static void
+method_call_cb (GDBusConnection       *connection,
+		const gchar           *sender,
+		const gchar           *object_path,
+		const gchar           *interface_name,
+		const gchar           *method_name,
+		GVariant              *parameters,
+		GDBusMethodInvocation *invocation,
+		gpointer               user_data)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (user_data);
+
+	if (g_strcmp0 (method_name, "PopupMenu") == 0) {
+		guint button;
+		guint time;
+
+		g_variant_get (parameters, "(uu)", &button, &time);
+		mate_panel_applet_menu_popup (applet, button, time);
+
+		g_dbus_method_invocation_return_value (invocation, NULL);
+	}
+}
+
+static GVariant *
+get_property_cb (GDBusConnection *connection,
+		 const gchar     *sender,
+		 const gchar     *object_path,
+		 const gchar     *interface_name,
+		 const gchar     *property_name,
+		 GError         **error,
+		 gpointer         user_data)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (user_data);
+	GVariant    *retval = NULL;
+
+	if (g_strcmp0 (property_name, "PrefsKey") == 0) {
+		retval = g_variant_new_string (applet->priv->prefs_key ?
+					       applet->priv->prefs_key : "");
+	} else if (g_strcmp0 (property_name, "Orient") == 0) {
+		retval = g_variant_new_uint32 (applet->priv->orient);
+	} else if (g_strcmp0 (property_name, "Size") == 0) {
+		retval = g_variant_new_uint32 (applet->priv->size);
+	} else if (g_strcmp0 (property_name, "Background") == 0) {
+		retval = g_variant_new_string (applet->priv->background ?
+					       applet->priv->background : "");
+	} else if (g_strcmp0 (property_name, "Flags") == 0) {
+		retval = g_variant_new_uint32 (applet->priv->flags);
+	} else if (g_strcmp0 (property_name, "SizeHints") == 0) {
+		GVariant **children;
+		gint       i;
+
+		children = g_new (GVariant *, applet->priv->size_hints_len);
+		for (i = 0; i < applet->priv->size_hints_len; i++)
+			children[i] = g_variant_new_int32 (applet->priv->size_hints[i]);
+		retval = g_variant_new_array (G_VARIANT_TYPE_INT32,
+					      children, applet->priv->size_hints_len);
+		g_free (children);
+	} else if (g_strcmp0 (property_name, "Locked") == 0) {
+		retval = g_variant_new_boolean (applet->priv->locked);
+	} else if (g_strcmp0 (property_name, "LockedDown") == 0) {
+		retval = g_variant_new_boolean (applet->priv->locked_down);
+	}
+
+	return retval;
+}
+
+static gboolean
+set_property_cb (GDBusConnection *connection,
+		 const gchar     *sender,
+		 const gchar     *object_path,
+		 const gchar     *interface_name,
+		 const gchar     *property_name,
+		 GVariant        *value,
+		 GError         **error,
+		 gpointer         user_data)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (user_data);
+
+	if (g_strcmp0 (property_name, "PrefsKey") == 0) {
+		mate_panel_applet_set_preferences_key (applet, g_variant_get_string (value, NULL));
+	} else if (g_strcmp0 (property_name, "Orient") == 0) {
+		mate_panel_applet_set_orient (applet, g_variant_get_uint32 (value));
+	} else if (g_strcmp0 (property_name, "Size") == 0) {
+		mate_panel_applet_set_size (applet, g_variant_get_uint32 (value));
+	} else if (g_strcmp0 (property_name, "Background") == 0) {
+		mate_panel_applet_set_background_string (applet, g_variant_get_string (value, NULL));
+	} else if (g_strcmp0 (property_name, "Flags") == 0) {
+		mate_panel_applet_set_flags (applet, g_variant_get_uint32 (value));
+	} else if (g_strcmp0 (property_name, "SizeHints") == 0) {
+		const int *size_hints;
+		gsize      n_elements;
+
+		size_hints = g_variant_get_fixed_array (value, &n_elements, sizeof (gint32));
+		mate_panel_applet_set_size_hints (applet, size_hints, n_elements, 0);
+	} else if (g_strcmp0 (property_name, "Locked") == 0) {
+		mate_panel_applet_set_locked (applet, g_variant_get_boolean (value));
+	} else if (g_strcmp0 (property_name, "LockedDown") == 0) {
+		mate_panel_applet_set_locked_down (applet, g_variant_get_boolean (value));
+	}
+
+	return TRUE;
+}
+
+static const gchar introspection_xml[] =
+	"<node>"
+	  "<interface name='org.mate.panel.applet.Applet'>"
+	    "<method name='PopupMenu'>"
+	      "<arg name='button' type='u' direction='in'/>"
+	      "<arg name='time' type='u' direction='in'/>"
+	    "</method>"
+	    "<property name='PrefsKey' type='s' access='readwrite'/>"
+	    "<property name='Orient' type='u' access='readwrite' />"
+	    "<property name='Size' type='u' access='readwrite'/>"
+	    "<property name='Background' type='s' access='readwrite'/>"
+	    "<property name='Flags' type='u' access='readwrite'/>"
+	    "<property name='SizeHints' type='ai' access='readwrite'/>"
+	    "<property name='Locked' type='b' access='readwrite'/>"
+	    "<property name='LockedDown' type='b' access='readwrite'/>"
+	    "<signal name='Move' />"
+	    "<signal name='RemoveFromPanel' />"
+	    "<signal name='Lock' />"
+	    "<signal name='Unlock' />"
+	  "</interface>"
+	"</node>";
+
+static const GDBusInterfaceVTable interface_vtable = {
+	method_call_cb,
+	get_property_cb,
+	set_property_cb
+};
+
+static GDBusNodeInfo *introspection_data = NULL;
+
+static void
+mate_panel_applet_register_object (MatePanelApplet *applet)
+{
+	GError     *error = NULL;
+	static gint id = 0;
+
+	if (!introspection_data)
+		introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
+
+	applet->priv->object_path = g_strdup_printf (MATE_PANEL_APPLET_OBJECT_PATH, applet->priv->id, id++);
+	applet->priv->object_id =
+		g_dbus_connection_register_object (applet->priv->connection,
+						   applet->priv->object_path,
+						   introspection_data->interfaces[0],
+						   &interface_vtable,
+						   applet, NULL,
+						   &error);
+	if (!applet->priv->object_id) {
+		g_printerr ("Failed to register object %s: %s\n", applet->priv->object_path, error->message);
+		g_error_free (error);
+	}
+}
+
+static void mate_panel_applet_factory_main_finalized(gpointer data, GObject* object)
+{
+	gtk_main_quit();
+
+	if (introspection_data)
+	{
+		g_dbus_node_info_unref(introspection_data);
+		introspection_data = NULL;
+	}
+}
+
+static int (*_x_error_func) (Display *, XErrorEvent *);
+
+static int
+_x_error_handler (Display *display, XErrorEvent *error)
+{
+	if (!error->error_code)
+		return 0;
+
+	/* If we got a BadDrawable or a BadWindow, we ignore it for now.
+	 * FIXME: We need to somehow distinguish real errors from
+	 * X-server-induced errors. Keeping a list of windows for which we
+	 * will ignore BadDrawables would be a good idea. */
+	if (error->error_code == BadDrawable ||
+	    error->error_code == BadWindow)
+		return 0;
+
+	return _x_error_func (display, error);
+}
+
+/*
+ * To do graphical embedding in the X window system, MATE Panel
+ * uses the classic foreign-window-reparenting trick. The
+ * GtkPlug/GtkSocket widgets are used for this purpose. However,
+ * serious robustness problems arise if the GtkSocket end of the
+ * connection unexpectedly dies. The X server sends out DestroyNotify
+ * events for the descendants of the GtkPlug (i.e., your embedded
+ * component's windows) in effectively random order. Furthermore, if
+ * you happened to be drawing on any of those windows when the
+ * GtkSocket was destroyed (a common state of affairs), an X error
+ * will kill your application.
+ *
+ * To solve this latter problem, MATE Panel sets up its own X error
+ * handler which ignores certain X errors that might have been
+ * caused by such a scenario. Other X errors get passed to gdk_x_error
+ * normally.
+ */
+static void
+_mate_panel_applet_setup_x_error_handler (void)
+{
+	static gboolean error_handler_setup = FALSE;
+
+	if (error_handler_setup)
+		return;
+
+	error_handler_setup = TRUE;
+
+	_x_error_func = XSetErrorHandler (_x_error_handler);
+}
+
+int mate_panel_applet_factory_main(const gchar* factory_id, gboolean out_process, GType applet_type, MatePanelAppletFactoryCallback callback, gpointer user_data)
+{
+	MatePanelAppletFactory* factory;
+	GClosure* closure;
+
+	g_return_val_if_fail(factory_id != NULL, 1);
+	g_return_val_if_fail(callback != NULL, 1);
+	g_assert(g_type_is_a(applet_type, PANEL_TYPE_APPLET));
+
+	if (out_process)
+	{
+		_mate_panel_applet_setup_x_error_handler();
+	}
+
+	closure = g_cclosure_new(G_CALLBACK(callback), user_data, NULL);
+	factory = mate_panel_applet_factory_new(factory_id, applet_type, closure);
+	g_closure_unref(closure);
+
+	if (mate_panel_applet_factory_register_service(factory))
+	{
+		if (out_process)
+		{
+			g_object_weak_ref(G_OBJECT(factory), mate_panel_applet_factory_main_finalized, NULL);
+			gtk_main();
+		}
+
+		return 0;
+	}
+
+	g_object_unref (factory);
+
+	return 1;
+}
+
+void
+mate_panel_applet_set_background_widget (MatePanelApplet *applet,
+				    GtkWidget   *widget)
+{
+	applet->priv->background_widget = widget;
+
+	if (widget) {
+		MatePanelAppletBackgroundType  type;
+		GdkColor                   color;
+		GdkPixmap                 *pixmap;
+
+		type = mate_panel_applet_get_background (applet, &color, &pixmap);
+		mate_panel_applet_update_background_for_widget (widget, type,
+							   &color, pixmap);
+		if (type == PANEL_PIXMAP_BACKGROUND)
+			g_object_unref (pixmap);
+	}
+}
+
+guint32
+mate_panel_applet_get_xid (MatePanelApplet *applet,
+		      GdkScreen   *screen)
+{
+	gtk_window_set_screen (GTK_WINDOW (applet->priv->plug), screen);
+	gtk_widget_show (applet->priv->plug);
+
+	return gtk_plug_get_id (GTK_PLUG (applet->priv->plug));
+}
+
+const gchar *
+mate_panel_applet_get_object_path (MatePanelApplet *applet)
+{
+	return applet->priv->object_path;
+}
diff --git a/libmate-panel-applet/mate-panel-applet.h b/libmate-panel-applet/mate-panel-applet.h
new file mode 100644
index 00000000..8c75e29f
--- /dev/null
+++ b/libmate-panel-applet/mate-panel-applet.h
@@ -0,0 +1,184 @@
+/*
+ * mate-panel-applet.h: panel applet writing API.
+ *
+ * Copyright (C) 2001 Sun Microsystems, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ *
+ * Authors:
+ *     Mark McLoughlin <[email protected]>
+ */
+
+#ifndef __MATE_PANEL_APPLET_H__
+#define __MATE_PANEL_APPLET_H__
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+	MATE_PANEL_APPLET_ORIENT_UP,
+	MATE_PANEL_APPLET_ORIENT_DOWN,
+	MATE_PANEL_APPLET_ORIENT_LEFT,
+	MATE_PANEL_APPLET_ORIENT_RIGHT
+} MatePanelAppletOrient;
+
+#define PANEL_TYPE_APPLET              (mate_panel_applet_get_type ())
+#define MATE_PANEL_APPLET(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_TYPE_APPLET, MatePanelApplet))
+#define MATE_PANEL_APPLET_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), PANEL_TYPE_APPLET, MatePanelAppletClass))
+#define PANEL_IS_APPLET(o)             (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_TYPE_APPLET))
+#define PANEL_IS_APPLET_CLASS(k)       (G_TYPE_CHECK_CLASS_TYPE ((k), PANEL_TYPE_APPLET))
+#define MATE_PANEL_APPLET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_TYPE_APPLET, MatePanelAppletClass))
+
+typedef enum {
+	PANEL_NO_BACKGROUND,
+	PANEL_COLOR_BACKGROUND,
+	PANEL_PIXMAP_BACKGROUND
+} MatePanelAppletBackgroundType;
+
+typedef enum {
+	MATE_PANEL_APPLET_FLAGS_NONE   = 0,
+	MATE_PANEL_APPLET_EXPAND_MAJOR = 1 << 0,
+	MATE_PANEL_APPLET_EXPAND_MINOR = 1 << 1,
+	MATE_PANEL_APPLET_HAS_HANDLE   = 1 << 2
+} MatePanelAppletFlags;
+
+typedef struct _MatePanelApplet        MatePanelApplet;
+typedef struct _MatePanelAppletClass   MatePanelAppletClass;
+typedef struct _MatePanelAppletPrivate MatePanelAppletPrivate;
+
+typedef gboolean (*MatePanelAppletFactoryCallback) (MatePanelApplet* applet, const gchar *iid, gpointer user_data);
+
+struct _MatePanelApplet {
+	GtkEventBox event_box;
+
+	MatePanelAppletPrivate* priv;
+};
+
+struct _MatePanelAppletClass {
+	GtkEventBoxClass event_box_class;
+
+	void (*change_orient) (MatePanelApplet* applet, MatePanelAppletOrient orient);
+
+	void (*change_size) (MatePanelApplet* applet, guint size);
+
+	void (*change_background) (MatePanelApplet* applet, MatePanelAppletBackgroundType type, GdkColor* color, GdkPixmap* pixmap);
+	void (*move_focus_out_of_applet) (MatePanelApplet* frame, GtkDirectionType direction);
+};
+
+GType mate_panel_applet_get_type(void) G_GNUC_CONST;
+
+GtkWidget* mate_panel_applet_new(void);
+
+MatePanelAppletOrient mate_panel_applet_get_orient(MatePanelApplet* applet);
+guint mate_panel_applet_get_size(MatePanelApplet* applet);
+MatePanelAppletBackgroundType mate_panel_applet_get_background(MatePanelApplet* applet, /* return values */ GdkColor* color, GdkPixmap** pixmap);
+
+void mate_panel_applet_set_background_widget(MatePanelApplet* applet, GtkWidget* widget);
+
+gchar* mate_panel_applet_get_preferences_key(MatePanelApplet* applet);
+
+void mate_panel_applet_add_preferences(MatePanelApplet* applet, const gchar* schema_dir, GError** opt_error);
+
+MatePanelAppletFlags mate_panel_applet_get_flags(MatePanelApplet* applet);
+void mate_panel_applet_set_flags(MatePanelApplet* applet, MatePanelAppletFlags flags);
+
+void mate_panel_applet_set_size_hints(MatePanelApplet* applet, const int* size_hints, int n_elements, int base_size);
+
+gboolean mate_panel_applet_get_locked_down(MatePanelApplet* applet);
+
+void mate_panel_applet_request_focus(MatePanelApplet* applet, guint32 timestamp);
+
+void mate_panel_applet_setup_menu(MatePanelApplet* applet, const gchar* xml, GtkActionGroup* action_group);
+void mate_panel_applet_setup_menu_from_file(MatePanelApplet* applet, const gchar* filename, GtkActionGroup* action_group);
+
+int mate_panel_applet_factory_main(const gchar* factory_id, gboolean out_process, GType applet_type, MatePanelAppletFactoryCallback callback, gpointer data);
+gboolean _mate_panel_applet_shlib_factory(void);
+
+
+/*
+ * These macros are getting a bit unwieldy.
+ *
+ * Things to define for these:
+ *	+ required if Native Language Support is enabled (ENABLE_NLS):
+ *                   GETTEXT_PACKAGE and MATELOCALEDIR
+ */
+
+#if !defined(ENABLE_NLS)
+	#define _MATE_PANEL_APPLET_SETUP_GETTEXT(call_textdomain) \
+		do { } while (0)
+#else /* defined(ENABLE_NLS) */
+	#include <libintl.h>
+	#define _MATE_PANEL_APPLET_SETUP_GETTEXT(call_textdomain) \
+	do { \
+		bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); \
+		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); \
+		if (call_textdomain) \
+			textdomain (GETTEXT_PACKAGE); \
+	} while (0)
+#endif /* !defined(ENABLE_NLS) */
+
+#define MATE_PANEL_APPLET_OUT_PROCESS_FACTORY(id, type, name, callback, data) \
+int main(int argc, char* argv[]) \
+{ \
+	GOptionContext* context; \
+	GError* error; \
+	int retval; \
+	 \
+	_MATE_PANEL_APPLET_SETUP_GETTEXT (TRUE); \
+	 \
+	context = g_option_context_new(""); \
+	g_option_context_add_group (context, gtk_get_option_group(TRUE)); \
+	 \
+	error = NULL; \
+	if (!g_option_context_parse (context, &argc, &argv, &error)) \
+	{ \
+		if (error) \
+		{ \
+			g_printerr ("Cannot parse arguments: %s.\n", error->message); \
+			g_error_free (error); \
+		} \
+		else \
+		{ \
+			g_printerr ("Cannot parse arguments.\n"); \
+		} \
+		g_option_context_free (context); \
+		return 1; \
+	} \
+	 \
+	gtk_init (&argc, &argv); \
+	 \
+	retval = mate_panel_applet_factory_main (id, TRUE, type, callback, data); \
+	g_option_context_free (context); \
+	 \
+	return retval; \
+}
+
+#define MATE_PANEL_APPLET_IN_PROCESS_FACTORY(id, type, descr, callback, data) \
+G_MODULE_EXPORT gint _mate_panel_applet_shlib_factory(void) \
+{ \
+	_MATE_PANEL_APPLET_SETUP_GETTEXT(FALSE); \
+	return mate_panel_applet_factory_main(id, FALSE, type, callback, data); \
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MATE_PANEL_APPLET_H__ */
diff --git a/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in b/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in
new file mode 100644
index 00000000..10a9544f
--- /dev/null
+++ b/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in
@@ -0,0 +1,10 @@
+[Applet Factory]
+Id=TestAppletFactory
+Location=test-dbus-applet
+_Name=Test DBus Applet Factory
+_Description=Factory for Test DBus Applet
+
+[TestApplet]
+_Name=Test DBus Applet
+_Description=A simple applet for testing the MATE panel
+Icon=mate-gegl
diff --git a/libmate-panel-applet/test-dbus-applet.c b/libmate-panel-applet/test-dbus-applet.c
new file mode 100644
index 00000000..abcae5c0
--- /dev/null
+++ b/libmate-panel-applet/test-dbus-applet.c
@@ -0,0 +1,211 @@
+#include <config.h>
+#include <string.h>
+
+#include "mate-panel-applet.h"
+
+static void
+test_applet_on_do (GtkAction *action,
+		   gpointer   user_data)
+{
+        g_message ("%s called\n", gtk_action_get_name (action));
+}
+
+static const GtkActionEntry test_applet_menu_actions[] = {
+	{ "TestAppletDo1", NULL, "TestAppletDo1",
+	  NULL, NULL,
+	  G_CALLBACK (test_applet_on_do) },
+	{ "TestAppletDo2", NULL, "TestAppletDo2",
+	  NULL, NULL,
+	  G_CALLBACK (test_applet_on_do) },
+	{ "TestAppletDo3", NULL, "TestAppletDo3",
+	  NULL, NULL,
+	  G_CALLBACK (test_applet_on_do) }
+};
+
+static const char test_applet_menu_xml[] =
+	"<menuitem name=\"Test Item 1\" action=\"TestAppletDo1\" />\n"
+	"<menuitem name=\"Test Item 2\" action=\"TestAppletDo2\" />\n"
+	"<menuitem name=\"Test Item 3\" action=\"TestAppletDo3\" />\n";
+
+typedef struct _TestApplet      TestApplet;
+typedef struct _TestAppletClass TestAppletClass;
+
+struct _TestApplet {
+	MatePanelApplet   base;
+	GtkWidget    *label;
+};
+
+struct _TestAppletClass {
+	MatePanelAppletClass   base_class;
+};
+
+static GType test_applet_get_type (void) G_GNUC_CONST;
+
+G_DEFINE_TYPE (TestApplet, test_applet, PANEL_TYPE_APPLET);
+
+static void
+test_applet_init (TestApplet *applet)
+{
+}
+
+static void
+test_applet_class_init (TestAppletClass *klass)
+{
+}
+
+static void
+test_applet_handle_orient_change (TestApplet       *applet,
+				  MatePanelAppletOrient orient,
+				  gpointer          dummy)
+{
+        gchar *text;
+
+        text = g_strdup (gtk_label_get_text (GTK_LABEL (applet->label)));
+
+        g_strreverse (text);
+
+        gtk_label_set_text (GTK_LABEL (applet->label), text);
+
+        g_free (text);
+}
+
+static void
+test_applet_handle_size_change (TestApplet *applet,
+				gint        size,
+				gpointer    dummy)
+{
+	switch (size) {
+	case 12:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"xx-small\">Hello</span>");
+		break;
+	case 24:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"x-small\">Hello</span>");
+		break;
+	case 36:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"small\">Hello</span>");
+		break;
+	case 48:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"medium\">Hello</span>");
+		break;
+	case 64:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"large\">Hello</span>");
+		break;
+	case 80:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"x-large\">Hello</span>");
+		break;
+	case 128:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"xx-large\">Hello</span>");
+		break;
+	default:
+		g_assert_not_reached ();
+		break;
+	}
+}
+
+static void
+test_applet_handle_background_change (TestApplet                *applet,
+				      MatePanelAppletBackgroundType  type,
+				      GdkColor                  *color,
+				      GdkPixmap                 *pixmap,
+				      gpointer                   dummy)
+{
+	GdkWindow *window = gtk_widget_get_window (applet->label);
+
+	switch (type) {
+	case PANEL_NO_BACKGROUND:
+		g_message ("Setting background to default");
+		gdk_window_set_back_pixmap (window, NULL, FALSE);
+		break;
+	case PANEL_COLOR_BACKGROUND:
+		g_message ("Setting background to #%2x%2x%2x",
+			   color->red, color->green, color->blue);
+		gdk_window_set_back_pixmap (window, NULL, FALSE);
+		break;
+	case PANEL_PIXMAP_BACKGROUND:
+		g_message ("Setting background to '%p'", pixmap);
+		gdk_window_set_back_pixmap (window, pixmap, FALSE);
+		break;
+	default:
+		g_assert_not_reached ();
+		break;
+	}
+}
+
+static gboolean
+test_applet_fill (TestApplet *applet)
+{
+	GtkActionGroup *action_group;
+
+	applet->label = gtk_label_new (NULL);
+
+	gtk_container_add (GTK_CONTAINER (applet), applet->label);
+
+	gtk_widget_show_all (GTK_WIDGET (applet));
+
+	test_applet_handle_size_change (applet,
+					mate_panel_applet_get_size (MATE_PANEL_APPLET (applet)),
+					NULL);
+	test_applet_handle_orient_change (applet,
+					  mate_panel_applet_get_orient (MATE_PANEL_APPLET (applet)),
+					  NULL);
+
+	action_group = gtk_action_group_new ("TestAppletActions");
+	gtk_action_group_add_actions (action_group,
+				      test_applet_menu_actions,
+				      G_N_ELEMENTS (test_applet_menu_actions),
+				      applet);
+
+	mate_panel_applet_setup_menu (MATE_PANEL_APPLET (applet),
+				 test_applet_menu_xml,
+				 action_group);
+	g_object_unref (action_group);
+
+	gtk_widget_set_tooltip_text (GTK_WIDGET (applet), "Hello Tip");
+
+	mate_panel_applet_set_flags (MATE_PANEL_APPLET (applet), MATE_PANEL_APPLET_HAS_HANDLE);
+
+	g_signal_connect (G_OBJECT (applet),
+			  "change_orient",
+			  G_CALLBACK (test_applet_handle_orient_change),
+			  NULL);
+
+	g_signal_connect (G_OBJECT (applet),
+			  "change_size",
+			  G_CALLBACK (test_applet_handle_size_change),
+			  NULL);
+
+	g_signal_connect (G_OBJECT (applet),
+			  "change_background",
+			  G_CALLBACK (test_applet_handle_background_change),
+			  NULL);
+
+	return TRUE;
+}
+
+static gboolean
+test_applet_factory (TestApplet  *applet,
+		     const gchar *iid,
+		     gpointer     data)
+{
+	gboolean retval = FALSE;
+
+	if (!strcmp (iid, "TestApplet"))
+		retval = test_applet_fill (applet);
+
+	return retval;
+}
+
+
+MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("TestAppletFactory",
+				  test_applet_get_type (),
+				  "A Test Applet for the MATE-3.0 Panel",
+				  (MatePanelAppletFactoryCallback) test_applet_factory,
+				  NULL)
+