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

17 files changed, 4801 insertions, 0 deletions

diff --git a/matecomponent/libmate-panel-applet/MATE_Panel_TestApplet.server.in b/matecomponent/libmate-panel-applet/MATE_Panel_TestApplet.server.in
new file mode 100644
index 00000000..18f2629f
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/MATE_Panel_TestApplet.server.in
@@ -0,0 +1,31 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:MATE_Panel_TestMateComponentApplet_Factory"
+	    type="exe"
+	    location="test-matecomponent-applet">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:MateComponent/GenericFactory:1.0"/>
+		<item value="IDL:MateComponent/Unknown:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Test MateComponent Applet Factory"/>
+	<oaf_attribute name="description" type="string" _value="Test MateComponent Applet Factory"/>
+
+</oaf_server>
+
+<oaf_server iid="OAFIID:MATE_Panel_TestMateComponentApplet"
+	    type="factory"
+	    location="OAFIID:MATE_Panel_TestMateComponentApplet_Factory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/>
+		<item value="IDL:MateComponent/Control:1.0"/>
+		<item value="IDL:MateComponent/Unknown:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Test MateComponent Applet"/>
+	<oaf_attribute name="description" type="string" _value="A simple applet for testing the MATE-2.0 panel"/>
+	<oaf_attribute name="panel:icon" type="string" value="mate-gegl.png"/>
+
+</oaf_server>
+
+</oaf_info>
diff --git a/matecomponent/libmate-panel-applet/Makefile.am b/matecomponent/libmate-panel-applet/Makefile.am
new file mode 100644
index 00000000..1cd38d9f
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/Makefile.am
@@ -0,0 +1,129 @@
+lib_LTLIBRARIES = libmate-panel-applet-2.la
+bin_PROGRAMS = panel-test-applets-matecomponent
+noinst_PROGRAMS = test-matecomponent-applet
+
+AM_CPPFLAGS =							\
+	$(LIBMATE_PANEL_APPLET_MATECOMPONENT_CFLAGS)			\
+	-I$(top_builddir)/matecomponent/libmate-panel-applet		\
+	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DMATE_PANEL_APPLET_DATADIR=\""$(datadir)"\"			\
+	-DMATE_PANEL_APPLET_BUILDERDIR=\""$(uidir)"\"		\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
+
+libmate_panel_appletincludedir = $(includedir)/panel-2.0
+libmate_panel_appletinclude_HEADERS =	\
+	mate-panel-applet.h			\
+	mate-panel-applet-mateconf.h		\
+	mate-panel-applet-enums.h		\
+	MATE_Panel.h
+
+libmate_panel_applet_2_la_SOURCES =		\
+	mate-panel-applet.h			\
+	mate-panel-applet.c			\
+	mate-panel-applet-mateconf.c		\
+	mate-panel-applet-mateconf.h		\
+	mate-panel-applet-shell.c		\
+	mate-panel-applet-shell.h		\
+	mate-panel-applet-private.h		\
+	mate-panel-applet-marshal.c		\
+	mate-panel-applet-marshal.h		\
+	mate-panel-applet-enums.c		\
+	mate-panel-applet-enums.h		\
+	$(CORBA_SRCLIST)
+
+libmate_panel_applet_2_la_LDFLAGS = \
+	-version-info $(LIB_MATE_PANEL_APPLET_MATECOMPONENT_LT_VERSION) \
+	-no-undefined
+libmate_panel_applet_2_la_LIBADD  = \
+	$(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS) \
+	$(X_LIBS)
+
+panel_test_applets_matecomponent_LDADD   =	\
+	$(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS)
+
+test_matecomponent_applet_LDADD =		\
+	$(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS)	\
+	libmate-panel-applet-2.la
+
+$(libmate_panel_applet_2_la_OBJECTS) $(test_matecomponent_applet_matecomponent_OBJECTS): $(BUILT_SOURCES)
+
+CORBA_SRCLIST =			\
+	MATE_Panel-stubs.c	\
+	MATE_Panel-skels.c	\
+	MATE_Panel-common.c	\
+	MATE_Panel.h
+
+$(CORBA_SRCLIST): $(top_srcdir)/matecomponent/idl/MATE_Panel.idl $(MATECORBA_IDL)
+	$(AM_V_GEN)$(MATECORBA_IDL) -I $(MATECOMPONENT_IDLDIR) -I $(MATECOMPONENT_ACT_IDLDIR) $(top_srcdir)/matecomponent/idl/MATE_Panel.idl
+
+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 = \
+	$(CORBA_SRCLIST)	\
+	mate-panel-applet-enums.c	\
+	mate-panel-applet-enums.h	\
+	mate-panel-applet-marshal.c	\
+	mate-panel-applet-marshal.h
+
+uidir   = $(datadir)/mate-panel/ui
+ui_DATA = panel-test-applets-matecomponent.ui
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmatepanelapplet-2.0.pc
+
+serverdir       = $(libdir)/matecomponent/servers
+server_in_files = MATE_Panel_TestApplet.server.in
+noinst_DATA     = $(server_in_files:.server.in=.server)
+
+@INTLTOOL_SERVER_RULE@
+
+EXTRA_DIST =					\
+	MATE_Panel_TestApplet.server.in	\
+	mate-panel-applet-marshal.list		\
+	libmatepanelapplet-2.0.pc.in		\
+	libmatepanelapplet-2.0-uninstalled.pc.in	\
+	panel-test-applets-matecomponent.ui
+
+CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
+
+dist-hook:
+	cd $(distdir) ; rm -f $(CLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/matecomponent/libmate-panel-applet/Makefile.in b/matecomponent/libmate-panel-applet/Makefile.in
new file mode 100644
index 00000000..03e6dce1
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/Makefile.in
@@ -0,0 +1,952 @@
+# 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@
+bin_PROGRAMS = panel-test-applets-matecomponent$(EXEEXT)
+noinst_PROGRAMS = test-matecomponent-applet$(EXEEXT)
+subdir = matecomponent/libmate-panel-applet
+DIST_COMMON = $(libmate_panel_appletinclude_HEADERS) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/libmatepanelapplet-2.0-uninstalled.pc.in \
+	$(srcdir)/libmatepanelapplet-2.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-2.0.pc \
+	libmatepanelapplet-2.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)$(bindir)" \
+	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(uidir)" \
+	"$(DESTDIR)$(libmate_panel_appletincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libmate_panel_applet_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__objects_1 = MATE_Panel-stubs.lo MATE_Panel-skels.lo \
+	MATE_Panel-common.lo
+am_libmate_panel_applet_2_la_OBJECTS = mate-panel-applet.lo \
+	mate-panel-applet-mateconf.lo mate-panel-applet-shell.lo \
+	mate-panel-applet-marshal.lo mate-panel-applet-enums.lo \
+	$(am__objects_1)
+libmate_panel_applet_2_la_OBJECTS =  \
+	$(am_libmate_panel_applet_2_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_2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libmate_panel_applet_2_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+panel_test_applets_matecomponent_SOURCES =  \
+	panel-test-applets-matecomponent.c
+panel_test_applets_matecomponent_OBJECTS =  \
+	panel-test-applets-matecomponent.$(OBJEXT)
+panel_test_applets_matecomponent_DEPENDENCIES = $(am__DEPENDENCIES_1)
+test_matecomponent_applet_SOURCES = test-matecomponent-applet.c
+test_matecomponent_applet_OBJECTS =  \
+	test-matecomponent-applet.$(OBJEXT)
+test_matecomponent_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	libmate-panel-applet-2.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_2_la_SOURCES) \
+	panel-test-applets-matecomponent.c test-matecomponent-applet.c
+DIST_SOURCES = $(libmate_panel_applet_2_la_SOURCES) \
+	panel-test-applets-matecomponent.c test-matecomponent-applet.c
+DATA = $(noinst_DATA) $(pkgconfig_DATA) $(ui_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-2.la
+AM_CPPFLAGS = \
+	$(LIBMATE_PANEL_APPLET_MATECOMPONENT_CFLAGS)			\
+	-I$(top_builddir)/matecomponent/libmate-panel-applet		\
+	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DMATE_PANEL_APPLET_DATADIR=\""$(datadir)"\"			\
+	-DMATE_PANEL_APPLET_BUILDERDIR=\""$(uidir)"\"		\
+	$(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
+libmate_panel_appletincludedir = $(includedir)/panel-2.0
+libmate_panel_appletinclude_HEADERS = \
+	mate-panel-applet.h			\
+	mate-panel-applet-mateconf.h		\
+	mate-panel-applet-enums.h		\
+	MATE_Panel.h
+
+libmate_panel_applet_2_la_SOURCES = \
+	mate-panel-applet.h			\
+	mate-panel-applet.c			\
+	mate-panel-applet-mateconf.c		\
+	mate-panel-applet-mateconf.h		\
+	mate-panel-applet-shell.c		\
+	mate-panel-applet-shell.h		\
+	mate-panel-applet-private.h		\
+	mate-panel-applet-marshal.c		\
+	mate-panel-applet-marshal.h		\
+	mate-panel-applet-enums.c		\
+	mate-panel-applet-enums.h		\
+	$(CORBA_SRCLIST)
+
+libmate_panel_applet_2_la_LDFLAGS = \
+	-version-info $(LIB_MATE_PANEL_APPLET_MATECOMPONENT_LT_VERSION) \
+	-no-undefined
+
+libmate_panel_applet_2_la_LIBADD = \
+	$(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS) \
+	$(X_LIBS)
+
+panel_test_applets_matecomponent_LDADD = \
+	$(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS)
+
+test_matecomponent_applet_LDADD = \
+	$(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS)	\
+	libmate-panel-applet-2.la
+
+CORBA_SRCLIST = \
+	MATE_Panel-stubs.c	\
+	MATE_Panel-skels.c	\
+	MATE_Panel-common.c	\
+	MATE_Panel.h
+
+mate_panel_applet_enum_headers = $(top_srcdir)/libmate-panel-applet/mate-panel-applet.h
+BUILT_SOURCES = \
+	$(CORBA_SRCLIST)	\
+	mate-panel-applet-enums.c	\
+	mate-panel-applet-enums.h	\
+	mate-panel-applet-marshal.c	\
+	mate-panel-applet-marshal.h
+
+uidir = $(datadir)/mate-panel/ui
+ui_DATA = panel-test-applets-matecomponent.ui
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmatepanelapplet-2.0.pc
+serverdir = $(libdir)/matecomponent/servers
+server_in_files = MATE_Panel_TestApplet.server.in
+noinst_DATA = $(server_in_files:.server.in=.server)
+EXTRA_DIST = \
+	MATE_Panel_TestApplet.server.in	\
+	mate-panel-applet-marshal.list		\
+	libmatepanelapplet-2.0.pc.in		\
+	libmatepanelapplet-2.0-uninstalled.pc.in	\
+	panel-test-applets-matecomponent.ui
+
+CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
+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 matecomponent/libmate-panel-applet/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu matecomponent/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-2.0.pc: $(top_builddir)/config.status $(srcdir)/libmatepanelapplet-2.0.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+libmatepanelapplet-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libmatepanelapplet-2.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-2.la: $(libmate_panel_applet_2_la_OBJECTS) $(libmate_panel_applet_2_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmate_panel_applet_2_la_LINK) -rpath $(libdir) $(libmate_panel_applet_2_la_OBJECTS) $(libmate_panel_applet_2_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_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
+
+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
+panel-test-applets-matecomponent$(EXEEXT): $(panel_test_applets_matecomponent_OBJECTS) $(panel_test_applets_matecomponent_DEPENDENCIES) 
+	@rm -f panel-test-applets-matecomponent$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(panel_test_applets_matecomponent_OBJECTS) $(panel_test_applets_matecomponent_LDADD) $(LIBS)
+test-matecomponent-applet$(EXEEXT): $(test_matecomponent_applet_OBJECTS) $(test_matecomponent_applet_DEPENDENCIES) 
+	@rm -f test-matecomponent-applet$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_matecomponent_applet_OBJECTS) $(test_matecomponent_applet_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MATE_Panel-common.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MATE_Panel-skels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MATE_Panel-stubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate-panel-applet-enums.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-shell.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mate-panel-applet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-test-applets-matecomponent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-matecomponent-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-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-uiDATA: $(ui_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
+	@list='$(ui_DATA)'; test -n "$(uidir)" || 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)$(uidir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
+	done
+
+uninstall-uiDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(uidir)" && 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)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(uidir)" "$(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-binPROGRAMS 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-libmate_panel_appletincludeHEADERS \
+	install-pkgconfigDATA install-uiDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS 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-binPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-libmate_panel_appletincludeHEADERS \
+	uninstall-pkgconfigDATA uninstall-uiDATA
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	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-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am 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-uiDATA 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-binPROGRAMS \
+	uninstall-libLTLIBRARIES \
+	uninstall-libmate_panel_appletincludeHEADERS \
+	uninstall-pkgconfigDATA uninstall-uiDATA
+
+
+$(libmate_panel_applet_2_la_OBJECTS) $(test_matecomponent_applet_matecomponent_OBJECTS): $(BUILT_SOURCES)
+
+$(CORBA_SRCLIST): $(top_srcdir)/matecomponent/idl/MATE_Panel.idl $(MATECORBA_IDL)
+	$(AM_V_GEN)$(MATECORBA_IDL) -I $(MATECOMPONENT_IDLDIR) -I $(MATECOMPONENT_ACT_IDLDIR) $(top_srcdir)/matecomponent/idl/MATE_Panel.idl
+
+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) > $@
+
+@INTLTOOL_SERVER_RULE@
+
+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/matecomponent/libmate-panel-applet/TODO b/matecomponent/libmate-panel-applet/TODO
new file mode 100644
index 00000000..e0384730
--- /dev/null
+++ b/matecomponent/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/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0-uninstalled.pc.in b/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0-uninstalled.pc.in
new file mode 100644
index 00000000..4b9b6c49
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0-uninstalled.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libmate-panel-applet-2
+Description: libmate-panel-applet-2
+Requires: mateconf-2.0 gtk+-2.0 libmatecomponentui-2.0
+Version: @VERSION@
+Libs: ${pc_top_builddir}/${pcfiledir}/libmate-panel-applet-2.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0.pc.in b/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0.pc.in
new file mode 100644
index 00000000..a790b2c8
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libmate-panel-applet-2
+Description: libmate-panel-applet-2
+Requires: mateconf-2.0 gtk+-2.0 libmatecomponentui-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lmate-panel-applet-2
+Cflags: -I${includedir}/panel-2.0
diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-marshal.list b/matecomponent/libmate-panel-applet/mate-panel-applet-marshal.list
new file mode 100644
index 00000000..1693a57d
--- /dev/null
+++ b/matecomponent/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/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.c b/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.c
new file mode 100644
index 00000000..588df9ef
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.c
@@ -0,0 +1,458 @@
+/*
+ * 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"
+#include "mate-panel-applet-private.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/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.h b/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.h
new file mode 100644
index 00000000..2eb523a4
--- /dev/null
+++ b/matecomponent/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/matecomponent/libmate-panel-applet/mate-panel-applet-private.h b/matecomponent/libmate-panel-applet/mate-panel-applet-private.h
new file mode 100644
index 00000000..6cc36abd
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/mate-panel-applet-private.h
@@ -0,0 +1,40 @@
+/*
+ * mate-panel-applet-private.h:
+ *
+ * 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_PRIVATE_H__
+#define __MATE_PANEL_APPLET_PRIVATE_H__
+
+#include "mate-panel-applet.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+gboolean _mate_panel_applet_popup_menu (MatePanelApplet *applet, guint button, guint32 time);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MATE_PANEL_APPLET_PRIVATE_H__ */
diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-shell.c b/matecomponent/libmate-panel-applet/mate-panel-applet-shell.c
new file mode 100644
index 00000000..a9b56489
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/mate-panel-applet-shell.c
@@ -0,0 +1,105 @@
+/*
+ * mate-panel-applet-shell.c: the panel's interface to the applet.
+ *
+ * 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]>
+ */
+
+#include <config.h>
+
+#include "mate-panel-applet-shell.h"
+#include "mate-panel-applet.h"
+#include "mate-panel-applet-private.h"
+
+struct _MatePanelAppletShellPrivate {
+	MatePanelApplet *applet;
+};
+
+static GObjectClass *parent_class = NULL;
+
+static void
+impl_MatePanelAppletShell_popup_menu (PortableServer_Servant  servant,
+				  CORBA_long   button,
+				  CORBA_long   time,
+				  CORBA_Environment      *ev)
+{
+	MatePanelAppletShell *applet_shell;
+
+	applet_shell = MATE_PANEL_APPLET_SHELL (matecomponent_object (servant));
+
+	_mate_panel_applet_popup_menu (applet_shell->priv->applet, button, time);
+}
+
+static void
+mate_panel_applet_shell_finalize (GObject *object)
+{
+	MatePanelAppletShell *shell = MATE_PANEL_APPLET_SHELL (object);
+
+	if (shell->priv) {
+		g_free (shell->priv);
+		shell->priv = NULL;
+	}
+
+	parent_class->finalize (object);
+}
+
+static void
+mate_panel_applet_shell_class_init (MatePanelAppletShellClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	klass->epv.popup_menu = impl_MatePanelAppletShell_popup_menu;
+
+	object_class->finalize = mate_panel_applet_shell_finalize;
+
+	parent_class = g_type_class_peek_parent (klass);
+}
+
+static void
+mate_panel_applet_shell_init (MatePanelAppletShell *shell)
+{
+	shell->priv = g_new0 (MatePanelAppletShellPrivate, 1);
+
+	shell->priv->applet = NULL;
+}
+
+MATECOMPONENT_TYPE_FUNC_FULL (MatePanelAppletShell,
+		       MATE_Vertigo_MatePanelAppletShell,
+		       MATECOMPONENT_OBJECT_TYPE,
+		       mate_panel_applet_shell)
+
+void
+mate_panel_applet_shell_construct (MatePanelAppletShell *shell,
+			      MatePanelApplet      *applet)
+{
+	shell->priv->applet = applet;
+}
+
+MatePanelAppletShell *
+mate_panel_applet_shell_new (MatePanelApplet *applet)
+{
+	MatePanelAppletShell *shell;
+
+	shell = g_object_new (MATE_PANEL_APPLET_SHELL_TYPE, NULL);
+
+	mate_panel_applet_shell_construct (shell, applet);
+
+	return shell;
+}
diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-shell.h b/matecomponent/libmate-panel-applet/mate-panel-applet-shell.h
new file mode 100644
index 00000000..b4c7d548
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/mate-panel-applet-shell.h
@@ -0,0 +1,62 @@
+/*
+ * mate-panel-applet-shell.h: the panel's interface to the applet.
+ *
+ * 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_SHELL_H__
+#define __MATE_PANEL_APPLET_SHELL_H__
+
+#include <matecomponent/matecomponent-object.h>
+
+#include <mate-panel-applet.h>
+#include <MATE_Panel.h>
+
+#define MATE_PANEL_APPLET_SHELL_TYPE        (mate_panel_applet_shell_get_type ())
+#define MATE_PANEL_APPLET_SHELL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MATE_PANEL_APPLET_SHELL_TYPE, MatePanelAppletShell))
+#define MATE_PANEL_APPLET_SHELL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST    ((k), MATE_PANEL_APPLET_SHELL_TYPE, MatePanelAppletShellClass))
+#define PANEL_IS_APPLET_SHELL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MATE_PANEL_APPLET_SHELL_TYPE))
+#define PANEL_IS_APPLET_SHELL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE    ((k), MATE_PANEL_APPLET_SHELL_TYPE))
+
+typedef struct _MatePanelAppletShellPrivate MatePanelAppletShellPrivate;
+
+typedef struct {
+	MateComponentObject             base;
+
+	MatePanelAppletShellPrivate *priv;
+} MatePanelAppletShell;
+
+typedef struct {
+	MateComponentObjectClass                       base_class;
+
+	POA_MATE_Vertigo_MatePanelAppletShell__epv epv;
+} MatePanelAppletShellClass;
+
+
+GType             mate_panel_applet_shell_get_type  (void) G_GNUC_CONST;
+
+void              mate_panel_applet_shell_construct (MatePanelAppletShell *shell,
+						MatePanelApplet      *applet);
+
+MatePanelAppletShell *mate_panel_applet_shell_new       (MatePanelApplet      *applet);
+
+
+#endif /* MATE_PANEL_APPLET_SHELL_H */
diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet.c b/matecomponent/libmate-panel-applet/mate-panel-applet.c
new file mode 100644
index 00000000..c83df49f
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/mate-panel-applet.c
@@ -0,0 +1,1879 @@
+/*
+ * mate-panel-applet.c: panel applet writing library.
+ *
+ * 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 <cairo.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <matecomponent/matecomponent-ui-util.h>
+#include <matecomponent/matecomponent-main.h>
+#include <matecomponent/matecomponent-types.h>
+#include <matecomponent/matecomponent-property-bag.h>
+#include <matecomponent/matecomponent-item-handler.h>
+#include <matecomponent/matecomponent-shlib-factory.h>
+#include <matecomponent/matecomponent-property-bag-client.h>
+#include <mateconf/mateconf.h>
+#include <mateconf/mateconf-client.h>
+#include <X11/Xatom.h>
+
+#include "mate-panel-applet.h"
+#include "mate-panel-applet-private.h"
+#include "mate-panel-applet-shell.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 {
+	MatePanelAppletShell           *shell;
+	MateComponentControl              *control;
+	MateComponentPropertyBag          *prop_sack;
+	MateComponentItemHandler          *item_handler;
+	MateConfClient                *client;
+
+	char                       *iid;
+	GClosure                   *closure;
+	gboolean                    bound;
+	char                       *prefs_key;
+
+	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_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];
+
+#define PROPERTY_ORIENT     "mate-panel-applet-orient"
+#define PROPERTY_SIZE       "mate-panel-applet-size"
+#define PROPERTY_BACKGROUND "mate-panel-applet-background"
+#define PROPERTY_FLAGS      "mate-panel-applet-flags"
+#define PROPERTY_SIZE_HINTS "mate-panel-applet-size-hints"
+#define PROPERTY_LOCKED_DOWN "mate-panel-applet-locked-down"
+
+enum {
+	PROPERTY_ORIENT_IDX,
+	PROPERTY_SIZE_IDX,
+	PROPERTY_BACKGROUND_IDX,
+	PROPERTY_FLAGS_IDX,
+	PROPERTY_SIZE_HINTS_IDX,
+	PROPERTY_LOCKED_DOWN_IDX
+};
+
+G_DEFINE_TYPE (MatePanelApplet, mate_panel_applet, GTK_TYPE_EVENT_BOX)
+
+static void mate_panel_applet_handle_background (MatePanelApplet *applet);
+static void mate_panel_applet_setup             (MatePanelApplet *applet);
+
+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)
+{
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+
+	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);
+	}
+}
+
+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->prop_sack != NULL)
+		matecomponent_pbclient_set_short (MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_FLAGS, flags, NULL);
+	else
+		applet->priv->flags = flags;
+}
+
+void
+mate_panel_applet_set_size_hints (MatePanelApplet      *applet,
+			     const int        *size_hints,
+			     int               n_elements,
+			     int               base_size)
+{
+	CORBA_sequence_CORBA_long *seq;
+	CORBA_Environment          env;
+	CORBA_any                  any;
+	int                        i;
+
+	CORBA_exception_init (&env);
+
+	seq = CORBA_sequence_CORBA_long__alloc ();
+	seq->_length = seq->_maximum = n_elements;
+	seq->_release = CORBA_TRUE;
+	seq->_buffer  = CORBA_sequence_CORBA_long_allocbuf (seq->_length);
+
+	for (i = 0; i < n_elements; i++)
+		seq->_buffer [i] = size_hints [i] + base_size;
+
+	any._type    = TC_CORBA_sequence_CORBA_long;
+	any._release = CORBA_FALSE;
+	any._value   = seq;
+
+	MateComponent_PropertyBag_setValue (MATECOMPONENT_OBJREF (applet->priv->prop_sack),
+				     PROPERTY_SIZE_HINTS,
+				     &any,
+				     &env);
+
+	CORBA_free (seq);
+
+	CORBA_exception_free (&env);
+}
+
+guint
+mate_panel_applet_get_size (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), 0);
+
+	return applet->priv->size;
+}
+
+MatePanelAppletOrient
+mate_panel_applet_get_orient (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), 0);
+
+	return applet->priv->orient;
+}
+
+gboolean
+mate_panel_applet_get_locked_down (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), FALSE);
+
+	return applet->priv->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);
+}
+
+void
+mate_panel_applet_setup_menu (MatePanelApplet        *applet,
+			 const gchar        *xml,
+			 const MateComponentUIVerb *verb_list,
+			 gpointer            user_data)
+{
+	MateComponentUIComponent *popup_component;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+	g_return_if_fail (xml != NULL && verb_list != NULL);
+
+	popup_component = mate_panel_applet_get_popup_component (applet);
+
+	matecomponent_ui_component_set (popup_component, "/", "<popups/>", NULL);
+
+	matecomponent_ui_component_set_translate (popup_component, "/popups", xml, NULL);
+
+	matecomponent_ui_component_add_verb_list_with_data (popup_component, verb_list, user_data);
+}
+
+void
+mate_panel_applet_setup_menu_from_file (MatePanelApplet        *applet,
+				   const gchar        *opt_datadir,
+				   const gchar        *file,
+				   const gchar        *opt_app_name,
+				   const MateComponentUIVerb *verb_list,
+				   gpointer            user_data)
+{
+	MateComponentUIComponent *popup_component;
+	gchar             *app_name = NULL;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+	g_return_if_fail (file != NULL && verb_list != NULL);
+
+	if (!opt_datadir)
+		opt_datadir = MATE_PANEL_APPLET_DATADIR;
+
+	if (!opt_app_name)
+		opt_app_name = app_name = g_strdup_printf ("%lu",
+							   (unsigned long) getpid ());
+
+	popup_component = mate_panel_applet_get_popup_component (applet);
+
+	matecomponent_ui_util_set_ui (popup_component, opt_datadir, file, opt_app_name, NULL);
+
+	matecomponent_ui_component_add_verb_list_with_data (popup_component, verb_list, user_data);
+
+	if (app_name)
+		g_free (app_name);
+}
+
+MateComponentControl *
+mate_panel_applet_get_control (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
+
+	return applet->priv->control;
+}
+
+MateComponentUIComponent *
+mate_panel_applet_get_popup_component (MatePanelApplet *applet)
+{
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL);
+
+	return matecomponent_control_get_popup_ui_component (applet->priv->control);
+}
+
+static void
+mate_panel_applet_finalize (GObject *object)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (object);
+
+	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->prop_sack)
+		matecomponent_object_unref (
+			MATECOMPONENT_OBJECT (applet->priv->prop_sack));
+	applet->priv->prop_sack = NULL;
+
+	g_free (applet->priv->size_hints);
+	g_free (applet->priv->prefs_key);
+	g_free (applet->priv->background);
+	g_free (applet->priv->iid);
+
+	if (applet->priv->closure)
+		g_closure_unref (applet->priv->closure);
+	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 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));
+}
+
+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 == 1)
+		return TRUE;
+	else if (event->button == 3) {
+		matecomponent_control_do_popup_full (
+				applet->priv->control,
+				NULL, NULL,
+				(GtkMenuPositionFunc) mate_panel_applet_position_menu,
+				applet,
+				event->button,
+				event->time);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+gboolean
+_mate_panel_applet_popup_menu (MatePanelApplet *applet,
+			  guint button,
+			  guint32 time)
+{
+	matecomponent_control_do_popup_full (applet->priv->control, NULL, NULL,
+				      (GtkMenuPositionFunc) mate_panel_applet_position_menu,
+				      applet, button, time);
+	return TRUE;
+}
+
+static gboolean
+mate_panel_applet_popup_menu (MatePanelApplet *applet)
+{
+	return _mate_panel_applet_popup_menu (applet, 3, GDK_CURRENT_TIME);
+}
+
+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_get_prop (MateComponentPropertyBag *sack,
+                       MateComponentArg         *arg,
+		       guint              arg_id,
+		       CORBA_Environment *ev,
+		       gpointer           user_data)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (user_data);
+
+	switch (arg_id) {
+	case PROPERTY_ORIENT_IDX:
+		MATECOMPONENT_ARG_SET_SHORT (arg, applet->priv->orient);
+		break;
+	case PROPERTY_SIZE_IDX:
+		MATECOMPONENT_ARG_SET_SHORT (arg, applet->priv->size);
+		break;
+	case PROPERTY_BACKGROUND_IDX:
+		MATECOMPONENT_ARG_SET_STRING (arg, applet->priv->background);
+		break;
+	case PROPERTY_FLAGS_IDX:
+		MATECOMPONENT_ARG_SET_SHORT (arg, applet->priv->flags);
+		break;
+	case PROPERTY_SIZE_HINTS_IDX: {
+		CORBA_sequence_CORBA_long *seq;
+		int                        i;
+
+		seq = arg->_value;
+
+		seq->_length  = seq->_maximum = applet->priv->size_hints_len;
+		seq->_buffer  = CORBA_sequence_CORBA_long_allocbuf (seq->_length);
+		seq->_release = CORBA_TRUE;
+
+		for (i = 0; i < applet->priv->size_hints_len; i++)
+			seq->_buffer [i] = applet->priv->size_hints [i];
+	}
+		break;
+	case PROPERTY_LOCKED_DOWN_IDX:
+		MATECOMPONENT_ARG_SET_BOOLEAN (arg, applet->priv->locked_down);
+		break;
+	default:
+		g_assert_not_reached ();
+		break;
+	}
+}
+
+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_set_prop (MateComponentPropertyBag *sack,
+		       const MateComponentArg   *arg,
+		       guint              arg_id,
+		       CORBA_Environment *ev,
+		       gpointer           user_data)
+{
+	MatePanelApplet *applet = MATE_PANEL_APPLET (user_data);
+
+	switch (arg_id) {
+	case PROPERTY_ORIENT_IDX: {
+		MatePanelAppletOrient orient;
+
+		orient = MATECOMPONENT_ARG_GET_SHORT (arg);
+
+		if (applet->priv->orient != orient) {
+			applet->priv->orient = orient;
+
+			g_signal_emit (G_OBJECT (applet),
+				       mate_panel_applet_signals [CHANGE_ORIENT],
+				       0, orient);
+		}
+	}
+		break;
+	case PROPERTY_SIZE_IDX: {
+		guint size;
+
+		size = MATECOMPONENT_ARG_GET_SHORT (arg);
+
+		if (applet->priv->size != size) {
+			applet->priv->size = size;
+
+			g_signal_emit (G_OBJECT (applet),
+                                       mate_panel_applet_signals [CHANGE_SIZE],
+                                       0, size);
+		}
+	}
+		break;
+	case PROPERTY_BACKGROUND_IDX:
+		if (applet->priv->background)
+			g_free (applet->priv->background);
+
+		applet->priv->background = g_strdup (MATECOMPONENT_ARG_GET_STRING (arg));
+
+		mate_panel_applet_handle_background (applet);
+		break;
+	case PROPERTY_FLAGS_IDX:
+		applet->priv->flags = MATECOMPONENT_ARG_GET_SHORT (arg);
+		break;
+	case PROPERTY_SIZE_HINTS_IDX: {
+		CORBA_sequence_CORBA_long *seq = arg->_value;
+		int                        i;
+
+		applet->priv->size_hints = g_realloc (applet->priv->size_hints,
+						      seq->_length * sizeof (int));
+		for (i = 0; i < seq->_length; i++)
+			applet->priv->size_hints [i] = seq->_buffer [i];
+
+		applet->priv->size_hints_len = seq->_length;;
+	}
+		break;
+	case PROPERTY_LOCKED_DOWN_IDX:
+		applet->priv->locked_down = MATECOMPONENT_ARG_GET_BOOLEAN (arg);
+		break;
+	default:
+		g_assert_not_reached ();
+		break;
+	}
+}
+
+static MateComponentPropertyBag *
+mate_panel_applet_property_bag (MatePanelApplet *applet)
+{
+	MateComponentPropertyBag *sack;
+
+	sack = matecomponent_property_bag_new (mate_panel_applet_get_prop,
+					mate_panel_applet_set_prop,
+					applet);
+
+	matecomponent_property_bag_add (sack,
+				 PROPERTY_ORIENT,
+				 PROPERTY_ORIENT_IDX,
+				 MATECOMPONENT_ARG_SHORT,
+				 NULL,
+				 "The Applet's containing Panel's orientation",
+				 MateComponent_PROPERTY_READABLE | MateComponent_PROPERTY_WRITEABLE);
+
+	matecomponent_property_bag_add (sack,
+				 PROPERTY_SIZE,
+				 PROPERTY_SIZE_IDX,
+				 MATECOMPONENT_ARG_SHORT,
+				 NULL,
+				 "The Applet's containing Panel's size in pixels",
+				 MateComponent_PROPERTY_READABLE | MateComponent_PROPERTY_WRITEABLE);
+
+	matecomponent_property_bag_add (sack,
+				 PROPERTY_BACKGROUND,
+				 PROPERTY_BACKGROUND_IDX,
+				 MATECOMPONENT_ARG_STRING,
+				 NULL,
+				 "The Applet's containing Panel's background color or pixmap",
+				 MateComponent_PROPERTY_READABLE | MateComponent_PROPERTY_WRITEABLE);
+
+	matecomponent_property_bag_add (sack,
+				 PROPERTY_FLAGS,
+				 PROPERTY_FLAGS_IDX,
+				 MATECOMPONENT_ARG_SHORT,
+				 NULL,
+				 "The Applet's flags",
+				 MateComponent_PROPERTY_READABLE);
+
+	matecomponent_property_bag_add (sack,
+				 PROPERTY_SIZE_HINTS,
+				 PROPERTY_SIZE_HINTS_IDX,
+				 TC_CORBA_sequence_CORBA_long,
+				 NULL,
+				 "Ranges that hint what sizes are acceptable for the applet",
+				 MateComponent_PROPERTY_READABLE);
+
+	matecomponent_property_bag_add (sack,
+				 PROPERTY_LOCKED_DOWN,
+				 PROPERTY_LOCKED_DOWN_IDX,
+				 MATECOMPONENT_ARG_BOOLEAN,
+				 NULL,
+				 "The Applet's containing Panel is locked down",
+				 MateComponent_PROPERTY_READABLE | MateComponent_PROPERTY_WRITEABLE);
+
+	return sack;
+}
+
+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_control_bound (MateComponentControl *control,
+			    MatePanelApplet   *applet)
+{
+	gboolean ret;
+
+	g_return_if_fail (PANEL_IS_APPLET (applet));
+	g_return_if_fail (applet->priv->iid != NULL &&
+			  applet->priv->closure != NULL);
+
+	if (applet->priv->bound)
+		return;
+
+	matecomponent_closure_invoke (applet->priv->closure,
+			       G_TYPE_BOOLEAN, &ret,
+			       PANEL_TYPE_APPLET, applet,
+			       G_TYPE_STRING, applet->priv->iid,
+			       NULL);
+
+
+	if (!ret) { /* FIXME */
+		g_warning ("need to free the control here");
+
+		return;
+	}
+
+	applet->priv->bound = TRUE;
+}
+
+static MateComponent_Unknown
+mate_panel_applet_item_handler_get_object (MateComponentItemHandler *handler,
+				      const char        *item_name,
+				      gboolean           only_if_exists,
+				      gpointer           user_data,
+				      CORBA_Environment *ev)
+{
+	MatePanelApplet *applet = user_data;
+	GSList      *options;
+	GSList      *l;
+
+	g_return_val_if_fail (PANEL_IS_APPLET (applet), CORBA_OBJECT_NIL);
+
+	options = matecomponent_item_option_parse (item_name);
+
+	for (l = options; l; l = l->next) {
+		MateComponentItemOption *option = l->data;
+
+		if (!option->value || !option->value [0])
+			continue;
+
+		if (!strcmp (option->key, "prefs_key") && !applet->priv->prefs_key)
+			mate_panel_applet_set_preferences_key (applet, option->value);
+
+		else if (!strcmp (option->key, "background"))
+			matecomponent_pbclient_set_string (MATECOMPONENT_OBJREF (applet->priv->prop_sack),
+						    PROPERTY_BACKGROUND, option->value, NULL);
+
+		else if (!strcmp (option->key, "orient")) {
+			if (!strcmp (option->value, "up"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_ORIENT,
+					MATE_PANEL_APPLET_ORIENT_UP, NULL);
+
+			else if (!strcmp (option->value, "down"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_ORIENT,
+					MATE_PANEL_APPLET_ORIENT_DOWN, NULL);
+
+			else if (!strcmp (option->value, "left"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_ORIENT,
+					MATE_PANEL_APPLET_ORIENT_LEFT, NULL);
+
+			else if (!strcmp (option->value, "right"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_ORIENT,
+					MATE_PANEL_APPLET_ORIENT_RIGHT, NULL);
+
+		} else if (!strcmp (option->key, "size")) {
+			if (!strcmp (option->value, "xx-small"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE,
+					MATE_Vertigo_PANEL_XX_SMALL, NULL);
+
+			else if (!strcmp (option->value, "x-small"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE,
+					MATE_Vertigo_PANEL_X_SMALL, NULL);
+
+			else if (!strcmp (option->value, "small"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE,
+					MATE_Vertigo_PANEL_SMALL, NULL);
+
+			else if (!strcmp (option->value, "medium"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE,
+					MATE_Vertigo_PANEL_MEDIUM, NULL);
+
+			else if (!strcmp (option->value, "large"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE,
+					MATE_Vertigo_PANEL_LARGE, NULL);
+
+			else if (!strcmp (option->value, "x-large"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE,
+					MATE_Vertigo_PANEL_X_LARGE, NULL);
+
+			else if (!strcmp (option->value, "xx-large"))
+				matecomponent_pbclient_set_short (
+					MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE,
+					MATE_Vertigo_PANEL_XX_LARGE, NULL);
+		} else if (!strcmp (option->key, "locked_down")) {
+			gboolean val = FALSE;
+			if (option->value[0] == 'T' ||
+			    option->value[0] == 't' ||
+			    option->value[0] == 'Y' ||
+			    option->value[0] == 'y' ||
+			    atoi (option->value) != 0)
+				val = TRUE;
+			matecomponent_pbclient_set_boolean (MATECOMPONENT_OBJREF (applet->priv->prop_sack),
+						     PROPERTY_LOCKED_DOWN, val, NULL);
+		}
+	}
+
+	matecomponent_item_options_free (options);
+
+	return matecomponent_object_dup_ref (MATECOMPONENT_OBJREF (applet->priv->control), ev);
+}
+
+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
+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 GObject* mate_panel_applet_constructor(GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
+{
+	GObject* obj = G_OBJECT_CLASS(mate_panel_applet_parent_class)->constructor(type, n_construct_properties, construct_properties);
+
+	MatePanelApplet* applet = MATE_PANEL_APPLET(obj);
+
+	/* 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_setup(applet);
+
+	return obj;
+}
+
+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->constructor = mate_panel_applet_constructor;
+	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->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;
+
+	gobject_class->finalize = mate_panel_applet_finalize;
+
+	g_type_class_add_private (klass, sizeof (MatePanelAppletPrivate));
+
+	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);
+}
+
+static void
+mate_panel_applet_init (MatePanelApplet *applet)
+{
+	applet->priv = MATE_PANEL_APPLET_GET_PRIVATE (applet);
+
+	applet->priv->client = mateconf_client_get_default ();
+
+	applet->priv->bound  = FALSE;
+	applet->priv->flags  = MATE_PANEL_APPLET_FLAGS_NONE;
+	applet->priv->orient = MATE_PANEL_APPLET_ORIENT_UP;
+	applet->priv->size   = MATE_Vertigo_PANEL_MEDIUM;
+
+	applet->priv->moving_focus_out = FALSE;
+
+	gtk_widget_set_events (GTK_WIDGET (applet),
+			       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+}
+
+static void
+mate_panel_applet_setup (MatePanelApplet *applet)
+{
+	MatePanelAppletPrivate *priv;
+
+	priv = applet->priv;
+
+	priv->control = matecomponent_control_new (GTK_WIDGET (applet));
+
+	g_signal_connect (priv->control, "set_frame",
+			  G_CALLBACK (mate_panel_applet_control_bound),
+			  applet);
+
+	priv->prop_sack = mate_panel_applet_property_bag (applet);
+
+	matecomponent_control_set_properties (
+			priv->control, MATECOMPONENT_OBJREF (priv->prop_sack), NULL);
+
+	priv->shell = mate_panel_applet_shell_new (applet);
+
+	matecomponent_object_add_interface (MATECOMPONENT_OBJECT (priv->control),
+				     MATECOMPONENT_OBJECT (priv->shell));
+
+	priv->item_handler =
+		matecomponent_item_handler_new (
+			NULL, mate_panel_applet_item_handler_get_object, applet);
+
+	matecomponent_object_add_interface (MATECOMPONENT_OBJECT (priv->control),
+				     MATECOMPONENT_OBJECT (priv->item_handler));
+
+	g_signal_connect (applet, "popup_menu",
+			  G_CALLBACK (mate_panel_applet_popup_menu), NULL);
+}
+
+GtkWidget* mate_panel_applet_new(void)
+{
+	MatePanelApplet* applet = g_object_new(PANEL_TYPE_APPLET, NULL);
+
+	return GTK_WIDGET (applet);
+}
+
+typedef struct {
+	GType     applet_type;
+	GClosure *closure;
+} MatePanelAppletCallBackData;
+
+static MatePanelAppletCallBackData *
+mate_panel_applet_callback_data_new (GType     applet_type,
+				GClosure *closure)
+{
+	MatePanelAppletCallBackData *retval;
+
+	retval = g_new0 (MatePanelAppletCallBackData, 1);
+
+	retval->applet_type = applet_type;
+	retval->closure     = closure;
+
+	return retval;
+}
+
+static void
+mate_panel_applet_callback_data_free (MatePanelAppletCallBackData *data)
+{
+	g_closure_unref (data->closure);
+	g_free (data);
+}
+
+static MateComponentObject *
+mate_panel_applet_factory_callback (MateComponentGenericFactory    *factory,
+			       const char              *iid,
+			       MatePanelAppletCallBackData *data)
+{
+	MatePanelApplet *applet;
+
+	applet = g_object_new (data->applet_type, NULL);
+
+	applet->priv->iid     = g_strdup (iid);
+	applet->priv->closure = g_closure_ref (data->closure);
+
+	matecomponent_control_life_instrument (applet->priv->control);
+
+	return MATECOMPONENT_OBJECT (applet->priv->control);
+}
+
+static void
+mate_panel_applet_all_controls_dead (void)
+{
+	if (!matecomponent_control_life_get_count())
+		matecomponent_main_quit ();
+}
+
+int
+mate_panel_applet_factory_main_closure (const gchar *iid,
+				   GType        applet_type,
+				   GClosure    *closure)
+{
+	int                      retval;
+	char                    *display_iid;
+	MatePanelAppletCallBackData *data;
+
+	g_return_val_if_fail (iid != NULL, 1);
+	g_return_val_if_fail (closure != NULL, 1);
+
+	g_assert (g_type_is_a (applet_type, PANEL_TYPE_APPLET));
+
+	bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+	matecomponent_control_life_set_callback (mate_panel_applet_all_controls_dead);
+
+	closure = matecomponent_closure_store (closure, mate_panel_applet_marshal_BOOLEAN__STRING);
+
+	data = mate_panel_applet_callback_data_new (applet_type, closure);
+
+	display_iid = matecomponent_activation_make_registration_id (
+		iid, DisplayString (gdk_display_get_default ()));
+	retval = matecomponent_generic_factory_main (
+		display_iid,
+		(MateComponentFactoryCallback) mate_panel_applet_factory_callback,
+		data);
+	g_free (display_iid);
+
+	mate_panel_applet_callback_data_free (data);
+
+	return retval;
+}
+
+int
+mate_panel_applet_factory_main (const gchar                 *iid,
+			   GType                        applet_type,
+			   MatePanelAppletFactoryCallback   callback,
+			   gpointer                     data)
+{
+	GClosure *closure;
+
+	g_return_val_if_fail (iid != NULL, 1);
+	g_return_val_if_fail (callback != NULL, 1);
+
+	closure = g_cclosure_new (G_CALLBACK (callback), data, NULL);
+
+	return mate_panel_applet_factory_main_closure (iid, applet_type, closure);
+}
+
+MateComponent_Unknown
+mate_panel_applet_shlib_factory_closure (const char         *iid,
+				    GType               applet_type,
+				    PortableServer_POA  poa,
+				    gpointer            impl_ptr,
+				    GClosure           *closure,
+				    CORBA_Environment  *ev)
+{
+	MateComponentShlibFactory *factory;
+
+	g_return_val_if_fail (iid != NULL, CORBA_OBJECT_NIL);
+	g_return_val_if_fail (closure != NULL, CORBA_OBJECT_NIL);
+
+	g_assert (g_type_is_a (applet_type, PANEL_TYPE_APPLET));
+
+	bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+	closure = matecomponent_closure_store (closure, mate_panel_applet_marshal_BOOLEAN__STRING);
+
+	factory = matecomponent_shlib_factory_new_closure (
+			iid, poa, impl_ptr,
+			g_cclosure_new (G_CALLBACK (mate_panel_applet_factory_callback),
+					mate_panel_applet_callback_data_new (applet_type, closure),
+					(GClosureNotify) mate_panel_applet_callback_data_free));
+
+        return CORBA_Object_duplicate (MATECOMPONENT_OBJREF (factory), ev);
+}
+
+MateComponent_Unknown
+mate_panel_applet_shlib_factory (const char                 *iid,
+			    GType                       applet_type,
+			    PortableServer_POA          poa,
+			    gpointer                    impl_ptr,
+			    MatePanelAppletFactoryCallback  callback,
+			    gpointer                    user_data,
+			    CORBA_Environment          *ev)
+{
+	g_return_val_if_fail (iid != NULL, CORBA_OBJECT_NIL);
+	g_return_val_if_fail (callback != NULL, CORBA_OBJECT_NIL);
+
+	return mate_panel_applet_shlib_factory_closure (
+			iid, applet_type, poa, impl_ptr,
+			g_cclosure_new (G_CALLBACK (callback),
+					user_data, NULL),
+			ev);
+}
+
+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);
+	}
+}
diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet.h b/matecomponent/libmate-panel-applet/mate-panel-applet.h
new file mode 100644
index 00000000..28d9e89d
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/mate-panel-applet.h
@@ -0,0 +1,258 @@
+/*
+ * 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>
+#include <matecomponent/matecomponent-control.h>
+#include <matecomponent/matecomponent-main.h>
+#include <matecomponent/matecomponent-ui-component.h>
+#include <matecomponent/matecomponent-generic-factory.h>
+
+#include <MATE_Panel.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef MATE_Vertigo_PanelOrient MatePanelAppletOrient;
+
+#define MATE_PANEL_APPLET_ORIENT_UP    MATE_Vertigo_PANEL_ORIENT_UP
+#define MATE_PANEL_APPLET_ORIENT_DOWN  MATE_Vertigo_PANEL_ORIENT_DOWN
+#define MATE_PANEL_APPLET_ORIENT_LEFT  MATE_Vertigo_PANEL_ORIENT_LEFT
+#define MATE_PANEL_APPLET_ORIENT_RIGHT MATE_Vertigo_PANEL_ORIENT_RIGHT
+
+
+#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);
+
+MateComponentControl     *mate_panel_applet_get_control          (MatePanelApplet  *applet);
+MateComponentUIComponent *mate_panel_applet_get_popup_component  (MatePanelApplet  *applet);
+
+void               mate_panel_applet_setup_menu           (MatePanelApplet        *applet,
+						      const gchar        *xml,
+						      const MateComponentUIVerb *verb_list,
+						      gpointer            user_data);
+
+void               mate_panel_applet_setup_menu_from_file (MatePanelApplet        *applet,
+						      const gchar        *opt_datadir,
+						      const gchar        *file,
+						      const gchar        *opt_app_name,
+						      const MateComponentUIVerb *verb_list,
+						      gpointer            user_data);
+
+
+int                mate_panel_applet_factory_main          (const gchar		  *iid,
+						       GType                       applet_type,
+						       MatePanelAppletFactoryCallback  callback,
+						       gpointer			   data);
+
+int                mate_panel_applet_factory_main_closure  (const gchar		  *iid,
+						       GType                       applet_type,
+						       GClosure                   *closure);
+
+MateComponent_Unknown     mate_panel_applet_shlib_factory         (const char                 *iid,
+						       GType                       applet_type,
+						       PortableServer_POA          poa,
+						       gpointer                    impl_ptr,
+						       MatePanelAppletFactoryCallback  callback,
+						       gpointer                    user_data,
+						       CORBA_Environment          *ev);
+
+MateComponent_Unknown	   mate_panel_applet_shlib_factory_closure (const char                 *iid,
+						       GType                       applet_type,
+						       PortableServer_POA          poa,
+						       gpointer                    impl_ptr,
+						       GClosure                   *closure,
+						       CORBA_Environment          *ev);
+
+/*
+ * 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_MATECOMPONENT_FACTORY(iid, type, name, version, 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));	\
+	g_option_context_add_group (context,					\
+				    matecomponent_activation_get_goption_group ());	\
+										\
+	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);						\
+	if (!matecomponent_init (&argc, argv)) {					\
+		g_printerr ("Cannot initialize matecomponent.\n");			\
+		return 1;							\
+	}									\
+										\
+        retval = mate_panel_applet_factory_main (iid, type, callback, data);		\
+	g_option_context_free (context);					\
+										\
+	return retval;								\
+}
+
+#define MATE_PANEL_APPLET_MATECOMPONENT_SHLIB_FACTORY(iid, type, descr, callback, data)	\
+static MateComponent_Unknown								\
+__mate_panel_applet_shlib_factory (PortableServer_POA  poa,				\
+			      const char         *oafiid,			\
+			      gpointer            impl_ptr,			\
+			      CORBA_Environment  *ev)				\
+{										\
+	_MATE_PANEL_APPLET_SETUP_GETTEXT (FALSE);					\
+        return mate_panel_applet_shlib_factory ((iid), (type), poa, impl_ptr,	\
+					   (callback), (data), ev);		\
+}										\
+static MateComponentActivationPluginObject plugin_list[] = {				\
+	{ (iid), __mate_panel_applet_shlib_factory },				\
+	{ NULL }								\
+};										\
+const  MateComponentActivationPlugin MateComponent_Plugin_info = { plugin_list, (descr) };
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MATE_PANEL_APPLET_H__ */
diff --git a/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.c b/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.c
new file mode 100644
index 00000000..7c0da952
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.c
@@ -0,0 +1,349 @@
+/*
+ * panel-test-applets.c:
+ *
+ * Authors:
+ *    Mark McLoughlin <[email protected]>
+ *
+ * Copyright 2002 Sun Microsystems, Inc.
+ */
+
+#include <config.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <matecomponent/matecomponent-exception.h>
+#include <matecomponent/matecomponent-main.h>
+#include <matecomponent/matecomponent-widget.h>
+#include <mateconf/mateconf.h>
+
+#include "mate-panel-applet.h"
+
+G_GNUC_UNUSED void on_execute_button_clicked (GtkButton *button, gpointer dummy);
+
+static GtkWidget *win = NULL;
+static GtkWidget *applet_combo = NULL;
+static GtkWidget *prefs_dir_entry = NULL;
+static GtkWidget *orient_combo = NULL;
+static GtkWidget *size_combo = NULL;
+
+static char *cli_iid = NULL;
+static char *cli_prefs_dir = NULL;
+static char *cli_size = NULL;
+static char *cli_orient = NULL;
+
+static const GOptionEntry options [] = {
+	{ "iid", 0, 0, G_OPTION_ARG_STRING, &cli_iid, N_("Specify an applet IID to load"), NULL},
+	{ "prefs-dir", 0, 0, G_OPTION_ARG_STRING, &cli_prefs_dir, N_("Specify a mateconf location in which the applet preferences should be stored"), NULL},
+	{ "size", 0, 0, G_OPTION_ARG_STRING, &cli_size, N_("Specify the initial size of the applet (xx-small, medium, large etc.)"), NULL},
+	{ "orient", 0, 0, G_OPTION_ARG_STRING, &cli_orient, N_("Specify the initial orientation of the applet (top, bottom, left or right)"), NULL},
+	{ NULL}
+};
+
+enum {
+	COLUMN_TEXT,
+	COLUMN_ITEM,
+	NUMBER_COLUMNS
+};
+
+typedef struct {
+	const char *name;
+	const char *value;
+} ComboItem;
+
+static ComboItem orient_items [] = {
+	{ NC_("Orientation", "Top"),    "top"    },
+	{ NC_("Orientation", "Bottom"), "bottom" },
+	{ NC_("Orientation", "Left"),   "left"   },
+	{ NC_("Orientation", "Right"),  "right"  }
+};
+
+
+static ComboItem size_items [] = {
+	{ NC_("Size", "XX Small"), "xx-small" },
+	{ NC_("Size", "X Small"),  "x-small"  },
+	{ NC_("Size", "Small"),    "small"    },
+	{ NC_("Size", "Medium"),   "medium"   },
+	{ NC_("Size", "Large"),    "large"    },
+	{ NC_("Size", "X Large"),  "x-large"  },
+	{ NC_("Size", "XX Large"), "xx-large" }
+};
+
+static char *
+get_combo_value (GtkWidget *combo_box)
+{
+	GtkTreeIter  iter;
+	GtkTreeModel *model;
+	char         *value;
+
+	if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter))
+		return NULL;
+
+	model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
+	gtk_tree_model_get (model, &iter, COLUMN_ITEM, &value, -1);
+
+	return value;
+}
+
+static char *
+construct_moniker (void)
+{
+	const char *prefs_key;
+	char       *iid;
+	char       *size;
+	char       *orient;
+	char       *ret_value;
+
+	iid = get_combo_value (applet_combo);
+	g_assert (iid != NULL);
+	size = get_combo_value (size_combo);
+	g_assert (size != NULL);
+	orient = get_combo_value (orient_combo);
+	g_assert (orient != NULL);
+
+	prefs_key = gtk_entry_get_text (GTK_ENTRY (prefs_dir_entry));
+
+	ret_value= g_strdup_printf ("%s!prefs_key=%s;size=%s;orient=%s",
+				    iid, prefs_key, size, orient);
+	g_free (iid);
+	g_free (size);
+	g_free (orient);
+
+	return ret_value;
+}
+
+static void
+load_applet_into_window (const char *moniker,
+			 const char *title)
+{
+	GtkWidget *applet_window;
+	GtkWidget *applet;
+
+	applet = matecomponent_widget_new_control (moniker, NULL);
+
+	if (!applet) {
+		GtkWidget *dialog;
+
+		dialog = gtk_message_dialog_new (win ? GTK_WINDOW (win) : NULL,
+						 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+						 GTK_MESSAGE_ERROR,
+						 GTK_BUTTONS_CLOSE,
+						 _("Failed to load applet %s"),
+						 title);
+		gtk_dialog_run (GTK_DIALOG (dialog));
+		gtk_widget_destroy (dialog);
+		return;
+	}
+
+	applet_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+	gtk_widget_show (applet);
+
+	gtk_container_add (GTK_CONTAINER (applet_window), applet);
+
+	//FIXME: we could set the window icon with the applet icon
+	gtk_window_set_title (GTK_WINDOW (applet_window), title);
+	gtk_widget_show (applet_window);
+}
+
+static void
+load_applet_from_command_line (void)
+{
+	GString *str;
+
+	g_assert (cli_iid != NULL);
+
+	str = g_string_new (cli_iid);
+
+	if (cli_prefs_dir || cli_size || cli_orient) {
+		g_string_append_c (str, '!');
+
+		if (cli_prefs_dir)
+			g_string_append_printf (str, "prefs_key=%s", cli_prefs_dir);
+
+		g_string_append_c (str, ';');
+
+		if (cli_size)
+			g_string_append_printf (str, "size=%s", cli_size);
+
+		g_string_append_c (str, ';');
+
+		if (cli_orient)
+			g_string_append_printf (str, "orient=%s", cli_orient);
+	}
+	
+	g_print ("Loading %s\n", str->str);
+
+	load_applet_into_window (str->str, cli_iid);
+
+	g_string_free (str, TRUE);
+}
+
+G_GNUC_UNUSED void
+on_execute_button_clicked (GtkButton *button,
+			   gpointer   dummy)
+{
+	char *moniker;
+	char *title;
+
+	moniker = construct_moniker ();
+	title = get_combo_value (applet_combo);
+	load_applet_into_window (moniker, title);
+	g_free (moniker);
+	g_free (title);
+}
+
+static void
+setup_combo (GtkWidget  *combo_box,
+	     ComboItem  *items,
+	     const char *context,
+	     int         nb_items,
+	     gboolean    dynamic)
+{
+	GtkListStore          *model;
+	GtkTreeIter            iter;
+	GtkCellRenderer       *renderer;
+	int                    i;
+
+	model = gtk_list_store_new (NUMBER_COLUMNS,
+				    G_TYPE_STRING,
+				    G_TYPE_STRING);
+
+	gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box),
+				 GTK_TREE_MODEL (model));
+
+
+	for (i = 0; i < nb_items; i++) {
+		gtk_list_store_append (model, &iter);
+		gtk_list_store_set (model, &iter,
+				    COLUMN_TEXT, dynamic ? g_strdup (items [i].name) : g_dpgettext2 (NULL, context, items [i].name),
+				    COLUMN_ITEM, dynamic ? g_strdup (items [i].value) : items [i].value,
+				    -1);
+	}
+
+	renderer = gtk_cell_renderer_text_new ();
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box),
+				    renderer, TRUE);
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box),
+					renderer, "text", COLUMN_TEXT, NULL);
+
+	gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
+}
+
+static void
+setup_options (void)
+{
+	MateComponent_ServerInfoList *applets;
+	CORBA_Environment      env;
+	int                    i;
+	char                  *prefs_dir;
+	char                  *unique_key;
+	ComboItem             *applet_items;
+	int                    applet_nb;
+
+	CORBA_exception_init (&env);
+
+	applets = matecomponent_activation_query (
+			"has (repo_ids, 'IDL:MATE/Vertigo/MatePanelAppletShell:1.0')",
+			NULL, &env);
+
+	if (MATECOMPONENT_EX (&env))
+		g_error (_("query returned exception %s\n"), MATECOMPONENT_EX_REPOID (&env));
+
+	CORBA_exception_free (&env);
+
+	applet_nb = applets->_length;
+	applet_items = g_new0 (ComboItem, applet_nb);
+
+	for (i = 0; i < applet_nb; i++) {
+		MateComponent_ServerInfo *info;
+
+		info = &applets->_buffer [i];
+
+		applet_items[i].name = info->iid;
+		applet_items[i].value = info->iid;
+	}
+
+	setup_combo (applet_combo, applet_items, NULL, applet_nb, TRUE);
+	g_free (applet_items);
+	CORBA_free (applets);
+
+	setup_combo (size_combo, size_items, "Size",
+		     G_N_ELEMENTS (size_items), FALSE);
+	setup_combo (orient_combo, orient_items, "Orientation",
+		     G_N_ELEMENTS (orient_items), FALSE);
+
+	unique_key = mateconf_unique_key ();
+	prefs_dir = g_strdup_printf ("/tmp/%s", unique_key);
+	g_free (unique_key);
+	gtk_entry_set_text (GTK_ENTRY (prefs_dir_entry), prefs_dir);
+	g_free (prefs_dir);
+}
+
+int
+main (int argc, char **argv)
+{
+	GtkBuilder *builder;
+	char       *uifile;
+	GError     *error;
+
+	bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
+	error = NULL;
+	if (!gtk_init_with_args (&argc, &argv,
+				 "", (GOptionEntry *) options, GETTEXT_PACKAGE,
+				 &error)) {
+		if (error) {
+			g_printerr ("%s\n", error->message);
+			g_error_free (error);
+		} else
+			g_printerr ("Cannot initiliaze GTK+.\n");
+
+		return 1;
+	}
+
+	if (!matecomponent_init (&argc, argv)) {
+		g_printerr ("Cannot initialize matecomponent.\n");
+		return 1;
+	}
+
+	if (cli_iid) {
+		load_applet_from_command_line ();
+		gtk_main ();
+		return 0;
+	}
+
+	builder = gtk_builder_new ();
+	gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
+
+	uifile = MATE_PANEL_APPLET_BUILDERDIR "/panel-test-applets.ui";
+	gtk_builder_add_from_file (builder, uifile, &error);
+
+	if (error) {
+		g_warning ("Error loading \"%s\": %s", uifile, error->message);
+		g_error_free (error);
+		return 1;
+	}
+
+	gtk_builder_connect_signals (builder, NULL);
+
+	win             = GTK_WIDGET (gtk_builder_get_object (builder,
+							      "toplevel"));
+	applet_combo    = GTK_WIDGET (gtk_builder_get_object (builder,
+							      "applet-combo"));
+	prefs_dir_entry = GTK_WIDGET (gtk_builder_get_object (builder,
+							      "prefs-dir-entry"));
+	orient_combo    = GTK_WIDGET (gtk_builder_get_object (builder,
+							      "orient-combo"));
+	size_combo      = GTK_WIDGET (gtk_builder_get_object (builder,
+							      "size-combo"));
+	g_object_unref (builder);
+
+	setup_options ();
+
+	gtk_widget_show (win);
+
+	gtk_main ();
+
+	return 0;
+}
diff --git a/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.ui b/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.ui
new file mode 100644
index 00000000..05916cf5
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.ui
@@ -0,0 +1,203 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkDialog" id="toplevel">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes" comments="This is an utility to easily test various applets">Test applet utility</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="has_separator">False</property>
+    <signal name="destroy" handler="gtk_main_quit"/>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">8</property>
+        <child>
+          <object class="GtkTable" id="table2">
+            <property name="visible">True</property>
+            <property name="border_width">2</property>
+            <property name="n_rows">5</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">4</property>
+            <property name="row_spacing">4</property>
+            <child>
+              <object class="GtkLabel" id="size-label">
+                <property name="visible">True</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Size:</property>
+                <property name="use_underline">True</property>
+                <property name="justify">center</property>
+                <property name="mnemonic_widget">size-combo</property>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="applet-label">
+                <property name="visible">True</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Applet:</property>
+                <property name="use_underline">True</property>
+                <property name="justify">center</property>
+                <property name="mnemonic_widget">applet-combo</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="orient-label">
+                <property name="visible">True</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Orientation:</property>
+                <property name="use_underline">True</property>
+                <property name="justify">center</property>
+                <property name="mnemonic_widget">orient-combo</property>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="prefs-label">
+                <property name="visible">True</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Prefs Dir:</property>
+                <property name="use_underline">True</property>
+                <property name="justify">center</property>
+                <property name="mnemonic_widget">prefs-dir-entry</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="prefs-dir-entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="applet-combo">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="orient-combo">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="size-combo">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHSeparator" id="hseparator2">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok-button">
+                <property name="label">gtk-execute</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_execute_button_clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="gtk_main_quit"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok-button</action-widget>
+      <action-widget response="-7">button1</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/matecomponent/libmate-panel-applet/test-matecomponent-applet.c b/matecomponent/libmate-panel-applet/test-matecomponent-applet.c
new file mode 100644
index 00000000..d57e7f96
--- /dev/null
+++ b/matecomponent/libmate-panel-applet/test-matecomponent-applet.c
@@ -0,0 +1,204 @@
+/*
+ * test-matecomponent-applet.c:
+ *
+ * Authors:
+ *    Mark McLoughlin <[email protected]>
+ *
+ * Copyright 2001 Sun Microsystems, Inc.
+ */
+
+#include <config.h>
+#include <string.h>
+
+#include <libmatecomponentui.h>
+
+#include "mate-panel-applet.h"
+
+static void
+test_applet_on_do (MateComponentUIComponent *uic,
+		   gpointer           user_data,
+		   const gchar       *verbname)
+{
+        g_message ("%s called\n", verbname);
+}
+
+static const MateComponentUIVerb test_applet_menu_verbs [] = {
+        MATECOMPONENT_UI_VERB ("TestAppletDo1", test_applet_on_do),
+        MATECOMPONENT_UI_VERB ("TestAppletDo2", test_applet_on_do),
+        MATECOMPONENT_UI_VERB ("TestAppletDo3", test_applet_on_do),
+
+        MATECOMPONENT_UI_VERB_END
+};
+
+static const char test_applet_menu_xml [] =
+	"<popup name=\"button3\">\n"
+	"   <menuitem name=\"Test Item 1\" verb=\"TestAppletDo1\" _label=\"Test This One\"/>\n"
+	"   <menuitem name=\"Test Item 2\" verb=\"TestAppletDo2\" _label=\"Test This Two\"/>\n"
+	"   <menuitem name=\"Test Item 3\" verb=\"TestAppletDo3\" _label=\"Test This Three\"/>\n"
+	"</popup>\n";
+
+typedef struct {
+	MatePanelApplet   base;
+	GtkWidget    *label;
+} TestApplet;
+
+static GType
+test_applet_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		static const GTypeInfo info = {
+			sizeof (MatePanelAppletClass),
+			NULL, NULL, NULL, NULL, NULL,
+			sizeof (TestApplet),
+			0, NULL, NULL
+		};
+
+		type = g_type_register_static (
+				PANEL_TYPE_APPLET, "TestApplet", &info, 0);
+	}
+
+	return type;
+}
+
+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 MATE_Vertigo_PANEL_XX_SMALL:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"xx-small\">Hello</span>");
+		break;
+	case MATE_Vertigo_PANEL_X_SMALL:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"x-small\">Hello</span>");
+		break;
+	case MATE_Vertigo_PANEL_SMALL:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"small\">Hello</span>");
+		break;
+	case MATE_Vertigo_PANEL_MEDIUM:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"medium\">Hello</span>");
+		break;
+	case MATE_Vertigo_PANEL_LARGE:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"large\">Hello</span>");
+		break;
+	case MATE_Vertigo_PANEL_X_LARGE:
+		gtk_label_set_markup (
+			GTK_LABEL (applet->label), "<span size=\"x-large\">Hello</span>");
+		break;
+	case MATE_Vertigo_PANEL_XX_LARGE:
+		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)
+{
+	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_Vertigo_PANEL_MEDIUM, NULL);
+
+	mate_panel_applet_setup_menu (
+		MATE_PANEL_APPLET (applet), test_applet_menu_xml, test_applet_menu_verbs, NULL);
+
+	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, "OAFIID:MATE_Panel_TestMateComponentApplet"))
+		retval = test_applet_fill (applet);
+
+	return retval;
+}
+
+MATE_PANEL_APPLET_MATECOMPONENT_FACTORY ("OAFIID:MATE_Panel_TestMateComponentApplet_Factory",
+			     test_applet_get_type (),
+			     "A Test Applet for the MATE-2.0 Panel",
+			     "0",
+			     (MatePanelAppletFactoryCallback) test_applet_factory,
+			     NULL)