initial commit for Enea Linux 5.0 arm

Signed-off-by: Tudor Florea <tudor.florea@enea.com>

197 files changed, 17089 insertions, 0 deletions

diff --git a/meta-gnome/COPYING.MIT b/meta-gnome/COPYING.MIT
new file mode 100644
index 000000000..fb950dc69
--- /dev/null
+++ b/meta-gnome/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/meta-gnome/README b/meta-gnome/README
new file mode 100644
index 000000000..6358d14a3
--- /dev/null
+++ b/meta-gnome/README
@@ -0,0 +1,22 @@
+This layer depends on:
+
+URI: git://github.com/openembedded/oe-core.git
+branch: dizzy
+revision: HEAD
+
+URI: git://github.com/openembedded/meta-oe.git
+branch: dizzy
+revision: HEAD
+
+Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][dizzy]' in the subject'
+
+When sending single patches, please using something like:
+'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][dizzy][PATCH'
+
+Interim layer maintainer: Martin Jansa <Martin.Jansa@gmail.com>
+
+Dizzy branch maintainers:
+    Otavio Salvador <otavio@ossystems.com.br>
+    Armin Kuster <akuster808@gmail.com>
+
+Prefix email subject with: [dizzy]
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
new file mode 100644
index 000000000..58e12a9cd
--- /dev/null
+++ b/meta-gnome/conf/layer.conf
@@ -0,0 +1,15 @@
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "gnome-layer"
+BBFILE_PATTERN_gnome-layer := "^${LAYERDIR}/"
+BBFILE_PRIORITY_gnome-layer = "7"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_gnome-layer = "1"
+
+LAYERDEPENDS_gnome-layer = "core openembedded-layer"
diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
new file mode 100644
index 000000000..a54a3a220
--- /dev/null
+++ b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Take photos and videos with your webcam, with fun graphical effects"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
+
+DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop evolution-data-server intltool-native"
+
+PR = "r2"
+
+inherit gnome
+
+SRC_URI[archive.md5sum] = "1599fded8a1797ea51fb010af4e6c45b"
+SRC_URI[archive.sha256sum] = "48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030d4eed3bc3cbd9a"
+
+FILES_${PN} += "${datadir}/dbus-1"
+RRECOMMENDS_${PN} = "gst-plugins-good-meta gst-plugins-base-meta"
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
+do_configure_prepend() {
+    sed -i -e "s: help : :g" ${S}/Makefile.am
+}
diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gmtk_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gmtk_1.0.5.bb
new file mode 100644
index 000000000..d455f1447
--- /dev/null
+++ b/meta-gnome/recipes-apps/gnome-mplayer/gmtk_1.0.5.bb
@@ -0,0 +1,16 @@
+SUMMARY = "GTK+ widget and function libraries for gnome-mplayer"
+HOMEPAGE = "http://code.google.com/p/gmtk"
+SECTION = "libs"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+DEPENDS = "gtk+ alsa-lib glib-2.0 virtual/libx11 intltool-native pulseaudio gtk+3"
+
+SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz"
+SRC_URI[md5sum] = "e06e9ca8d61d74910343bb3ef4348f7f"
+SRC_URI[sha256sum] = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468"
+
+EXTRA_OECONF = "--disable-gconf --with-gio --with-alsa --enable-keystore"
+
+inherit gettext pkgconfig autotools gconf
diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
new file mode 100644
index 000000000..ef460f13d
--- /dev/null
+++ b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
@@ -0,0 +1,32 @@
+SUMMARY = "A GTK+ interface to MPlayer"
+HOMEPAGE = "http://code.google.com/p/gnome-mplayer"
+SECTION = "multimedia"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+PNBLACKLIST[gnome-mplayer] ?= "rdepends on blacklisted mplayer"
+PR = "r2"
+
+DEPENDS = "gmtk gtk+ alsa-lib libnotify glib-2.0 dbus-glib virtual/libx11 libxscrnsaver"
+
+SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz"
+SRC_URI[md5sum] = "1d3ab24c5501b5528e357931ca4dc6da"
+SRC_URI[sha256sum] = "ac3c179345baecb4ca5237782aa33e83253a87bf8b42ce6eb3a9207a340f61b2"
+
+EXTRA_OECONF = "--with-gio --with-alsa --with-dbus --with-libnotify"
+
+FILES_${PN} += "${datadir}/gnome-control-center/default-apps/${PN}.xml"
+PACKAGES =+ "${PN}-nautilus-extension"
+FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so \
+                                   ${libdir}/nautilus/extensions-3.0/*.so"
+FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \
+                    ${libdir}/nautilus/extensions-3.0/*.la"
+FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \
+                          ${libdir}/nautilus/extensions-3.0/*.a"
+FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug \
+                    ${libdir}/nautilus/extensions-3.0/.debug"
+
+inherit gettext pkgconfig mime gtk-icon-cache autotools
+
+RDEPENDS_${PN} = "mplayer"
diff --git a/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/browser_command.patch b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/browser_command.patch
new file mode 100644
index 000000000..75e45e0ab
--- /dev/null
+++ b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/browser_command.patch
@@ -0,0 +1,17 @@
+Imported from Debian 0.1.8-3
+
+Upstream-Status: Pending
+
+diff --git a/src/Config.cxx b/src/Config.cxx
+index 28f37ab..bc58819 100644
+--- a/src/Config.cxx
++++ b/src/Config.cxx
+@@ -22,7 +22,7 @@
+ using namespace ePDFView;
+ 
+ // Constants
+-static const gchar *DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE = "firefox %s";
++static const gchar *DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE = "x-www-browser %s";
+ static const gchar *DEFAULT_OPEN_FILE_FOLDER = NULL;
+ static const gchar *DEFAULT_SAVE_FILE_FOLDER = NULL;
+ static const gboolean DEFAULT_SHOW_STATUSBAR = TRUE;
diff --git a/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/fix-format.patch b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/fix-format.patch
new file mode 100644
index 000000000..8ad5b97ca
--- /dev/null
+++ b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/fix-format.patch
@@ -0,0 +1,19 @@
+Imported from Debian 0.1.8-3
+
+Upstream-Status: Pending
+
+diff --git a/src/gtk/MainView.cxx b/src/gtk/MainView.cxx
+index b983bff..f87de28 100644
+--- a/src/gtk/MainView.cxx
++++ b/src/gtk/MainView.cxx
+@@ -634,8 +634,9 @@ MainView::showErrorMessage (const gchar *title, const gchar *body)
+             GTK_DIALOG_DESTROY_WITH_PARENT,
+             GTK_MESSAGE_ERROR,
+             GTK_BUTTONS_OK,
++            "%s",
+             title);
+-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(errorDialog),
++    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(errorDialog), "%s",
+                                               body);
+     gtk_dialog_run (GTK_DIALOG (errorDialog));
+     gtk_widget_destroy (errorDialog);
diff --git a/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/glib-single-include.patch b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/glib-single-include.patch
new file mode 100644
index 000000000..84a491386
--- /dev/null
+++ b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/glib-single-include.patch
@@ -0,0 +1,17 @@
+Imported from Debian 0.1.8-3
+
+Upstream-Status: Pending
+
+diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
+index c142a7a..58fcf2e 100644
+--- a/src/gtk/StockIcons.h
++++ b/src/gtk/StockIcons.h
+@@ -18,7 +18,7 @@
+ #if !defined (__STOCK_ICONS_H__)
+ #define __STOCK_ICONS_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/swap-colors.patch b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/swap-colors.patch
new file mode 100644
index 000000000..282bfb184
--- /dev/null
+++ b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/swap-colors.patch
@@ -0,0 +1,43 @@
+Imported from Debian 0.1.8-3
+
+Upstream-Status: Pending
+
+Index: trunk/src/PDFDocument.cxx
+===================================================================
+--- trunk/src/PDFDocument.cxx   (revision 361)
++++ trunk/src/PDFDocument.cxx   (revision 367)
+@@ -21,4 +21,5 @@
+ #include <poppler.h>
+ #include <unistd.h>
++#include <algorithm>
+ #include "epdfview.h"
+ 
+@@ -33,4 +34,22 @@
+ static PageMode convertPageMode (gint pageMode);
+ static gchar *getAbsoluteFileName (const gchar *fileName);
++
++namespace
++{
++    void
++    convert_bgra_to_rgba (guint8 *data, int width, int height)
++    {
++        using std::swap;
++
++        for (int y = 0; y < height; y++)
++        {
++            for (int x = 0; x < width; x++)
++            {
++                swap(data[0], data[2]);
++                data += 4;
++            }
++        }
++    }
++}
+ 
+ ///
+@@ -651,4 +670,5 @@
+         cairo_destroy(context);
+         cairo_surface_destroy (surface);
++        convert_bgra_to_rgba(renderedPage->getData (), width, height);
+ #else // !HAVE_POPPLER_0_17_0
+         // Create the pixbuf from the data and render to it.
diff --git a/meta-gnome/recipes-apps/nonworking/epdfview/epdfview_0.1.8.bb b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview_0.1.8.bb
new file mode 100644
index 000000000..9167cd3d7
--- /dev/null
+++ b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview_0.1.8.bb
@@ -0,0 +1,21 @@
+SUMMARY = "A lightweight PDF viewer based on gtk and poppler"
+HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+SECTION = "x11/applications"
+DEPENDS = "gtk+ poppler"
+
+PR = "r3"
+
+EXTRA_OECONF += "--without-cups"
+
+inherit autotools gettext
+
+SRC_URI = "http://www.emma-soft.com/projects/${BPN}/chrome/site/releases/${BP}.tar.bz2 \
+           file://browser_command.patch \
+           file://fix-format.patch \
+           file://glib-single-include.patch \
+           file://swap-colors.patch \
+"
+SRC_URI[md5sum] = "e50285b01612169b2594fea375f53ae4"
+SRC_URI[sha256sum] = "948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0"
diff --git a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
new file mode 100644
index 000000000..2b85ff436
--- /dev/null
+++ b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
@@ -0,0 +1,21 @@
+SUMMARY = "A simple presentation tool for hackers"
+DESCRIPTION = "Pinpoint is a simple presentation tool that hopes to avoid audience death \
+               by bullet point and instead encourage presentations containing beautiful \
+               images and small amounts of concise text in slides."
+SECTION = "x11/multimedia"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
+                    file://pinpoint.c;beginline=6;endline=17;md5=201d438283607da393fae6aca085454c"
+
+DEPENDS = "gnome-common glib-2.0 gdk-pixbuf cogl-1.0 clutter-1.0 clutter-gst-1.0"
+
+inherit autotools gettext pkgconfig
+
+SRC_URI = "git://git.gnome.org/pinpoint"
+
+SRCREV = "80a056c57e819d0b75035424638813b0670830e1"
+PV = "0.1.4+gitr${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+RRECOMMENDS_${PN} = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
new file mode 100644
index 000000000..4bd0e4ffa
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
@@ -0,0 +1,41 @@
+From c7d75ce38fa392c04c39a75e7b7e068666a7b1e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 8 Apr 2014 15:22:54 +0200
+Subject: [PATCH] remove classes and properties which are not supported by gtk+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+unsupported classes caused nm-connection editor to crash
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/connection-editor/ce-page-general.ui | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
+index b05f0df..049432b 100644
+--- a/src/connection-editor/ce-page-general.ui
++++ b/src/connection-editor/ce-page-general.ui
+@@ -37,8 +37,6 @@
+       <object class="GtkComboBox" id="dependent_vpn_combo">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+-        <property name="margin_left">26</property>
+-        <property name="margin_bottom">12</property>
+         <property name="model">dependent_vpn_model</property>
+         <child>
+           <object class="GtkCellRendererText" id="renderer1"/>
+@@ -59,7 +57,6 @@
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="receives_default">False</property>
+-        <property name="margin_bottom">12</property>
+         <property name="use_underline">True</property>
+         <property name="xalign">0</property>
+         <property name="draw_indicator">True</property>
+-- 
+1.8.3.1
+
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch
new file mode 100644
index 000000000..d0506b2e8
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch
@@ -0,0 +1,128 @@
+From d789ef88a8806887bf1160bfa5d3d9eb47b6216c Mon Sep 17 00:00:00 2001
+From: "Marius B. Kotsbak" <marius@kotsbak.com>
+Date: Mon, 11 Aug 2014 22:11:52 +0200
+Subject: [PATCH] Add support for AP mode setting for wifi sharing.
+
+Upstream-Status: Pending [1]
+
+[1] https://bugzilla.gnome.org/show_bug.cgi?id=734589
+---
+ src/connection-editor/ce-page-wifi.ui |  3 +++
+ src/connection-editor/page-wifi.c     | 46 ++++++++++++++++++++---------------
+ 2 files changed, 30 insertions(+), 19 deletions(-)
+
+diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui
+index e2e544b..b8b27c1 100644
+--- a/src/connection-editor/ce-page-wifi.ui
++++ b/src/connection-editor/ce-page-wifi.ui
+@@ -50,6 +50,9 @@
+       <row>
+         <col id="0" translatable="yes">Ad-hoc</col>
+       </row>
++      <row>
++        <col id="0" translatable="yes">Shared AP</col>
++      </row>
+     </data>
+   </object>
+   <object class="GtkTable" id="WifiPage">
+diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
+index d0a5617..17db2fa 100644
+--- a/src/connection-editor/page-wifi.c
++++ b/src/connection-editor/page-wifi.c
+@@ -59,6 +59,12 @@ typedef struct {
+        gboolean disposed;
+ } CEPageWifiPrivate;
+ 
++enum {
++       WIFI_MODE_INFRASTRUCTURE,
++       WIFI_MODE_ADHOC,
++       WIFI_MODE_AP
++};
++
+ static void
+ wifi_private_init (CEPageWifi *self)
+ {
+@@ -244,22 +250,16 @@ mode_combo_changed_cb (GtkComboBox *combo,
+        CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self);
+        CEPage *parent = CE_PAGE (self);
+        GtkWidget *widget_band_label, *widget_chan_label, *widget_bssid_label;
+-       gboolean adhoc;
++       gint wifi_mode;
++       gboolean shared_wifi;
+ 
+-       switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo))) {
+-       case 1: /* adhoc */
+-               adhoc = TRUE;
+-               break;
+-       default: /* infrastructure */
+-               adhoc = FALSE;
+-               break;
+-       }
++       wifi_mode = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
+ 
+        widget_band_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_band_label"));
+        widget_chan_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_channel_label"));
+        widget_bssid_label = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wifi_bssid_label"));
+ 
+-       if (adhoc) {
++       if (WIFI_MODE_ADHOC == wifi_mode || WIFI_MODE_AP == wifi_mode) {
+                /* For Ad-Hoc show Band and Channel */
+                gtk_widget_show (widget_band_label);
+                gtk_widget_show (GTK_WIDGET (priv->band));
+@@ -283,12 +283,13 @@ mode_combo_changed_cb (GtkComboBox *combo,
+                gtk_widget_show (GTK_WIDGET (priv->bssid));
+        }
+ 
+-       gtk_widget_set_sensitive (widget_band_label, adhoc);
+-       gtk_widget_set_sensitive (GTK_WIDGET (priv->band), adhoc);
+-       gtk_widget_set_sensitive (widget_chan_label, adhoc);
+-       gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), adhoc);
+-       gtk_widget_set_sensitive (widget_bssid_label, !adhoc);
+-       gtk_widget_set_sensitive (GTK_WIDGET (priv->bssid), !adhoc);
++       shared_wifi = wifi_mode != WIFI_MODE_INFRASTRUCTURE;
++       gtk_widget_set_sensitive (widget_band_label, shared_wifi);
++       gtk_widget_set_sensitive (GTK_WIDGET (priv->band), shared_wifi);
++       gtk_widget_set_sensitive (widget_chan_label, shared_wifi);
++       gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), shared_wifi);
++       gtk_widget_set_sensitive (widget_bssid_label, !shared_wifi);
++       gtk_widget_set_sensitive (GTK_WIDGET (priv->bssid), !shared_wifi);
+ 
+        ce_page_changed (CE_PAGE (self));
+ }
+@@ -348,9 +349,12 @@ populate_ui (CEPageWifi *self)
+                g_byte_array_free (ssid, TRUE);
+ 
+        /* Default to Infrastructure */
+-       gtk_combo_box_set_active (priv->mode, 0);
++       gtk_combo_box_set_active (priv->mode, WIFI_MODE_INFRASTRUCTURE);
+        if (mode && !strcmp (mode, "adhoc"))
+-               gtk_combo_box_set_active (priv->mode, 1);
++               gtk_combo_box_set_active (priv->mode, WIFI_MODE_ADHOC);
++       else if (mode && !strcmp (mode, "ap"))
++               gtk_combo_box_set_active (priv->mode, WIFI_MODE_AP);
++
+        mode_combo_changed_cb (priv->mode, self);
+        g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self);
+        g_free (mode);
+@@ -510,14 +514,18 @@ ui_to_setting (CEPageWifi *self)
+        GByteArray *bssid = NULL;
+        GByteArray *device_mac = NULL;
+        GByteArray *cloned_mac = NULL;
++       gint wifi_mode;
+        const char *mode;
+        const char *band;
+        GtkWidget *entry;
+ 
+        ssid = ce_page_wifi_get_ssid (self);
+ 
+-       if (gtk_combo_box_get_active (priv->mode) == 1)
++       wifi_mode = gtk_combo_box_get_active (priv->mode);
++       if (WIFI_MODE_ADHOC == wifi_mode)
+                mode = "adhoc";
++       else if (WIFI_MODE_AP == wifi_mode)
++               mode = "ap";
+        else
+                mode = "infrastructure";
+ 
+-- 
+1.9.1
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch
new file mode 100644
index 000000000..e2156463d
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch
@@ -0,0 +1,48 @@
+From 7343b16113e378d04e40012abfe5bd96ca776968 Mon Sep 17 00:00:00 2001
+From: "Marius B. Kotsbak" <marius@kotsbak.com>
+Date: Tue, 12 Aug 2014 11:15:20 +0200
+Subject: [PATCH 2/2] Use AP mode for network sharing if device supports it.
+
+Logic taken from similar functionality in gnome-control-center.
+
+Upstream-Status: Backport [1]
+
+[1] https://bug734589.bugzilla-attachments.gnome.org/attachment.cgi?id=283165
+---
+ src/libnm-gtk/nm-wifi-dialog.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
+index 3532caa..ca72c96 100644
+--- a/src/libnm-gtk/nm-wifi-dialog.c
++++ b/src/libnm-gtk/nm-wifi-dialog.c
+@@ -1226,10 +1226,26 @@ nma_wifi_dialog_get_connection (NMAWifiDialog *self,
+                s_wireless = (NMSettingWireless *) nm_setting_wireless_new ();
+                g_object_set (s_wireless, NM_SETTING_WIRELESS_SSID, validate_dialog_ssid (self), NULL);
+ 
++               /* Fill device */
++               if (device) {
++                       combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_combo"));
++                       gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
++                       gtk_tree_model_get (priv->device_model, &iter, D_DEV_COLUMN, device, -1);
++                       g_object_unref (*device);
++               }
++
+                if (priv->adhoc_create) {
+                        NMSettingIP4Config *s_ip4;
+ 
+-                       g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "adhoc", NULL);
++                       const char *mode;
++
++                       /* Use real AP mode if the device supports it */
++                       if (device && nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (*device)) & NM_WIFI_DEVICE_CAP_AP)
++                               mode = NM_SETTING_WIRELESS_MODE_AP;
++                       else
++                               mode = NM_SETTING_WIRELESS_MODE_ADHOC;
++
++                       g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, mode, NULL);
+ 
+                        s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
+                        g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_SHARED, NULL);
+-- 
+1.8.3.1
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb
new file mode 100644
index 000000000..663c38cbe
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb
@@ -0,0 +1,45 @@
+SUMMARY = "GTK+ applet for NetworkManager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+DEPENDS = "polkit-gnome libnotify libsecret networkmanager dbus-glib gconf gnome-keyring libgnome-keyring iso-codes"
+
+inherit gnomebase gtk-icon-cache
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI += " \
+    file://0001-remove-classes-and-properties-which-are-not-supporte.patch \
+    file://0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch \
+    file://0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch \
+"
+SRC_URI[archive.md5sum] = "5148348c139229c6a753f815f3f11e1c"
+SRC_URI[archive.sha256sum] = "46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb"
+
+# GTK2.x mode
+EXTRA_OECONF += " \
+    --with-gtkver=2 \
+"
+
+PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth"
+PACKAGECONFIG ??= ""
+
+do_configure_append() {
+    # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
+    for i in $(find ${B} -name "Makefile") ; do
+        sed -i -e s:-Werror::g $i
+    done
+}
+
+RDEPENDS_${PN} =+ "networkmanager"
+RRECOMMENDS_${PN} =+ "gnome-keyring"
+
+FILES_${PN} += " \
+    ${datadir}/nm-applet/ \
+    ${datadir}/libnm-gtk/wifi.ui \
+"
+
+FILES_${PN} += "${libdir}/gnome-bluetooth/plugins/*.so"
+FILES_${PN}-dev += "${libdir}/gnome-bluetooth/plugins/libnma.la"
+FILES_${PN}-staticdev += "${libdir}/gnome-bluetooth/plugins/libnma.a"
+FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/"
diff --git a/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch b/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
new file mode 100644
index 000000000..2009dcd22
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
@@ -0,0 +1,32 @@
+include unistd.h to get ssize_t definitions
+
+Fixes errors like
+
+| In file included from plugins/mas.c:36:0:
+| ./src/obex.h:39:1: error: unknown type name 'ssize_t'
+| ./src/obex.h:49:1: error: unknown type name 'ssize_t'
+| ./src/obex.h:50:1: error: unknown type name 'ssize_t'
+| In file included from plugins/mas.c:38:0:
+| ./src/mimetype.h:36:2: error: expected specifier-qualifier-list before 'ssize_t'
+| In file included from plugins/mas.c:39:0:
+| plugins/filesystem.h:24:1: error: unknown type name 'ssize_t'
+| plugins/mas.c:550:1: error: unknown type name 'ssize_t'
+| plugins/mas.c:557:1: error: unknown type name 'ssize_t'
+| plugins/mas.c: In function 'any_read':
+| plugins/mas.c:560:2: error: unknown type name 'ssize_t'
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Index: obexd-0.44/plugins/mas.c
+===================================================================
+--- obexd-0.44.orig/plugins/mas.c       2012-01-11 14:53:53.000000000 -0800
++++ obexd-0.44/plugins/mas.c    2013-01-08 12:51:12.681882174 -0800
+@@ -29,6 +29,7 @@
+ #include <glib.h>
+ #include <fcntl.h>
+ #include <inttypes.h>
++#include <unistd.h>
+ 
+ #include "obexd.h"
+ #include "plugin.h"
diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
new file mode 100644
index 000000000..f28f77b8c
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
@@ -0,0 +1,24 @@
+SUMMARY = "OBEX Server and Client"
+# obexd was integrated into bluez5
+DEPENDS = "glib-2.0 dbus bluez4 libical"
+RCONFLICTS_${PN} = "bluez5"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+
+
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \
+           file://ssize_t_definition.patch \
+"
+SRC_URI[md5sum] = "d03cf9bad2983243837f4f6d76ef14a6"
+SRC_URI[sha256sum] = "eaa9d8d9542700e6750918d72a3ce00f8cf3a2771d3e2516efd1be5a05f78582"
+
+inherit autotools-brokensep pkgconfig
+
+PACKAGES =+ "obex-client obex-plugins"
+
+FILES_${PN} += "${datadir}/dbus-1/services/${PN}.service"
+FILES_obex-client = "${libexecdir}/obex-client \
+                     ${datadir}/dbus-1/services/obex-client.service"
+# currently the plugins are empty
+FILES_obex-plugins = "${libdir}/obex/plugins"
diff --git a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
new file mode 100644
index 000000000..3abacfb86
--- /dev/null
+++ b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG ??= "gnome"
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh b/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh
new file mode 100755
index 000000000..c1f10e1a4
--- /dev/null
+++ b/meta-gnome/recipes-gnome/abiword/abiword/autogen-common.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# find plugins Makefile templates
+find plugins -name Makefile.am | sed  's|.am$||g' > plugin-makefiles.m4
+
+# create plugin list
+(cd plugins && find . -maxdepth 1 -type d | grep -v '^\.$' | grep -v '\./\.' | sed 's|\./||g' | xargs echo) > plugin-list.m4
+
+# create conditionals for builtin plugins
+(for plugin in `cat plugin-list.m4`; do
+        u=`echo $plugin | tr '[:lower:]' '[:upper:]'`
+        echo 'AM_CONDITIONAL(['$u'_BUILTIN], test "$enable_'$plugin'_builtin" == "yes")'
+done) > plugin-builtin.m4
+
+# create plugin configuration
+find plugins -name plugin.m4 | xargs cat > plugin-configure.m4
+#to debug if plugin configuration code misbehaves (instead of the above line):
+#rm plugin-configure.m4
+#for f in $(find plugins -name plugin.m4); do
+#       echo "AC_MSG_RESULT([plugin: $f])" >> plugin-configure.m4
+#       cat $f >> plugin-configure.m4
+#done
+
+# find extra m4 files provided by plugins and symlink them
+for f in ` find ./plugins -name '*.m4' | grep -v 'plugin\.m4'`; do
+    ln -sf $f
+done
+
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch b/meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
new file mode 100644
index 000000000..cf50cb2c9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
@@ -0,0 +1,32 @@
+Last-Update: 2014-02-05
+Forwarded: yes
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Bug-Debian: http://bugs.debian.org/737551
+Bug-Abiword: http://bugzilla.abisource.com/13602
+Description: fix FTBFS with libboost1.54-dev
+Upstream-Status: Applied
+
+--- a/plugins/collab/core/sync/xp/SynchronizedQueue.h
++++ b/plugins/collab/core/sync/xp/SynchronizedQueue.h
+@@ -21,8 +21,9 @@
+ 
+ #include <deque>
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
++#include <boost/noncopyable.hpp>
+ #include <sync/xp/lock.h>
+ #include <sync/xp/Synchronizer.h>
+ 
+ class EmptyQueueException {};
+--- a/plugins/collab/backends/tcp/xp/Session.h
++++ b/plugins/collab/backends/tcp/xp/Session.h
+@@ -21,8 +21,9 @@
+ 
+ #include <boost/function.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/enable_shared_from_this.hpp>
++#include <boost/noncopyable.hpp>
+ #include <deque>
+ #include <sync/xp/lock.h>
+ #include <sync/xp/Synchronizer.h>
+ 
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
new file mode 100644
index 000000000..eb4bba217
--- /dev/null
+++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
@@ -0,0 +1,127 @@
+SUMMARY = "AbiWord is free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
+DEPENDS     = "perl-native wv libglade libfribidi jpeg libpng \
+               librsvg libwmf-native gtkmathview asio gtk+ evolution-data-server"
+RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
+               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+RCONFLICTS_${PN} = "${PN}-embedded"
+
+SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
+           file://debian_patches_boost54.patch \
+           file://autogen-common.sh \
+"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
+
+SRC_URI[md5sum] = "8d9c41cff3a8fbef8d0c835c65600e65"
+SRC_URI[sha256sum] = "d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01"
+
+#want 3.x from 3.x.y for the installation directory
+SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
+
+inherit autotools-brokensep pkgconfig
+
+PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp"
+PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
+PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth"
+PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2"
+PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls"
+PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control"
+PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-collab-backend-sugar,libgsf libxml2 dbus-glib"
+
+EXTRA_OECONF = " --disable-static  \
+                 --enable-plugins \
+                 --enable-clipart \
+                 --enable-templates \
+                 --without-gnomevfs \
+                 --with-gtk2 \
+                 --with-libwmf-config=${STAGING_DIR} \
+"
+
+# AbiWord configure.ac does not play nicely with autoreconf
+# so use the autogen.sh script that comes with AbiWord
+do_configure() {
+    install -m 0755 ${WORKDIR}/autogen-common.sh ${B}/autogen-common.sh
+    ./autogen-common.sh
+    autotools_do_configure
+}
+
+do_compile() {
+    cd goffice-bits2
+    make goffice-paths.h
+    make libgoffice.la
+    cd ${B}
+    oe_runmake
+}
+
+PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
+
+FILES_${PN} += " \
+                ${libdir}/lib${PN}-*.so \
+                ${datadir}/mime-info \
+                ${datadir}/icons/* \
+                ${datadir}/${PN}-${SHRT_VER}/glade \
+                ${datadir}/${PN}-${SHRT_VER}/scripts \
+                ${datadir}/${PN}-${SHRT_VER}/system.profile-en \
+                ${datadir}/${PN}-${SHRT_VER}/system.profile-en_GB \
+                ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt \
+                ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt-en_GB \
+                ${datadir}/${PN}-${SHRT_VER}/templates/Employee-Directory.awt \
+                ${datadir}/${PN}-${SHRT_VER}/templates/Business-Report.awt \
+                ${datadir}/${PN}-${SHRT_VER}/templates/Fax-Coversheet.awt \
+                ${datadir}/${PN}-${SHRT_VER}/templates/Resume.awt \
+                ${datadir}/${PN}-${SHRT_VER}/templates/Two-Columns.awt \
+                ${datadir}/${PN}-${SHRT_VER}/templates/Memo.awt \
+                ${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \
+                ${datadir}/${PN}-${SHRT_VER}/certs \
+                ${datadir}/${PN}-${SHRT_VER}/ui \
+                ${datadir}/${PN}-${SHRT_VER}/xsl* \ 
+                ${datadir}/${PN}-${SHRT_VER}/mime-info \
+                ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \
+"
+
+# don't steal /usr/lib/libabiword-3.0.so from ${PN}
+# in this case it's needed in ${PN}
+FILES_${PN}-dev = " \
+                  ${includedir} \
+                  ${libdir}/pkgconfig \
+                  ${libdir}/${PN}*.la \
+                  ${libdir}/lib${PN}*.la \
+                  ${libdir}/${PN}-${SHRT_VER}/plugins/*.la \
+"
+FILES_${PN}-dbg += "${libdir}/${PN}-${SHRT_VER}/plugins/.debug"
+FILES_${PN}-doc += "${datadir}/${PN}-*/readme*"
+
+FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/strings"
+FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*"
+FILES_${PN}-clipart        += "${datadir}/${PN}-${SHRT_VER}/clipart"
+FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings"
+FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*"
+FILES_${PN}-templates      += "${datadir}/${PN}-${SHRT_VER}/templates"
+
+PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*"
+
+python populate_packages_prepend () {
+    abiword_libdir    = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins')
+    do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+
+    metapkg = "abiword-meta"
+    d.setVar('ALLOW_EMPTY_' + metapkg, "1")
+    d.setVar('FILES_' + metapkg, "")
+    blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
+    metapkg_rdepends = []
+    packages = d.getVar('PACKAGES', 1).split()
+    for pkg in packages[1:]:
+        if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
+            print "Modifying ", pkg
+            metapkg_rdepends.append(pkg)
+    d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
+    d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package')
+    packages.append(metapkg)
+    d.setVar('PACKAGES', ' '.join(packages))
+}
+
+FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt"
diff --git a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 b/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4
new file mode 100644
index 000000000..3ec41666b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4
@@ -0,0 +1,53 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH(html-dir,
+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST(HTML_DIR)
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE(gtk-doc,
+    AC_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [default=no]]),,
+    enable_gtk_doc=no)
+
+  have_gtk_doc=no
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+    have_gtk_doc=yes
+  fi
+
+  dnl do we want to do a version check?
+ifelse([$1],[],,
+  [gtk_doc_min_version=$1
+  if test "$have_gtk_doc" = yes; then
+    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+      have_gtk_doc=no
+    fi
+  fi
+])
+  if test x$enable_gtk_doc = xyes; then
+    if test "$have_gtk_doc" != yes; then
+      enable_gtk_doc=no
+    fi
+  fi
+
+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+])
diff --git a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make b/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make
new file mode 100644
index 000000000..354ffb7c6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make
@@ -0,0 +1,173 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST =                            \
+        $(content_files)                \
+        $(HTML_IMAGES)                  \
+        $(DOC_MAIN_SGML_FILE)           \
+        $(DOC_MODULE)-sections.txt      \
+        $(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+           $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES =                  \
+        $(DOC_MODULE).args       \
+        $(DOC_MODULE).hierarchy  \
+        $(DOC_MODULE).interfaces \
+        $(DOC_MODULE).prerequisites \
+        $(DOC_MODULE).signals
+
+REPORT_FILES = \
+        $(DOC_MODULE)-undocumented.txt \
+        $(DOC_MODULE)-undeclared.txt \
+        $(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+else
+all-local:
+endif
+
+docs: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+        @echo 'gtk-doc: Scanning header files'
+        @-chmod -R u+w $(srcdir)
+        cd $(srcdir) && \
+          gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+        if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+            CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+        else \
+            cd $(srcdir) ; \
+            for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+            done \
+        fi
+        touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+        @true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+        @echo 'gtk-doc: Rebuilding template files'
+        @-chmod -R u+w $(srcdir)
+        cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+        touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+        @true
+
+tmpl/*.sgml:
+        @true
+
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+        @echo 'gtk-doc: Building XML'
+        @-chmod -R u+w $(srcdir)
+        cd $(srcdir) && \
+        gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+        touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+        @true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+        @echo 'gtk-doc: Building HTML'
+        @-chmod -R u+w $(srcdir)
+        rm -rf $(srcdir)/html
+        mkdir $(srcdir)/html
+        cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+        test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+        @echo 'gtk-doc: Fixing cross-references'
+        cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+        touch html-build.stamp
+
+##############
+
+clean-local:
+        rm -f *~ *.bak
+        rm -rf .libs
+
+distclean-local:
+        cd $(srcdir) && \
+          rm -rf xml $(REPORT_FILES) \
+                 $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+maintainer-clean-local: clean
+        cd $(srcdir) && rm -rf xml html
+
+install-data-local:
+        -installfiles=`echo $(srcdir)/html/*`; \
+        if test "$$installfiles" = '$(srcdir)/html/*'; \
+        then echo '-- Nothing to install' ; \
+        else \
+          $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+          for i in $$installfiles; do \
+            echo '-- Installing '$$i ; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+          done; \
+          echo '-- Installing $(srcdir)/html/index.sgml' ; \
+          $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+          which gtkdoc-rebase >/dev/null && \
+            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+        fi
+        
+
+uninstall-local:
+        rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+        @echo "*** gtk-doc must be installed and enabled in order to make dist"
+        @false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+        mkdir $(distdir)/tmpl
+        mkdir $(distdir)/xml
+        mkdir $(distdir)/html
+        -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+        -cp $(srcdir)/xml/*.xml $(distdir)/xml
+        cp $(srcdir)/html/* $(distdir)/html
+        -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+        -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+        cd $(distdir) && rm -f $(DISTCLEANFILES)
+        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
new file mode 100644
index 000000000..8b6007e86
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "Bonobo CORBA interfaces library"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
+SECTION = "x11/gnome/libs"
+DEPENDS = "glib-2.0 orbit2 intltool-native libxml2 dbus dbus-glib"
+
+inherit gnomebase gtk-doc
+
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
+FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \
+    ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug"
+FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la ${libdir}/bonobo/monikers/*.la ${libdir}/bonobo-2.0/samples"
+FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a ${libdir}/bonobo/monikers/*.a"
+
+LEAD_SONAME = "libbonobo-2.so"
+
+PARALLEL_MAKE = ""
+
+do_compile() {
+    oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
+}
+
+do_install() {
+    oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+}
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch
new file mode 100644
index 000000000..44cf1f9fa
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch
@@ -0,0 +1,47 @@
+From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 2 May 2013 14:17:38 -0400
+Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This now trips up on GStaticRecMutex; I'm not going to bother to port,
+realistically no one is actively maintaining this code anymore.
+
+Upstream-Status: Applied
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ activation-server/Makefile.am |    1 -
+ configure.in                  |    2 +-
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am
+index efb18a8..ffa90f6 100644
+--- a/activation-server/Makefile.am
++++ b/activation-server/Makefile.am
+@@ -17,7 +17,6 @@ INCLUDES=                                     \
+        $(SERVER_CFLAGS)                        \
+        $(WARN_CFLAGS)                          \
+        -DSERVER_CONFDIR=\"$(sysconfdir)\"      \
+-       -DG_DISABLE_DEPRECATED                  \
+        -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \
+        $(NULL)
+ 
+diff --git a/configure.in b/configure.in
+index 70a4e26..6be2bca 100644
+--- a/configure.in
++++ b/configure.in
+@@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS)
+ AC_SUBST(SERVER_CFLAGS)
+ 
+ if test "$enable_maintainer_mode" = "yes"; then
+-       DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
++       DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES"
+        AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+ fi
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch
new file mode 100644
index 000000000..a20edda84
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch
@@ -0,0 +1,24 @@
+| tests/Makefile.am:55: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/te
+st-properties.sh'
+| tests/test-activation/Makefile.am:76: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS
+' (or '*_CPPFLAGS')
+| utils/Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS
+')
+| autoreconf: automake failed with exit status: 1
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Not Submitted
+
+Index: libbonobo-2.32.1/tests/Makefile.am
+===================================================================
+--- libbonobo-2.32.1.orig/tests/Makefile.am     2010-08-29 04:56:00.000000000 -0700
++++ libbonobo-2.32.1/tests/Makefile.am  2014-04-25 15:38:22.024744384 -0700
+@@ -55,7 +55,7 @@
+        MODELS_DIR="$(srcdir)/models"
+ 
+ TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \
+-       test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \
++       test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \
+        test-main-loop$(EXEEXT)
+ 
+ # TESTS += test-generic-factory.sh
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb
new file mode 100644
index 000000000..a83a0f1f5
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb
@@ -0,0 +1,8 @@
+require libbonobo.inc
+
+SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \
+            file://do-not-use-srcdir-variable.patch \
+           "
+SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b"
+SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b"
+
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
new file mode 100644
index 000000000..6c2d67aa6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
@@ -0,0 +1,17 @@
+SECTION = "x11/gnome/libs"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+inherit gnomebase pkgconfig gtk-doc
+SRC_URI[archive.md5sum] = "853be8e28aaa4ce48ba60be7d9046bf4"
+SRC_URI[archive.sha256sum] = "fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd"
+
+DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gconf libxml2 libglade gnome-common intltool-native"
+
+FILES_${PN} += "${libdir}/libglade/2.0/*.so"
+FILES_${PN}-dev += "${libdir}/libglade/2.0/*.la ${datadir}/gnome-2.0/ui \
+                    ${libdir}/bonobo-2.0/samples"
+FILES_${PN}-staticdev += "${libdir}/libglade/2.0/*.a"
+FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \
+                    ${libdir}/libglade/2.0/.debug"
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
new file mode 100644
index 000000000..2b6f15e82
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -0,0 +1,29 @@
+SUMMARY = "configuation database system"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+SECTION = "x11/gnome"
+
+inherit gnomebase gsettings
+SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515"
+SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955"
+GNOME_COMPRESS_TYPE = "xz"
+
+DEPENDS = "glib-2.0 gtk+3 libxml2"
+
+inherit vala gtk-doc
+
+EXTRA_OECONF += "--disable-man"
+
+PACKAGES =+ "dconf-editor"
+
+FILES_${PN} += " \
+        ${datadir}/dbus-1 \
+        ${libdir}/gio/modules/*.so \
+"
+FILES_dconf-editor = " \
+        ${bindir}/dconf-editor \
+        ${datadir}/icons \
+        ${datadir}/bash-completion \
+"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
diff --git a/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb b/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb
new file mode 100644
index 000000000..57a8720f2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb
@@ -0,0 +1,18 @@
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"
+DESCRIPTION = "desktop-file-utils contains a few command line utilities for working with desktop entries:"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "glib-2.0"
+
+PR = "r1"
+
+SRC_URI = "http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.bz2"
+SRC_URI[md5sum] = "d966b743eb394650f98d5dd56b9aece1"
+SRC_URI[sha256sum] = "d9449956c1c8caa75281a3322b2bb433db42610942f0ceeaa65ccd9636c04231"
+
+inherit autotools pkgconfig
+
+CACHED_CONFIGUREVARS += "ac_cv_prog_EMACS=no"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.33.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.33.bb
new file mode 100644
index 000000000..b00a44935
--- /dev/null
+++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.33.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created"
+HOMEPAGE = "http://www.gusnan.se/devilspie2"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \
+                    file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = "gtk+ glib-2.0 libwnck lua virtual/libx11"
+
+SRC_URI = " \
+    http://www.gusnan.se/devilspie2/download/devilspie2_${PV}-src.tar.gz \
+    file://default.lua \
+    file://devilspie2.desktop \
+"
+SRC_URI[md5sum] = "99c88f702e134d2b2f2f8caad4b1ef03"
+SRC_URI[sha256sum] = "01a2ebcece14065c9a2e47decd81341e2a6f63e3bf43ff446103686718748356"
+
+inherit pkgconfig
+
+do_compile() {
+    export GTK2=1
+    oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}"
+}
+
+do_install() {
+    oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install
+    install -d ${D}/${sysconfdir}/devilspie2
+    install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2
+    install -d ${D}/${sysconfdir}/xdg/autostart
+    install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart
+}
diff --git a/meta-gnome/recipes-gnome/devilspie/files/default.lua b/meta-gnome/recipes-gnome/devilspie/files/default.lua
new file mode 100644
index 000000000..22a17fe98
--- /dev/null
+++ b/meta-gnome/recipes-gnome/devilspie/files/default.lua
@@ -0,0 +1,46 @@
+-- Copyright (c) 2012 Andreas Müller <schnitzeltony@googlemail.com>
+--
+-- this is an example 
+-- * undecorating all windows opened maximized
+-- * maximizing and undecorating all appplication's windows in apps_list
+-- for further information see
+-- http://www.gusnan.se/devilspie2/manual.php
+
+wnd_type = get_window_type()
+
+if(wnd_type == "WINDOW_TYPE_NORMAL") then
+
+        -- add only applications you want maximized+undecorated and
+        -- which don't keep maximized state
+        apps_list = 
+        {
+                "Terminal",
+                "ristretto",
+                "xarchiver",
+        }
+
+        app_name = get_application_name()
+
+        -- to have some informational output, start devilspie2 with --debug 
+        -- option and uncomment the following lines:
+
+        --debug_print ("Window Name: " .. get_window_name())
+        --debug_print ("Application name: " .. app_name)
+        --debug_print ("window-type: " .. wnd_type)
+
+        -- undecorate all windows starting maximized 
+        if (get_window_is_maximized()) then
+                undecorate_window()
+
+        -- maximize/undecorate all windows in apps_list
+        -- (unfortunately for some also their settings)
+        else
+                for line, str in ipairs(apps_list) do
+                        if (string.find(app_name, str)) then
+                                maximize()
+                                undecorate_window()
+                                break
+                        end
+                end
+        end
+end
diff --git a/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop b/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop
new file mode 100644
index 000000000..e34e881cd
--- /dev/null
+++ b/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=Devilspie2
+Exec=devilspie2 -f /etc/devilspie2
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
new file mode 100644
index 000000000..b77e7b9bd
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
@@ -0,0 +1,215 @@
+From 4df8bd8ae4258289663b27af1207027c7ee06340 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sun, 4 Aug 2013 09:13:25 +0200
+Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something
+ more appropriate
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ addressbook/backends/file/Makefile.am    |   1 +
+ addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++-------------
+ 2 files changed, 103 insertions(+), 77 deletions(-)
+
+diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am
+index 08cf58f..17e7149 100644
+--- a/addressbook/backends/file/Makefile.am
++++ b/addressbook/backends/file/Makefile.am
+@@ -2,6 +2,7 @@ ebook_backend_LTLIBRARIES = libebookbackendfile.la
+ 
+ libebookbackendfile_la_CPPFLAGS = \
+        $(AM_CPPFLAGS)                                  \
++       -DCREATE_DEFAULT_VCARD \
+        -DG_LOG_DOMAIN=\"libebookbackend\"              \
+        -I$(top_srcdir)                                 \
+        -I$(top_builddir)                               \
+diff --git a/addressbook/libedata-book/ximian-vcard.h b/addressbook/libedata-book/ximian-vcard.h
+index 782d37b..5b0b250 100644
+--- a/addressbook/libedata-book/ximian-vcard.h
++++ b/addressbook/libedata-book/ximian-vcard.h
+@@ -1,80 +1,105 @@
+ #define XIMIAN_VCARD \
+ "BEGIN:VCARD\n" \
+-"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \
+-"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \
+-"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \
+-"TEL;WORK;VOICE:(617) 613-2000\n" \
+-"TEL;WORK;FAX:(617) 613-2001\n" \
+-"EMAIL;INTERNET:hello@ximian.com\n" \
+-"URL:http://www.ximian.com/\n" \
+-"ORG:Novell;Ximian Group\n" \
+-"PHOTO;ENCODING=b;TYPE=JPEG:/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\n" \
+-" IFRoZSBHSU1Q/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCM\n" \
+-" cHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMj\n" \
+-" IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAbgBkAwEiAAIRAQMRAf/EA\n" \
+-" BwAAAIDAQEBAQAAAAAAAAAAAAAHBQYIBAMBAv/EAEYQAAEDAwEFBgMEBgQPAAAAAAECAwQABREG\n" \
+-" BxIhMWETIkFRcYEUkaEIMkLBFSNSsbLRFmJydRgkMzY3Q0RGgpKTosLh8P/EABsBAQACAwEBAAA\n" \
+-" AAAAAAAAAAAAEBQIDBgEH/8QALREAAQMCAwYGAgMAAAAAAAAAAQACAwQREiFRBRMiMUFhMnGBkb\n" \
+-" HRBsEUofD/2gAMAwEAAhEDEQA/AH/RRRREVwXe9W2wwFzbpNZixkc1uqwPQeZ6CoHXevLfom1ds\n" \
+-" 9h6a6D8PGCsFZHMk+CR4n86yzdbrqfaZqYBSnp0hRPZMoG62ynoOSR1Pua8Lg0XPJegX5Jv6k+0\n" \
+-" bBjrWxp22LlkcBIlHs0HqEjiR64peT9umupqyWrhHhpP4WI6eHureNW7Tmw+DGaTI1FJVJdxksM\n" \
+-" qKG09CrmfbFMCHpCw2xATDs8JrH4gykq+Z4mqifbMUZsxpd/QUllK53M2SCb2xa+bXvf0gcV0Uw\n" \
+-" 0R/DVktH2hdUwlpFxjQrg1490tLPuOH0pvv2qE4jdchx1p8lNAj91Va87OtM3RCt+2Nx3Dyci/q\n" \
+-" yPYcD7g1EZ+RR4rSMI9b/S2mhdbhKsmkdtWmNTuNxnXVW2cvgGZRASo+SV8j74PSmOlQUMpORWP\n" \
+-" NU7MrjY0rlQFmdDTxOE4cQOo8R1Hyqe2Z7ZJ2m32bXfHnJVpJCUuqO8uP7+Kenh4eVXkFRFUMxx\n" \
+-" G4UOSN0Zs4LU1FeEOWxOityYzqHWXEhSFoOQoHkQa963rBFFFFERUdfr1E09Y5d1mr3Y8ZsrV5n\n" \
+-" yA6k4A6mpGkL9ojUym0W/TrLmAsGU+AeYBwgfPJ/4RREqrrcb1tJ1oUpBXLmObqUZ7rSByT0SkZ\n" \
+-" J8zk1pHQmiLXo+zpbabC3SAp55Q7zyvM9PIUudiGmURbS7fpCMvzFFton8LSTxx6qH0FM7VV9VY\n" \
+-" 9MzZ7aQt5tASw3+26ohKB/zEVSVFVvZzGMw02tqe/kpbI8LMR6/C/Xxq9QagfbbP+IW1QQ4Rycf\n" \
+-" xncHRAIJ/rEfsmu2a9Fgsl2XIZjtj8bqwgfM1+9L2VFksESAV9o6hG886ebjqjvLWepUSarutdn\n" \
+-" MXV+obRcZks/CwCQ5DKMpeBOTxzwzgA9KwfTtfxPOSB5GQUXc9pOjoC+zXe2HV5xiOC6PmkEfWp\n" \
+-" xe6tAWghSVDIIOQRXxekNOx4b0WPZYLLTram19mwlJKSMHjjNUzQd2dZM7SNxczcLOsttqVzdYz\n" \
+-" 3FewI9iKpK2mjMZdFe7ed9NfT9qZDI4OAd1Vkko50ndoui22kuXq2NBOO9JZSOH9sD9/z86c8gc\n" \
+-" DUJNQlaFJUkKSoYII4EVGoKp9PIHt9e6lyRNlZhcqlsJ2guQpydL3F4mO7kw1KP3Fcyj0PEjrnz\n" \
+-" rSAIIyOVYfvsJ3TGqlCKpTfYuJfjLHMDOR8jw9q2Foy+o1FpWBckY/XMpUoeRxxHsciu/jeJGB7\n" \
+-" eRXPvaWuLT0U/RRRWaxQeVY82x3BVw2oXbJyhgoZR0AQM/UmthK+6fSsWbRQW9pV73x/tZPtwNE\n" \
+-" Wj9Nw0WuwwIKQAGI6G/cAZ+tRW0lx5nTEW4Ntqdat9xjy5CEjJLSFZP5H2qaYdCkpUk5BGQa7Ap\n" \
+-" DrSm3EpWhYKVJUMgg8wRXz+kqyyTG7VXUsV22Clrfc48+CzMiPIejvIC23EHIUDXNe79b7HbXbh\n" \
+-" c5SI8ZvmtZ5nyA5k9BS7d0nfdMPuSdD3JtEZaitdom5Uznx3DzT6cPWkvq/V1611fGW5nZtBCgy\n" \
+-" zFbXhtCycE5JxknxPhXR07RUeB3D11H+9lAfwcxmrrqLbxcHpikWGAw1FScByUkqWvrgEBPpxqi\n" \
+-" ztdXWdqmNqIIjx7gykJUphJCXAM/eBJ5g4PQCmBZNiDKWEu364uF0jJYh4AT6qUDn2FVu6bPIkT\n" \
+-" aTB08xKeMOU2H99eCtKRvZGQMZ7hwceNZxVGzsbmMzIBv5dfNeOjnsCdUwbTtKsV8nJgIccZkqw\n" \
+-" lJcThDqvJJz8s4zUtLVzpc2vZZKt+qBIkyUKt0V0ONKSe+7g5SCPDr9Kv0tznXP1cNMyQfxnXBC\n" \
+-" tqUyuB3gslftPjJLkGWB3u82o/Ij86bf2e7iqRoxyIpWfhpC0JHQ4V/5GlVtJcBt0RPiXif+00w\n" \
+-" Ps5BQtNxP4TJP8Ka6rZZJpW37/Kq68ATlPeiiirBQ0HlWR9t9qVbtpEp/dwiY0h5J8Mgbp/h+ta\n" \
+-" 4pM7fdKLumn2rxGbKn4BKl4HEtn73ywD7GiL7o28JuulLbKCsqLKUL/tJ7p+oqyIe4c6RGyzU4g\n" \
+-" THLNJc3WpCt9gk8A54j3GPcdaZuoosy82V23QpaYpkEIdeIJKUeIAHieXPkTXA11DuassJsCefY\n" \
+-" /SvYZN5FiGZU9edRwLDAXJny2mRukoStQBWQOQHjSjg7PYE7ZmzcZb7cG6KK5CZD6txOCcJQvPg\n" \
+-" QAQfAn2q6RNOWi1D9J3R5dwlR2xmZPVv9mlI8ByTj59ar09Lm0jUIQl5Y0zAUMrQSPiXfHHpyz4\n" \
+-" D1qTRvMQIieQAQXOtllfIDre/X2WqVmI8Qz6D9q0bP9SO37SrSpW8ZUVXw7q+YcKeSgeRyMZ65q\n" \
+-" qammvWTalEv1yjOJtaWfh25CBvBOUkHPlxUeHlyq/MiPCitxorSGWG07qG0DASK45xZlx3GJDaH\n" \
+-" WljCkLGQR6VGinY2ofIG8Lri2gOi37hxYG3zC+uT2HY6ZDbyFMrAUlwK7pB5HNRcp7nxqpzdN3G\n" \
+-" CFQ7NObTa3nApcaSN/suOe4SDw6VK3O4swojsp9WGmxk9fIDrW4UzWkbt2K/v691vjec8YtZUTa\n" \
+-" BL+IuMaIjiWWytXQn/wBD608tgtrVC0W2+tOFSFqd9icD6AVnmFFl6n1AhoAmRPdwcfgR4n2H7q\n" \
+-" 2Ppi1N2exRojaQlKEBIHkAK7Gmi3MTWaLn6iTeSF+qmaKKK3rSiuedEanQ3I7qQpC0kEEZzXRRR\n" \
+-" FjnaRoSVoq/KcYQv9HOr3mHB/qzz3SenhVi0ftAbnNNwLo6G5iQEodUcJd9fJX760ZqLTkHUdsd\n" \
+-" hTWEOtuJwQoVl/XGyS7aakOPwGnJcDORujK0DqPH2qJV0cdUzC/0Oi3QTuhddqY84IuFukwnFFK\n" \
+-" JDSmlEcwFDGR86ISI1tgtQ4jYaYaTuoSP/udJS1azvFoAZLnbsp4dm/klPQHmKs0faVEWkfEw32\n" \
+-" 1f1CFj8q56XZNSwYG5t7fSt46yB5ucimM5L4c643pXWqU5tCteMpRKUfIIH86ipmvnnAUwoQSf2\n" \
+-" 3lZ+g/nWEey5yfCtrquBo8Su0+4sQ46pEp1LTSeZUfoPOlnfr67fZKQlK0QkK/VtficV5nrXOkX\n" \
+-" XUk9KQHp0gnghI7qPyAp1bOdkCmH2rneQHHxxQjHdb9OvWr2j2c2Didm74VZVVplGFuQXRsc2fO\n" \
+-" Qgb1cmsSXQN1JH+TT4D+dPEAAADkK848duMylppISkDGBXrVkoCKKKKIiiqrrbX9m0JARIua1re\n" \
+-" dJDMdoArcI58+AA8zVLsO26RqiS9Gsukpct5lHaKbTLaSrd8wFEZ9s0RN6vGRGZktlDqAoHzFKq\n" \
+-" JtomzrPOuzGjZvwEBRTJfckttpbUOae9jJ5cBk8R514Wrbo7e489+3aTlvtQGTIkqElsdm2Mkq4\n" \
+-" 4zyPKiKf1Hsj09flKdXEQh4/jR3VfMUvJ/2et1ZMOe8keSgFfyqz2LbfJ1M9IZs2kJsx2O0XnEN\n" \
+-" yEAhA4ZwcZ58hxr7ZdtkvUS5SbTo2fJMRsuPkPoSG0jzKsDPPhz4HyoipDewC47+FXFWOjYH51Y\n" \
+-" bTsAgtrSqc88/jwWrA+QxUlYtujupZ6oNo0nLlSUtqdKEyW04SMZOVYHiKjP8ACUt5/wB3pX/XT\n" \
+-" /KiJnWLQ1nsTSURorad39lIFWZKUoThIAHSlNqDbLP0siKu96MnQ0ygSyVyGzvYxnlnB4jga87F\n" \
+-" ttlamXJbs2j50xcZvtXUtyEZCfPB5+gyaIm9RSetm3J68RbhJgaSmPM25vtZaviW09knjxIOM8j\n" \
+-" y8q7LHtzstwv/AOhrlBftkkudkFOLS43v5xgqSeHHx5daImrRX5QtK0hSTkGiiLMP2ho8wa1iSn\n" \
+-" QoxVRQ20fAKClFQ9eIqq7LLJe7vreG7ZZCoZhqD8iZjustjnnwORkY8c+Wa1ZqbStt1PBMa4MId\n" \
+-" Rz7wzg+dL8bEbA1vpa7RtK+CkpdWAfXjRFB7UpCNe6Kdm6NnJft1qluKuUJlvdKznPbYH3hzPXJ\n" \
+-" PMGqZsk/zc2gf3G5/Cumc3sRsTO92Rcb3uB3XVjP1r4jYfYGwoN76QsYUEurGR5HjREudhUt2BP\n" \
+-" 1TMYID0eyuuoJGRvJII+oq96I2iwtVz7rb7ZZWbalyzyJ9wKUjLsrKEkjH4cE8+Jz049bew+wNb\n" \
+-" 3Z76N4YO66sZHlzob2H2Bkktb6CRglLqxkeXOiJZbAv9IMj+7X/wB6ag9lGnEaj17CRJA+BhZmy\n" \
+-" lK+6EI44PQq3R6E06W9h9gZVvNb6FYxlLqwcfOhvYhYWt7s99G8MK3XVjI68aIo7UxgbR9IajhQ\n" \
+-" 7/Du9yiSF3S3tMNrStlkAAt94DPDI4eJFUvYfNetqNYz4xAfjWZx5skZAUnJHD1FMVrYhYWVbzW\n" \
+-" +2ojGUOrBx86EbD7A0FBvfRvDCt11YyPI8aIo23zdP6i2e621TaUJiXCfa1IucFPJt5KVnfHRWS\n" \
+-" euPPNZ2YadfkNsspUp1aglCU8yTyrTSNh9gbCgjfSFjCgl1YyPI8al9PbItP2WamUywkuJ5KOVE\n" \
+-" emeVEVw02ZH9H4YkEqdDYCifE4oqXbaS02lCRhIGBRRF//Z\n" \
++"VERSION:3.0\n" \
++"FN:Yocto Project\n" \
++"URL:http://www.yoctoproject.org/\n" \
++"EMAIL:yocto@yoctoproject.org\n" \
++"TEL;TYPE=VOICE:+00 000 000 0000\n" \
++"ADR;TYPE=HOME:;1720 Beaver Creek;Dam #4;Planet Earth\n" \
++"LABEL:1720 Beaver Creek\\nDam #4\\nPlanet Earth\n" \
++"PHOTO;ENCODING=b:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pV\n" \
++" UAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAFE9JREFUeJztnXmQHNV9xz\n" \
++" +ve86dvU/tanUiCVwRQuaIhSEOMsIiEsbGRtiVGFy4EsdU4bINOICPUtkQHOxgYoiDTVJxCBiwM\n" \
++" CBxBjAlsIUlEQzISAhZN5JW2l3tvbNz9JU/fu/N7CwgVquVmEr194/t7enu97p73vf9zvcbCBEi\n" \
++" RIgQIUKECDH5UB/0DYwXwZv/Mh8AK3ISgBs4AwAR29oCwNwFfQBKLXY/mDucHFgf9A2EKEXZMiT\n" \
++" YdtdUADff+QCA5Q/9BQB+Xk7w9a27vpxP8g0AO9J4IYA64/qOE3m/k4WQIWWGsmJI/q0fn2P+t5\n" \
++" zerwFYDK0ACAgCAMsXRuCLqPDTQ7LvBgogSDY8DODWLvguQOLkv9t6Qm5+khAypMwQfiFlhkmZs\n" \
++" vY/9rOzAXK59EkAEc87BDD9c99cC6CU8t7tumD/PQ0A/uCOHwF4Vm6pOWbnc20AlvIDOTnQF8nU\n" \
++" hJOT3XQ/AK7jyJRWUSXHIw1vAQQV078BEJ1/7f9MwqMed4QMKTNMiCF/uP/ONgC7Y/ODAF52YCE\n" \
++" ArhcBwMIDiMZiLkAsVX8fwClfvfOrALldd5wGYGe6HgRQQfpkABXxi/fjCKkCX6ihtJ6rtFAP8i\n" \
++" Ny3nAfAJ4dk/OiCQBsZSn5vLoXIJ+aezVAxfxvPDCRZz5RCBlSZpgQQzbe+qXzAYLcwAMAgRM0A\n" \
++" UTQ072Sf6JKmo8HWQVgNSc7AU6+YG4AELiZKXITIic8gsL92J5uyzXixzBGbx1tIA73yIMkK2Vr\n" \
++" x/R5cg9KaXU40gCAH2//lOkjsm3WkwB97KoEyOHUA2TTw9J5U0MWwNm5rw9g3tfuzB3lqzpqhAw\n" \
++" pM0QmclE0knIBvOywD+ApB4BAG2u2EmoEnnw+xEAAsODD7S0AuGLMKZRRnYRBRpMCfMMMLTNUIP\n" \
++" vKc0u2WPoaSz+KbeuPPQXge8I+5XeLDAqsX5k+OnK7bwJwe50bAHLZfBWAo9v2DnfK3dnxtQCv3\n" \
++" vH1WwB2TPnoWoDLLrvsXbXHY0HIkDLDhBhizzx1J4C7tXcYQAVOC4CtRYAVyKh2/DQA886ZoQAS\n" \
++" VVGgaEqosTJsFEOUN8aJyNjB6JdeY+mxFZQ2qSwtQzw50c4eSJhjUW/wHwF275O+UpX1Its0w72\n" \
++" 88eSPLAZwoiMfAWj1131aH3iOSUbIkDLDhBhy2me/vB9gw21XPQQQH8zcAOArmdADJ6MApp5SB0\n" \
++" D1lKqS6wtjODBGuLYt/FGxJSM7fDNmglF/QRkfo2aORel5Zlvsy9NMKfbR0CLXJPZIG44n51hKP\n" \
++" ncLfcp+3sknALxMunbsO5kshAwpM0yIIQaLrr3rRoD1t15ZB5AY6vx7gGhKRlxNe61oOLYto1Nf\n" \
++" F2hmKE/LBTNqNVNglP3hyvyuCtfIvm/cYyqpt7Y+T2t8Y5lSuqsvEf60z4gD8MarYvVX1WibRZ/\n" \
++" saHnlqOQWgFjDzFfe+60cG0KGlBkmNUC1/t9XngfQ1nTg1wDTZ9jizS3M23p4+qZz3X1ExoWy7E\n" \
++" JbgXHyau1JG/0of0xbuo3A1Z97pZZ9gX3umC2gHQRkhrIAvLxeLHTbEoYYZntWbBjAr5t6HcDHr\n" \
++" 73950d4DceEkCFlhmOSIWOx6LwqmYyzNdUAXrav5LiypTsVE39TwYYwE7w3yg7Rmo7RtgjMyDfX\n" \
++" 2HrP7BsmGc1IU8pY8rbpsiinDItiCfEU19aLzdLZKYxJVNbtAnAq638CcMFxZIZByJAyw6TIkGD\n" \
++" vc7MBvM5nNgCoYKAJINDD1dIeVxPLANGEKPirHNPSqEaNvDHMUKVbY5nbhimaIfq4r4IxVwW6uV\n" \
++" EWvyf3Y2lZ0tNrdQFs3hb7KYCTaH4U4IJrb3/j/d7BZCFkSJlhUmRILuckAGKD2SYAnAwAFmL5Z\n" \
++" jKZACCTFgs+OyzHs3kJLzg62S2fLxLW08ywtWyIxuRYLCG3XBGXbVV1BQCpSn2tlhWWHdVPKGIt\n" \
++" MHZKiSEibfiabTXNElP5y2mNjwGoj9xywphhEDKkzDApDEnMW/YmQG7DDyS2PsBXAF7dsPNigDe\n" \
++" 27msDCIzfyZZRa+mRGTExjFESzVKxkj6M1Vzwe3nCMiffr9uQ4w3V0nZzszTWWC99NDbK6E9WJg\n" \
++" ttqmhC7I7KavFhxWqbAdxI5ZSjfQeThZAhZYbwCykzTKphGF904yb971UAv1l5hQPQ3uZdLZ1Jt\n" \
++" KngXNT+EEuZgFVxfPgFhdUIYatkz1zrG/VYq7M5TxSFvQdlf9N22R/JSDi2rqo4L86cJprAwvl2\n" \
++" L0BFW634VWKRD2yNSciQMsOkMsRg67rVVQDD69acBoCq1u73Uoeg75e6Q7xRrhO/4IfUzsPRHg+\n" \
++" KLDNX+JackNTqbjwqR6qrdLBJG6X5UQGq/f362r2V1wF8tL71fwFinTM+sIz5kCFlhuPCkNxbW2\n" \
++" YAJOxYG0CvttYefWUnAGfOqAfg9FbZ5rXj0LOL87uvKeIaEVHIudYukDHnKW34YRtnozxajzZCa\n" \
++" 5Ki7laM0qar4non0ZoBiC/95uaJPO9kImRImeG4MCTiZWYDxJORaQDPbpTlfvslK4hUp4zas2bK\n" \
++" fB9xSmULFI1EIzsK3nhvjLNRlTLH4M2DAwA8sWk/AOd9qA2AD0+rL56kU4yi5C/Wnzw47oc8Tgg\n" \
++" ZUmY4LgyxLW8ugB94cYADg7mSlFETNIpoGng6dBtRxfHhaoejju7iGQYYd3spIQpamQlodQ8KC1\n" \
++" 0tW/b3yf6HWopaVkVSZIibHT7l6J/y+CBkSJlhUhnyp6eeigPk9v52FkBUB6C0x5z+rIze2Y2SO\n" \
++" KfGWOyj00BNwoMJapnAk9L6lTVG7JgosGFKbUq0Ks+X5QoZR6/a9YoGja95FnhOJUAQBDF9P/mj\n" \
++" ffbJQsiQMsOkMiTa2akA0k5OfOCOhGaXzW8HoCct+6e31wCQ0dpVXssLNdr/ruVJoBliZIrJB1K\n" \
++" 2DtkWBrz8Y3Sw2U3Cwnk66NSiA1mxaHEMKl8CaK4nnW1/+j6TiB0yJIRgUhmyZ+ZMF6Byy5ZuKO\n" \
++" akTauS+Xx6jWzNqDbmhxfIuOjuOlxoK1mRAqD5zLMBmDp/AQAdL64FYHDPdgBc7ZuKxoWURitLa\n" \
++" at/+fxpQHHkGc8ygGuqQyjlAsxbdvngBB6bTZs2tANYFfE5APPnLPyDOaaUGjqatkKGlBkmlSGL\n" \
++" F0utqg0/ve4FAKWiVwPkA6cKIHB8naqpSuIiRvNpbGgotGVkQVWrRFNrpk4H4GC7bL0dkn8QT1S\n" \
++" U3oRxZWkZFLeMbFHvcAd4nvwfj9dMaKn0s8/ffzHAa5s2rgF4fNUaABoaG3abc35868rLAK65/n\n" \
++" vjStAOGVJmOC7VgFYGIhTO/+dr7gDIDXd+CSDieUmASCFzuvQu7FFtFOZ8bU3bKdHMRgYlPTWql\n" \
++" 5sZJcvEO4yZkdNZEb5ehOPp4zkVKdj4qqLuBYDPfu/ujx/N8z3x9H2fkrbdVQB73z4YA3ju8acD\n" \
++" gP7unsJ7bZnSlgGYffKsCwFuve3u3x6p7ZAhZYYTUi9rzc1f/i5A98G3vw9Qoxf3VyVFhMULDqv\n" \
++" Rlrp8ZhVSQsdEG8fE1M3WK0QG5eysF+QAPMt+HcCJVj5i+vibW/7zNnjv4jjveI41v1gE4OFLTS\n" \
++" 7sNgBli99goH9QATy3+qkCC/ds26kAmqc0DwEsXXrRJQBXX3f98+/WR8iQMsNx8fYaGN/QvXddd\n" \
++" T7Azr1iAO/auQcA1xGpYevRPm9mMYktEZNYSTIqW9ss3DFMcOUaNyeDeyAt+4Pa+LF04kheW//1\n" \
++" 7W3bASJnT/9X08d4mfHLX981FyDvuqKNRWyd+Ie+F6F2MiUa3+KLLixQ/Yn06gBgsKurCuB3v3v\n" \
++" uh/rQGe/WV8iQMkP4hZQZjotQf+WXP28EcBP+zwCG4sGnAQb6hy2A7l1bFcCiOgmvbu8Wj8Xat4\n" \
++" vFdmrrqgFIJHX1B1MVVmc9ZLK6jsqQTINbtsv+nsOy/cxZcn0kIVpBqqVOAbTHpz1m+vjKd/6tU\n" \
++" Bno3fDoow9MA3C9YUkAjFp1UHT1eDrDIghMtQh94SgnaW5EVmP96r/ulRXJmXwHwA/vuvN0gIUL\n" \
++" z+ka3WfIkDLDMTHk9f++NgUQT0eaAEac3JUAvV2Hvg6wr3egGmD3iIzqs5b/FQCREUnrPCsiAy+\n" \
++" bl1F0y7qBQttVzbLUpLJCC/WoKACONghHRoQJ+3d1A9CxR5gyNCLH/3yOFB46c34rANs6DwYAFf\n" \
++" 3FRSgNze1vAcSTkRsAalMtUrZ8SnsGwG+s3ghgRW0p6myq22nXj6etUM8kXhgaB6MWoUTFy9nXI\n" \
++" UR45uHHfgTw9Avr/+GdbzRkSNlhQmrvlv/49gyA6NDw7QD5bN8lAP6weJrNiLeaWgKAzte3K4C8\n" \
++" /v47B2UARdNSN3HJKcKCl94qEna7Tua0IibZQa6Ja89HhTYYG4fkeI1OfqhNySO98baEbrd3Sr5\n" \
++" odVRmgznVscLojXXvPwUgn0isBhipEpbVTm0GQNutONoLalnWEWeUIChlEICn1fDmltbV8N7MMA\n" \
++" gZUmYYN0N2r/1Foc5Udstr3wIg138JQKATCNxAhrEKZCQ5VlIBXLrkPACaDu0DYOfmHQAMW5I5F\n" \
++" 3xY5vmVFxb7+/4a0bjmatnRpjPmDudlgL+o5VKVzmqoTsjxXp1CGtGGpakE0ZeTezw0VJQhlQlp\n" \
++" O6mrGFHfqAA2bJT40vwzTpf7ntqqQ7263uOYFKRgTOZ3aWK49RiAW2t9gXEgZEiZYdwM6d38ZiE\n" \
++" HM54fOgPAz4umk8nLMM27kpvpOTJENq2XmExSj5zzW8S1UN8j2lTPdAm7Zl4TO2T+1mII958qpI\n" \
++" 2WKaJtDc+eAUDt1l0A/G1C2KUCGfmNmkkHtUP+qRHZf13HiWt0FQl3OF3ow6/XNX4rErJaWAe79\n" \
++" u4Q+2jX9r0AXHL5ZdJ3kwTQXLO+PijZoHSuUhCo9aYP2/a/CnDF0iuKHR8BIUPKDOPXspLFUGkm\n" \
++" I3Oun5XRmdajMK0ZM5AVbaVrUOTAqoyMqFPrJCUn1yo2wut/Et28tUOOVwcFMUWtkS/aYu8+YxE\n" \
++" ATXtEDjVrmRBTIitSMWHEbJ1gl9d1fdf3y3k9SNtWtugNmK3lj601obgenhVVcp993aKprb53FQ\n" \
++" CXXiliIFktCRieXmFkGdPcsg4CpJI115s+VnxyxdscBUKGlBnGzZDTTzqv4HN5qXfViwBZV50JM\n" \
++" JyRytWDOWHI7l5JbN6ake97d81skTE1LQrg2ks/BsCT9z0NwOY+sbaXnrug0N+da34PwEU7JGQ7\n" \
++" c794vndoP9Kd/RLSnabXoX9xkSTjPfuaeAEe7hdZslWZer5yXrKY7MD2nhEFUF8hsizWI9b8SXO\n" \
++" mK4BX+6RvNysOtGdWP6kAPnHJ8gAgkUpqH5bqArDtxOcBVnxyxe/e80W+D0KGlBnGzRC1uPhzdC\n" \
++" /+9Ns/ARgeGJgG0DGUXQLQPTB8AGBzt5SuPhhtOB3Ar2tIAGw4JMx5/hWxQ7py0v36PgnpLpozt\n" \
++" 9Df7mYZ6Vcf0rlrGZMYYcK+woAfzJH9tC+y5O4D0lZXXIJdkZSMfs/8RFIuU7BDtg1k0gDVKacX\n" \
++" gM7N0wDmnHlmL8CfLZwfA/jjy5sqAboPCINeenatAjh36ZJBgGgscTnAFy79whETGMaDkCFlhmP\n" \
++" y9r696rYkwM+fWf95gG279n8OoLM/PRWgI8fJAJ2pKVGAkXpJeivQUntLnRHRqM6e11Zoe5tekt\n" \
++" aTLy0uYIziuOQusETcTgxpL/Dve6T1IKK3+gnjfQcBaBop2jqtFXZeN5oGUL5bBzB9SuPNABd/8\n" \
++" Yu/AXjt5ZcfAXjzj3+sB1BW0AfwieUXXQnwtWu+s2Ycr2tcCBlSZjgmhtz07etOAtj86saNAE5m\n" \
++" pBYgl3ctAE/n6gxlZUnbznxKAfQ0zAIgSIhtYGr0Wn7RSRQoPefrytaB+XUEnSJqKlmbKkAmLcj\n" \
++" Tn1s6CTvZK3bL9LyIicZUtNCJrbMrzHK5vF4EWlFVGQC0z5p1GsA55yw+AOA72cUA6ezwawDXXH\n" \
++" PjrqN4XeNCyJAywzEx5IpPffwJAC+fWwaQ1dZzoNtNZyUuMqLj33kdD+90RfM5VK1/TiQqlq/yi\n" \
++" pE2W7mOfOZmAGxNEU9XCAgsKwngWzrrzpKN0nHu6NBBBTAzIzZOoy6YGo0Ux2ChrKPeutpGsXW9\n" \
++" 3qbW1ucBVj365JKjfzsTQ8iQMsOEIobf+PJfnwrQsXf3qQC5jKhCvv6Vm5z2ablBacVqSy8NaLI\n" \
++" kUhjpk/m9XzPEihfrXiz72MduBVix5NyHAJYtW9YF8MILLzQB/OSBxy8C2LZ330UAnQNDCwGC9E\n" \
++" AKoCUv2lS9DvtFDDPUaIYYQhbctvIcOu6RT4+ce3Rv5tgRMqTMEH4hZYYJTVmeE9QA+L5UqjSra\n" \
++" ANLV/XxSjPSi9+7WW0rbo5qW85PepL1oLLFckCnpOxfASxfvnzLmO479XYzwLp16x4C+Ob1Nz4C\n" \
++" MJTvWQCQiprqQDpLXt+Tskb9JIapYl5YA19aN8Vx8/H3exeTjZAhZYYJMSTrcxgg70uBw+IaDTn\n" \
++" ujd2aWldarTSV5Fy9TtwPxECrb6j9jenj+ptuehPghptvPuK9ZLq6+gHswBUdW7PQ9WSs2VrVDm\n" \
++" zzG0klY1BSQY2DZUxloVi8YkKrco8FIUPKDBNiyJeuurwD4I5bbt8IMJLubgfIZXMWjKqXaKrCm\n" \
++" a1ZuK5LNtTU1h8GaG+fthLg/oceusv0oVQxkHQkXPCZz/QA3HPPPSsAnn7y8SsBeroOnwtg4y8A\n" \
++" yOez8qORjluQC+YHJH1fll1F7UgOIJlK7gOYPmvubXLmpP863nsiZEiZYVKWI6xc+a2FAHv/tP1\n" \
++" cgM7OzmqAwLdaARzP6QCobajrA5gza+5LALfefuJ+BsKgt7d3xtjP6urqxP2u1OF3XnFiETIkRI\n" \
++" gQIUKE+H+C/wMGX8Ias1s6CQAAAABJRU5ErkJggg==\n" \
+ "END:VCARD"
+-- 
+1.8.3.2
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
new file mode 100644
index 000000000..5f222aeaa
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
@@ -0,0 +1,32 @@
+From f46423c9e4b8b19eda27b307456a717de79b75f3 Mon Sep 17 00:00:00 2001
+From: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: Sun, 4 Aug 2013 09:15:43 +0200
+Subject: [PATCH 2/5] Fix for automake-1.12.x
+
+Fixed these kinds if warning-errors
+
+warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
+
+Upstream-Status: Pending
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 9bd97db..49d7506 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,6 +31,7 @@ AC_LANG(C)
+ 
+ dnl Automake 1.11 - Silent Build Rules
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+ 
+ dnl Required Package Versions
+ m4_define([glib_minimum_version], [2.28])
+-- 
+1.8.3.2
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
new file mode 100644
index 000000000..a182d4d5e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
@@ -0,0 +1,97 @@
+From 37b227cff78fd4c652651662dafd71537280824e Mon Sep 17 00:00:00 2001
+From: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: Sun, 4 Aug 2013 09:16:59 +0200
+Subject: [PATCH 3/5] Disable Werror for automake
+
+Avoid these warning-errors
+
+automake: warnings are treated as errors
+Makefile.am:15: warning: '%'-style pattern rules are a GNU make extension
+Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+addressbook/backends/file/Makefile.am: installing './depcomp'
+addressbook/libebook/Makefile.am:55: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libebook/Makefile.am:65: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-POSIX variable name
+addressbook/libebook/Makefile.am:66: (probably a GNU make extension)
+addressbook/libebook/Makefile.am:72: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+addressbook/libedata-book/Makefile.am:2: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:3: warning: subst -,_,$*: non-POSIX variable name
+addressbook/libedata-book/Makefile.am:3: (probably a GNU make extension)
+glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+addressbook/libedata-book/Makefile.am:86: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:101: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+calendar/backends/weather/Makefile.am:44: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:53: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:61: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:62: warning: subst -,_,$*: non-POSIX variable name
+calendar/libecal/Makefile.am:62: (probably a GNU make extension) calendar/libecal/Makefile.am:68: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+calendar/libedata-cal/Makefile.am:5: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:6: warning: subst -,_,$*: non-POSIX variable name
+calendar/libedata-cal/Makefile.am:6: (probably a GNU make extension)
+glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+calendar/libedata-cal/Makefile.am:71: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:86: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+camel/Makefile.am:17: warning: '%'-style pattern rules are a GNU make extension
+libebackend/Makefile.am:35: warning: '%'-style pattern rules are a GNU make extension
+libebackend/Makefile.am:41: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+libedataserver/Makefile.am:91: warning: '%'-style pattern rules are a GNU make extension
+libedataserver/Makefile.am:97: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+libedataserverui/Makefile.am:108: warning: '%'-style pattern rules are a GNU make extension
+libedataserverui/Makefile.am:118: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/google/libgdata-google/Makefile.am:27: warning: '%'-style pattern rules are a GNU make extension
+servers/google/libgdata-google/Makefile.am:33: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/google/libgdata/Makefile.am:31: warning: '%'-style pattern rules are a GNU make extension
+servers/google/libgdata/Makefile.am:37: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/groupwise/Makefile.am:85: warning: '%'-style pattern rules are a GNU make extension
+servers/groupwise/Makefile.am:91: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+autoreconf: automake failed with exit status: 1
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+Conflicts:
+        configure.ac
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 49d7506..1c802ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ m4_define([api_version], [1.2])
+ dnl Autoconf / Automake Initialization
+ AC_PREREQ(2.62)
+ AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
+-AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability -Werror foreign])
++AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability foreign])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(README)
+ AC_CONFIG_HEADERS(config.h)
+-- 
+1.8.3.2
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
new file mode 100644
index 000000000..138334798
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
@@ -0,0 +1,39 @@
+From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sun, 4 Aug 2013 10:57:08 +0200
+Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host
+ paths
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ calendar/libecal/libecal.pc.in | 2 +-
+ configure.ac                   | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in
+index fc6b359..d3435bb 100644
+--- a/calendar/libecal/libecal.pc.in
++++ b/calendar/libecal/libecal.pc.in
+@@ -12,4 +12,4 @@ Description: Client library for evolution calendars
+ Version: @VERSION@
+ Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0
+ Libs: -L${libdir} -lecal-1.2
+-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
++Cflags: -I${privincludedir}
+diff --git a/configure.ac b/configure.ac
+index 1c802ff..f1d4ce8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1351,7 +1351,8 @@ dnl to differentiate between <libical/ical.h> and <ical.h>
+ dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
+ dnl libical is fixed, we have to work-around the buggy CFlags.
+ dnl *****
+-       LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
++       m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++       LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
+        LIBICAL_EXTRA_LIBS=""
+        AC_SUBST(LIBICAL_EXTRA_CFLAGS)
+        AC_SUBST(LIBICAL_EXTRA_LIBS)
+-- 
+1.8.3.2
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
new file mode 100644
index 000000000..addf2ee8d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
@@ -0,0 +1,77 @@
+From ac95e89749a01618f98b554a98e78d7c988bfc10 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 27 Nov 2012 08:46:51 +0100
+Subject: [PATCH 5/5] soup: adapt to new libxml2 API from 2.9.0
+
+* for more info see
+  https://mail.gnome.org/archives/xml/2012-August/msg00005.html
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ calendar/backends/caldav/e-cal-backend-caldav.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
+index 12f8f22..5555a3e 100644
+--- a/calendar/backends/caldav/e-cal-backend-caldav.c
++++ b/calendar/backends/caldav/e-cal-backend-caldav.c
+@@ -1172,8 +1172,13 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
+        soup_message_set_request (message,
+                                  "application/xml",
+                                  SOUP_MEMORY_COPY,
++#ifdef LIBXML2_NEW_BUFFER
++                                 (gchar *) xmlOutputBufferGetContent(buf),
++                                 xmlOutputBufferGetSize(buf));
++#else
+                                  (gchar *) buf->buffer->content,
+                                  buf->buffer->use);
++#endif
+ 
+        /* Send the request now */
+        send_and_handle_redirection (priv->session, message, NULL);
+@@ -1321,8 +1326,13 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav,
+        soup_message_set_request (message,
+                                  "application/xml",
+                                  SOUP_MEMORY_COPY,
++#ifdef LIBXML2_NEW_BUFFER
++                                 (gchar *) xmlOutputBufferGetContent(buf),
++                                 xmlOutputBufferGetSize(buf));
++#else
+                                  (gchar *) buf->buffer->content,
+                                  buf->buffer->use);
++#endif
+ 
+        /* Send the request now */
+        send_and_handle_redirection (priv->session, message, NULL);
+@@ -1715,8 +1725,14 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
+        soup_message_set_request (message,
+                                  "application/xml",
+                                  SOUP_MEMORY_COPY,
++#ifdef LIBXML2_NEW_BUFFER
++                                 (gchar *) xmlOutputBufferGetContent(buf),
++                                 xmlOutputBufferGetSize(buf));
++#else
+                                  (gchar *) buf->buffer->content,
+                                  buf->buffer->use);
++#endif
++
+ 
+        /* Send the request now */
+        send_and_handle_redirection (priv->session, message, NULL);
+@@ -1765,8 +1781,13 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
+                soup_message_set_request (message,
+                                  "application/xml",
+                                  SOUP_MEMORY_COPY,
++#ifdef LIBXML2_NEW_BUFFER
++                                 (gchar *) xmlOutputBufferGetContent(buf),
++                                 xmlOutputBufferGetSize(buf));
++#else
+                                  (gchar *) buf->buffer->content,
+                                  buf->buffer->use);
++#endif
+ 
+                /* Send the request now */
+                send_and_handle_redirection (priv->session, message, NULL);
+-- 
+1.8.3.2
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h b/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
new file mode 100644
index 000000000..46f476d5b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
@@ -0,0 +1,5 @@
+/* This is an auto-generated header, DO NOT EDIT! */
+
+#define ICONV_ISO_D_FORMAT "iso-%d-%d"
+#define ICONV_ISO_S_FORMAT "iso-%d-%s"
+#define ICONV_10646 "iso-10646"
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
new file mode 100644
index 000000000..7c935a3d5
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
@@ -0,0 +1,112 @@
+SUMMARY = "Evolution database backend server"
+HOMEPAGE = "http://www.gnome.org/projects/evolution/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2 & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
+                    file://camel/camel.h;endline=24;md5=b02175c88f821224746b347a89731a2b \
+                    file://libedataserver/e-data-server-util.h;endline=20;md5=934502f03c84523aa059d4825887b380 \
+                    file://calendar/libecal/e-cal.h;endline=24;md5=5d496b9b6fd2a4fdbbfc31ef9455c9d0"
+
+DEPENDS = "intltool-native glib-2.0 gtk+3 gconf dbus db gnome-common virtual/libiconv zlib libsoup-2.4 libglade libical libgnome-keyring gperf-native libgdata nss"
+
+SRCREV = "a9e4e74ec4473a4fd09e56b690bd4fa72f686687"
+
+# 3.4 series needs libgdata-0.10*, 3.8 series needs also libsecret instead of gnome-keyring
+PV = "3.2.3+git${SRCPV}"
+
+SRC_URI = " \
+    git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \
+    file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \
+    file://0002-Fix-for-automake-1.12.x.patch \
+    file://0003-Disable-Werror-for-automake.patch \
+    file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
+    file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
+    file://iconv-detect.h \
+"
+
+S = "${WORKDIR}/git"
+
+inherit autotools gtk-doc pkgconfig gettext
+
+# -ldb needs this on some platforms
+LDFLAGS += "-lpthread"
+
+# Parallel make shows many issues with this source code.
+# Current problems seem to be duplicate execution of the calander/backends
+# directories by make resulting in truncated/corrupt .la files
+#PARALLEL_MAKE = ""
+
+do_configure_append () {
+    cp ${WORKDIR}/iconv-detect.h ${S}
+}
+
+EXTRA_OECONF = "--without-openldap \
+                --with-libdb=${STAGING_DIR_HOST}${prefix} \
+                --disable-nntp --disable-goa --disable-weather"
+
+PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
+             libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
+             libedataserver libedataserver-dev \
+             libedataserverui libedataserverui-dev"
+
+FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
+FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
+FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \
+                    ${libdir}/evolution-data-server*/calendar-backends/.debug \
+                    ${libdir}/evolution-data-server*/addressbook-backends/.debug \
+                    ${libdir}/evolution-data-server*/extensions/.debug/"
+
+RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
+
+FILES_libcamel = "${libdir}/libcamel-*.so.* \
+                  ${libdir}/libcamel-provider-*.so.* \
+                  ${libdir}/evolution-data-server*/camel-providers/*.so \
+                  ${libdir}/evolution-data-server*/camel-providers/*.urls"
+FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
+                      ${libdir}/pkgconfig/camel*pc \
+                      ${libdir}/evolution-data-server*/camel-providers/*.la \
+                      ${includedir}/evolution-data-server*/camel"
+
+FILES_libebook = "${libdir}/libebook-*.so.*"
+FILES_libebook-dev = "${libdir}/libebook-1.2.so \
+                      ${libdir}/pkgconfig/libebook-*.pc \
+                      ${includedir}/evolution-data-server*/libebook/*.h"
+RRECOMMENDS_libebook = "libedata-book"
+
+FILES_libecal = "${libdir}/libecal-*.so.* \
+                 ${datadir}/evolution-data-server-1.4/zoneinfo"
+FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
+                     ${includedir}/evolution-data-server*/libecal/*.h \
+                     ${includedir}/evolution-data-server*/libical/*.h"
+RRECOMMENDS_libecal = "libedata-cal tzdata"
+
+FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
+                       ${datadir}/dbus-1/services/*.AddressBook.service \
+                       ${libdir}/libedata-book-*.so.* \
+                       ${libdir}/evolution-data-server-*/extensions/libebook*.so \
+                       ${datadir}/evolution-data-server-1.4/weather/Locations.xml"
+FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
+                           ${libdir}/pkgconfig/libedata-book-*.pc \
+                           ${libdir}/evolution-data-server-*/extensions/libebook*.la \
+                           ${includedir}/evolution-data-server-*/libedata-book"
+
+FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
+                      ${datadir}/dbus-1/services/*.Calendar.service \
+                      ${libdir}/libedata-cal-*.so.* \
+                      ${libdir}/evolution-data-server-*/extensions/libecal*.so"
+FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
+                          ${libdir}/pkgconfig/libedata-cal-*.pc \
+                          ${includedir}/evolution-data-server-*/libedata-cal \
+                          ${libdir}/evolution-data-server-*/extensions/libecal*.la"
+
+FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
+FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
+                            ${libdir}/pkgconfig/libedataserver-*.pc \
+                            ${includedir}/evolution-data-server-*/libedataserver/*.h"
+
+FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
+FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
+                              ${libdir}/pkgconfig/libedataserverui-*.pc \
+                              ${includedir}/evolution-data-server-*/libedataserverui/*.h"
+
diff --git a/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb b/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb
new file mode 100644
index 000000000..9e1a0dc7d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb
@@ -0,0 +1,21 @@
+SUMMARY = "GNOME default webbrowser"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "gnome-doc-utils libsoup-2.4 webkit-gtk gtk+ gconf iso-codes startup-notification ca-certificates libgnome-keyring avahi libnotify"
+
+inherit gnome
+SRC_URI[archive.md5sum] = "0c566b3ffd428d2135e3c8cb65352d64"
+SRC_URI[archive.sha256sum] = "278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc"
+
+EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO} --without-ca-file"
+
+do_configure_prepend() {
+    touch ${S}/gnome-doc-utils.make
+    sed -i -e s:help::g ${S}/Makefile.am
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+RDEPENDS_${PN} = "iso-codes"
+RRECOMMENDS_${PN} = "ca-certificates"
+
diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch b/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
new file mode 100644
index 000000000..ebc8976b3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
@@ -0,0 +1,33 @@
+From 00b5e55c90477eeac02bec58f032cb6916a1eb5c Mon Sep 17 00:00:00 2001
+From: Hib Eris <hib@hiberis.nl>
+Date: Mon, 20 Feb 2012 21:36:16 +0100
+Subject: [PATCH] tiff: fix compile warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ backend/tiff/tiff2ps.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/backend/tiff/tiff2ps.c b/backend/tiff/tiff2ps.c
+index c0dc0bf..fc63c2e 100644
+--- a/backend/tiff/tiff2ps.c
++++ b/backend/tiff/tiff2ps.c
+@@ -1127,8 +1127,8 @@ PS_Lvl2page(TIFF2PSContext* ctx, TIFF* tif, uint32 w, uint32 h)
+        }
+        buf_data = (unsigned char *)_TIFFmalloc(chunk_size);
+        if (!buf_data) {
+-               TIFFError(ctx->filename, "Can't alloc %u bytes for %s.",
+-                       chunk_size, tiled_image ? "tiles" : "strips");
++               TIFFError(ctx->filename, "Can't alloc %u bytes for %s.",
++                       (uint) chunk_size, tiled_image ? "tiles" : "strips");
+                return(FALSE);
+        }
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
new file mode 100644
index 000000000..6f5420a52
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
@@ -0,0 +1,25 @@
+Index: evince-2.30.0/gnome-doc-utils.make
+===================================================================
+--- evince-2.30.0.orig/gnome-doc-utils.make     2010-03-29 11:52:47.000000000 -0700
++++ evince-2.30.0/gnome-doc-utils.make  2010-08-17 15:20:22.597646001 -0700
+@@ -132,13 +132,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
+ 
+ _xml2po ?= `which xml2po`
+ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+-
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ 
+ if ENABLE_SK
+ _ENABLE_SK = true
+
diff --git a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
new file mode 100644
index 000000000..5aa485eab
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
@@ -0,0 +1,43 @@
+SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
+SECTION = "x11/office"
+DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade"
+
+PR = "r5"
+
+inherit gnome pkgconfig gtk-icon-cache gsettings
+
+SRC_URI += " \
+    file://cross-compile-fix.patch \
+    file://0001-tiff-fix-compile-warning.patch \
+"
+
+SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319"
+SRC_URI[archive.sha256sum] = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"
+
+EXTRA_OECONF = " --enable-thumbnailer \
+                 --disable-scrollkeeper \
+                 --enable-pixbuf \
+                 --disable-help \
+"
+
+do_install_append() {
+    install -d install -d ${D}${datadir}/pixmaps
+    install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/
+}
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
+
+RDEPENDS_${PN} += "glib-2.0-utils"
+
+PACKAGES =+ "${PN}-nautilus-extension"
+FILES_${PN} += "${datadir}/dbus-1"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug \
+                    ${libdir}/*/*/*/.debug"
+FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \
+                    ${libdir}/evince/*/backends/*.la"
+FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \
+                          ${libdir}/evince/*/backends/*.a"
+FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
diff --git a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
new file mode 100644
index 000000000..dbaae649e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "An icon theme for Gnome"
+SECTION = "x11/wm"
+LICENSE = "GPLv3"
+HOMEPAGE = "http://code.google.com/p/faenza-icon-theme/"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+inherit allarch gtk-icon-cache
+
+S = "${WORKDIR}"
+
+SRC_URI = "http://faenza-icon-theme.googlecode.com/files/${PN}_${PV}.zip"
+SRC_URI[md5sum] = "e9bd6106d13017ce06d24b586259ae9c"
+SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a"
+
+do_install() {
+    install -d ${D}${datadir}/icons
+    for theme in `find -name 'Faenza*.tar.gz'`; do
+        tar -xf ${theme} -C ${D}${datadir}/icons
+    done
+    tar -xf emesene-faenza-theme.tar.gz -C ${D}${datadir}
+    mv -f ${D}${datadir}/emesene/themes ${D}${datadir}/themes
+    rm -rf ${D}${datadir}/emesene
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/themes"
diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
new file mode 100644
index 000000000..e9a837bb9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
@@ -0,0 +1,24 @@
+SUMMARY = "A library for bits of crypto UI and parsing etc"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt"
+
+PNBLACKLIST[gcr] ?= "CONFLICT: 4 files conflict with gnome-keyring"
+# e.g. sysroots/qemux86-64/usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
+#      sysroots/qemux86-64/usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert
+
+inherit autotools gnomebase gtk-icon-cache gtk-doc
+
+GNOME_COMPRESS_TYPE="xz"
+
+SRC_URI[archive.md5sum] = "f5e66afcab19897a0de0590735329fb1"
+SRC_URI[archive.sha256sum] = "a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1"
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/gcr-3 \
+"
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml b/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
new file mode 100644
index 000000000..f8c2e9cc2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
@@ -0,0 +1,492 @@
+<?xml version="1.0"?>
+<gconf>
+        <dir name="desktop">
+                <dir name="gnome">
+                        <dir name="url-handlers">
+                                <dir name="ymsgr">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="xmpp">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="webcal">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="uvox">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="trash">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="sip">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="rtsp">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="rtp">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="pnm">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="note">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="net">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="msnim">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="mmsh">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="mms">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="man">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="mailto">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="lastfm">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="itpc">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="itms">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="irc">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="info">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="icyx">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="icy">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="icq">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="https">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="http">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="h323">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="ghelp">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="gg">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="ftp">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="file">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="feed">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="cdda">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="callto">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="aim">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                                <dir name="about">
+                                        <entry name="command" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                        </dir>
+                        <dir name="lockdown">
+                                <entry name="disable_url_handlers" mtime="1227173197" type="bool" value="true">
+                                </entry>
+                                <entry name="disable_save_to_disk" mtime="1227173197" type="bool" value="true">
+                                </entry>
+                                <entry name="disable_print_setup" mtime="1227173197" type="bool" value="true">
+                                </entry>
+                                <entry name="disable_printing" mtime="1227173197" type="bool" value="true">
+                                </entry>
+                                <entry name="disable_lock_screen" mtime="1227173197" type="bool" value="true">
+                                </entry>
+                                <entry name="disable_command_line" mtime="1227173197" type="bool" value="true">
+                                </entry>
+                        </dir>
+                        <dir name="applications">
+                                <dir name="terminal">
+                                        <entry name="exec" mtime="1227173197" type="string">
+                                                <stringvalue>/bin/true</stringvalue>
+                                        </entry>
+                                </dir>
+                        </dir>
+                        <dir name="accessibility">
+                                <dir name="keyboard">
+                                        <entry name="enable" mtime="1227173197" type="bool" value="true">
+                                        </entry>
+                                </dir>
+                        </dir>
+                </dir>
+        </dir>
+        <dir name="apps">
+                <dir name="gnome_settings_daemon">
+                        <dir name="keybindings">
+                                <entry name="www" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="stop" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="sleep" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="search" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="screensaver" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="previous" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="power" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="play" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="pause" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="next" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="media" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="home" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="help" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="email" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="calculator" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                                <entry name="eject" mtime="1227173197" type="string">
+                                        <stringvalue></stringvalue>
+                                </entry>
+                        </dir>
+                </dir>
+                <dir name="metacity">
+                        <dir name="keybinding_commands">
+                                <entry name="command_window_screenshot" mtime="1227173197" type="string">
+                                        <stringvalue>/bin/true</stringvalue>
+                                </entry>
+                                <entry name="command_screenshot" mtime="1227173197" type="string">
+                                        <stringvalue>gdm-screenshot</stringvalue>
+                                </entry>
+                        </dir>
+                        <dir name="global_keybindings">
+                                <entry name="switch_to_workspace_up" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                                <entry name="switch_to_workspace_right" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                                <entry name="switch_to_workspace_left" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                                <entry name="switch_to_workspace_down" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                                <entry name="switch_group" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                                <entry name="show_desktop" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                                <entry name="run_command_window_screenshot" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                                <entry name="run_command_screenshot" mtime="1227173197" type="string">
+                                        <stringvalue>Print</stringvalue>
+                                </entry>
+                                <entry name="panel_run_dialog" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                                <entry name="panel_main_menu" mtime="1227173197" type="string">
+                                        <stringvalue>disabled</stringvalue>
+                                </entry>
+                        </dir>
+                        <dir name="general">
+                                <entry name="num_workspaces" mtime="1227173197" type="int" value="1">
+                                </entry>
+                        </dir>
+                </dir>
+                <dir name="compiz">
+                        <dir name="general">
+                                <dir name="allscreens">
+                                        <dir name="options">
+                                                <entry name="run_command11_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command11_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command10_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command10_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command8_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command8_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command7_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command7_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command6_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command6_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command5_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command5_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command4_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command4_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command3_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command3_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command2_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command2_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command1_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command1_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command0_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_command0_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="run_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="main_menu_key" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="main_menu_button" mtime="1227173197" type="string">
+                                                        <stringvalue>Disabled</stringvalue>
+                                                </entry>
+                                                <entry name="command_window_screenshot" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command11" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command10" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command9" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command8" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command7" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command6" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command5" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command4" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command3" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command2" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command1" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command0" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command_terminal" mtime="1227173197" type="string">
+                                                        <stringvalue></stringvalue>
+                                                </entry>
+                                                <entry name="command_screenshot" mtime="1227173197" type="string">
+                                                        <stringvalue>gdm-screenshot</stringvalue>
+                                                </entry>
+                                                <entry name="active_plugins" mtime="1227173197" type="list" ltype="string">
+                                                        <li type="string">
+                                                                <stringvalue>cube</stringvalue>
+                                                        </li>
+                                                        <li type="string">
+                                                                <stringvalue>decoration</stringvalue>
+                                                        </li>
+                                                        <li type="string">
+                                                                <stringvalue>gconf</stringvalue>
+                                                        </li>
+                                                        <li type="string">
+                                                                <stringvalue>glib</stringvalue>
+                                                        </li>
+                                                        <li type="string">
+                                                                <stringvalue>move</stringvalue>
+                                                        </li>
+                                                        <li type="string">
+                                                                <stringvalue>place</stringvalue>
+                                                        </li>
+                                                        <li type="string">
+                                                                <stringvalue>resize</stringvalue>
+                                                        </li>
+                                                        <li type="string">
+                                                                <stringvalue>screenshot</stringvalue>
+                                                        </li>
+                                                        <li type="string">
+                                                                <stringvalue>wobbly</stringvalue>
+                                                        </li>
+                                                </entry>
+                                        </dir>
+                                </dir>
+                        </dir>
+                </dir>
+                <dir name="gnome-power-manager">
+                        <dir name="ui">
+                                <entry name="show_context_menu" mtime="1227173197" type="bool" value="false">
+                                </entry>
+                        </dir>
+                </dir>
+                <dir name="gnome-screensaver">
+                        <entry name="power_management_delay" mtime="1227173197" type="int" value="30">
+                        </entry>
+                </dir>
+                <dir name="nautilus">
+                        <dir name="preferences">
+                                <entry name="show_desktop" mtime="1227173197" type="bool" value="false">
+                                </entry>
+                        </dir>
+                </dir>
+        </dir>
+</gconf>
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch b/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch
new file mode 100644
index 000000000..75aff5d7c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch
@@ -0,0 +1,2281 @@
+From 0a4fe802edbd2e8a016161f08283e4b467c6762e Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 21 Jun 2011 12:48:39 +0200
+Subject: [PATCH] Remove user switch applet
+
+This hasn't been updated to work with gnome-panel > 2.30.0, so just drop it
+
+Upstream-Status: unacceptable, backport
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.ac                                       |    8 -
+ gui/Makefile.am                                    |    2 -
+ .../GNOME_FastUserSwitchApplet.server.in.in        |   38 -
+ .../GNOME_FastUserSwitchApplet.xml                 |   20 -
+ gui/user-switch-applet/Makefile.am                 |   67 -
+ gui/user-switch-applet/applet.c                    | 1662 --------------------
+ gui/user-switch-applet/gdm-entry-menu-item.c       |  304 ----
+ gui/user-switch-applet/gdm-entry-menu-item.h       |   51 -
+ po/POTFILES.in                                     |    4 -
+ po/POTFILES.skip                                   |    1 -
+ 10 files changed, 0 insertions(+), 2157 deletions(-)
+ delete mode 100644 gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
+ delete mode 100644 gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
+ delete mode 100644 gui/user-switch-applet/Makefile.am
+ delete mode 100644 gui/user-switch-applet/applet.c
+ delete mode 100644 gui/user-switch-applet/gdm-entry-menu-item.c
+ delete mode 100644 gui/user-switch-applet/gdm-entry-menu-item.h
+
+diff --git a/configure.ac b/configure.ac
+index 841efe0..a834110 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,13 +149,6 @@ PKG_CHECK_MODULES(SIMPLE_CHOOSER,
+ AC_SUBST(SIMPLE_CHOOSER_CFLAGS)
+ AC_SUBST(SIMPLE_CHOOSER_LIBS)
+ 
+-PKG_CHECK_MODULES(APPLET,
+-        dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+-        gtk+-2.0 >= $GTK_REQUIRED_VERSION
+-        libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION)
+-AC_SUBST(APPLET_CFLAGS)
+-AC_SUBST(APPLET_LIBS)
+-
+ PLUGIN_LIBTOOL_FLAGS="-export_dynamic -module -avoid-version"
+ AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
+ 
+@@ -1340,7 +1333,6 @@ gui/Makefile
+ gui/simple-greeter/Makefile
+ gui/simple-greeter/libnotificationarea/Makefile
+ gui/simple-chooser/Makefile
+-gui/user-switch-applet/Makefile
+ utils/Makefile
+ data/gdm.conf
+ data/Makefile
+diff --git a/gui/Makefile.am b/gui/Makefile.am
+index 326239f..bda3f7a 100644
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -2,7 +2,6 @@ NULL =
+ 
+ SUBDIRS =                      \
+        simple-greeter          \
+-       user-switch-applet      \
+        $(NULL)
+ 
+ if XDMCP_SUPPORT
+@@ -12,5 +11,4 @@ endif
+ DIST_SUBDIRS =                 \
+        simple-chooser          \
+        simple-greeter          \
+-       user-switch-applet      \
+        $(NULL)
+diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
+deleted file mode 100644
+index a9b775f..0000000
+--- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
++++ /dev/null
+@@ -1,38 +0,0 @@
+-<oaf_info>
+-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
+-              location="@LIBEXECDIR@/gdm-user-switch-applet">
+-
+-    <oaf_attribute name="repo_ids" type="stringv">
+-      <item value="IDL:Bonobo/GenericFactory:1.0"/>
+-      <item value="IDL:Bonobo/Unknown:1.0"/>
+-    </oaf_attribute>
+-    <oaf_attribute name="name" type="string" _value="User Switcher Applet Factory"/>
+-    <oaf_attribute name="description" type="string" _value="User Switcher Applet Factory"/>
+-    <oaf_attribute name="bonobo:environment" type="stringv">
+-       <item value="DBUS_SESSION_BUS_ADDRESS"/>
+-     <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+-     <oaf_attribute name="bugzilla:product" type="string" value="gdm"/>
+-     <oaf_attribute name="bugzilla:component" type="string" value="general"/>
+-     <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
+-     <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/>
+-    </oaf_attribute>
+-  </oaf_server>
+-
+-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
+-              location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
+-
+-    <oaf_attribute name="repo_ids" type="stringv">
+-      <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+-      <item value="IDL:Bonobo/Control:1.0"/>
+-      <item value="IDL:Bonobo/Unknown:1.0"/>
+-    </oaf_attribute>
+-    <oaf_attribute name="name" type="string" _value="User Switcher"/>
+-    <oaf_attribute name="description" type="string" _value="A menu to quickly switch between users"/>
+-    <oaf_attribute name="panel:icon" type="string" value="stock_people"/>
+-    <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+-    <oaf_attribute name="bugzilla:product" type="string" value="gdm"/>
+-    <oaf_attribute name="bugzilla:component" type="string" value="general"/>
+-    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
+-    <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/>
+-  </oaf_server>
+-</oaf_info>
+diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
+deleted file mode 100644
+index e1845c8..0000000
+--- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
++++ /dev/null
+@@ -1,20 +0,0 @@
+-<Root>
+-  <popups>
+-    <popup name="button3">
+-      <menuitem
+-       name="About Me Item"
+-       verb="GdmAboutMe"
+-       _label="Edit Personal _Information"/>
+-      <menuitem
+-       name="Users and Groups Admin Item"
+-       verb="GdmUsersGroupsAdmin"
+-       _label="_Edit Users and Groups"/>
+-      <menuitem
+-       name="About Item"
+-       verb="GdmAbout"
+-       _label="_About"
+-       pixtype="stock"
+-       pixname="gtk-about"/>
+-    </popup>
+-  </popups>
+-</Root>
+diff --git a/gui/user-switch-applet/Makefile.am b/gui/user-switch-applet/Makefile.am
+deleted file mode 100644
+index 2d2cdc0..0000000
+--- a/gui/user-switch-applet/Makefile.am
++++ /dev/null
+@@ -1,67 +0,0 @@
+-NULL =
+-
+-AM_CPPFLAGS = \
+-       -I$(top_srcdir)/gui/simple-greeter              \
+-       -I$(top_srcdir)/common                          \
+-       -DPREFIX=\""$(prefix)"\"                        \
+-       -DLIBDIR=\""$(libdir)"\"                        \
+-       -DDATADIR=\""$(datadir)"\"                      \
+-       -DSYSCONFDIR=\""$(sysconfdir)"\"                \
+-       -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
+-       -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+-       -DGLADEDIR=\""$(pkgdatadir)"\"                  \
+-       -DLIBEXECDIR=\""$(libexecdir)"\"                \
+-       -DSBINDIR=\""$(sbindir)"\"                      \
+-       -DGDMCONFDIR=\"$(gdmconfdir)\"                  \
+-       $(GTK_CFLAGS)                                   \
+-       $(APPLET_CFLAGS)                                \
+-       $(NULL)
+-
+-libexec_PROGRAMS =                     \
+-       gdm-user-switch-applet          \
+-       $(NULL)
+-
+-gdm_user_switch_applet_SOURCES =       \
+-       applet.c                        \
+-       gdm-entry-menu-item.h           \
+-       gdm-entry-menu-item.c           \
+-       $(NULL)
+-
+-gdm_user_switch_applet_LDADD =                 \
+-       $(top_builddir)/gui/simple-greeter/libgdmuser.la        \
+-       $(top_builddir)/common/libgdmcommon.la          \
+-       $(COMMON_LIBS)                                  \
+-       $(APPLET_LIBS)                                  \
+-       $(NULL)
+-
+-# Bonobo UI
+-uidir =        $(datadir)/gnome-2.0/ui
+-ui_DATA =                                      \
+-       GNOME_FastUserSwitchApplet.xml          \
+-       $(NULL)
+-
+-# Bonobo .server
+-serverdir = $(libdir)/bonobo/servers
+-server_in_files =                              \
+-       GNOME_FastUserSwitchApplet.server.in    \
+-       $(NULL)
+-server_DATA = $(server_in_files:.server.in=.server)
+-
+-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-       sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+-
+-@INTLTOOL_SERVER_RULE@
+-
+-EXTRA_DIST =                   \
+-       $(ui_DATA)              \
+-       GNOME_FastUserSwitchApplet.server.in.in \
+-       $(NULL)
+-
+-DISTCLEANFILES =                        \
+-       $(server_in_files)              \
+-       $(server_DATA)                  \
+-        $(NULL)
+-
+-MAINTAINERCLEANFILES =                  \
+-        *~                              \
+-        Makefile.in
+diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c
+deleted file mode 100644
+index b4f944c..0000000
+--- a/gui/user-switch-applet/applet.c
++++ /dev/null
+@@ -1,1662 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
+- * Copyright (C) 2008      Red Hat, Inc.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+- */
+-
+-#include "config.h"
+-
+-#include <string.h>
+-#include <unistd.h>
+-#include <stdlib.h>
+-#include <sys/types.h>
+-
+-#include <glib/gi18n.h>
+-#include <gdk/gdkkeysyms.h>
+-#include <gtk/gtk.h>
+-
+-#include <gconf/gconf.h>
+-#include <gconf/gconf-client.h>
+-
+-#include <dbus/dbus-glib.h>
+-
+-#include <bonobo/bonobo-main.h>
+-#include <bonobo/bonobo-ui-util.h>
+-
+-#include <panel-applet.h>
+-#include <panel-applet-gconf.h>
+-
+-#include "gdm-user-manager.h"
+-#include "gdm-entry-menu-item.h"
+-#include "gdm-settings-client.h"
+-
+-#define LOCKDOWN_DIR    "/desktop/gnome/lockdown"
+-#define LOCKDOWN_USER_SWITCHING_KEY LOCKDOWN_DIR "/disable_user_switching"
+-#define LOCKDOWN_LOCK_SCREEN_KEY    LOCKDOWN_DIR "/disable_lock_screen"
+-#define LOCKDOWN_COMMAND_LINE_KEY   LOCKDOWN_DIR "/disable_command_line"
+-
+-typedef enum {
+-        GSM_PRESENCE_STATUS_AVAILABLE = 0,
+-        GSM_PRESENCE_STATUS_INVISIBLE,
+-        GSM_PRESENCE_STATUS_BUSY,
+-        GSM_PRESENCE_STATUS_IDLE,
+-} GsmPresenceStatus;
+-
+-typedef struct _GdmAppletData
+-{
+-        PanelApplet    *applet;
+-
+-        GConfClient    *client;
+-        GdmUserManager *manager;
+-        GdmUser        *user;
+-
+-        GtkWidget      *menubar;
+-        GtkWidget      *menuitem;
+-        GtkWidget      *menu;
+-#ifdef BUILD_PRESENSE_STUFF
+-        GtkWidget      *user_item;
+-#endif
+-        GtkWidget      *control_panel_item;
+-        GtkWidget      *account_item;
+-        GtkWidget      *lock_screen_item;
+-        GtkWidget      *login_screen_item;
+-        GtkWidget      *quit_session_item;
+-
+-        guint           client_notify_lockdown_id;
+-
+-        guint           current_status;
+-        guint           user_loaded_notify_id;
+-        guint           user_changed_notify_id;
+-        gint8           pixel_size;
+-        gint            panel_size;
+-        GtkIconSize     icon_size;
+-#ifdef BUILD_PRESENSE_STUFF
+-        DBusGProxy     *presence_proxy;
+-#endif
+-} GdmAppletData;
+-
+-typedef struct _SelectorResponseData
+-{
+-        GdmAppletData  *adata;
+-        GtkRadioButton *radio;
+-} SelectorResponseData;
+-
+-static void reset_icon   (GdmAppletData *adata);
+-static void update_label (GdmAppletData *adata);
+-
+-static gboolean applet_factory (PanelApplet   *applet,
+-                                const char    *iid,
+-                                gpointer       data);
+-
+-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
+-                             PANEL_TYPE_APPLET,
+-                             "gdm-user-switch-applet", "0",
+-                             (PanelAppletFactoryCallback)applet_factory,
+-                             NULL)
+-
+-static void
+-about_me_cb (BonoboUIComponent *ui_container,
+-             gpointer           data,
+-             const char        *cname)
+-{
+-        GError *err;
+-
+-        err = NULL;
+-        if (! g_spawn_command_line_async ("gnome-about-me", &err)) {
+-                g_critical ("Could not run `gnome-about-me': %s",
+-                            err->message);
+-                g_error_free (err);
+-                bonobo_ui_component_set_prop (ui_container,
+-                                              "/commands/GdmAboutMe",
+-                                              "hidden", "1",
+-                                              NULL);
+-        }
+-}
+-
+-/*
+- * gnome-panel/applets/wncklet/window-menu.c:window_filter_button_press()
+- *
+- * Copyright (C) 2005 James M. Cape.
+- * Copyright (C) 2003 Sun Microsystems, Inc.
+- * Copyright (C) 2001 Free Software Foundation, Inc.
+- * Copyright (C) 2000 Helix Code, Inc.
+- */
+-static gboolean
+-menubar_button_press_event_cb (GtkWidget      *menubar,
+-                               GdkEventButton *event,
+-                               GdmAppletData  *adata)
+-{
+-        if (event->button != 1) {
+-                g_signal_stop_emission_by_name (menubar, "button-press-event");
+-                /* Reset the login window item */
+-        }
+-
+-        return FALSE;
+-}
+-
+-static void
+-about_cb (BonoboUIComponent *ui_container,
+-          gpointer           data,
+-          const char        *cname)
+-{
+-        static const char *authors[] = {
+-                "James M. Cape <jcape@ignore-your.tv>",
+-                "Thomas Thurman <thomas@thurman.org.uk>",
+-                "William Jon McCann <jmccann@redhat.com>",
+-                NULL
+-        };
+-        static char *license[] = {
+-                N_("The User Switch Applet is free software; you can redistribute it and/or modify "
+-                   "it under the terms of the GNU General Public License as published by "
+-                   "the Free Software Foundation; either version 2 of the License, or "
+-                   "(at your option) any later version."),
+-                N_("This program is distributed in the hope that it will be useful, "
+-                   "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+-                   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
+-                   "GNU General Public License for more details."),
+-                N_("You should have received a copy of the GNU General Public License "
+-                   "along with this program; if not, write to the Free Software "
+-                   "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "),
+-                NULL
+-        };
+-        char *license_i18n;
+-
+-        license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL); 
+-
+-        gtk_show_about_dialog (NULL,
+-                               "version", VERSION,
+-                               "copyright", "Copyright \xc2\xa9 2004-2005 James M. Cape.\n"
+-                               "Copyright \xc2\xa9 2006 Thomas Thurman.\n"
+-                               "Copyright \xc2\xa9 2008 Red Hat, Inc.",
+-                               "comments", _("A menu to quickly switch between users."),
+-                               "authors", authors,
+-                               "license", license_i18n,
+-                               "wrap-license", TRUE,
+-                               "translator-credits", _("translator-credits"),
+-                               "logo-icon-name", "stock_people",
+-                               NULL);
+-
+-        g_free (license_i18n);
+-}
+-
+-
+-static void
+-admin_cb (BonoboUIComponent *ui_container,
+-          gpointer           data,
+-          const char        *cname)
+-{
+-#ifdef USERS_ADMIN
+-        char   **args;
+-        gboolean res;
+-        GError  *err;
+-
+-        err = NULL;
+-        if (!g_shell_parse_argv (USERS_ADMIN, NULL, &args, &err)) {
+-                g_critical ("Could not parse users and groups management command line `%s': %s",
+-                            USERS_ADMIN, err->message);
+-                return;
+-        }
+-
+-        res = g_spawn_async (g_get_home_dir (),
+-                             args,
+-                             NULL,
+-                             (G_SPAWN_STDOUT_TO_DEV_NULL |
+-                              G_SPAWN_STDERR_TO_DEV_NULL |
+-                              G_SPAWN_SEARCH_PATH),
+-                             NULL,
+-                             NULL,
+-                             NULL,
+-                             &err);
+-        if (! res) {
+-                g_critical ("Could not run `%s' to manage users and groups: %s",
+-                            USERS_ADMIN, err->message);
+-                g_error_free (err);
+-        }
+-        g_strfreev (args);
+-#endif /* USERS_ADMIN */
+-}
+-
+-static void
+-set_menuitem_icon (BonoboUIComponent *component,
+-                   const char        *item_path,
+-                   GtkIconTheme      *theme,
+-                   const char        *icon_name,
+-                   gint               icon_size)
+-{
+-        GdkPixbuf *pixbuf;
+-        int        width;
+-        int        height;
+-
+-        pixbuf = gtk_icon_theme_load_icon (theme, icon_name, icon_size, 0, NULL);
+-        if (pixbuf == NULL) {
+-                return;
+-        }
+-
+-        width = gdk_pixbuf_get_width (pixbuf);
+-        height = gdk_pixbuf_get_height (pixbuf);
+-        if (width > icon_size + 4 || height > icon_size + 4) {
+-                GdkPixbuf *tmp;
+-                if (height > width) {
+-                        width *= (gdouble) icon_size / (gdouble) height;
+-                        height = icon_size;
+-                } else {
+-                        height *= (gdouble) icon_size / (gdouble) width;
+-                        width = icon_size;
+-                }
+-                tmp = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
+-                g_object_unref (pixbuf);
+-                pixbuf = tmp;
+-        }
+-
+-        bonobo_ui_util_set_pixbuf (component, item_path, pixbuf, NULL);
+-        g_object_unref (pixbuf);
+-}
+-
+-static void
+-applet_style_set_cb (GtkWidget *widget,
+-                     GtkStyle  *old_style,
+-                     gpointer   data)
+-{
+-        BonoboUIComponent *component;
+-        GdkScreen         *screen;
+-        GtkIconTheme      *theme;
+-        int                width;
+-        int                height;
+-        int                icon_size;
+-
+-        if (gtk_widget_has_screen (widget)) {
+-                screen = gtk_widget_get_screen (widget);
+-        } else {
+-                screen = gdk_screen_get_default ();
+-        }
+-
+-        if (gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
+-                                               GTK_ICON_SIZE_MENU, &width, &height)) {
+-                icon_size = MAX (width, height);
+-        } else {
+-                icon_size = 16;
+-        }
+-
+-        theme = gtk_icon_theme_get_for_screen (screen);
+-        component = panel_applet_get_popup_component (PANEL_APPLET (widget));
+-
+-        set_menuitem_icon (component,
+-                           "/commands/GdmAboutMe",
+-                           theme,
+-                           "user-info",
+-                           icon_size);
+-        set_menuitem_icon (component,
+-                           "/commands/GdmUsersGroupsAdmin",
+-                           theme,
+-                           "stock_people",
+-                           icon_size);
+-}
+-
+-static void
+-applet_change_background_cb (PanelApplet               *applet,
+-                             PanelAppletBackgroundType  type,
+-                             GdkColor                  *color,
+-                             GdkPixmap                 *pixmap,
+-                             GdmAppletData             *adata)
+-{
+-        GtkRcStyle *rc_style;
+-        GtkStyle   *style;
+-
+-        gtk_widget_set_style (adata->menubar, NULL);
+-        rc_style = gtk_rc_style_new ();
+-        gtk_widget_modify_style (GTK_WIDGET (adata->menubar), rc_style);
+-        g_object_unref (rc_style);
+-
+-        switch (type) {
+-        case PANEL_NO_BACKGROUND:
+-                break;
+-        case PANEL_COLOR_BACKGROUND:
+-                gtk_widget_modify_bg (adata->menubar, GTK_STATE_NORMAL, color);
+-                break;
+-        case PANEL_PIXMAP_BACKGROUND:
+-                style = gtk_style_copy (gtk_widget_get_style (adata->menubar));
+-                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 (adata->menubar, style);
+-                g_object_unref (style);
+-                break;
+-        }
+-}
+-
+-/*
+- * gnome-panel/applets/wncklet/window-menu.c:window_menu_key_press_event()
+- *
+- * Copyright (C) 2003 Sun Microsystems, Inc.
+- * Copyright (C) 2001 Free Software Foundation, Inc.
+- * Copyright (C) 2000 Helix Code, Inc.
+- */
+-static gboolean
+-applet_key_press_event_cb (GtkWidget     *widget,
+-                           GdkEventKey   *event,
+-                           GdmAppletData *adata)
+-{
+-        GtkMenuShell *menu_shell;
+-
+-        switch (event->keyval) {
+-        case GDK_KP_Enter:
+-        case GDK_ISO_Enter:
+-        case GDK_3270_Enter:
+-        case GDK_Return:
+-        case GDK_space:
+-        case GDK_KP_Space:
+-                menu_shell = GTK_MENU_SHELL (adata->menubar);
+-                /*
+-                 * We need to call _gtk_menu_shell_activate() here as is done in
+-                 * window_key_press_handler in gtkmenubar.c which pops up menu
+-                 * when F10 is pressed.
+-                 *
+-                 * As that function is private its code is replicated here.
+-                 */
+-                if (!menu_shell->active) {
+-                        gtk_grab_add (GTK_WIDGET (menu_shell));
+-                        menu_shell->have_grab = TRUE;
+-                        menu_shell->active = TRUE;
+-                }
+-
+-                gtk_menu_shell_select_first (menu_shell, FALSE);
+-                return TRUE;
+-        default:
+-                break;
+-        }
+-
+-        return FALSE;
+-}
+-
+-static void
+-set_item_text_angle_and_alignment (GtkWidget *item,
+-                                   double     text_angle,
+-                                   float      xalign,
+-                                   float      yalign)
+-{
+-        GtkWidget *label;
+-
+-        label = gtk_bin_get_child (GTK_BIN (item));
+-
+-        gtk_label_set_angle (GTK_LABEL (label), text_angle);
+-
+-        gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
+-}
+-
+-/*
+- * gnome-panel/applets/wncklet/window-menu.c:window_menu_size_allocate()
+- *
+- * Copyright (C) 2003 Sun Microsystems, Inc.
+- * Copyright (C) 2001 Free Software Foundation, Inc.
+- * Copyright (C) 2000 Helix Code, Inc.
+- */
+-static void
+-applet_size_allocate_cb (GtkWidget     *widget,
+-                         GtkAllocation *allocation,
+-                         GdmAppletData *adata)
+-{
+-        GList            *children;
+-        GtkWidget        *top_item;
+-        PanelAppletOrient orient;
+-        gint              pixel_size;
+-        gdouble           text_angle;
+-        GtkPackDirection  pack_direction;
+-        float             text_xalign;
+-        float             text_yalign;
+-
+-        pack_direction = GTK_PACK_DIRECTION_LTR;
+-        text_angle = 0.0;
+-        text_xalign = 0.0;
+-        text_yalign = 0.5;
+-
+-        children = gtk_container_get_children (GTK_CONTAINER (adata->menubar));
+-        top_item = GTK_WIDGET (children->data);
+-        g_list_free (children);
+-
+-        orient = panel_applet_get_orient (PANEL_APPLET (widget));
+-
+-        switch (orient) {
+-        case PANEL_APPLET_ORIENT_UP:
+-        case PANEL_APPLET_ORIENT_DOWN:
+-                gtk_widget_set_size_request (top_item, -1, allocation->height);
+-                pixel_size = allocation->height - gtk_widget_get_style (top_item)->ythickness * 2;
+-                break;
+-        case PANEL_APPLET_ORIENT_LEFT:
+-                gtk_widget_set_size_request (top_item, allocation->width, -1);
+-                pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2;
+-                pack_direction = GTK_PACK_DIRECTION_TTB;
+-                text_angle = 270.0;
+-                text_xalign = 0.5;
+-                text_yalign = 0.0;
+-                break;
+-        case PANEL_APPLET_ORIENT_RIGHT:
+-                gtk_widget_set_size_request (top_item, allocation->width, -1);
+-                pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2;
+-                pack_direction = GTK_PACK_DIRECTION_BTT;
+-                text_angle = 90.0;
+-                text_xalign = 0.5;
+-                text_yalign = 0.0;
+-                break;
+-        default:
+-                g_assert_not_reached ();
+-                break;
+-        }
+-
+-        gtk_menu_bar_set_pack_direction (GTK_MENU_BAR (adata->menubar),
+-                                         pack_direction);
+-        gtk_menu_bar_set_child_pack_direction (GTK_MENU_BAR (adata->menubar),
+-                                               pack_direction);
+-
+-        set_item_text_angle_and_alignment (adata->menuitem,
+-                                           text_angle,
+-                                           text_xalign,
+-                                           text_yalign);
+-
+-        if (adata->panel_size != pixel_size) {
+-                adata->panel_size = pixel_size;
+-                reset_icon (adata);
+-        }
+-}
+-
+-
+-static void
+-gdm_applet_data_free (GdmAppletData *adata)
+-{
+-        gconf_client_notify_remove (adata->client, adata->client_notify_lockdown_id);
+-
+-        if (adata->user_loaded_notify_id != 0) {
+-                g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id);
+-        }
+-
+-        if (adata->user_changed_notify_id != 0) {
+-                g_signal_handler_disconnect (adata->user, adata->user_changed_notify_id);
+-        }
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-        if (adata->presence_proxy != NULL) {
+-                g_object_unref (adata->presence_proxy);
+-        }
+-#endif
+-
+-        if (adata->user != NULL) {
+-                g_object_unref (adata->user);
+-        }
+-        g_object_unref (adata->client);
+-        g_object_unref (adata->manager);
+-
+-        g_free (adata);
+-}
+-
+-
+-/*
+- * gnome-panel/applets/wncklet/window-menu.c:window_menu_on_expose()
+- *
+- * Copyright (C) 2003 Sun Microsystems, Inc.
+- * Copyright (C) 2001 Free Software Foundation, Inc.
+- * Copyright (C) 2000 Helix Code, Inc.
+- */
+-static gboolean
+-menubar_expose_event_cb (GtkWidget      *widget,
+-                         GdkEventExpose *event,
+-                         GdmAppletData  *adata)
+-{
+-        if (gtk_widget_has_focus (GTK_WIDGET (adata->applet)))
+-                gtk_paint_focus (gtk_widget_get_style (widget),
+-                                 gtk_widget_get_window (widget),
+-                                 gtk_widget_get_state (widget),
+-                                 NULL, widget, "menu-applet", 0, 0, -1, -1);
+-
+-        return FALSE;
+-}
+-
+-static void
+-menu_style_set_cb (GtkWidget     *menu,
+-                   GtkStyle      *old_style,
+-                   GdmAppletData *adata)
+-{
+-        GtkSettings *settings;
+-        int          width;
+-        int          height;
+-
+-        adata->icon_size = gtk_icon_size_from_name ("panel-menu");
+-
+-        if (adata->icon_size == GTK_ICON_SIZE_INVALID) {
+-                adata->icon_size = gtk_icon_size_register ("panel-menu", 24, 24);
+-        }
+-
+-        if (gtk_widget_has_screen (menu)) {
+-                settings = gtk_settings_get_for_screen (gtk_widget_get_screen (menu));
+-        } else {
+-                settings = gtk_settings_get_default ();
+-        }
+-
+-        if (!gtk_icon_size_lookup_for_settings (settings, adata->icon_size,
+-                                                &width, &height)) {
+-                adata->pixel_size = -1;
+-        } else {
+-                adata->pixel_size = MAX (width, height);
+-        }
+-}
+-
+-static void
+-menuitem_style_set_cb (GtkWidget     *menuitem,
+-                       GtkStyle      *old_style,
+-                       GdmAppletData *adata)
+-{
+-        GtkWidget *image;
+-
+-        if (GDM_IS_ENTRY_MENU_ITEM (menuitem)) {
+-        } else {
+-                const char *icon_name;
+-
+-                if (menuitem == adata->login_screen_item) {
+-                        icon_name = "system-users";
+-                } else if (menuitem == adata->lock_screen_item) {
+-                        icon_name = "system-lock-screen";
+-                } else if (menuitem == adata->quit_session_item) {
+-                        icon_name = "system-log-out";
+-                } else if (menuitem == adata->account_item) {
+-                        icon_name = "user-info";
+-                } else if (menuitem == adata->control_panel_item) {
+-                        icon_name = "preferences-desktop";
+-                } else {
+-                        icon_name = GTK_STOCK_MISSING_IMAGE;
+-                }
+-
+-                image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem));
+-                gtk_image_set_pixel_size (GTK_IMAGE (image), adata->pixel_size);
+-                gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name,
+-                                              adata->icon_size);
+-        }
+-}
+-
+-static void
+-on_user_changed (GdmUser         *user,
+-                 GdmAppletData   *adata)
+-{
+-        g_debug ("user changed");
+-        update_label (adata);
+-        reset_icon (adata);
+-}
+-
+-/* Called every time the menu is displayed (and also for some reason
+- * immediately it's created, which does no harm). All we have to do
+- * here is kick off a request to GDM to let us know which users are
+- * logged in, so we can display check marks next to their names.
+- */
+-static gboolean
+-menu_expose_cb (GtkWidget *menu,
+-                gpointer   data)
+-{
+-        char *program;
+-        GdmAppletData *adata = data;
+-
+-        program = g_find_program_in_path ("gnome-control-center");
+-        if (program != NULL) {
+-                gtk_widget_show (adata->control_panel_item);
+-        } else {
+-                gtk_widget_hide (adata->control_panel_item);
+-        }
+-        g_free (program);
+-        return FALSE;
+-}
+-
+-static void
+-maybe_lock_screen (GdmAppletData *adata)
+-{
+-        char      *args[3];
+-        GError    *err;
+-        GdkScreen *screen;
+-        gboolean   use_gscreensaver = TRUE;
+-        gboolean   res;
+-
+-        g_debug ("Attempting to lock screen");
+-
+-        args[0] = g_find_program_in_path ("gnome-screensaver-command");
+-        if (args[0] == NULL) {
+-                args[0] = g_find_program_in_path ("xscreensaver-command");
+-                use_gscreensaver = FALSE;
+-        }
+-
+-        if (args[0] == NULL) {
+-                return;
+-        }
+-
+-        if (use_gscreensaver) {
+-                args[1] = "--lock";
+-        } else {
+-                args[1] = "-lock";
+-        }
+-        args[2] = NULL;
+-
+-        if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) {
+-                screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet));
+-        } else {
+-                screen = gdk_screen_get_default ();
+-        }
+-
+-        err = NULL;
+-        res = gdk_spawn_on_screen (screen,
+-                                   g_get_home_dir (),
+-                                   args,
+-                                   NULL,
+-                                   0,
+-                                   NULL,
+-                                   NULL,
+-                                   NULL,
+-                                   &err);
+-        if (! res) {
+-                g_warning (_("Can't lock screen: %s"), err->message);
+-                g_error_free (err);
+-        }
+-
+-        if (use_gscreensaver) {
+-                args[1] = "--throttle";
+-        } else {
+-                args[1] = "-throttle";
+-        }
+-
+-        err = NULL;
+-        res = gdk_spawn_on_screen (screen,
+-                                   g_get_home_dir (),
+-                                   args,
+-                                   NULL,
+-                                   (G_SPAWN_STDERR_TO_DEV_NULL
+-                                   | G_SPAWN_STDOUT_TO_DEV_NULL),
+-                                   NULL,
+-                                   NULL,
+-                                   NULL,
+-                                   &err);
+-        if (! res) {
+-                g_warning (_("Can't temporarily set screensaver to blank screen: %s"),
+-                           err->message);
+-                g_error_free (err);
+-        }
+-
+-        g_free (args[0]);
+-}
+-
+-static void
+-do_switch (GdmAppletData *adata,
+-           GdmUser       *user)
+-{
+-        guint num_sessions;
+-
+-        g_debug ("Do user switch");
+-
+-        if (user == NULL) {
+-                gdm_user_manager_goto_login_session (adata->manager);
+-                goto out;
+-        }
+-
+-        num_sessions = gdm_user_get_num_sessions (user);
+-        if (num_sessions > 0) {
+-                gdm_user_manager_activate_user_session (adata->manager, user);
+-        } else {
+-                gdm_user_manager_goto_login_session (adata->manager);
+-        }
+- out:
+-        maybe_lock_screen (adata);
+-}
+-
+-static void
+-update_switch_user (GdmAppletData *adata)
+-{
+-        gboolean can_switch;
+-        gboolean has_other_users;
+-
+-        can_switch = gdm_user_manager_can_switch (adata->manager);
+-        g_object_get (adata->manager,
+-                      "has-multiple-users", &has_other_users,
+-                      NULL);
+-
+-        if (can_switch && has_other_users) {
+-                gtk_widget_show (adata->login_screen_item);
+-        } else {
+-
+-                gtk_widget_hide (adata->login_screen_item);
+-        }
+-}
+-
+-static void
+-on_manager_is_loaded_changed (GdmUserManager *manager,
+-                              GParamSpec     *pspec,
+-                              GdmAppletData  *adata)
+-{
+-        update_switch_user (adata);
+-}
+-
+-static void
+-on_manager_has_multiple_users_changed (GdmUserManager       *manager,
+-                                       GParamSpec           *pspec,
+-                                       GdmAppletData        *adata)
+-{
+-        update_switch_user (adata);
+-}
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-static void
+-on_user_item_activate (GtkMenuItem   *item,
+-                       GdmAppletData *adata)
+-{
+-        g_signal_stop_emission_by_name (item, "activate");
+-}
+-#endif
+-
+-static void
+-on_control_panel_activate (GtkMenuItem   *item,
+-                           GdmAppletData *adata)
+-{
+-        char      *args[2];
+-        GError    *error;
+-        GdkScreen *screen;
+-        gboolean   res;
+-
+-        args[0] = g_find_program_in_path ("gnome-control-center");
+-        if (args[0] == NULL) {
+-                return;
+-        }
+-        args[1] = NULL;
+-
+-        if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) {
+-                screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet));
+-        } else {
+-                screen = gdk_screen_get_default ();
+-        }
+-
+-        error = NULL;
+-        res = gdk_spawn_on_screen (screen,
+-                                   g_get_home_dir (),
+-                                   args,
+-                                   NULL,
+-                                   0,
+-                                   NULL,
+-                                   NULL,
+-                                   NULL,
+-                                   &error);
+-        if (! res) {
+-                g_warning (_("Can't lock screen: %s"), error->message);
+-                g_error_free (error);
+-        }
+-
+-        g_free (args[0]);
+-}
+-
+-static void
+-on_account_activate (GtkMenuItem   *item,
+-                     GdmAppletData *adata)
+-{
+-        char      *args[2];
+-        GError    *error;
+-        GdkScreen *screen;
+-        gboolean   res;
+-
+-        args[0] = g_find_program_in_path ("accounts-dialog");
+-        if (args[0] == NULL) {
+-                args[0] = g_find_program_in_path ("gnome-about-me");
+-                if (args[0] == NULL) {
+-                        return;
+-                }
+-        }
+-        args[1] = NULL;
+-
+-        if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) {
+-                screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet));
+-        } else {
+-                screen = gdk_screen_get_default ();
+-        }
+-
+-        error = NULL;
+-        res = gdk_spawn_on_screen (screen,
+-                                   g_get_home_dir (),
+-                                   args,
+-                                   NULL,
+-                                   0,
+-                                   NULL,
+-                                   NULL,
+-                                   NULL,
+-                                   &error);
+-        if (! res) {
+-                g_warning (_("Can't lock screen: %s"), error->message);
+-                g_error_free (error);
+-        }
+-
+-        g_free (args[0]);
+-}
+-
+-static void
+-on_lock_screen_activate (GtkMenuItem   *item,
+-                         GdmAppletData *adata)
+-{
+-        maybe_lock_screen (adata);
+-}
+-
+-static void
+-on_login_screen_activate (GtkMenuItem   *item,
+-                          GdmAppletData *adata)
+-{
+-        GdmUser *user;
+-
+-        user = NULL;
+-
+-        do_switch (adata, user);
+-}
+-
+-static void
+-on_quit_session_activate (GtkMenuItem   *item,
+-                          GdmAppletData *adata)
+-{
+-        char      *args[3];
+-        GError    *error;
+-        GdkScreen *screen;
+-        gboolean   res;
+-
+-        args[0] = g_find_program_in_path ("gnome-session-save");
+-        if (args[0] == NULL) {
+-                return;
+-        }
+-
+-        args[1] = "--logout-dialog";
+-        args[2] = NULL;
+-
+-        if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) {
+-                screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet));
+-        } else {
+-                screen = gdk_screen_get_default ();
+-        }
+-
+-        error = NULL;
+-        res = gdk_spawn_on_screen (screen,
+-                                   g_get_home_dir (),
+-                                   args,
+-                                   NULL,
+-                                   0,
+-                                   NULL,
+-                                   NULL,
+-                                   NULL,
+-                                   &error);
+-        if (! res) {
+-                g_warning (_("Can't log out: %s"), error->message);
+-                g_error_free (error);
+-        }
+-
+-        g_free (args[0]);
+-}
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-static gboolean
+-on_menu_key_press_event (GtkWidget     *widget,
+-                         GdkEventKey   *event,
+-                         GdmAppletData *adata)
+-{
+-        GtkWidget *entry;
+-
+-        entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item));
+-
+-        if (GTK_WIDGET_HAS_FOCUS (entry)) {
+-                gtk_widget_event (entry, (GdkEvent *)event);
+-                return TRUE;
+-        } else {
+-                return FALSE;
+-        }
+-}
+-
+-static void
+-save_status (GdmAppletData *adata,
+-             guint          status)
+-{
+-        if (adata->current_status != status) {
+-                GError *error;
+-
+-                adata->current_status = status;
+-
+-                g_debug ("Saving status: %u", status);
+-                error = NULL;
+-                dbus_g_proxy_call (adata->presence_proxy,
+-                                   "SetStatus",
+-                                   &error,
+-                                   G_TYPE_UINT, status,
+-                                   G_TYPE_INVALID,
+-                                   G_TYPE_INVALID);
+-
+-                if (error != NULL) {
+-                        g_warning ("Couldn't save presence status: %s", error->message);
+-                        g_error_free (error);
+-                }
+-        }
+-}
+-
+-static void
+-on_status_available_activate (GtkWidget     *widget,
+-                              GdmAppletData *adata)
+-{
+-
+-        if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
+-                save_status (adata, GSM_PRESENCE_STATUS_AVAILABLE);
+-        }
+-}
+-
+-static void
+-on_status_busy_activate (GtkWidget     *widget,
+-                         GdmAppletData *adata)
+-{
+-         if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
+-                 save_status (adata, GSM_PRESENCE_STATUS_BUSY);
+-         }
+-}
+-
+-static void
+-on_status_invisible_activate (GtkWidget     *widget,
+-                              GdmAppletData *adata)
+-{
+-         if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
+-                 save_status (adata, GSM_PRESENCE_STATUS_INVISIBLE);
+-         }
+-}
+-
+-static struct {
+-        char      *icon_name;
+-        char      *display_name;
+-        void      *menu_callback;
+-        GtkWidget *widget;
+-} statuses[] = {
+-        { "user-online", N_("Available"), on_status_available_activate, NULL },
+-        { "user-invisible", N_("Invisible"), on_status_invisible_activate, NULL },
+-        { "user-busy", N_("Busy"), on_status_busy_activate, NULL },
+-        { "user-away", N_("Away"), NULL, NULL },
+-};
+-#endif
+-
+-static void
+-update_label (GdmAppletData *adata)
+-{
+-        GtkWidget *label;
+-        char      *markup;
+-
+-        label = gtk_bin_get_child (GTK_BIN (adata->menuitem));
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-        markup = g_strdup_printf ("<b>%s</b> <small>(%s)</small>",
+-                                  gdm_user_get_real_name (GDM_USER (adata->user)),
+-                                  _(statuses[adata->current_status].display_name));
+-#else
+-        markup = g_strdup_printf ("<b>%s</b>",
+-                                  gdm_user_get_real_name (GDM_USER (adata->user)));
+-#endif
+-        gtk_label_set_markup (GTK_LABEL (label), markup);
+-        g_free (markup);
+-}
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-static void
+-save_status_text (GdmAppletData *adata)
+-{
+-        GtkWidget     *entry;
+-        GtkTextBuffer *buffer;
+-        char          *escaped_text;
+-        char          *text;
+-        GtkTextIter    start, end;
+-
+-        entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item));
+-        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
+-        gtk_text_buffer_get_bounds (buffer, &start, &end);
+-        text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+-        escaped_text = g_markup_escape_text (text, -1);
+-
+-        if (escaped_text != NULL) {
+-                GError *error;
+-
+-                error = NULL;
+-                dbus_g_proxy_call (adata->presence_proxy,
+-                                   "SetStatusText",
+-                                   &error,
+-                                   G_TYPE_STRING, escaped_text,
+-                                   G_TYPE_INVALID,
+-                                   G_TYPE_INVALID);
+-
+-                if (error != NULL) {
+-                        g_warning ("Couldn't set presence status text: %s", error->message);
+-                        g_error_free (error);
+-                }
+-        }
+-
+-        g_free (text);
+-        g_free (escaped_text);
+-}
+-
+-static void
+-on_user_item_deselect (GtkWidget     *item,
+-                       GdmAppletData *adata)
+-{
+-        save_status_text (adata);
+-}
+-#endif
+-
+-static void
+-create_sub_menu (GdmAppletData *adata)
+-{
+-        GtkWidget *item;
+-#ifdef BUILD_PRESENSE_STUFF
+-        int        i;
+-        GSList    *radio_group;
+-#endif
+-
+-        adata->menu = gtk_menu_new ();
+-#ifdef BUILD_PRESENSE_STUFF
+-        g_signal_connect (adata->menu,
+-                          "key-press-event",
+-                          G_CALLBACK (on_menu_key_press_event),
+-                          adata);
+-#endif
+-        gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), adata->menu);
+-        g_signal_connect (adata->menu, "style-set",
+-                          G_CALLBACK (menu_style_set_cb), adata);
+-        g_signal_connect (adata->menu, "show",
+-                          G_CALLBACK (menu_expose_cb), adata);
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-        adata->user_item = gdm_entry_menu_item_new ();
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
+-                               adata->user_item);
+-        gtk_widget_show (adata->user_item);
+-        g_signal_connect (adata->user_item, "activate",
+-                          G_CALLBACK (on_user_item_activate), adata);
+-        g_signal_connect (adata->user_item,
+-                          "deselect",
+-                          G_CALLBACK (on_user_item_deselect),
+-                          adata);
+-
+-        item = gtk_separator_menu_item_new ();
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item);
+-        gtk_widget_show (item);
+-
+-        radio_group = NULL;
+-        for (i = 0; i < G_N_ELEMENTS (statuses); i++) {
+-                GtkWidget *hbox;
+-                GtkWidget *label;
+-                GtkWidget *image;
+-                GtkWidget *item;
+-
+-                if (statuses[i].menu_callback == NULL) {
+-                        continue;
+-                }
+-
+-                item = gtk_radio_menu_item_new (radio_group);
+-                radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+-                hbox = gtk_hbox_new (FALSE, 3);
+-                label = gtk_label_new (_(statuses[i].display_name));
+-                gtk_label_set_justify (GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+-                gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+-                gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+-                gtk_widget_show (label);
+-                image = gtk_image_new_from_icon_name (statuses[i].icon_name, GTK_ICON_SIZE_MENU);
+-                gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
+-                gtk_widget_show (image);
+-                gtk_widget_show (hbox);
+-                gtk_container_add (GTK_CONTAINER (item), hbox);
+-
+-                gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
+-                                       item);
+-                g_signal_connect (item, "activate",
+-                                  G_CALLBACK (statuses[i].menu_callback), adata);
+-                gtk_widget_show (item);
+-
+-                statuses[i].widget = item;
+-        }
+-
+-        item = gtk_separator_menu_item_new ();
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item);
+-        gtk_widget_show (item);
+-#endif
+-
+-        adata->account_item = gtk_image_menu_item_new_with_label (_("Account Information"));
+-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->account_item),
+-                                       gtk_image_new ());
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
+-                               adata->account_item);
+-        g_signal_connect (adata->account_item, "style-set",
+-                          G_CALLBACK (menuitem_style_set_cb), adata);
+-        g_signal_connect (adata->account_item, "activate",
+-                          G_CALLBACK (on_account_activate), adata);
+-        gtk_widget_show (adata->account_item);
+-
+-
+-        adata->control_panel_item = gtk_image_menu_item_new_with_label (_("System Preferences"));
+-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->control_panel_item),
+-                                       gtk_image_new ());
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
+-                               adata->control_panel_item);
+-        g_signal_connect (adata->control_panel_item, "style-set",
+-                          G_CALLBACK (menuitem_style_set_cb), adata);
+-        g_signal_connect (adata->control_panel_item, "activate",
+-                          G_CALLBACK (on_control_panel_activate), adata);
+-
+-        item = gtk_separator_menu_item_new ();
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item);
+-        gtk_widget_show (item);
+-
+-        adata->lock_screen_item = gtk_image_menu_item_new_with_label (_("Lock Screen"));
+-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->lock_screen_item),
+-                                       gtk_image_new ());
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
+-                               adata->lock_screen_item);
+-        g_signal_connect (adata->lock_screen_item, "style-set",
+-                          G_CALLBACK (menuitem_style_set_cb), adata);
+-        g_signal_connect (adata->lock_screen_item, "activate",
+-                          G_CALLBACK (on_lock_screen_activate), adata);
+-        /* Only show if not locked down */
+-
+-        adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User"));
+-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item),
+-                                       gtk_image_new ());
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
+-                               adata->login_screen_item);
+-        g_signal_connect (adata->login_screen_item, "style-set",
+-                          G_CALLBACK (menuitem_style_set_cb), adata);
+-        g_signal_connect (adata->login_screen_item, "activate",
+-                          G_CALLBACK (on_login_screen_activate), adata);
+-        /* Only show switch user if there are other users */
+-
+-        adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit…"));
+-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item),
+-                                       gtk_image_new ());
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
+-                               adata->quit_session_item);
+-        g_signal_connect (adata->quit_session_item, "style-set",
+-                          G_CALLBACK (menuitem_style_set_cb), adata);
+-        g_signal_connect (adata->quit_session_item, "activate",
+-                          G_CALLBACK (on_quit_session_activate), adata);
+-        gtk_widget_show (adata->quit_session_item);
+-        gtk_widget_show (adata->menu);
+-}
+-
+-static void
+-destroy_sub_menu (GdmAppletData *adata)
+-{
+-        gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), NULL);
+-}
+-
+-static void
+-set_menu_visibility (GdmAppletData *adata,
+-                     gboolean       visible)
+-{
+-
+-        if (visible) {
+-                create_sub_menu (adata);
+-        } else {
+-                destroy_sub_menu (adata);
+-        }
+-}
+-
+-static void
+-client_notify_lockdown_func (GConfClient   *client,
+-                             guint          cnxn_id,
+-                             GConfEntry    *entry,
+-                             GdmAppletData *adata)
+-{
+-        GConfValue *value;
+-        const char *key;
+-
+-        value = gconf_entry_get_value (entry);
+-        key = gconf_entry_get_key (entry);
+-
+-        if (value == NULL || key == NULL) {
+-                return;
+-        }
+-
+-        if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) {
+-                if (gconf_value_get_bool (value)) {
+-                        set_menu_visibility (adata, FALSE);
+-                } else {
+-                        set_menu_visibility (adata, TRUE);
+-                }
+-        } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) {
+-                if (gconf_value_get_bool (value)) {
+-                        gtk_widget_hide (adata->lock_screen_item);
+-                } else {
+-                        gtk_widget_show (adata->lock_screen_item);
+-                }
+-        }
+-}
+-
+-static void
+-reset_icon (GdmAppletData *adata)
+-{
+-        GdkPixbuf *pixbuf;
+-        GtkWidget *image;
+-
+-        if (adata->user == NULL || !gtk_widget_has_screen (GTK_WIDGET (adata->menuitem))) {
+-                return;
+-        }
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-        if (adata->user_item != NULL) {
+-                image = gdm_entry_menu_item_get_image (GDM_ENTRY_MENU_ITEM (adata->user_item));
+-                pixbuf = gdm_user_render_icon (adata->user, adata->panel_size * 3);
+-                if (pixbuf == NULL) {
+-                        return;
+-                }
+-
+-                gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+-                g_object_unref (pixbuf);
+-        }
+-#else
+-        pixbuf = gdm_user_render_icon (adata->user, adata->panel_size);
+-
+-        if (pixbuf == NULL) {
+-                return;
+-        }
+-
+-        image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (adata->menuitem));
+-        gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+-        g_object_unref (pixbuf);
+-#endif
+-}
+-
+-static void
+-setup_current_user_now (GdmAppletData *adata)
+-{
+-        g_assert (adata->user != NULL);
+-
+-        if (adata->user_loaded_notify_id != 0) {
+-                g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id);
+-        }
+-        adata->user_loaded_notify_id = 0;
+-
+-        update_label (adata);
+-        reset_icon (adata);
+-        adata->user_changed_notify_id =
+-            g_signal_connect (adata->user,
+-                              "changed",
+-                              G_CALLBACK (on_user_changed),
+-                              adata);
+-}
+-
+-static void
+-on_current_user_loaded (GdmUser       *user,
+-                        GParamSpec    *pspec,
+-                        GdmAppletData *adata)
+-{
+-        if (!gdm_user_is_loaded (user)) {
+-                return;
+-        }
+-
+-        setup_current_user_now (adata);
+-}
+-
+-static void
+-setup_current_user (GdmAppletData *adata)
+-{
+-        adata->user = gdm_user_manager_get_user_by_uid (adata->manager, getuid ());
+-
+-        if (adata->user == NULL) {
+-                g_warning ("Could not setup current user");
+-                return;
+-        }
+-
+-        g_object_ref (adata->user);
+-
+-        adata->menuitem = gtk_image_menu_item_new_with_label ("");
+-#ifndef BUILD_PRESENSE_STUFF
+-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->menuitem),
+-                                       gtk_image_new ());
+-#endif
+-        gtk_menu_shell_append (GTK_MENU_SHELL (adata->menubar), adata->menuitem);
+-        gtk_widget_show (adata->menuitem);
+-
+-        if (gdm_user_is_loaded (adata->user)) {
+-                setup_current_user_now (adata);
+-                return;
+-        }
+-
+-        adata->user_loaded_notify_id = g_signal_connect (adata->user,
+-                                                         "notify::is-loaded",
+-                                                         G_CALLBACK (on_current_user_loaded),
+-                                                         adata);
+-}
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-static void
+-set_status (GdmAppletData *adata,
+-            guint status)
+-{
+-        int i;
+-
+-        g_debug ("Setting current status: %u", status);
+-        adata->current_status = status;
+-        for (i = 0; i < G_N_ELEMENTS (statuses); i++) {
+-                if (statuses[i].widget == NULL) {
+-                        continue;
+-                }
+-                if (i == status) {
+-                        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (statuses[i].widget),
+-                                                        TRUE);
+-                }
+-        }
+-
+-        update_label (adata);
+-}
+-
+-static void
+-on_presence_status_changed (DBusGProxy    *presence_proxy,
+-                            guint          status,
+-                            GdmAppletData *adata)
+-{
+-        g_debug ("Status changed: %u", status);
+-
+-        set_status (adata, status);
+-}
+-
+-static void
+-set_status_text (GdmAppletData *adata,
+-                 const char    *status_text)
+-{
+-        GtkWidget     *entry;
+-        GtkTextBuffer *buffer;
+-
+-        g_debug ("Status text changed: %s", status_text);
+-
+-        entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item));
+-        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
+-        gtk_text_buffer_set_text (buffer, status_text, -1);
+-}
+-
+-static void
+-on_presence_status_text_changed (DBusGProxy    *presence_proxy,
+-                                 const char    *status_text,
+-                                 GdmAppletData *adata)
+-{
+-        set_status_text (adata, status_text);
+-}
+-#endif
+-
+-static gboolean
+-fill_applet (PanelApplet *applet)
+-{
+-        static const BonoboUIVerb menu_verbs[] = {
+-                BONOBO_UI_VERB ("GdmAboutMe", about_me_cb),
+-                BONOBO_UI_VERB ("GdmUsersGroupsAdmin", admin_cb),
+-                BONOBO_UI_VERB ("GdmAbout", about_cb),
+-                BONOBO_UI_VERB_END
+-        };
+-        static gboolean    first_time = FALSE;
+-        char              *tmp;
+-        BonoboUIComponent *popup_component;
+-        GdmAppletData     *adata;
+-        GError            *error;
+-        DBusGConnection   *bus;
+-
+-        if (!first_time) {
+-                first_time = TRUE;
+-
+-                /* Do this here so it's only done once. */
+-                gtk_rc_parse_string ("style \"gdm-user-switch-menubar-style\"\n"
+-                                     "{\n"
+-                                     "GtkMenuBar::shadow-type = none\n"
+-                                     "GtkMenuBar::internal-padding = 0\n"
+-                                     "}\n"
+-                                     "style \"gdm-user-switch-applet-style\"\n"
+-                                     "{\n"
+-                                     "GtkWidget::focus-line-width = 0\n"
+-                                     "GtkWidget::focus-padding = 0\n"
+-                                     "}\n"
+-                                     "widget \"*.gdm-user-switch-menubar\" style \"gdm-user-switch-menubar-style\"\n"
+-                                     "widget \"*.gdm-user-switch-applet\" style \"gdm-user-switch-applet-style\"\n");
+-                gtk_window_set_default_icon_name ("stock_people");
+-                g_set_application_name (_("User Switch Applet"));
+-
+-                if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
+-                        g_critical ("Unable to initialize settings client");
+-                        exit (1);
+-                }
+-
+-        }
+-
+-        adata = g_new0 (GdmAppletData, 1);
+-        adata->applet = applet;
+-        adata->panel_size = 24;
+-
+-        adata->client = gconf_client_get_default ();
+-
+-        gtk_widget_set_tooltip_text (GTK_WIDGET (applet), _("Change account settings and status"));
+-        gtk_container_set_border_width (GTK_CONTAINER (applet), 0);
+-        gtk_widget_set_name (GTK_WIDGET (applet), "gdm-user-switch-applet");
+-        panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
+-        panel_applet_setup_menu_from_file (applet, NULL,
+-                                           DATADIR "/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml",
+-                                           NULL, menu_verbs, adata);
+-
+-        popup_component = panel_applet_get_popup_component (applet);
+-
+-        /* Hide the admin context menu items if locked down or no cmd-line */
+-        if (gconf_client_get_bool (adata->client,
+-                                   LOCKDOWN_COMMAND_LINE_KEY,
+-                                   NULL) ||
+-            panel_applet_get_locked_down (applet)) {
+-                bonobo_ui_component_set_prop (popup_component,
+-                                              "/popups/button3/GdmSeparator",
+-                                              "hidden", "1", NULL);
+-                bonobo_ui_component_set_prop (popup_component,
+-                                              "/commands/GdmUsersGroupsAdmin",
+-                                              "hidden", "1", NULL);
+-        } else {
+-#ifndef USERS_ADMIN
+-#  ifdef GDM_SETUP
+-                bonobo_ui_component_set_prop (popup_component,
+-                                              "/popups/button3/GdmSeparator",
+-                                              "hidden", "1",
+-                                              NULL);
+-#  endif /* !GDM_SETUP */
+-                bonobo_ui_component_set_prop (popup_component,
+-                                              "/commands/GdmUsersGroupsAdmin",
+-                                              "hidden", "1",
+-                                              NULL);
+-#endif /* !USERS_ADMIN */
+-        }
+-
+-        /* Hide the gdmphotosetup item if it can't be found in the path. */
+-        tmp = g_find_program_in_path ("gnome-about-me");
+-        if (!tmp) {
+-                bonobo_ui_component_set_prop (popup_component,
+-                                              "/commands/GdmAboutMe",
+-                                              "hidden", "1",
+-                                              NULL);
+-        } else {
+-                g_free (tmp);
+-        }
+-
+-        g_signal_connect (adata->applet,
+-                          "style-set",
+-                          G_CALLBACK (applet_style_set_cb), adata);
+-        g_signal_connect (applet,
+-                          "change-background",
+-                          G_CALLBACK (applet_change_background_cb), adata);
+-        g_signal_connect (applet,
+-                          "size-allocate",
+-                          G_CALLBACK (applet_size_allocate_cb), adata);
+-        g_signal_connect (applet,
+-                          "key-press-event",
+-                          G_CALLBACK (applet_key_press_event_cb), adata);
+-        g_signal_connect_after (applet,
+-                                "focus-in-event",
+-                                G_CALLBACK (gtk_widget_queue_draw), NULL);
+-        g_signal_connect_after (applet,
+-                                "focus-out-event",
+-                                G_CALLBACK (gtk_widget_queue_draw), NULL);
+-        g_object_set_data_full (G_OBJECT (applet),
+-                                "gdm-applet-data",
+-                                adata,
+-                                (GDestroyNotify) gdm_applet_data_free);
+-
+-        adata->menubar = gtk_menu_bar_new ();
+-        gtk_widget_set_name (adata->menubar, "gdm-user-switch-menubar");
+-        gtk_widget_set_can_focus (adata->menubar, TRUE);
+-        g_signal_connect (adata->menubar, "button-press-event",
+-                          G_CALLBACK (menubar_button_press_event_cb), adata);
+-        g_signal_connect_after (adata->menubar, "expose-event",
+-                                G_CALLBACK (menubar_expose_event_cb), adata);
+-        gtk_container_add (GTK_CONTAINER (applet), adata->menubar);
+-        gtk_widget_show (adata->menubar);
+-
+-        adata->manager = gdm_user_manager_ref_default ();
+-        g_object_set (adata->manager, "include-all", TRUE, NULL);
+-        g_signal_connect (adata->manager,
+-                          "notify::is-loaded",
+-                          G_CALLBACK (on_manager_is_loaded_changed),
+-                          adata);
+-        g_signal_connect (adata->manager,
+-                          "notify::has-multiple-users",
+-                          G_CALLBACK (on_manager_has_multiple_users_changed),
+-                          adata);
+-
+-        gdm_user_manager_queue_load (adata->manager);
+-        setup_current_user (adata);
+-
+-        gconf_client_add_dir (adata->client,
+-                              LOCKDOWN_DIR,
+-                              GCONF_CLIENT_PRELOAD_ONELEVEL,
+-                              NULL);
+-
+-        adata->client_notify_lockdown_id = gconf_client_notify_add (adata->client,
+-                                                                    LOCKDOWN_DIR,
+-                                                                    (GConfClientNotifyFunc)client_notify_lockdown_func,
+-                                                                    adata,
+-                                                                    NULL,
+-                                                                    NULL);
+-
+-        if (gconf_client_get_bool (adata->client, LOCKDOWN_USER_SWITCHING_KEY, NULL)) {
+-                set_menu_visibility (adata, FALSE);
+-        } else {
+-                set_menu_visibility (adata, TRUE);
+-        }
+-        if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) {
+-                        gtk_widget_hide (adata->lock_screen_item);
+-        } else {
+-                        gtk_widget_show (adata->lock_screen_item);
+-        }
+-
+-        error = NULL;
+-        bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+-        if (bus == NULL) {
+-                g_warning ("Unable to get session bus: %s", error->message);
+-                g_error_free (error);
+-                goto done;
+-        }
+-
+-#ifdef BUILD_PRESENSE_STUFF
+-        adata->presence_proxy = dbus_g_proxy_new_for_name (bus,
+-                                                          "org.gnome.SessionManager",
+-                                                          "/org/gnome/SessionManager/Presence",
+-                                                          "org.gnome.SessionManager.Presence");
+-        if (adata->presence_proxy != NULL) {
+-                DBusGProxy *proxy;
+-
+-                dbus_g_proxy_add_signal (adata->presence_proxy,
+-                                         "StatusChanged",
+-                                         G_TYPE_UINT,
+-                                         G_TYPE_INVALID);
+-                dbus_g_proxy_connect_signal (adata->presence_proxy,
+-                                             "StatusChanged",
+-                                             G_CALLBACK (on_presence_status_changed),
+-                                             adata,
+-                                             NULL);
+-                dbus_g_proxy_add_signal (adata->presence_proxy,
+-                                         "StatusTextChanged",
+-                                         G_TYPE_STRING,
+-                                         G_TYPE_INVALID);
+-                dbus_g_proxy_connect_signal (adata->presence_proxy,
+-                                             "StatusTextChanged",
+-                                             G_CALLBACK (on_presence_status_text_changed),
+-                                             adata,
+-                                             NULL);
+-
+-
+-                proxy = dbus_g_proxy_new_from_proxy (adata->presence_proxy,
+-                                                     "org.freedesktop.DBus.Properties",
+-                                                     "/org/gnome/SessionManager/Presence");
+-                if (proxy != NULL) {
+-                        guint       status;
+-                        const char *status_text;
+-                        GValue      value = { 0, };
+-
+-                        status = 0;
+-                        status_text = NULL;
+-
+-                        error = NULL;
+-                        dbus_g_proxy_call (proxy,
+-                                           "Get",
+-                                           &error,
+-                                           G_TYPE_STRING, "org.gnome.SessionManager.Presence",
+-                                           G_TYPE_STRING, "status",
+-                                           G_TYPE_INVALID,
+-                                           G_TYPE_VALUE, &value,
+-                                           G_TYPE_INVALID);
+-
+-                        if (error != NULL) {
+-                                g_warning ("Couldn't get presence status: %s", error->message);
+-                                g_error_free (error);
+-                        } else {
+-                                status = g_value_get_uint (&value);
+-                        }
+-
+-                        g_value_unset (&value);
+-
+-                        error = NULL;
+-                        dbus_g_proxy_call (proxy,
+-                                           "Get",
+-                                           &error,
+-                                           G_TYPE_STRING, "org.gnome.SessionManager.Presence",
+-                                           G_TYPE_STRING, "status-text",
+-                                           G_TYPE_INVALID,
+-                                           G_TYPE_VALUE, &value,
+-                                           G_TYPE_INVALID);
+-
+-                        if (error != NULL) {
+-                                g_warning ("Couldn't get presence status text: %s", error->message);
+-                                g_error_free (error);
+-                        } else {
+-                                status_text = g_value_get_string (&value);
+-                        }
+-
+-                        set_status (adata, status);
+-                        set_status_text (adata, status_text);
+-                }
+-        } else {
+-                g_warning ("Failed to get session presence proxy");
+-        }
+-#endif
+-
+- done:
+-        gtk_widget_show (GTK_WIDGET (adata->applet));
+-
+-        return TRUE;
+-}
+-
+-static gboolean
+-applet_factory (PanelApplet   *applet,
+-                const char    *iid,
+-                gpointer       data)
+-{
+-        gboolean ret;
+-        ret = FALSE;
+-        if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") == 0) {
+-                ret = fill_applet (applet);
+-        }
+-        return ret;
+-}
+diff --git a/gui/user-switch-applet/gdm-entry-menu-item.c b/gui/user-switch-applet/gdm-entry-menu-item.c
+deleted file mode 100644
+index d657e7a..0000000
+--- a/gui/user-switch-applet/gdm-entry-menu-item.c
++++ /dev/null
+@@ -1,304 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2008 Red Hat, Inc.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+- */
+-
+-#include "config.h"
+-
+-#include <unistd.h>
+-#include <sys/types.h>
+-
+-#include <string.h>
+-
+-#include <glib/gi18n.h>
+-#include <gtk/gtk.h>
+-
+-#include "gdm-entry-menu-item.h"
+-
+-/* same as twitter */
+-#define TEXT_BUFFER_MAX_CHARS 64
+-
+-enum
+-{
+-        PROP_0,
+-};
+-
+-struct _GdmEntryMenuItem
+-{
+-        GtkMenuItem      parent;
+-
+-        GtkWidget       *hbox;
+-        GtkWidget       *image;
+-        GtkWidget       *entry;
+-};
+-
+-struct _GdmEntryMenuItemClass
+-{
+-        GtkMenuItemClass parent_class;
+-};
+-
+-G_DEFINE_TYPE (GdmEntryMenuItem, gdm_entry_menu_item, GTK_TYPE_MENU_ITEM)
+-
+-static void
+-gdm_entry_menu_item_set_property (GObject      *object,
+-                                  guint         param_id,
+-                                  const GValue *value,
+-                                  GParamSpec   *pspec)
+-{
+-        GdmEntryMenuItem *item;
+-
+-        item = GDM_ENTRY_MENU_ITEM (object);
+-
+-        switch (param_id) {
+-        default:
+-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+-                break;
+-        }
+-}
+-
+-static void
+-gdm_entry_menu_item_get_property (GObject    *object,
+-                                  guint       param_id,
+-                                  GValue     *value,
+-                                  GParamSpec *pspec)
+-{
+-        GdmEntryMenuItem *item;
+-
+-        item = GDM_ENTRY_MENU_ITEM (object);
+-
+-        switch (param_id) {
+-        default:
+-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+-                break;
+-        }
+-}
+-
+-static void
+-gdm_entry_menu_item_dispose (GObject *object)
+-{
+-
+-        (*G_OBJECT_CLASS (gdm_entry_menu_item_parent_class)->dispose) (object);
+-}
+-
+-static gboolean
+-gdm_entry_menu_item_button_release (GtkWidget      *widget,
+-                                    GdkEventButton *event)
+-{
+-        return TRUE;
+-}
+-
+-/* Cut and paste from gtkwindow.c */
+-static void
+-send_focus_change (GtkWidget *widget,
+-                   gboolean   in)
+-{
+-        GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE);
+-
+-        g_object_ref (widget);
+-
+-        gtk_widget_set_can_focus (widget, in);
+-
+-        fevent->focus_change.type = GDK_FOCUS_CHANGE;
+-        fevent->focus_change.window = g_object_ref (gtk_widget_get_window (widget));
+-        fevent->focus_change.in = in;
+-
+-        gtk_widget_event (widget, fevent);
+-
+-        g_object_notify (G_OBJECT (widget), "has-focus");
+-
+-        g_object_unref (widget);
+-        gdk_event_free (fevent);
+-}
+-
+-static gboolean
+-gdm_entry_menu_item_button_press (GtkWidget      *widget,
+-                                  GdkEventButton *event)
+-{
+-        GtkWidget *entry;
+-
+-        entry = GDM_ENTRY_MENU_ITEM (widget)->entry;
+-
+-        if (gtk_widget_get_window (entry) != NULL) {
+-                gdk_window_raise (gtk_widget_get_window (entry));
+-        }
+-
+-        if (!gtk_widget_has_focus (entry)) {
+-                gtk_widget_grab_focus (entry);
+-        }
+-
+-        return FALSE;
+-}
+-
+-static void
+-gdm_entry_menu_item_realize (GtkWidget *widget)
+-{
+-        if (GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize) {
+-                GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize (widget);
+-        }
+-}
+-
+-static void
+-gdm_entry_menu_item_select (GtkItem *item)
+-{
+-        g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item));
+-        send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), TRUE);
+-}
+-
+-static void
+-gdm_entry_menu_item_deselect (GtkItem *item)
+-{
+-        g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item));
+-
+-        send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE);
+-}
+-
+-static void
+-gdm_entry_menu_item_class_init (GdmEntryMenuItemClass *klass)
+-{
+-        GObjectClass     *gobject_class;
+-        GtkWidgetClass   *widget_class;
+-        GtkMenuItemClass *menu_item_class;
+-        GtkItemClass     *item_class;
+-
+-        gobject_class = G_OBJECT_CLASS (klass);
+-        widget_class = GTK_WIDGET_CLASS (klass);
+-        menu_item_class = GTK_MENU_ITEM_CLASS (klass);
+-        item_class = GTK_ITEM_CLASS (klass);
+-
+-        gobject_class->set_property = gdm_entry_menu_item_set_property;
+-        gobject_class->get_property = gdm_entry_menu_item_get_property;
+-        gobject_class->dispose = gdm_entry_menu_item_dispose;
+-
+-        widget_class->button_release_event = gdm_entry_menu_item_button_release;
+-        widget_class->button_press_event = gdm_entry_menu_item_button_press;
+-        widget_class->realize = gdm_entry_menu_item_realize;
+-
+-        item_class->select = gdm_entry_menu_item_select;
+-        item_class->deselect = gdm_entry_menu_item_deselect;
+-
+-        menu_item_class->hide_on_activate = FALSE;
+-}
+-
+-static void
+-on_entry_show (GtkWidget        *widget,
+-               GdmEntryMenuItem *item)
+-{
+-        if (gtk_widget_get_window (widget) != NULL) {
+-                gdk_window_raise (gtk_widget_get_window (widget));
+-        }
+-        send_focus_change (widget, TRUE);
+-}
+-
+-static void
+-on_text_buffer_changed (GtkTextBuffer    *buffer,
+-                        GdmEntryMenuItem *item)
+-{
+-        int len;
+-
+-        len = gtk_text_buffer_get_char_count (buffer);
+-        if (len > TEXT_BUFFER_MAX_CHARS) {
+-                gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (item)));
+-        }
+-}
+-
+-static void
+-on_entry_move_focus (GtkWidget        *widget,
+-                     GtkDirectionType  direction,
+-                     GdmEntryMenuItem *item)
+-{
+-        g_debug ("focus move");
+-        send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE);
+-        g_signal_emit_by_name (item,
+-                               "move-focus",
+-                               GTK_DIR_TAB_FORWARD);
+-}
+-
+-static void
+-gdm_entry_menu_item_init (GdmEntryMenuItem *item)
+-{
+-        PangoFontDescription *fontdesc;
+-        PangoFontMetrics     *metrics;
+-        PangoContext         *context;
+-        PangoLanguage        *lang;
+-        int                   ascent;
+-        GtkTextBuffer        *buffer;
+-
+-        item->hbox = gtk_hbox_new (FALSE, 6);
+-        gtk_container_add (GTK_CONTAINER (item), item->hbox);
+-
+-        item->image = gtk_image_new ();
+-        gtk_box_pack_start (GTK_BOX (item->hbox), item->image, FALSE, FALSE, 0);
+-
+-        item->entry = gtk_text_view_new ();
+-        gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (item->entry), FALSE);
+-        gtk_text_view_set_editable (GTK_TEXT_VIEW (item->entry), TRUE);
+-        gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (item->entry),
+-                                     GTK_WRAP_WORD);
+-        g_signal_connect (item->entry,
+-                          "show",
+-                          G_CALLBACK (on_entry_show),
+-                          item);
+-        g_signal_connect (item->entry,
+-                          "move-focus",
+-                          G_CALLBACK (on_entry_move_focus),
+-                          item);
+-
+-        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (item->entry));
+-        g_signal_connect (buffer,
+-                          "changed",
+-                          G_CALLBACK (on_text_buffer_changed),
+-                          item);
+-
+-        /* get the font ascent for the current font and language */
+-        context = gtk_widget_get_pango_context (item->entry);
+-        fontdesc = pango_context_get_font_description (context);
+-        lang = pango_context_get_language (context);
+-        metrics = pango_context_get_metrics (context, fontdesc, lang);
+-        ascent = pango_font_metrics_get_ascent (metrics) * 1.5 / PANGO_SCALE;
+-        pango_font_metrics_unref (metrics);
+-
+-        /* size our progress bar to be five ascents long */
+-        gtk_widget_set_size_request (item->entry, ascent * 5, -1);
+-
+-        gtk_box_pack_start (GTK_BOX (item->hbox), item->entry, TRUE, TRUE, 0);
+-
+-        gtk_widget_show (item->hbox);
+-        gtk_widget_show (item->image);
+-        gtk_widget_show (item->entry);
+-}
+-
+-GtkWidget *
+-gdm_entry_menu_item_new (void)
+-{
+-        return g_object_new (GDM_TYPE_ENTRY_MENU_ITEM, NULL);
+-}
+-
+-GtkWidget *
+-gdm_entry_menu_item_get_entry (GdmEntryMenuItem *item)
+-{
+-        g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL);
+-
+-        return item->entry;
+-}
+-
+-GtkWidget *
+-gdm_entry_menu_item_get_image (GdmEntryMenuItem *item)
+-{
+-        g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL);
+-
+-        return item->image;
+-}
+diff --git a/gui/user-switch-applet/gdm-entry-menu-item.h b/gui/user-switch-applet/gdm-entry-menu-item.h
+deleted file mode 100644
+index 3031609..0000000
+--- a/gui/user-switch-applet/gdm-entry-menu-item.h
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+- */
+-
+-#ifndef __GDM_ENTRY_MENU_ITEM__
+-#define __GDM_ENTRY_MENU_ITEM__
+-
+-#include <gtk/gtk.h>
+-
+-G_BEGIN_DECLS
+-
+-#define GDM_TYPE_ENTRY_MENU_ITEM \
+-  (gdm_entry_menu_item_get_type ())
+-#define GDM_ENTRY_MENU_ITEM(object) \
+-  (G_TYPE_CHECK_INSTANCE_CAST ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItem))
+-#define GDM_ENTRY_MENU_ITEM_CLASS(klass) \
+-  (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass))
+-#define GDM_IS_ENTRY_MENU_ITEM(object) \
+-  (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDM_TYPE_ENTRY_MENU_ITEM))
+-#define GDM_IS_ENTRY_MENU_ITEM_CLASS(klass) \
+-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GDM_TYPE_ENTRY_MENU_ITEM))
+-#define GDM_ENTRY_MENU_ITEM_GET_CLASS(object) \
+-  (G_TYPE_INSTANCE_GET_CLASS ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass))
+-
+-typedef struct _GdmEntryMenuItem GdmEntryMenuItem;
+-typedef struct _GdmEntryMenuItemClass GdmEntryMenuItemClass;
+-
+-GType      gdm_entry_menu_item_get_type      (void) G_GNUC_CONST;
+-
+-GtkWidget *gdm_entry_menu_item_new           (void);
+-GtkWidget *gdm_entry_menu_item_get_entry     (GdmEntryMenuItem *item);
+-GtkWidget *gdm_entry_menu_item_get_image     (GdmEntryMenuItem *item);
+-
+-G_END_DECLS
+-
+-#endif /* __GDM_ENTRY_MENU_ITEM__ */
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 1fccb90..cc1a3fd 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -84,10 +84,6 @@ gui/simple-greeter/gdm-timer.c
+ gui/simple-greeter/gdm-user.c
+ gui/simple-greeter/gdm-user-chooser-widget.c
+ gui/simple-greeter/greeter-main.c
+-gui/user-switch-applet/applet.c
+-gui/user-switch-applet/gdm-entry-menu-item.c
+-gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
+-gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
+ utils/gdmflexiserver.c
+ utils/gdm-screenshot.c
+ 
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 0269a0f..ee3d753 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -7,7 +7,6 @@
+ # remove these unless you fix "make distcheck" a different way.
+ #
+ data/gdm.schemas.in
+-gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in
+ data/greeter-autostart/at-spi-registryd-wrapper.desktop.in
+ data/greeter-autostart/gdm-simple-greeter.desktop.in
+ data/greeter-autostart/gnome-power-manager.desktop.in
+-- 
+1.6.6.1
+
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch b/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch
new file mode 100644
index 000000000..ad21073a0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch
@@ -0,0 +1,34 @@
+From 43e59f3deadb3914a1cc931ae18d4023874cdeca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 26 Apr 2013 17:15:48 +0200
+Subject: [PATCH] gdm-user-manager.c: avoid displaying system users in
+ greeter's list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+yocto environment system users have UID below 1000
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ gui/simple-greeter/gdm-user-manager.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
+index c631989..f18e478 100644
+--- a/gui/simple-greeter/gdm-user-manager.c
++++ b/gui/simple-greeter/gdm-user-manager.c
+@@ -63,7 +63,7 @@
+ #ifdef __sun
+ #define FALLBACK_MINIMAL_UID     100
+ #else
+-#define FALLBACK_MINIMAL_UID     500
++#define FALLBACK_MINIMAL_UID     1000
+ #endif
+ 
+ #ifndef _PATH_SHELLS
+-- 
+1.7.4.4
+
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/Default b/meta-gnome/recipes-gnome/gdm/gdm/Default
new file mode 100755
index 000000000..a7a7fcf7f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/Default
@@ -0,0 +1,96 @@
+#!/bin/sh
+# Stolen from the debian kdm setup, aren't I sneaky
+# Plus a lot of fun stuff added
+#  -George
+
+PATH="/usr/bin:$PATH"
+OLD_IFS=$IFS
+
+gdmwhich () {
+  COMMAND="$1"
+  OUTPUT=
+  IFS=:
+  for dir in $PATH
+  do
+    if test -x "$dir/$COMMAND" ; then
+      if test "x$OUTPUT" = "x" ; then
+        OUTPUT="$dir/$COMMAND"
+      fi
+    fi
+  done
+  IFS=$OLD_IFS
+  echo "$OUTPUT"
+}
+
+sysresources=/etc/X11/Xresources
+
+# merge in defaults
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+sysmodmap=/etc/X11/Xmodmap
+
+XMODMAP=`gdmwhich xmodmap`
+if [ "x$XMODMAP" != "x" ] ; then
+  if [ "x$GDM_PARENT_DISPLAY" = "x" ]; then
+    if [ -f $sysmodmap ]; then
+      $XMODMAP $sysmodmap
+    fi
+  else
+    ( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $XMODMAP -pke ) | $XMODMAP -
+  fi
+
+  #
+  # Switch Sun's Alt and Meta mod mappings
+  #
+
+  UNAME=`gdmwhich uname`
+  PROCESSOR=`$UNAME -p`
+  if [ "x$PROCESSOR" = "xsparc" ]; then
+    if $XMODMAP | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null
+    then
+      $XMODMAP -e "clear Mod1" \
+               -e "clear Mod4" \
+               -e "add Mod1 = Alt_L" \
+               -e "add Mod1 = Alt_R" \
+               -e "add Mod4 = Meta_L" \
+               -e "add Mod4 = Meta_R"
+    fi
+  fi
+fi
+
+SETXKBMAP=`gdmwhich setxkbmap`
+if [ "x$SETXKBMAP" != "x" ] ; then
+  # FIXME: is this all right?  Is this completely on crack?
+  # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY
+  # FIXME: This should be done in code.  Or there must be an easier way ...
+  if [ -n "$GDM_PARENT_DISPLAY" ]; then
+    XKBSETUP=`( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $SETXKBMAP -v )`
+    if [ -n "$XKBSETUP" ]; then
+      XKBKEYMAP=`echo "$XKBSETUP" | grep '^keymap' | awk '{ print $2 }'`
+      XKBTYPES=`echo "$XKBSETUP" | grep '^types' | awk '{ print $2 }'`
+      XKBCOMPAT=`echo "$XKBSETUP" | grep '^compat' | awk '{ print $2 }'`
+      XKBSYMBOLS=`echo "$XKBSETUP" | grep '^symbols' | awk '{ print $2 }'`
+      XKBGEOMETRY=`echo "$XKBSETUP" | grep '^geometry' | awk '{ print $2 }'`
+      if [ -n "$XKBKEYMAP" ]; then
+        $SETXKBMAP -keymap "$XKBKEYMAP"
+      elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" -a -n "$XKBGEOMETRY" ]; then
+        $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS" -geometry "$XKBGEOMETRY"
+      elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" ]; then
+        $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS"
+      elif [ -n "$XKBSYMBOLS" ]; then
+        $SETXKBMAP -symbols "$XKBSYMBOLS"
+      fi
+    fi
+  fi
+fi
+
+# FIXME: the housekeeping below really should be moved to the postinst of packages that require it
+# brute force approach for now
+update-desktop-database
+glib-compile-schemas /usr/share/glib-2.0/schemas/
+
+#x11vnc  -q -bg -display :0 -forever -avahi -xkb
+
+exit 0
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
new file mode 100644
index 000000000..bee35116e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
@@ -0,0 +1,96 @@
+From 60084e7e973634971c9643f2459e5d3e248ee3f1 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 9 Jun 2011 18:12:45 +0200
+Subject: [PATCH] build-sys: hardcode x paths to fix crosscompiling
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.ac |   72 ++++-----------------------------------------------------
+ 1 files changed, 5 insertions(+), 67 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index eeaf3dc..841efe0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1101,73 +1101,11 @@ dnl ---------------------------------------------------------------------------
+ dnl - Check for X Server location
+ dnl ---------------------------------------------------------------------------
+ 
+-# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
+-# symlink to each other, and configure should use the more stable
+-# location (the real directory) if possible.
+-#
+-# On Solaris, the /usr/bin/Xserver script is used to decide whether to
+-# use Xsun or Xorg, so this is used on Solaris.
+-#
+-# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6
+-# and /usr/X11 since they often symlink to each other, and configure
+-# should use the more stable location (the real directory) if possible.
+-#
+-if test -x /usr/X11/bin/Xserver; then
+-   X_PATH="/usr/X11/bin"
+-   X_SERVER_PATH="/usr/X11/bin"
+-   X_SERVER="/usr/X11/bin/Xserver"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
+-   X_PATH="/usr/X11R6/bin"
+-   X_SERVER_PATH="/usr/X11R6/bin"
+-   X_SERVER="/usr/X11R6/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
+-   X_PATH="/usr/X11/bin"
+-   X_SERVER_PATH="/usr/X11/bin"
+-   X_SERVER="/usr/X11/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11R6/bin/X; then
+-   X_PATH="/usr/X11R6/bin"
+-   X_SERVER_PATH="/usr/X11R6/bin"
+-   X_SERVER="/usr/X11R6/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/bin/Xorg; then
+-   X_PATH="/usr/bin"
+-   X_SERVER_PATH="/usr/bin"
+-   X_SERVER="/usr/bin/Xorg"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11/bin/X; then
+-   X_PATH="/usr/X11/bin"
+-   X_SERVER_PATH="/usr/X11/bin"
+-   X_SERVER="/usr/X11/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/openwin/bin/Xsun; then
+-   # Do not add /usr/openwin/bin here because on Solaris you need
+-   # /usr/openwin/bin in your PATH even if you are using the Xorg
+-   # Xserver.  We add this to the path below.
+-   X_PATH="/usr/openwin/bin"
+-   X_SERVER_PATH="/usr/openwin/bin"
+-   X_SERVER="/usr/openwin/bin/Xsun"
+-   X_CONFIG_OPTIONS="-audit 0 -nobanner"
+-elif test -x /opt/X11R6/bin/X; then
+-   X_PATH="/opt/X11R6/bin"
+-   X_SERVER_PATH="/opt/X11R6/bin"
+-   X_SERVER="/opt/X11R6/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/bin/X; then
+-   X_PATH="/usr/bin"
+-   X_SERVER_PATH="/usr/bin"
+-   X_SERVER="/usr/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+-else
+-   # what to do, what to do, this is wrong, but this just sets the
+-   # defaults, perhaps this user is cross compiling or some such
+-   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
+-   X_SERVER_PATH="/usr/bin"
+-   X_SERVER="/usr/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+-fi
++# We hardcode the X paths since we know where it will be in the OE univers
++X_PATH="/usr/bin"
++X_SERVER_PATH="/usr/bin"
++X_SERVER="/usr/bin/X"
++X_CONFIG_OPTIONS="-audit 0"
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - Check for Xnest / Xephyr support
+-- 
+1.6.6.1
+
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm b/meta-gnome/recipes-gnome/gdm/gdm/gdm
new file mode 100755
index 000000000..43eae9517
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm
@@ -0,0 +1,89 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          gdm
+# Should-Start:      console-screen acpid dbus hal network-manager
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: GNOME Display Manager
+# Description:       Debian init script for the GNOME Display Manager
+### END INIT INFO
+#
+# Author:       Ryan Murray <rmurray@debian.org>
+#
+set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/gdm
+
+test -x $DAEMON || exit 0
+
+if [ -r /etc/default/locale ]; then
+  . /etc/default/locale
+  export LANG LANGUAGE
+fi
+
+# To start gdm even if it is not the default display manager, change
+# HEED_DEFAULT_DISPLAY_MANAGER to "false."
+HEED_DEFAULT_DISPLAY_MANAGER=true
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+case "$1" in
+  start)
+        # make needed directories in volatile
+
+        if [ -e /var/log/gdm ] ; then 
+                rm -rf /var/log/gdm
+        fi
+
+        mkdir -m 01770 /var/log/gdm
+        chown gdm:gdm /var/log/gdm
+
+        if [ -e /tmp/.ICE-unix ] ; then 
+                rm -rf /tmp/.ICE-unix
+        fi
+
+        mkdir -m 01777 /tmp/.ICE-unix
+        chown root:root /tmp/.ICE-unix
+
+        CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)")
+        if grep -wqs text /proc/cmdline; then
+            echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
+        elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
+           [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
+           [ "$CONFIGURED_DAEMON" != gdm ] ; then
+                echo "Not starting GNOME Display Manager; it is not the default display manager"
+        else
+                echo "Starting GNOME Display Manager" "gdm"
+                start-stop-daemon --start -b --exec $DAEMON 
+        fi
+  ;;
+  stop)
+        echo "Stopping GNOME Display Manager" "gdm"
+        set +e
+        start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \
+                --name gdm --retry 5
+        set -e
+  ;;
+  reload)
+        echo "Scheduling reload of GNOME Display Manager configuration" "gdm"
+        set +e
+        start-stop-daemon --stop --signal USR1 --quiet --pidfile \
+                /var/run/gdm.pid --name gdm
+        set -e
+  ;;
+  status)
+        status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $?
+  ;;
+  restart|force-reload)
+        $0 stop
+        $0 start
+  ;;
+  *)
+        echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}"
+        exit 1
+  ;;
+esac
+
+exit 0
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam b/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
new file mode 100644
index 000000000..f9fafed9d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
@@ -0,0 +1,11 @@
+#
+# default; standard UN*X access
+#
+auth     required       pam_unix.so
+account  required       pam_unix.so
+password required       pam_unix.so
+session  required       pam_unix.so
+
+auth     optional       pam_gnome_keyring.so
+session  optional       pam_gnome_keyring.so  auto_start
+
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf b/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
new file mode 100644
index 000000000..559823b86
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
@@ -0,0 +1,80 @@
+# GDM Custom Configuration file.
+#
+# This file is the appropriate place for specifying your customizations to the
+# GDM configuration.   If you run gdmsetup, it will automatically edit this
+# file for you and will cause the daemon and any running GDM GUI programs to
+# automatically update with the new configuration.  Not all configuration
+# options are supported by gdmsetup, so to modify some values it may be
+# necessary to modify this file directly by hand.
+#
+# This file overrides the default configuration settings.  These settings 
+# are stored in the GDM System Defaults configuration file, which is found
+# at the following location.
+#
+# /usr/share/gdm/defaults.conf.  
+#
+# This file contains comments about the meaning of each configuration option,
+# so is also a useful reference.  Also refer to the documentation links at
+# the end of this comment for further information.  In short, to hand-edit
+# this file, simply add or modify the key=value combination in the
+# appropriate section in the template below this comment section.
+#
+# For example, if you want to specify a different value for the Enable key
+# in the "[debug]" section of your GDM System Defaults configuration file,
+# then add "Enable=true" in the "[debug]" section of this file.  If the
+# key already exists in this file, then simply modify it.
+#
+# Older versions of GDM used the "gdm.conf" file for configuration.  If your
+# system has an old gdm.conf file on the system, it will be used instead of
+# this file - so changes made to this file will not take effect.  Consider
+# migrating your configuration to this file and removing the gdm.conf file.
+#
+# If you hand edit a GDM configuration file, you can run the following
+# command and the GDM daemon will immediately reflect the change.  Any
+# running GDM GUI programs will also be notified to update with the new
+# configuration.
+#
+# gdmflexiserver --command="UPDATE_CONFIG <configuration key>"
+#
+# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable".
+#
+# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and
+# re-read the new configuration settings.  You can also restart GDM by sending
+# a HUP or USR1 signal to the daemon.  HUP behaves like gdm-restart and causes
+# any user session started by GDM to exit immediately while USR1 behaves like
+# gdm-safe-restart and will wait until all users log out before restarting GDM.
+#
+# For full reference documentation see the gnome help browser under
+# GNOME|System category.  You can also find the docs in HTML form on
+# http://www.gnome.org/projects/gdm/
+#
+# NOTE: Lines that begin with "#" are considered comments.
+#
+# Have fun!
+
+[daemon]
+
+[security]
+
+[xdmcp]
+
+[gui]
+
+[greeter]
+
+[chooser]
+
+[debug]
+
+# Note that to disable servers defined in the GDM System Defaults
+# configuration file (such as 0=Standard, you must put a line in this file
+# that says 0=inactive, as described in the Configuration section of the GDM
+# documentation.
+#
+[servers]
+
+# Also note, that if you redefine a [server-foo] section, then GDM will
+# use the definition in this file, not the GDM System Defaults configuration
+# file.  It is currently not possible to disable a [server-foo] section
+# defined in the GDM System Defaults configuration file.
+#
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in b/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
new file mode 100644
index 000000000..3e1556ae0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=Gnome Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=%sbindir%/gdm -nodaemon
+StandardOutput=syslog
+
+[Install]
+Alias=display-manager.service
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch
new file mode 100644
index 000000000..1f9fa2ac2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch
@@ -0,0 +1,37 @@
+In cross environment we have to prepend the sysroot to the path found by
+pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
+it ends up using the files from host system. Now usually people have gnome installed
+so the build succeeds but if you dont have gnome installed on build host then
+it wont find the files on host system and packages using gnome-doc-utils wont
+compile.
+
+This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
+will be empty
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gdm-2.32.2/gnome-doc-utils.make
+===================================================================
+--- gdm-2.32.2.orig/gnome-doc-utils.make        2011-05-31 08:06:59.000000000 -0700
++++ gdm-2.32.2/gnome-doc-utils.make     2011-09-25 15:32:39.540992521 -0700
+@@ -133,12 +133,12 @@
+ _xml2po ?= `which xml2po`
+ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
+ 
+ if ENABLE_SK
+ _ENABLE_SK = true
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
new file mode 100644
index 000000000..d8f015064
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -0,0 +1,104 @@
+SUMMARY = "Graphical login manager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
+
+PR = "r18"
+
+inherit gnome update-rc.d systemd useradd
+
+SRC_URI += " \
+    file://cross-xdetection.diff \
+    file://0001-Remove-user-switch-applet.patch \
+    file://0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch \
+    file://sysrooted-pkg-config.patch \
+    file://%gconf-tree.xml \
+    file://gdm \
+    file://gdm.conf \
+    file://gdm-pam \
+    file://Default \
+    file://gdm.service.in \
+"
+
+SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
+SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703"
+
+EXTRA_OECONF = " \
+    --enable-authentication-scheme=shadow \
+    --enable-debug=yes \
+    --with-console-kit \
+    --disable-scrollkeeper \
+"
+
+do_configure_prepend() {
+    sed -i -e "s:\bdocs::g" ${S}/Makefile.am
+}
+
+do_install_prepend() {
+    install -d ${D}/${localstatedir}/lib/gdm/.gconf.mandatory
+    install ${WORKDIR}/%gconf-tree.xml ${D}/${localstatedir}/lib/gdm/.gconf.mandatory/
+}
+
+do_install_append() {
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/
+
+    install -d ${D}/${sysconfdir}/gdm
+    install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/
+
+    install -d ${D}/${sysconfdir}/pam.d
+    install -m 0755 ${WORKDIR}/gdm-pam       ${D}/${sysconfdir}/pam.d/gdm
+    rm -f ${D}/${sysconfdir}/pam.d/gdm-autologin
+
+    install -d ${D}/${sysconfdir}/gdm/Init
+    install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
+
+    install -d ${D}${systemd_unitdir}/system
+    sed -e 's,%sbindir%,${sbindir},g' \
+        < ${WORKDIR}/gdm.service.in \
+        > ${D}${systemd_unitdir}/system/gdm.service
+
+    chown -R gdm:gdm ${D}${localstatedir}/lib/gdm
+    chmod 0750 ${D}${localstatedir}/lib/gdm
+
+    rm -rf "${D}${localstatedir}/run"
+    rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+
+    rm -f ${D}${datadir}/gdm/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
+    rm -f ${D}${datadir}/gdm/autostart/LoginWindow/orca-screen-reader.desktop
+    rm -f ${D}${datadir}/gdm/autostart/LoginWindow/gnome-mag.desktop
+    rm -f ${D}${datadir}/gdm/autostart/LoginWindow/gok.desktop
+    rm -f ${D}${datadir}/gdm/autostart/LoginWindow/metacity.desktop
+}
+
+FILES_${PN} += "${datadir}/icon* \
+    ${datadir}/xsession* \
+"
+
+RDEPENDS_${PN} += "grep dbus-x11 shadow"
+# "libpam-base-files"
+CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm"
+RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit"
+
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "gdm.service"
+
+INITSCRIPT_NAME = "gdm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm"
+
+pkg_postinst_${PN} () {
+# Register up as default dm
+mkdir -p $D${sysconfdir}/X11/
+echo "${bindir}/gdm" > $D${sysconfdir}/X11/default-display-manager
+}
+
+pkg_postrm_${PN} () {
+    deluser gdm || true
+    delgroup gdm || true
+    sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
+}
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch b/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
new file mode 100644
index 000000000..a28808b8d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
@@ -0,0 +1,57 @@
+From 8e0cbfac142d38320dd02416601e14c65585cd17 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sat, 9 Mar 2013 12:47:06 +0100
+Subject: [PATCH] workaround void pointer arithmetic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fixes errors like:
+error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith]
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ gedit/gedit-document-input-stream.c   |    4 ++--
+ gedit/gedit-smart-charset-converter.c |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gedit/gedit-document-input-stream.c b/gedit/gedit-document-input-stream.c
+index 5a1f961..38316e7 100644
+--- a/gedit/gedit-document-input-stream.c
++++ b/gedit/gedit-document-input-stream.c
+@@ -426,7 +426,7 @@ gedit_document_input_stream_read (GInputStream  *stream,
+ 
+        do
+        {
+-               n = read_line (dstream, buffer + read, space_left);
++               n = read_line (dstream, ((char*)buffer) + read, space_left);
+                read += n;
+                space_left -= n;
+        } while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0);
+@@ -451,7 +451,7 @@ gedit_document_input_stream_read (GInputStream  *stream,
+ 
+                        newline = get_new_line (dstream);
+ 
+-                       memcpy (buffer + read, newline, newline_size);
++                       memcpy (((char*)buffer) + read, newline, newline_size);
+ 
+                        read += newline_size;
+                        dstream->priv->newline_added = TRUE;
+diff --git a/gedit/gedit-smart-charset-converter.c b/gedit/gedit-smart-charset-converter.c
+index e32b0b1..6745ce3 100644
+--- a/gedit/gedit-smart-charset-converter.c
++++ b/gedit/gedit-smart-charset-converter.c
+@@ -153,7 +153,7 @@ try_convert (GCharsetConverter *converter,
+        do
+        {
+                res = g_converter_convert (G_CONVERTER (converter),
+-                                          inbuf + nread,
++                                          ((const char*)inbuf) + nread,
+                                           inbuf_size - nread,
+                                           out + nwritten,
+                                           out_size - nwritten,
+-- 
+1.7.4.4
+
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
new file mode 100644
index 000000000..36bae08a7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
@@ -0,0 +1,27 @@
+SUMMARY = "GNOME editor"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2+"
+PR = "r2"
+
+DEPENDS = "gvfs enchant gconf gnome-doc-utils gnome-doc-utils-native glib-2.0 gtk+ gtksourceview2 iso-codes"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+inherit gnome gettext pythonnative
+SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch"
+SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b"
+SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c"
+
+EXTRA_OECONF = "--disable-scrollkeeper \
+                --enable-gvfs-metadata"
+
+do_configure_prepend() {
+    cd ${S}
+    gnome-doc-common --copy || true
+    gnome-doc-prepare --force --copy || true
+    cd ${B}
+}
+
+FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
+FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug"
+
diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_2.32.0.bb
new file mode 100644
index 000000000..ca18341ec
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_2.32.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Gnome background images"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SECTION = "x11/gnome"
+
+# glib-2.0 for glib-gettext.m4 which provides AM_GLIB_GNU_GETTEXT
+# intltool-native for IT_PROG_INTLTOOL(0.35.0)
+DEPENDS = "glib-2.0 intltool-native"
+
+inherit gnomebase
+
+SRC_URI[archive.md5sum] = "3df26626483b02e51adefc6ab5945a8d"
+SRC_URI[archive.sha256sum] = "4d7b60b5ba768bf8834b5fa3a3471cd9a9e14b5884bc210dc2d3cdbf1faddcef"
+
+FILES_${PN} += "${datadir}/gnome-background-properties"
+
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
new file mode 100644
index 000000000..0b0cf8b6e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
@@ -0,0 +1,37 @@
+From e3c789d6dca9a8a99b60b86e28d8119c55253c13 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 15 May 2013 08:37:03 -0700
+Subject: [PATCH] bluetooth-input: Fix compile errors
+
+XID is unsigned long type so %d will error out with -Wformat
+where format warnings are being treated at errors
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Unknown
+---
+ wizard/bluetooth-input.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/wizard/bluetooth-input.c b/wizard/bluetooth-input.c
+index b3fbdaf..d17e67c 100644
+--- a/wizard/bluetooth-input.c
++++ b/wizard/bluetooth-input.c
+@@ -190,12 +190,12 @@ bluetooth_input_check_for_devices (BluetoothInput *input)
+                if (bluetooth_input_device_get_type (&device_info[i], &is_mouse, &is_keyboard) == FALSE)
+                        continue;
+                if (is_mouse != FALSE) {
+-                       g_message ("has mouse: %s (id = %d)", device_info[i].name, device_info[i].id);
++                       g_message ("has mouse: %s (id = %lu)", device_info[i].name, device_info[i].id);
+                        has_mouse = TRUE;
+                        //break;
+                }
+                if (is_keyboard != FALSE) {
+-                       g_message ("has keyboard: %s (id = %d)", device_info[i].name, device_info[i].id);
++                       g_message ("has keyboard: %s (id = %lu)", device_info[i].name, device_info[i].id);
+                        has_keyboard = TRUE;
+                        //break;
+                }
+-- 
+1.7.9.5
+
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
new file mode 100644
index 000000000..4fd38a0a9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
@@ -0,0 +1,33 @@
+SUMMARY = "GNOME bluetooth manager"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
+                    file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+"
+
+PR = "r1"
+
+SECTION = "x11/gnome"
+DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez4 gnome-keyring virtual/libx11 libxi intltool-native"
+
+inherit gnomebase gtk-icon-cache
+
+SRC_URI += "file://0001-bluetooth-input-Fix-compile-errors.patch \
+           "
+SRC_URI[archive.md5sum] = "f129686fe46c4c98eb70a0cc85d59cae"
+SRC_URI[archive.sha256sum] = "57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973"
+
+# No 'nautilus-sendto' recipe in meta-gnome yet
+EXTRA_OECONF += "--enable-nautilus-sendto=no"
+
+# No native docbook XSL stylesheets recipe in OE yet
+do_configure_prepend() {
+    sed -i s/help// ${S}/Makefile.am
+}
+
+do_configure_append() {
+    sed -i 's,func_fatal_error "error: cannot install,echo "bogus message about,' ${HOST_SYS}-libtool
+}
+
+RRECOMMENDS_${PN} += "obexd obex-data-server"
+
+FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/"
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
new file mode 100644
index 000000000..5cc7ad15a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
@@ -0,0 +1,31 @@
+SUMMARY = "GNOME control center"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "desktop-file-utils-native gnome-menus libunique dbus-glib gnome-desktop libxml2 metacity gconf gnome-settings-daemon librsvg pango libgnomekbd libxklavier libcanberra libgtop libxscrnsaver"
+
+PR = "r1"
+
+inherit gnome
+
+SRC_URI[archive.md5sum] = "b4e8ab5c7556ae07addbfcfb4fa2f761"
+SRC_URI[archive.sha256sum] = "7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66"
+
+LDFLAGS += "-lgthread-2.0 -lxml2"
+
+do_configure_prepend() {
+    sed -i s:help::g ${S}/Makefile.am
+}
+do_install_append() {
+    rm -rf ${D}${datadir}/mime
+}
+
+FILES_${PN} += "${datadir}/icon* \
+                ${datadir}/xsession* \
+                ${libdir}/window-manager-settings/*.so \
+                ${datadir}/gnome \
+                ${datadir}/desktop-directories \
+"
+FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug"
+FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la"
+FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a"
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.4.2.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.4.2.bb
new file mode 100644
index 000000000..a056e1501
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.4.2.bb
@@ -0,0 +1,26 @@
+SUMMARY = "GNOME library for reading .desktop files"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+BPN = "gnome-desktop"
+GNOME_COMPRESS_TYPE ?= "xz"
+
+inherit gnome pkgconfig
+SRC_URI[archive.md5sum] = "efd11d3841c34cc1709d0ea1d3f83cf1"
+SRC_URI[archive.sha256sum] = "7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952"
+
+DEPENDS += "gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification"
+
+EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
+
+do_configure_prepend () {
+    cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+}
+
+PACKAGES =+ "libgnome-desktop3"
+FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml"
+
+RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas"
+
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
new file mode 100644
index 000000000..f1675160c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
@@ -0,0 +1,29 @@
+SUMMARY = "GNOME library for reading .desktop files"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+PR = "r6"
+
+inherit gnome pkgconfig
+
+SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67"
+SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d"
+
+DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification"
+
+EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
+
+do_configure_prepend () {
+    cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S}
+    sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in
+}
+
+PACKAGES =+ "libgnome-desktop"
+FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop/pnp.ids"
+FILES_${PN} += "${datadir}/gnome-about"
+
+# for gnome-about
+RRECOMMENDS_${PN} += "python-pygtk python-pycairo"
+
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch
new file mode 100644
index 000000000..805e93776
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch
@@ -0,0 +1,74 @@
+From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Fri, 8 Jul 2011 11:03:52 -0400
+Subject: [PATCH] Add support for DeviceAutomountHint
+
+Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184
+
+Upstream-Status: Applied [1]
+
+[1] https://mail.gnome.org/archives/commits-list/2011-July/msg03207.html
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+ src/gdu/gdu-device.c |   10 ++++++++++
+ src/gdu/gdu-device.h |    1 +
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c
+index 6a5afad..4be39cf 100644
+--- a/src/gdu/gdu-device.c
++++ b/src/gdu/gdu-device.c
+@@ -82,6 +82,7 @@ typedef struct
+   gboolean device_presentation_nopolicy;
+   char *device_presentation_name;
+   char *device_presentation_icon_name;
++  char *device_automount_hint;
+   guint64 device_size;
+   guint64 device_block_size;
+ 
+@@ -279,6 +280,8 @@ collect_props (const char *key,
+     props->device_presentation_name = g_strdup (g_value_get_string (value));
+   else if (strcmp (key, "DevicePresentationIconName") == 0)
+     props->device_presentation_icon_name = g_strdup (g_value_get_string (value));
++  else if (strcmp (key, "DeviceAutomountHint") == 0)
++    props->device_automount_hint = g_strdup (g_value_get_string (value));
+   else if (strcmp (key, "DeviceSize") == 0)
+     props->device_size = g_value_get_uint64 (value);
+   else if (strcmp (key, "DeviceBlockSize") == 0)
+@@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props)
+   g_strfreev (props->device_mount_paths);
+   g_free (props->device_presentation_name);
+   g_free (props->device_presentation_icon_name);
++  g_free (props->device_automount_hint);
+   g_free (props->job_id);
+   g_free (props->id_usage);
+   g_free (props->id_type);
+@@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device)
+ }
+ 
+ const char *
++gdu_device_get_automount_hint (GduDevice *device)
++{
++        return device->priv->props->device_automount_hint;
++}
++
++const char *
+ gdu_device_drive_get_media (GduDevice *device)
+ {
+         return device->priv->props->drive_media;
+diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h
+index 4c1302b..8cfd7a9 100644
+--- a/src/gdu/gdu-device.h
++++ b/src/gdu/gdu-device.h
+@@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device);
+ const char *gdu_device_drive_get_connection_interface (GduDevice *device);
+ guint64 gdu_device_drive_get_connection_speed (GduDevice *device);
+ char **gdu_device_drive_get_media_compatibility (GduDevice *device);
++const gchar *gdu_device_get_automount_hint(GduDevice *device);
+ const char *gdu_device_drive_get_media (GduDevice *device);
+ gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device);
+ gboolean gdu_device_drive_get_requires_eject (GduDevice *device);
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch
new file mode 100644
index 000000000..f36942d19
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch
@@ -0,0 +1,27 @@
+From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+Subject: Disable scrollkeeper-config not found message
+Upstream-Status: Not-Applicable
+
+If scrollkeeper-config isn't found, configure fails with an error.
+Fix that by commenting out the check.
+
+Signed-Off-By: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+
+
+Index: gnome-disk-utility-2.32.0/configure.ac
+===================================================================
+--- gnome-disk-utility-2.32.0.orig/configure.ac 2010-09-15 19:07:25.000000000 +0400
++++ gnome-disk-utility-2.32.0/configure.ac      2011-08-20 01:29:48.000000000 +0400
+@@ -188,9 +188,9 @@
+ # *************
+
+ AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+-  AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package)
+-fi
++dnl if test x$SCROLLKEEPER_CONFIG = xno; then
++dnl  AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package])
++dnl fi
+
+ # ********************
+ # Internationalization
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch
new file mode 100644
index 000000000..6ba397955
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch
@@ -0,0 +1,34 @@
+Index: gnome-disk-utility-2.32.0/src/gdu/Makefile.am
+===================================================================
+--- gnome-disk-utility-2.32.0.orig/src/gdu/Makefile.am  2011-08-20 01:59:16.000000000 +0400
++++ gnome-disk-utility-2.32.0/src/gdu/Makefile.am       2011-08-20 02:08:18.000000000 +0400
+@@ -14,20 +14,20 @@
+ gdu-marshal.c: gdu-marshal.list
+        echo "#include \"gdu-marshal.h\"" > $@ && glib-genmarshal $< --prefix=gdu_marshal --body >> $@
+
+-udisks-daemon-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am
+-       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml
++udisks-daemon-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am
++       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml
+
+-udisks-device-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am
+-       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-device-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml
++udisks-device-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am
++       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-device-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml
+
+-udisks-adapter-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am
+-       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-adapter-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml
++udisks-adapter-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am
++       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-adapter-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml
+
+-udisks-expander-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am
+-       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-expander-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml
++udisks-expander-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am
++       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-expander-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml
+
+-udisks-port-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am
+-       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-port-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml
++udisks-port-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am
++       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-port-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml
+
+ lib_LTLIBRARIES=libgdu.la
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch
new file mode 100644
index 000000000..48e63b1ea
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch
@@ -0,0 +1,37 @@
+In cross environment we have to prepend the sysroot to the path found by
+pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
+it ends up using the files from host system. Now usually people have gnome installed
+so the build succeeds but if you dont have gnome installed on build host then
+it wont find the files on host system and packages using gnome-doc-utils wont
+compile.
+
+This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
+will be empty
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gnome-disk-utility-2.32.0/gnome-doc-utils.make
+===================================================================
+--- gnome-disk-utility-2.32.0.orig/gnome-doc-utils.make 2010-09-15 08:27:46.000000000 -0700
++++ gnome-disk-utility-2.32.0/gnome-doc-utils.make      2011-09-25 16:04:30.693795591 -0700
+@@ -133,12 +133,12 @@
+ _xml2po ?= `which xml2po`
+ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ 
+ if ENABLE_SK
+ _ENABLE_SK = true
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
new file mode 100644
index 000000000..2c526c8ed
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
@@ -0,0 +1,35 @@
+SUMMARY = "GNOME disk utility"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
+
+DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart gnome-doc-utils intltool-native libgnome-keyring"
+
+PR = "r4"
+
+inherit gnomebase gtk-icon-cache
+SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"
+SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98"
+
+SRC_URI += "\
+    file://disable-scrollkeeper.patch \
+    file://fix-dbus-interfaces.patch \
+    file://sysrooted-pkg-config.patch \
+    file://0001-Add-support-for-DeviceAutomountHint.patch \
+"
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
+
+do_configure_prepend() {
+    sed -i -e "s: help : :g" ${S}/Makefile.am
+}
+
+PACKAGES =+ "${PN}-nautilus-extension ${PN}-libs"
+FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
+FILES_${PN}-libs += "${libdir}/libgdu*.so.*"
+FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la"
+FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a"
+FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug"
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch
new file mode 100644
index 000000000..ad8a40ccf
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch
@@ -0,0 +1,55 @@
+Fixed build error with gcc 4.8
+
+Errors like below
+
+egg-asn1x.c: In function 'anode_encode_build':
+egg-asn1x.c:1280:7: warning: variable 'type' set but not used [-Wunused-but-set-variable]
+egg-asn1x.c: In function 'traverse_and_prepare':
+egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' from incompatible pointer type [enabled by default]
+In file included from egg-asn1x.c:50:0:
+egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but argument is of type 'const struct asn1_static_node *'
+egg-asn1x.c: At top level:
+egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create'
+In file included from egg-asn1x.c:50:0:
+egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was here
+egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark'
+In file included from egg-asn1x.c:50:0:
+egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' was here
+egg-asn1x.c:3579:1: error: conflicting types for 'egg_asn1x_create_and_decode'
+In file included from egg-asn1x.c:50:0:
+egg-asn1x.h:44:8: note: previous declaration of 'egg_asn1x_create_and_decode' was here
+make[4]: *** [libegg_la-egg-asn1x.lo] Error 1
+
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: gnome-keyring-2.32.1/egg/egg-asn1x.h
+===================================================================
+--- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h   2010-10-18 19:11:38.000000000 -0700
++++ gnome-keyring-2.32.1/egg/egg-asn1x.h        2013-06-11 15:15:00.675399263 -0700
+@@ -25,6 +25,7 @@
+ #define EGG_ASN1X_H_
+ 
+ #include <glib.h>
++#include <libtasn1.h>
+ 
+ #ifndef HAVE_EGG_ALLOCATOR
+ typedef void* (*EggAllocator) (void* p, gsize);
+@@ -35,13 +36,13 @@
+ 
+ struct static_struct_asn;
+ 
+-GNode*              egg_asn1x_create                 (const struct static_struct_asn *defs,
++GNode*              egg_asn1x_create                 (const ASN1_ARRAY_TYPE *defs,
+                                                       const gchar *type);
+ 
+-GNode*              egg_asn1x_create_quark           (const struct static_struct_asn *defs,
++GNode*              egg_asn1x_create_quark           (const ASN1_ARRAY_TYPE *defs,
+                                                       GQuark type);
+ 
+-GNode*              egg_asn1x_create_and_decode      (const struct static_struct_asn *defs,
++GNode*              egg_asn1x_create_and_decode      (const ASN1_ARRAY_TYPE *defs,
+                                                       const gchar *type,
+                                                       gconstpointer data,
+                                                       gsize n_data);
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
new file mode 100644
index 000000000..860851d98
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Password and keyring managing daemon"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \
+                    file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \
+                    file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \
+                    file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439"
+
+SECTION = "x11/gnome"
+
+PR = "r12"
+
+inherit autotools gnome gtk-doc pkgconfig gsettings
+
+SRC_URI += "file://egg-asn1x.patch"
+
+DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native"
+RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils"
+
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
+
+SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc"
+SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9"
+
+FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \
+                ${base_libdir}/security/*${SOLIBSDEV} \
+               "
+
+FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \
+                    ${libdir}/${BPN}/devel/*${SOLIBSDEV} \
+                    ${libdir}/${BPN}/standalone/*.la \
+                    ${base_libdir}/security/*.la \
+                   "
+
+FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \
+                    ${libdir}/${BPN}/devel/.debug/ \
+                    ${base_libdir}/security/.debug/"
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb
new file mode 100644
index 000000000..43379bdca
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Compatibility library for accessing secrets"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \
+                    file://library/gnome-keyring.h;endline=25;md5=68ea64f81c160d670c37da5f137be4fb \
+                    file://library/gnome-keyring.c;endline=26;md5=8d7a4fb674aaa012ea5a98e7c368b4a5 \
+                    file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08"
+
+SECTION = "x11/gnome/libs"
+PR = "r3"
+
+inherit gnomebase gtk-doc
+
+DEPENDS = "dbus libgcrypt glib-2.0 intltool-native"
+
+SRC_URI[archive.md5sum] = "c42b2ca66204835d901d3dbfc1fa5ae6"
+SRC_URI[archive.sha256sum] = "56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c"
diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
new file mode 100644
index 000000000..611499aff
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
@@ -0,0 +1,26 @@
+SUMMARY = "GNOME menus"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+PNBLACKLIST[gnome-menus3] ?= "CONFLICT: 24 files are conflicting with gnome-menus"
+# e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory
+
+DEPENDS = "python libxml2 gconf popt gtk+3"
+
+inherit gnomebase pkgconfig python-dir pythonnative
+
+BPN = "gnome-menus"
+
+SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081"
+SRC_URI[sha256sum] = "46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71"
+
+PACKAGES += "${PN}-python"
+FILES_${PN} += "${datadir}/desktop-directories/"
+FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \
+                    ${PYTHON_SITEPACKAGES_DIR}/.debug"
diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb
new file mode 100644
index 000000000..d9328b81b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb
@@ -0,0 +1,21 @@
+SUMMARY = "GNOME menus"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+PR = "r1"
+
+DEPENDS = "python libxml2 gconf popt gtk+"
+
+inherit gnomebase pkgconfig python-dir pythonnative
+
+SRC_URI[archive.md5sum] = "caa6772e63ed5870cf43dc3d354e0624"
+SRC_URI[archive.sha256sum] = "6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa"
+
+PACKAGES += "${PN}-python"
+FILES_${PN} += "${datadir}/desktop-directories/"
+FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \
+                    ${PYTHON_SITEPACKAGES_DIR}/.debug"
+
+
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch
new file mode 100644
index 000000000..378e3e405
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch
@@ -0,0 +1,36 @@
+From c65f1ae3472cfd4cd96fd376b7bbd95fba5eef0a Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Fri, 27 May 2011 17:00:14 +0000
+Subject: build: Fix build with --as-needed
+
+upstream-status: backport
+
+---
+diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
+index 0afc6c5..9734536 100644
+--- a/applets/notification_area/Makefile.am
++++ b/applets/notification_area/Makefile.am
+@@ -29,17 +29,17 @@ libtray_la_SOURCES =                \
+ NOTIFICATION_AREA_SOURCES = main.c main.h
+ 
+ NOTIFICATION_AREA_LDADD =                              \
++       libtray.la                                      \
+        ../../libpanel-applet/libpanel-applet-4.la      \
+        $(X_LIBS)                                       \
+        $(NOTIFICATION_AREA_LIBS)                       \
+-       $(LIBPANEL_APPLET_LIBS)                         \
+-       libtray.la
++       $(LIBPANEL_APPLET_LIBS)
+ 
+ testtray_SOURCES = testtray.c
+ testtray_LDADD =                       \
++       libtray.la                      \
+        $(X_LIBS)                       \
+-       $(NOTIFICATION_AREA_LIBS)       \
+-       libtray.la
++       $(NOTIFICATION_AREA_LIBS)
+ 
+ if NOTIFICATION_AREA_INPROCESS
+ APPLET_IN_PROCESS = true
+--
+cgit v0.9
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch
new file mode 100644
index 000000000..de4cd8486
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch
@@ -0,0 +1,22 @@
+--- /tmp/Makefile.am    2009-10-26 16:53:20.000000000 +0100
++++ gnome-panel-2.28.0/gnome-panel/Makefile.am  2009-10-26 16:53:51.000000000 +0100
+@@ -43,7 +43,7 @@
+        $(NULL)
+ 
+ $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
+-       $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
++       $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+ 
+ BUILT_SOURCES = \
+        $(CORBA_SRCLIST)        \
+--- /tmp/Makefile.am    2009-10-26 16:54:17.000000000 +0100
++++ gnome-panel-2.28.0/libpanel-applet/Makefile.am      2009-10-26 16:54:34.000000000 +0100
+@@ -45,7 +45,7 @@
+        GNOME_Panel.h
+ 
+ $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
+-       $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
++       $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+ 
+ noinst_PROGRAMS = test-bonobo-applet
+ 
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
new file mode 100644
index 000000000..972a4d4db
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
@@ -0,0 +1,51 @@
+SUMMARY = "GNOME panel"
+LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
+
+BPN = "gnome-panel"
+PR = "r1"
+
+PNBLACKLIST[gnome-panel3] ?= "CONFLICT: depends on libgweather3 which conflicts with libgweather"
+
+# conflicts with gnome-panel, because they provide the same package
+# http://patches.openembedded.org/patch/43105/
+EXCLUDE_FROM_WORLD = "1"
+DEFAULT_PREFERENCE = "-1"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING-DOCS;md5=c9211dab3ae61e580f48432020784324 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+SECTION = "x11/gnome"
+
+DEPENDS = "gnome-doc-utils-native gtk+3 dconf gconf glib-2.0 gnome-desktop3 gtk+ pango libwnck3 gnome-menus cairo libgweather3 dbus-glib librsvg libcanberra" 
+
+inherit gtk-doc gnome gettext pkgconfig
+
+SRC_URI += "file://as-needed.patch "
+
+SRC_URI[archive.md5sum] = "0f2f644dc4081b72f6df7a65282af7c6"
+SRC_URI[archive.sha256sum] = "25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196"
+
+EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none"
+
+do_configure_prepend() {
+    gnome-doc-prepare --automake
+    sed -i -e s:help:: ${S}/Makefile.am
+}
+
+pkg_postinst_${PN}_append () {
+    gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
+        --direct --load /etc/gconf/schemas/panel-default-setup.entries
+}
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-3.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+                ${datadir}/dbus-1 \
+                ${datadir}/icons \
+                ${datadir}/PolicyKit \
+                ${libdir}/bonobo \
+"
+
+
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
new file mode 100644
index 000000000..4957a99aa
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
@@ -0,0 +1,37 @@
+SUMMARY = "GNOME panel"
+LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING-DOCS;md5=c9211dab3ae61e580f48432020784324 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+SECTION = "x11/gnome"
+
+PR = "r7"
+
+DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ pango libwnck gnome-menus cairo libgweather dbus-glib librsvg libcanberra" 
+
+inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf
+
+SRCREV = "6a364b6a4a9beed3da9ca6f5b0dac81eb99dea2a"
+SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none"
+
+do_configure_prepend() {
+    gnome-doc-prepare --automake
+    sed -i -e s:help:: ${S}/Makefile.am
+    sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in
+}
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-*.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+                ${datadir}/dbus-1 \
+                ${datadir}/icons \
+                ${datadir}/PolicyKit \
+                ${libdir}/bonobo \
+"
diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch
new file mode 100644
index 000000000..d6d49bbda
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch
@@ -0,0 +1,37 @@
+From 3ed15a3c6ae4ab94c7e3af306644bb5d7f3fd1fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 29 Apr 2013 13:08:10 +0200
+Subject: [PATCH] Makefile.am: don't build help/man
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+help crashes with:
+
+| xsltproc -o gnome-power-manager-C.omf --stringparam db2omf.basename gnome-power-manager --stringparam db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML V4.3//EN" --stringparam db2omf.lang C --stringparam db2omf.omf_dir "/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help" --stringparam db2omf.omf_in "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnome-power-manager/2.32.0-r2/gnome-power-manager-2.32.0/help/gnome-power-manager.omf.in"  /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils` C/gnome-power-manager.xml || { rm -f "gnome-power-manager-C.omf"; exit 1; }
+| unable to parse fr/gnome-power-manager.xml
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile.am |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 005b8a0..5b9e318 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,9 +5,7 @@ SUBDIRS =                                               \
+        src                                             \
+        po                                              \
+        docs                                            \
+-       man                                             \
+        data                                            \
+-       help                                            \
+        policy                                          \
+        tools
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch
new file mode 100644
index 000000000..f3db7ab6e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch
@@ -0,0 +1,35 @@
+In cross environment we have to prepend the sysroot to the path found by
+pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
+it ends up using the files from host system. Now usually people have gnome installed
+so the build succeeds but if you dont have gnome installed on build host then
+it wont find the files on host system and packages using gnome-doc-utils wont
+compile.
+
+This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
+will be empty
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gnome-power-manager-2.32.0/gnome-doc-utils.make
+===================================================================
+--- gnome-power-manager-2.32.0.orig/gnome-doc-utils.make        2010-01-27 08:28:31.000000000 -0800
++++ gnome-power-manager-2.32.0/gnome-doc-utils.make     2011-09-25 16:16:04.914813800 -0700
+@@ -124,11 +124,11 @@
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ 
+ if ENABLE_SK
+ _ENABLE_SK = true
diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb
new file mode 100644
index 000000000..2c55cf157
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb
@@ -0,0 +1,51 @@
+SUMMARY = "Power management daemon"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+PR = "r4"
+
+DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower gnome-doc-utils"
+RRECOMMENDS_${PN} += "gnome-keyring"
+
+inherit gnome
+
+SRC_URI += " \
+    file://sysrooted-pkg-config.patch \
+    file://0001-Makefile.am-don-t-build-help-man.patch \
+"
+
+SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda"
+SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476"
+
+EXTRA_OECONF = " --disable-scrollkeeper \
+                 --disable-applets \
+                 --x-includes=${STAGING_INCDIR} \
+                 --x-libraries=${STAGING_LIBDIR} \
+                 --enable-compile-warnings=no \
+                 ac_cv_header_X11_extensions_dpms_h=yes \
+"
+
+do_configure_append() {
+    # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
+    for i in $(find ${B} -name "Makefile") ; do
+        sed -i -e s:-Werror::g $i
+    done
+    sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${B}/src/Makefile
+}
+
+PACKAGES =+ "${PN}-applets"
+
+FILES_${PN}-applets = "${bindir}/*applet* \
+    ${libdir}/bonobo/servers \
+    ${datadir}/gnome-2.0/ui \
+"
+
+FILES_${PN} += "${datadir}/icons \
+    ${datadir}/dbus-1 \
+    ${datadir}/gnome/autostart \
+"
+
+FILES_${PN}-doc += "${datadir}/omf \
+    ${datadir}/gnome/help \
+"
+
diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch
new file mode 100644
index 000000000..b09f8d200
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch
@@ -0,0 +1,61 @@
+This patch fixes the build errors when building gnome-session for 64bit target using gcc 4.8
+
+| gs-idle-monitor.c: In function 'handle_alarm_notify_event':
+| gs-idle-monitor.c:196:9: error: format '%lld' expects argument of type 'long long int', but argument 5 has type 'gint64' [-Werror=format=]
+|          g_debug ("Watch %d fired, idle time = %lld",
+|          ^
+| gs-idle-monitor.c: In function '_xsync_alarm_set':
+| gs-idle-monitor.c:453:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=]
+|                  g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld",
+|                  ^
+| gs-idle-monitor.c:457:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=]
+|                  g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%lld",
+|                  ^
+| gs-idle-monitor.c:464:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=]
+|                  g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld",
+|                  ^
+| gs-idle-monitor.c:468:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=]
+
+Upstream-Status: Unknown
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Index: gnome-session-2.32.1/gnome-session/gs-idle-monitor.c
+===================================================================
+--- gnome-session-2.32.1.orig/gnome-session/gs-idle-monitor.c   2010-11-17 03:17:04.000000000 -0800
++++ gnome-session-2.32.1/gnome-session/gs-idle-monitor.c        2013-06-11 23:33:12.239960082 -0700
+@@ -193,7 +193,7 @@
+                 return;
+         }
+ 
+-        g_debug ("Watch %d fired, idle time = %lld",
++        g_debug ("Watch %d fired, idle time = %" G_GINT64_FORMAT "",
+                  watch->id,
+                  _xsyncvalue_to_int64 (alarm_event->counter_value));
+ 
+@@ -450,22 +450,22 @@
+ 
+         attr.trigger.test_type = XSyncPositiveTransition;
+         if (watch->xalarm_positive != None) {
+-                g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld",
++                g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%" G_GINT64_FORMAT "",
+                          _xsyncvalue_to_int64 (attr.trigger.wait_value));
+                 XSyncChangeAlarm (GDK_DISPLAY (), watch->xalarm_positive, flags, &attr);
+         } else {
+-                g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%lld",
++                g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%" G_GINT64_FORMAT "",
+                          _xsyncvalue_to_int64 (attr.trigger.wait_value));
+                 watch->xalarm_positive = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr);
+         }
+ 
+         attr.trigger.test_type = XSyncNegativeTransition;
+         if (watch->xalarm_negative != None) {
+-                g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld",
++                g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%" G_GINT64_FORMAT "",
+                          _xsyncvalue_to_int64 (attr.trigger.wait_value));
+                 XSyncChangeAlarm (GDK_DISPLAY (), watch->xalarm_negative, flags, &attr);
+         } else {
+-                g_debug ("GSIdleMonitor: creating new alarm for negative transition wait=%lld",
++                g_debug ("GSIdleMonitor: creating new alarm for negative transition wait=%" G_GINT64_FORMAT "",
+                          _xsyncvalue_to_int64 (attr.trigger.wait_value));
+                 watch->xalarm_negative = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr);
+         }
diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb
new file mode 100644
index 000000000..cd8f43df6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Gnome session manager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+PR = "r3"
+
+SECTION = "x11/gnome"
+DEPENDS = "libxtst gtk+ glib-2.0 upower dbus-glib gconf pango gdk-pixbuf-native startup-notification"
+
+inherit gnome
+
+SRC_URI += "file://use_G_GINT64_FORMAT.patch"
+
+SRC_URI[archive.md5sum] = "222bad6b446cb19a6b9028ea24538002"
+SRC_URI[archive.sha256sum] = "22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a"
+
+EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set --disable-docbook-docs"
+
+do_configure_append() {
+    for i in $(find ${S} -name "Makefile") ; do
+        sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i
+        sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i
+    done    
+}
+
+RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}"
+FILES_${PN} += "${datadir}/xsessions ${datadir}/icons ${datadir}/gnome ${libdir}/gnome-session/helpers"
+FILES_${PN}-dbg += "${libexecdir}/gnome-session/helpers/.debug"
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
new file mode 100644
index 000000000..729d750bf
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
@@ -0,0 +1,38 @@
+SUMMARY = "GNOME settings daemon"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+PR = "r7"
+
+DEPENDS = "intltool libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop"
+
+inherit gnome
+
+SRC_URI = "git://git.gnome.org/gnome-settings-daemon;branch=gnome-2-32"
+SRCREV = "0160f6725cfb872e017f3958f108792c3b882872"
+
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)"
+PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio glib-2.0 libcanberra"
+
+EXTRA_OECONF = " \
+    --x-includes=${STAGING_INCDIR} \
+    --x-libraries=${STAGING_LIBDIR} \
+    --enable-polkit \
+"
+
+do_configure_prepend() {
+    sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' ${S}/configure.ac
+}
+
+FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \
+                ${datadir}/dbus-1/ \
+                ${datadir}/icon* \
+                ${datadir}/gnome-control-center \
+                ${datadir}/xsession*"
+
+FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug"
+FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la"
+FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a"
+
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch
new file mode 100644
index 000000000..ace1b0076
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch
@@ -0,0 +1,101 @@
+From 8587e35af52f7773f62361be2e72ddf286a59185 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 15 May 2012 13:02:02 +0200
+Subject: [PATCH] Fix glib includes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Upstream-Status: unknown
+
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/interface.h       |    2 +-
+ src/load-graph.h      |    2 +-
+ src/lsof.h            |    2 +-
+ src/openfiles.h       |    2 +-
+ src/procman_gnomesu.h |    2 +-
+ src/util.cpp          |    2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/interface.h b/src/interface.h
+index 4bda35a..b26b670 100644
+--- a/src/interface.h
++++ b/src/interface.h
+@@ -20,7 +20,7 @@
+ #ifndef _PROCMAN_INTERFACE_H_
+ #define _PROCMAN_INTERFACE_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include "procman.h"
+ 
+diff --git a/src/load-graph.h b/src/load-graph.h
+index 6111c78..6e7a599 100644
+--- a/src/load-graph.h
++++ b/src/load-graph.h
+@@ -1,7 +1,7 @@
+ #ifndef _PROCMAN_LOAD_GRAPH_H_
+ #define _PROCMAN_LOAD_GRAPH_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibtop/cpu.h>
+ 
+ enum
+diff --git a/src/lsof.h b/src/lsof.h
+index ad7f111..da420e2 100644
+--- a/src/lsof.h
++++ b/src/lsof.h
+@@ -1,7 +1,7 @@
+ #ifndef H_PROCMAN_LSOF_1161179202
+ #define H_PROCMAN_LSOF_1161179202
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "procman.h"
+ 
+ void procman_lsof(ProcData *data);
+diff --git a/src/openfiles.h b/src/openfiles.h
+index 38b1cc8..a8b7b05 100644
+--- a/src/openfiles.h
++++ b/src/openfiles.h
+@@ -1,7 +1,7 @@
+ #ifndef _OPENFILES_H_
+ #define _OPENFILES_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "procman.h"
+ 
+diff --git a/src/procman_gnomesu.h b/src/procman_gnomesu.h
+index fec2650..474ca9a 100644
+--- a/src/procman_gnomesu.h
++++ b/src/procman_gnomesu.h
+@@ -1,7 +1,7 @@
+ #ifndef H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917
+ #define H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ gboolean
+ procman_gnomesu_create_root_password_dialog(const char * message);
+diff --git a/src/util.cpp b/src/util.cpp
+index 9b1c9f5..90073fe 100644
+--- a/src/util.cpp
++++ b/src/util.cpp
+@@ -1,7 +1,7 @@
+ #include <config.h>
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include <glibtop/proctime.h>
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch
new file mode 100644
index 000000000..7b6728102
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch
@@ -0,0 +1,49 @@
+From acff719983aa1294148dc4a367c48957f5510eff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 17 May 2013 18:25:56 +0200
+Subject: [PATCH] src/procman.cpp: include main gtkmm.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+after update of gtkmm build failed with:
+
+In file included from /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gtkmm-2.4/gtkmm/main.h:33:0,
+                 from procman.cpp:26:
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:7: error: 'Value' is not a template
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected template-name before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected '{' before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected unqualified-id before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:7: error: 'Value' is not a template
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:30: error: 'Glib::Value' is not a template type
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:58: error: expected template-name before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:7: error: 'Value' is not a template
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:24: error: 'Glib::Value' is not a template type
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:51: error: expected template-name before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:7: error: 'Value' is not a template
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:32: error: 'Glib::Value' is not a template type
+<...>
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/procman.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/procman.cpp b/src/procman.cpp
+index b5c0d0a..d9b4b3f 100644
+--- a/src/procman.cpp
++++ b/src/procman.cpp
+@@ -23,7 +23,7 @@
+ 
+ #include <locale.h>
+ 
+-#include <gtkmm/main.h>
++#include <gtkmm.h>
+ #include <giomm/volumemonitor.h>
+ #include <giomm/init.h>
+ #include <glib.h>
+-- 
+1.7.4.4
+
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb
new file mode 100644
index 000000000..ce4b64e97
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Gnome system monitor"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+SECTION = "x11/gnome"
+PR = "r2"
+
+DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils gnome-icon-theme libwnck gtk+ dbus-glib librsvg intltool-native"
+
+inherit gnome
+SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167"
+SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59"
+SRC_URI += " \
+    file://0001-Fix-glib-includes.patch \
+    file://0002-src-procman.cpp-include-main-gtkmm.h.patch \
+"
+
+do_configure_prepend() {
+    sed -i -e s:help::g ${S}/Makefile.am
+}
+
+FILES_${PN} += "${datadir}/icons \
+                ${datadir}/dbus-1 \
+                ${datadir}/gnome/autostart \
+"
+
+FILES_${PN}-doc += "${datadir}/omf \
+                    ${datadir}/gnome/help "
+
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
new file mode 100644
index 000000000..383329970
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
@@ -0,0 +1,77 @@
+From 536e9b57cada4a9f92e073fdf01cdf1def435b6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 7 May 2013 14:56:06 +0200
+Subject: [PATCH] multiple Makefile.am: remove -DG_DISABLE_DEPRECATED to fix
+ build with glib-2.36
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ daemon/Makefile.am      |    1 -
+ libgnomevfs/Makefile.am |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+Index: gnome-vfs-2.24.4/daemon/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/daemon/Makefile.am    2013-10-17 16:39:39.081024798 -0700
++++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-10-17 16:39:39.213024794 -0700
+@@ -8,7 +8,6 @@
+        -D_LARGEFILE64_SOURCE                   \
+        -D_POSIX_PTHREAD_SEMANTICS              \
+        -D_REENTRANT                            \
+-       -DG_DISABLE_DEPRECATED                  \
+        -DGNOME_VFS_PREFIX=\"$(prefix)\"        \
+        -DGNOME_VFS_DATADIR=\"$(datadir)\"      \
+        -DGNOME_VFS_LIBDIR=\"$(libdir)\"        \
+Index: gnome-vfs-2.24.4/libgnomevfs/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am       2013-10-17 16:39:39.081024798 -0700
++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am    2013-10-17 16:39:39.213024794 -0700
+@@ -19,7 +19,6 @@
+        -D_LARGEFILE64_SOURCE                   \
+        -D_POSIX_PTHREAD_SEMANTICS              \
+        -D_REENTRANT                            \
+-       -DG_DISABLE_DEPRECATED                  \
+        -DGNOME_VFS_PREFIX=\"$(prefix)\"        \
+        -DGNOME_VFS_BINDIR=\"$(bindir)\"        \
+        -DGNOME_VFS_DATADIR=\"$(datadir)\"      \
+Index: gnome-vfs-2.24.4/modules/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/modules/Makefile.am   2013-10-17 16:39:39.081024798 -0700
++++ gnome-vfs-2.24.4/modules/Makefile.am        2013-10-17 16:39:39.213024794 -0700
+@@ -18,7 +18,6 @@
+        -D_POSIX_PTHREAD_SEMANTICS              \
+        -D_REENTRANT                            \
+        -DSSH_PROGRAM=\"$(SSH_PROGRAM)\"        \
+-       -DG_DISABLE_DEPRECATED                  \
+        -DGNOME_VFS_PREFIX=\"$(prefix)\"        \
+        -DGNOME_VFS_DATADIR=\"$(datadir)\"      \
+        -DGNOME_VFS_LIBDIR=\"$(libdir)\"        \
+Index: gnome-vfs-2.24.4/programs/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/programs/Makefile.am  2013-10-17 16:39:39.081024798 -0700
++++ gnome-vfs-2.24.4/programs/Makefile.am       2013-10-17 16:39:39.213024794 -0700
+@@ -4,8 +4,7 @@
+        -I$(top_srcdir)                         \
+        -I$(top_builddir)                       \
+        $(TEST_CFLAGS)                          \
+-       $(VFS_CFLAGS)                           \
+-       -DG_DISABLE_DEPRECATED
++       $(VFS_CFLAGS)
+ 
+ libraries =                                            \
+        $(top_builddir)/libgnomevfs/libgnomevfs-2.la    \
+Index: gnome-vfs-2.24.4/test/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/test/Makefile.am      2010-02-09 04:16:14.000000000 -0800
++++ gnome-vfs-2.24.4/test/Makefile.am   2013-10-17 16:42:49.109019172 -0700
+@@ -6,7 +6,6 @@
+        -I$(top_builddir)/libgnomevfs           \
+        $(TEST_CFLAGS)                          \
+        $(VFS_CFLAGS)                           \
+-       -DG_DISABLE_DEPRECATED                  \
+        -DMODULES_PATH=\"$(libdir)/vfs/modules\"
+ 
+ if OS_WIN32
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch
new file mode 100644
index 000000000..30ca29b10
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch
@@ -0,0 +1,22 @@
+Fixes errors with new autotools
+
+| automake: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/auto-test'
+| autoreconf: automake failed with exit status: 1
+| ERROR: autoreconf execution failed.
+
+Upstream-Status: Not Submitted
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gnome-vfs-2.24.4/test/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/test/Makefile.am      2013-10-17 16:43:36.677017764 -0700
++++ gnome-vfs-2.24.4/test/Makefile.am   2013-10-17 16:48:47.369008566 -0700
+@@ -64,7 +64,7 @@
+        test-async-cancel \
+        test-escape       \
+        test-uri          \
+-       $(srcdir)/auto-test     
++       auto-test
+ 
+ libraries =                                            \
+        $(top_builddir)/libgnomevfs/libgnomevfs-2.la    \
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch
new file mode 100644
index 000000000..0f52136e3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch
@@ -0,0 +1,13 @@
+Upstream-Status: Inappropriate [configuration]
+
+--- gnome-vfs-2.6.0/configure.in~       2004-03-22 12:36:23.000000000 +0000
++++ gnome-vfs-2.6.0/configure.in        2004-06-07 16:04:34.000000000 +0100
+@@ -154,7 +154,7 @@
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+ 
+ if test x"$GCONFTOOL" = xno; then
+-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
++  AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
+ 
+ AM_GCONF_SOURCE_2
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
new file mode 100644
index 000000000..dabec32c6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
@@ -0,0 +1,53 @@
+Upstream-Status: Inappropriate [configuration]
+
+removes kerberos completely to avoid conflicts with installed kerberos
+--- configure.in.orig   2007-01-05 19:42:26.418541610 +0200
++++ configure.in        2007-01-05 19:42:56.604261797 +0200
+@@ -436,47 +436,6 @@
+ ])
+ AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
+ AC_SUBST(CDDA_LIBS)
+-
+-dnl GSSAPI
+-dnl Check for Kerberos installation
+-have_gssapi=no
+-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+-                                          
+-if test "x$KRB5_CONFIG" != "xnone"; then
+-   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+-   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-   
+-   saved_CPPFLAGS="$CPPFLAGS"
+-   saved_LIBS="$LIBS"
+-   LIBS="$LIBS $GSSAPI_LIBS"
+-   CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+-   # MIT and Heimdal put gssapi.h in different places
+-   AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
+-       AC_CHECK_FUNCS(gss_init_sec_context, [
+-           AC_MSG_NOTICE([GSSAPI authentication support enabled])
+-           AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
+-           AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
+-                have_gssapi=yes
+-        
+-       # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
+-       AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
+-          [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, 
+-             [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
+-               ], [
+-                   #ifdef HAVE_GSSAPI_GSSAPI_H
+-                   #include <gssapi/gssapi.h>
+-                   #else          
+-                   #include <gssapi.h>
+-                   #endif
+-               ])
+-         ])
+-     break
+-   ])
+-   LIBS="$saved_LIBS" 
+-   CPPFLAGS="$saved_CPPFLAGS" 
+-fi   
+-AC_SUBST(GSSAPI_LIBS)
+-AC_SUBST(GSSAPI_CFLAGS)
+           
+ dnl ******************************
+ dnl http-method (neon checks)
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
new file mode 100644
index 000000000..6988b3a5e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -0,0 +1,59 @@
+SUMMARY = "a userspace virtual filesystem"
+HOMEPAGE = "http://www.gnome.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2+ & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://libgnomevfs/gnome-vfs.h;endline=25;md5=17071e69707a8f42887d88413f2623cb \
+                    file://programs/gnomevfs-ls.c;endline=23;md5=678a2e8bedaef5818ccabe633840196b \
+                    file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \
+                    file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54"
+
+DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib intltool-native"
+RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
+# Some legacy packages will require gnome-mime-data to be installed, but use of
+# it is deprecated.
+PR = "r3"
+
+inherit gnome
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+RPROVIDES_${PN} = "gnome-vfs-plugin-dbus"
+
+SRC_URI += " \
+    file://gconftool-lossage.patch \
+    file://gnome-vfs-no-kerberos.patch;striplevel=0 \
+    file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \
+    file://do-not-use-srcdir-variable.patch \
+"
+
+SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e"
+SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
+PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
+PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin"
+
+EXTRA_OECONF = " --disable-hal \
+                 --disable-openssl \
+                 --disable-samba \
+                 ac_cv_lib_acl_acl_get_file=no \
+                 ac_cv_lib_sec_acl=no \
+                 gvfs_cv_HAVE_SOLARIS_ACLS=no \
+                 gvfs_cv_HAVE_POSIX_ACLS=no \
+"
+
+FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services"
+FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug"
+FILES_${PN}-dev += "${libdir}/gnome-vfs-2.0/include/* ${libdir}/gnome-vfs-2.0/modules/*.la"
+FILES_${PN}-staticdev += "${libdir}/gnome-vfs-2.0/modules/*.a"
+FILES_${PN}-doc += "${datadir}/gtk-doc"
+
+PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*"
+
+python populate_packages_prepend () {
+    print d.getVar('FILES_gnome-vfs', 1)
+
+    plugindir = d.expand('${libdir}/gnome-vfs-2.0/modules/')
+    do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch b/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch
new file mode 100644
index 000000000..d7874e492
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch
@@ -0,0 +1,28 @@
+From d2549d3ef08536be6d141524e3382fef07fea8bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 30 Apr 2013 19:48:27 +0200
+Subject: [PATCH] Makefile.am: do not build help
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 89f7ee4..31e11ab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = src po help
++SUBDIRS = src po
+ 
+ NULL =
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb
new file mode 100644
index 000000000..26fbeb2d9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb
@@ -0,0 +1,18 @@
+SUMMARY = "GNOME Terminal"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed"
+DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte gnome-doc-utils intltool-native"
+PR = "r1"
+
+inherit gnome
+
+SRC_URI += " \
+    file://0001-Makefile.am-do-not-build-help.patch \
+"
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
+SRC_URI[archive.md5sum] = "74c4528f00067072c2bd867d1f8fe844"
+SRC_URI[archive.sha256sum] = "2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a"
+
+RRECOMMENDS_${PN} += "gnome-common-schemas"
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch
new file mode 100644
index 000000000..dba60ca69
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch
@@ -0,0 +1,288 @@
+Imported from gentoo:
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch
+
+From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 7 Aug 2012 06:53:09 -0400
+Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions
+
+CUPS 1.6 makes various structures private and introduces these ippGet
+and ippSet functions for all of the fields in these structures.
+http://www.cups.org/str.php?L3928
+
+We define our own accessors when building against CUPS < 1.6.
+
+Based on work by Jiri Popelka <jpopelka@redhat.com> at
+https://bugzilla.gnome.org/show_bug.cgi?id=679759
+---
+ libgnomecups/gnome-cups-printer.c |   48 +++++++++++++++++++++++++++++-------
+ libgnomecups/gnome-cups-queue.c   |   43 +++++++++++++++++++++++++++------
+ libgnomecups/gnome-cups-request.c |   44 ++++++++++++++++++++++++++++-----
+ 3 files changed, 110 insertions(+), 25 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c
+index c924af0..f5e1ef7 100644
+--- a/libgnomecups/gnome-cups-printer.c
++++ b/libgnomecups/gnome-cups-printer.c
+@@ -37,6 +37,34 @@
+ 
+ #define UPDATE_TIMEOUT 5000
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr)     attr->num_values
++#define ippGetName(attr)      attr->name
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ struct _GnomeCupsPPDFile {
+        char name[1];
+ };
+@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer,
+        printer->details->state_reasons = NULL;
+ 
+        /* cf. RFC2911 4.4.12 */
+-       for (i = 0; i < attr->num_values; i++) {
++       for (i = 0; i < ippGetCount (attr); i++) {
+                const char *p;
+-               const char *keyword = attr->values [i].string.text;
++               const char *keyword = ippGetString (attr, i, NULL);
+ 
+                reason = g_new (GnomeCupsPrinterReason, 1);
+ 
+@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer)
+        return printer->details->info;
+ }
+ 
+-#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }}
+-#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}}
++#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }}
++#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}}
+ 
+ static void
+ attributes_update_cb (guint id,
+@@ -243,14 +271,14 @@ attributes_update_cb (guint id,
+        changed = FALSE;
+ 
+        if (!error && response) {
+-               for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-                       if (!attr->name) {
++               for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++                       if (!ippGetName (attr)) {
+                                continue;
+                        } 
+-                       if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) {
++                       if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) {
+                                continue;
+                        }
+-                       if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) {
++                       if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) {
+                                map_reasons (printer, attr);
+                        }
+                        MAP_INT (printer->details->state, "printer-state");
+@@ -570,7 +598,7 @@ get_default (void)
+        
+        attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
+        if (attr) {
+-               name = g_strdup (attr->values[0].string.text);
++               name = g_strdup (ippGetString (attr, 0, NULL));
+        } else {
+                name = NULL;
+        }
+@@ -698,7 +726,7 @@ get_printer_names (void)
+        attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
+        while (attr) {
+                ret = g_list_prepend (ret, 
+-                                     g_strdup (attr->values[0].string.text));
++                                     g_strdup (ippGetString (attr, 0, NULL)));
+                
+                attr = ippFindNextAttribute (response, 
+                                             "printer-name", 
+diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c
+index 9f98ed9..298db42 100644
+--- a/libgnomecups/gnome-cups-queue.c
++++ b/libgnomecups/gnome-cups-queue.c
+@@ -15,6 +15,33 @@
+ 
+ #define UPDATE_TIMEOUT 3000
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetName(attr)      attr->name
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ struct _GnomeCupsQueueDetails {
+        char *queue_name;
+        GList *jobs;
+@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job)
+        job->size = job->size * 1024;
+ }
+ 
+-#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}}
+-#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } }
++#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}}
++#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } }
+ 
+ static void
+ get_jobs_cb (guint id,
+@@ -231,8 +258,8 @@ get_jobs_cb (guint id,
+        
+        if (response) {
+                job = g_new0 (GnomeCupsJob, 1);
+-               for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-                       if (attr->name == NULL) {
++               for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++                       if (ippGetName (attr) == NULL) {
+                                if (job->name) {
+                                        finish_job (job);
+                                        jobs = g_list_prepend (jobs, job);      
+@@ -244,7 +271,7 @@ get_jobs_cb (guint id,
+                                continue;
+                        }
+                        
+-                       if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
++                       if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
+                                continue;
+                                
+                        }
+@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
+ 
+        if (response) {
+                job = g_new0 (GnomeCupsJob, 1);
+-               for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-                       if (attr->name == NULL) {
++               for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++                       if (ippGetName (attr) == NULL) {
+                                if (job->name) {
+                                        finish_job (job);
+                                } else {
+@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
+                                break;
+                        }
+                        
+-                       if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
++                       if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
+                                continue;
+                        }
+                        
+diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c
+index c94f623..13f0948 100644
+--- a/libgnomecups/gnome-cups-request.c
++++ b/libgnomecups/gnome-cups-request.c
+@@ -19,6 +19,36 @@
+ #define STOP_UNUSED_THREADS_TIMEOUT 60
+ #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr)     attr->num_values
++#define ippGetValueTag(attr)  attr->value_tag
++#define ippGetName(attr)      attr->name
++#define ippGetBoolean(attr, element) attr->values[element].boolean
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ typedef struct
+ {
+        GMutex *mutex;
+@@ -276,14 +306,14 @@ dump_request (ipp_t const *req)
+        unsigned i;
+        ipp_attribute_t *attr;
+ 
+-       for (attr = req->attrs; attr != NULL; attr = attr->next) {
+-               g_print ("%s", attr->name);
+-               for (i = 0 ; i < attr->num_values ; i++) {
++       for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) {
++               g_print ("%s", ippGetName (attr));
++               for (i = 0 ; i < ippGetCount (attr) ; i++) {
+                        g_print ("\t[%d] = ", i);
+-                       switch (attr->value_tag & ~IPP_TAG_COPY) {
++                       switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) {
+                        case IPP_TAG_INTEGER:
+                        case IPP_TAG_ENUM:
+-                               g_print ("%d\n", attr->values[i].integer);
++                               g_print ("%d\n", ippGetInteger (attr, i));
+                                break;
+ 
+                        case IPP_TAG_STRING:
+@@ -294,11 +324,11 @@ dump_request (ipp_t const *req)
+                        case IPP_TAG_CHARSET:
+                        case IPP_TAG_LANGUAGE:
+                        case IPP_TAG_MIMETYPE:
+-                               g_print ("'%s'\n", attr->values[i].string.text);
++                               g_print ("'%s'\n", ippGetString (attr, i, NULL));
+                                break;
+ 
+                        case IPP_TAG_BOOLEAN:
+-                               g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false");
++                               g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false");
+                                break;
+ 
+                        default:
+-- 
+1.7.8.6
+
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch
new file mode 100644
index 000000000..c7b616578
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch
@@ -0,0 +1,42 @@
+Imported from gentoo:
+
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch
+
+From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Sun, 27 Nov 2011 21:36:41 +0100
+Subject: [PATCH] Fix: Only glib.h can be included
+
+---
+ libgnomecups/gnome-cups-i18n.c |    2 +-
+ libgnomecups/gnome-cups-init.h |    3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
+index 8987c5c..127756d 100644
+--- a/libgnomecups/gnome-cups-i18n.c
++++ b/libgnomecups/gnome-cups-i18n.c
+@@ -1,5 +1,5 @@
+ #include <config.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gnome-cups-i18n.h"
+ 
+ #ifdef ENABLE_NLS
+diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
+index 22b682a..c4600fc 100644
+--- a/libgnomecups/gnome-cups-init.h
++++ b/libgnomecups/gnome-cups-init.h
+@@ -1,8 +1,7 @@
+ #ifndef GNOME_CUPS_INIT
+ #define GNOME_CUPS_INIT
+ 
+-#include <glib/gtypes.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+-- 
+1.7.7
+
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
new file mode 100644
index 000000000..fe0d34e5e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
@@ -0,0 +1,22 @@
+DESCRIPTION="Gnome Cups Manager"
+LICENSE="GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
+
+PR = "r2"
+
+inherit gnomebase pkgconfig
+
+do_compile_append () {
+    cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old
+    sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc
+}
+
+SRC_URI += "\
+    file://libgnomecups-0.2.3-glib.h.patch \
+    file://libgnomecups-0.2.3-cups-1.6.patch \
+"
+
+SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b"
+SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29"
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch
new file mode 100644
index 000000000..174985a7e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch
@@ -0,0 +1,37 @@
+From ed31fd89f4c77d89390774d29427898a85b25ab1 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 1 Aug 2014 13:58:36 +0200
+Subject: [PATCH] configure: use pkgconfig for freetype
+
+Upstream-status: Pending
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.in | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 729278d..e569429 100644
+--- a/configure.in
++++ b/configure.in
+@@ -164,13 +164,11 @@ dnl Checking for freetype2
+ dnl =================================
+ FREETYPE_LIBS=
+ FREETYPE_CFLAGS=
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-if test "x$FREETYPE_CONFIG" = "xno" ; then
+-       AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
+-else
+-       FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-       FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+-fi
++PKG_CHECK_MODULES(FREETYPE2, freetype2, 
++    FREETYPE_CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++    FREETYPE_LIBS="$LIBS $FREETYPE2_LIBS",
++    AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
++)
+ 
+ libgnomeprint_save_ldflags=$LDFLAGS
+ LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+-- 
+1.9.0
+
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch
new file mode 100644
index 000000000..53235a12d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch
@@ -0,0 +1,11 @@
+diff -uNr libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+--- libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c   2009-04-19 19:45:36.000000000 +0200
++++ libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c        2012-12-23 12:34:52.058643537 +0100
+@@ -35,6 +35,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <stdio.h>
+ #include <locale.h>
+ 
+ #include <cups/cups.h>
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch
new file mode 100644
index 000000000..7a27ecd23
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch
@@ -0,0 +1,38 @@
+Use proper method to include freetype headers
+
+FreeType wants to use these special macros to include its APIs
+so be it.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Index: libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c
+===================================================================
+--- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-font-face.c
++++ libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c
+@@ -36,7 +36,9 @@
+ #include <stdarg.h>
+ #include <locale.h>
+ 
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
++
+ 
+ #include <libgnomeprint/gnome-print-private.h>
+ #include <libgnomeprint/gnome-font-private.h>
+Index: libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c
+===================================================================
+--- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-rfont.c
++++ libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c
+@@ -28,8 +28,8 @@
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftbbox.h>
++#include FT_GLYPH_H
++#include FT_BBOX_H
+ #include <libart_lgpl/art_misc.h>
+ #include <libart_lgpl/art_affine.h>
+ #include <libart_lgpl/art_vpath.h>
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
new file mode 100644
index 000000000..15e513a78
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
@@ -0,0 +1,24 @@
+LICENSE = "GPLv2"
+SECTION = "x11/gnome/libs"
+
+DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common freetype"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+inherit pkgconfig gnomebase
+
+SRC_URI += "file://fix.includes.patch \
+            file://freetype.patch \
+            file://0001-configure-use-pkgconfig-for-freetype.patch \
+           "
+SRC_URI[archive.md5sum] = "63b05ffb5386e131487c6af30f4c56ac"
+SRC_URI[archive.sha256sum] = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"
+
+FILES_${PN}-dbg += "\
+    ${libdir}/${PN}/${PV}/modules/.debug \
+    ${libdir}/${PN}/${PV}/modules/*/.debug \
+"
+FILES_${PN}-staticdev += "\
+    ${libdir}/${PN}/${PV}/modules/*.a \
+    ${libdir}/${PN}/${PV}/modules/*/*.a \
+"
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch
new file mode 100644
index 000000000..cc81b1fc0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch
@@ -0,0 +1,15 @@
+Index: gnumeric-1.12.0/test/Makefile.am
+===================================================================
+--- gnumeric-1.12.0.orig/test/Makefile.am       2011-05-17 17:54:24.000000000 -0700
++++ gnumeric-1.12.0/test/Makefile.am    2013-10-17 20:28:19.920618596 -0700
+@@ -25,7 +25,9 @@
+ #
+ # 90xx: Misc stuff.
+ 
+-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
++TESTS_EXTENSIONS=.pl
++TESTS = @auto_find_tests@
++
+ SUPPS = common.supp commondots.supp gui.supp t8003-valgrind-pdf.supp
+ 
+ import-db:
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
new file mode 100644
index 000000000..71f99cafb
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
@@ -0,0 +1,46 @@
+LICENSE = "GPLv2 | GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=be0de417af78dd340558810d1ced52e6"
+SECTION = "x11/utils"
+S = "${WORKDIR}/gnumeric-${PV}"
+DEPENDS = "gdk-pixbuf libgsf gtk+3 libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libbonoboui orbit2-native goffice"
+SUMMARY = "Gnumeric spreadsheet for GNOME"
+
+GNOME_COMPRESS_TYPE = "xz"
+
+inherit gnome
+
+SRC_URI += "file://do-not-use-srcdir.patch"
+
+SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27"
+SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"
+
+
+EXTRA_OECONF=" --without-perl "
+
+PACKAGES_DYNAMIC += "gnumeric-plugin-*"
+PACKAGES += "libspreadsheet libspreadsheet-dev gnumeric-goffice gnumeric-goffice-dbg"
+
+FILES_${PN}-dbg += "${libdir}/gnumeric/${PV}/plugins/*/.debug"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
+FILES_${PN}-staticdev = "${libdir}/libspreadsheet.la"
+FILES_libspreadsheet = "${libdir}/libspreadsheet-${PV}.so"
+FILES_libspreadsheet-dev = "${libdir}/libspreadsheet.so"
+FILES_gnumeric-goffice-dbg += "${libdir}/goffice/*/plugins/gnumeric/.debug"
+FILES_gnumeric-goffice = "${libdir}/goffice/*/plugins/gnumeric/*"
+
+# This hack works around the problem mentioned here:
+# https://mail.gnome.org/archives/gnumeric-list/2010-February/msg00006.html
+do_install_prepend() {
+    sed -i ${B}/doc/C/Makefile -e 's/\tfor file in $(omffile); do/\t-for file in $(omffile); do/'
+}
+
+python populate_packages_prepend () {
+    gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
+
+    do_split_packages(d, gnumeric_libdir, '^(.*)/.*$',
+        output_pattern='gnumeric-plugin-%s',
+        description='Gnumeric plugin %s',
+        extra_depends='',
+        recursive=True,
+        prepend=True)
+}
diff --git a/meta-gnome/recipes-gnome/gthumb/files/parallel.patch b/meta-gnome/recipes-gnome/gthumb/files/parallel.patch
new file mode 100644
index 000000000..20ce5c5aa
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gthumb/files/parallel.patch
@@ -0,0 +1,158 @@
+From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Tue, 31 Jul 2012 17:26:27 +0100
+Subject: [PATCH] build: Fix parallel build problems with enum generation
+
+This is a backport from a patch against master.
+
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=680925]
+---
+ extensions/file_tools/Makefile.am    |   10 ++++------
+ extensions/importer/Makefile.am      |   10 ++++------
+ extensions/pixbuf_savers/Makefile.am |   10 ++++------
+ gthumb/Makefile.am                   |   10 ++++------
+ 4 files changed, 16 insertions(+), 24 deletions(-)
+
+diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am
+index 7785eff..d70a8a5 100644
+--- a/extensions/file_tools/Makefile.am
++++ b/extensions/file_tools/Makefile.am
+@@ -24,17 +24,16 @@ HEADER_FILES =                              \
+        gth-file-tool-undo.h            \
+        preferences.h
+ 
+-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS)
++enum-types.h: $(HEADER_FILES)
+        $(AM_V_GEN)( $(GLIB_MKENUMS) \
+                --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+                --fprod "/* enumerations from \"@filename@\" */\n" \
+                --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+                --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \
+                $^> xgen-$(@F) \
+-       && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \
+-       && rm -f xgen-$(@F) )
++       && mv -f xgen-$(@F) enum-types.h )
+ 
+-enum-types.c: $(HEADER_FILES) enum-types.h
++enum-types.c: $(HEADER_FILES)
+        $(AM_V_GEN)( $(GLIB_MKENUMS) \
+                --fhead "#include <glib-object.h>\n" \
+                --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \
+@@ -42,8 +41,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h
+                --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+                --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+                $^> xgen-$(@F) \
+-       && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \
+-       && rm -f xgen-$(@F) )
++       && mv -f xgen-$(@F) enum-types.c )
+ 
+ libfile_tools_la_SOURCES =             \
+        $(ENUM_TYPES)                   \
+diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am
+index 29e7f2c..07c1eba 100644
+--- a/extensions/importer/Makefile.am
++++ b/extensions/importer/Makefile.am
+@@ -14,17 +14,16 @@ HEADER_FILES =                                      \
+        preferences.h                           \
+        utils.h
+ 
+-gth-import-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS)
++gth-import-enum-types.h: $(HEADER_FILES)
+        $(AM_V_GEN)( $(GLIB_MKENUMS) \
+                --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+                --fprod "/* enumerations from \"@filename@\" */\n" \
+                --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+                --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \
+                $^> xgen-$(@F) \
+-       && (cmp -s xgen-$(@F) gth-import-enum-types.h || cp xgen-$(@F) gth-import-enum-types.h ) \
+-       && rm -f xgen-$(@F) )
++       && mv -f xgen-$(@F) gth-import-enum-types.h )
+ 
+-gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h
++gth-import-enum-types.c: $(HEADER_FILES)
+        $(AM_V_GEN)( $(GLIB_MKENUMS) \
+                --fhead "#include <glib-object.h>\n" \
+                --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \
+@@ -32,8 +31,7 @@ gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h
+                --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+                --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+                $^> xgen-$(@F) \
+-       && (cmp -s xgen-$(@F) gth-import-enum-types.c || cp xgen-$(@F) gth-import-enum-types.c ) \
+-       && rm -f xgen-$(@F) )
++       && mv -f xgen-$(@F) gth-import-enum-types.c )
+ 
+ libimporter_la_SOURCES =                       \
+        $(ENUM_TYPES)                           \
+diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am
+index bfe9f34..4764c32 100644
+--- a/extensions/pixbuf_savers/Makefile.am
++++ b/extensions/pixbuf_savers/Makefile.am
+@@ -10,17 +10,16 @@ ENUM_TYPES =                                \
+ HEADER_FILES =                                 \
+        preferences.h
+ 
+-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS)
++enum-types.h: $(HEADER_FILES)
+        $(AM_V_GEN)( $(GLIB_MKENUMS) \
+                --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+                --fprod "/* enumerations from \"@filename@\" */\n" \
+                --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+                --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \
+                $^> xgen-$(@F) \
+-       && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \
+-       && rm -f xgen-$(@F) )
++       && mv -f xgen-$(@F) enum-types.h )
+ 
+-enum-types.c: $(HEADER_FILES) enum-types.h
++enum-types.c: $(HEADER_FILES)
+        $(AM_V_GEN)( $(GLIB_MKENUMS) \
+                --fhead "#include <glib-object.h>\n" \
+                --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \
+@@ -28,8 +27,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h
+                --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+                --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+                $^> xgen-$(@F) \
+-       && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \
+-       && rm -f xgen-$(@F) )
++       && mv -f xgen-$(@F) enum-types.c )
+ 
+ libpixbuf_savers_la_SOURCES =  \
+        $(ENUM_TYPES)           \
+diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am
+index e9e385e..2f14e03 100644
+--- a/gthumb/Makefile.am
++++ b/gthumb/Makefile.am
+@@ -296,17 +296,16 @@ gthumb_CFLAGS =                                                   \
+        -DGTHUMB_EXTENSIONS_DIR=\"$(extensions_dir)\"           \
+        $(NULL)
+ 
+-gth-enum-types.h: $(PUBLIC_HEADER_FILES) $(GLIB_MKENUMS)
++gth-enum-types.h: $(PUBLIC_HEADER_FILES)
+        $(AM_V_GEN)( $(GLIB_MKENUMS) \
+                --fhead "#ifndef GTH_ENUM_TYPES_H\n#define GTH_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+                --fprod "/* enumerations from \"@filename@\" */\n" \
+                --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+                --ftail "G_END_DECLS\n\n#endif /* GTH_ENUM_TYPES_H */" \
+                $^> xgen-$(@F) \
+-       && (cmp -s xgen-$(@F) gth-enum-types.h || cp xgen-$(@F) gth-enum-types.h ) \
+-       && rm -f xgen-$(@F) )
++       && mv -f xgen-$(@F) gth-enum-types.h )
+ 
+-gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h
++gth-enum-types.c: $(PUBLIC_HEADER_FILES)
+        $(AM_V_GEN)( $(GLIB_MKENUMS) \
+                --fhead "#include <glib-object.h>\n" \
+                --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \
+@@ -314,8 +313,7 @@ gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h
+                --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+                --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+                $^> xgen-$(@F) \
+-       && (cmp -s xgen-$(@F) gth-enum-types.c || cp xgen-$(@F) gth-enum-types.c ) \
+-       && rm -f xgen-$(@F) )
++       && mv -f xgen-$(@F) gth-enum-types.c )
+ 
+ gth-marshal.h: gth-marshal.list $(GLIB_GENMARSHAL)
+        $(AM_V_GEN)( $(GLIB_GENMARSHAL) $(srcdir)/gth-marshal.list --header --prefix=gth_marshal > $@ )
+-- 
+1.7.10.4
+
diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
new file mode 100644
index 000000000..70ef19394
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
@@ -0,0 +1,27 @@
+SUMMARY = "gThumb is an image viewer and browser for the GNOME Desktop"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base"
+
+PR = "r4"
+
+EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter"
+
+inherit gnome pkgconfig
+
+SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f"
+SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d"
+
+SRC_URI += "file://parallel.patch"
+
+do_install_append () {
+    rm ${D}${libdir}/${BPN}/extensions/*.a
+}
+
+FILES_${PN} += "${datadir}/icons"
+FILES_${PN} += "${libdir}/${BPN}/extensions/*.so \
+                ${libdir}/${BPN}/extensions/*.extension"
+FILES_${PN}-dev += "${libdir}/${BPN}/extensions/*.la"
+FILES_${PN}-dbg += "${libdir}/${BPN}/extensions/.debug/"
+
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4 b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4
new file mode 100644
index 000000000..53518fb2e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+        [  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\  \ @:>@$1@<:@\   \ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4 b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4
new file mode 100644
index 000000000..3ec41666b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4
@@ -0,0 +1,53 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH(html-dir,
+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST(HTML_DIR)
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE(gtk-doc,
+    AC_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [default=no]]),,
+    enable_gtk_doc=no)
+
+  have_gtk_doc=no
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+    have_gtk_doc=yes
+  fi
+
+  dnl do we want to do a version check?
+ifelse([$1],[],,
+  [gtk_doc_min_version=$1
+  if test "$have_gtk_doc" = yes; then
+    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+      have_gtk_doc=no
+    fi
+  fi
+])
+  if test x$enable_gtk_doc = xyes; then
+    if test "$have_gtk_doc" != yes; then
+      enable_gtk_doc=no
+    fi
+  fi
+
+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+])
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make
new file mode 100644
index 000000000..354ffb7c6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make
@@ -0,0 +1,173 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST =                            \
+        $(content_files)                \
+        $(HTML_IMAGES)                  \
+        $(DOC_MAIN_SGML_FILE)           \
+        $(DOC_MODULE)-sections.txt      \
+        $(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+           $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES =                  \
+        $(DOC_MODULE).args       \
+        $(DOC_MODULE).hierarchy  \
+        $(DOC_MODULE).interfaces \
+        $(DOC_MODULE).prerequisites \
+        $(DOC_MODULE).signals
+
+REPORT_FILES = \
+        $(DOC_MODULE)-undocumented.txt \
+        $(DOC_MODULE)-undeclared.txt \
+        $(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+else
+all-local:
+endif
+
+docs: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+        @echo 'gtk-doc: Scanning header files'
+        @-chmod -R u+w $(srcdir)
+        cd $(srcdir) && \
+          gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+        if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+            CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+        else \
+            cd $(srcdir) ; \
+            for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+            done \
+        fi
+        touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+        @true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+        @echo 'gtk-doc: Rebuilding template files'
+        @-chmod -R u+w $(srcdir)
+        cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+        touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+        @true
+
+tmpl/*.sgml:
+        @true
+
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+        @echo 'gtk-doc: Building XML'
+        @-chmod -R u+w $(srcdir)
+        cd $(srcdir) && \
+        gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+        touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+        @true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+        @echo 'gtk-doc: Building HTML'
+        @-chmod -R u+w $(srcdir)
+        rm -rf $(srcdir)/html
+        mkdir $(srcdir)/html
+        cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+        test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+        @echo 'gtk-doc: Fixing cross-references'
+        cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+        touch html-build.stamp
+
+##############
+
+clean-local:
+        rm -f *~ *.bak
+        rm -rf .libs
+
+distclean-local:
+        cd $(srcdir) && \
+          rm -rf xml $(REPORT_FILES) \
+                 $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+maintainer-clean-local: clean
+        cd $(srcdir) && rm -rf xml html
+
+install-data-local:
+        -installfiles=`echo $(srcdir)/html/*`; \
+        if test "$$installfiles" = '$(srcdir)/html/*'; \
+        then echo '-- Nothing to install' ; \
+        else \
+          $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+          for i in $$installfiles; do \
+            echo '-- Installing '$$i ; \
+            $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+          done; \
+          echo '-- Installing $(srcdir)/html/index.sgml' ; \
+          $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+          which gtkdoc-rebase >/dev/null && \
+            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+        fi
+        
+
+uninstall-local:
+        rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+        @echo "*** gtk-doc must be installed and enabled in order to make dist"
+        @false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+        mkdir $(distdir)/tmpl
+        mkdir $(distdir)/xml
+        mkdir $(distdir)/html
+        -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+        -cp $(srcdir)/xml/*.xml $(distdir)/xml
+        cp $(srcdir)/html/* $(distdir)/html
+        -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+        -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+        cd $(distdir) && rm -f $(DISTCLEANFILES)
+        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
new file mode 100644
index 000000000..c745e345a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Portable C library for multiline text editing"
+HOMEPAGE = "http://projects.gnome.org/gtksourceview/"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "gtk+ libxml2"
+
+PNAME = "gtksourceview"
+
+S = "${WORKDIR}/${PNAME}-${PV}"
+
+inherit gnomebase lib_package gettext
+
+# overrule SRC_URI from gnome.conf
+SRC_URI = "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2;name=archive \
+           file://gtk-doc.make \
+"
+SRC_URI[archive.md5sum] = "1219ad1694df136f126507466aeb41aa"
+SRC_URI[archive.sha256sum] = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"
+
+do_configure_prepend() {
+    cp ${WORKDIR}/gtk-doc.make ${S}/
+    sed -i -e s:docs::g ${S}/Makefile.am
+    echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
+}
+
+FILES_${PN} += " ${datadir}/gtksourceview-2.0"
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch b/meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch
new file mode 100644
index 000000000..a5c655671
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/files/0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch
@@ -0,0 +1,57 @@
+From 1b9ceef87405296adccdadc9528d4cbb2bc51b76 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 2 May 2013 13:27:16 +0200
+Subject: [PATCH] Revert "Respect UDISKS_AUTOMOUNT_HINT available in recent
+ udisks and gnome-disk-utility"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 493ee806eba214a748d064b43c10882d76ee1492.
+
+AFAICS was the requirement for gnome-disk-utility V3 for a minor functionality change.
+
+Upstream-Status: Inappropriate [related to missing gnome3 support]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac             |    2 +-
+ monitor/gdu/ggduvolume.c |    9 ---------
+ 2 files changed, 1 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 601e994..377770e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -205,7 +205,7 @@ AC_ARG_ENABLE(gdu, AS_HELP_STRING([--disable-gdu],[build without GDU volume moni
+ msg_gdu=no
+ GDU_LIBS=
+ GDU_CFLAGS=
+-GDU_REQUIRED=3.0.2
++GDU_REQUIRED=2.29.0
+ 
+ if test "x$enable_gdu" != "xno"; then
+   PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes)
+diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
+index eb15d22..0665b7a 100644
+--- a/monitor/gdu/ggduvolume.c
++++ b/monitor/gdu/ggduvolume.c
+@@ -429,15 +429,6 @@ update_volume (GGduVolume *volume)
+       g_free (activation_uri);
+     }
+ 
+-  /* if there's an automount hint, use it */
+-  if (device != NULL)
+-    {
+-      if (g_strcmp0 (gdu_device_get_automount_hint (device), "always") == 0)
+-        volume->should_automount = TRUE;
+-      else if (g_strcmp0 (gdu_device_get_automount_hint (device), "never") == 0)
+-        volume->should_automount = FALSE;
+-    }
+-
+   if (pool != NULL)
+     g_object_unref (pool);
+   if (device != NULL)
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0002-Adapt-to-GLib-2.31-deprecations-and-thread-API-chang.patch b/meta-gnome/recipes-gnome/gvfs/files/0002-Adapt-to-GLib-2.31-deprecations-and-thread-API-chang.patch
new file mode 100644
index 000000000..0aa927115
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/files/0002-Adapt-to-GLib-2.31-deprecations-and-thread-API-chang.patch
@@ -0,0 +1,599 @@
+From bd014bd8a442cae12aace7deb6e6a4d21ac3dd0e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 21 Oct 2011 14:15:09 +0200
+Subject: [PATCH] Adapt to GLib 2.31 deprecations and thread API changes
+
+GStaticMutex and GStaticRWLock have been replaced by GMutex
+and GRWLock, and g_thread_init() is no longer needed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661148
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ client/gdaemonvfs.c                          |    5 +-
+ client/gvfsdaemondbus.c                      |   15 ++++---
+ client/gvfsfusedaemon.c                      |    1 -
+ common/gmounttracker.c                       |   43 ++++++------------
+ configure.ac                                 |    2 +-
+ daemon/daemon-main.c                         |    1 -
+ daemon/gvfsdaemonutils.c                     |    8 ++--
+ daemon/main.c                                |    2 -
+ metadata/metatree.c                          |   60 +++++++++++++-------------
+ monitor/proxy/gvfsproxyvolumemonitordaemon.c |    1 -
+ 10 files changed, 60 insertions(+), 78 deletions(-)
+
+diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
+index 0f021b9..ae17c3c 100644
+--- a/client/gdaemonvfs.c
++++ b/client/gdaemonvfs.c
+@@ -298,9 +298,8 @@ g_daemon_vfs_init (GDaemonVfs *vfs)
+ 
+   bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+-  
+-  if (g_thread_supported ())
+-    dbus_threads_init_default ();
++
++  dbus_threads_init_default ();
+ 
+   vfs->async_bus = dbus_bus_get_private (DBUS_BUS_SESSION, NULL);
+ 
+diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c
+index f32a6f8..2cfd2e6 100644
+--- a/client/gvfsdaemondbus.c
++++ b/client/gvfsdaemondbus.c
+@@ -53,7 +53,10 @@ typedef struct {
+ static gint32 vfs_data_slot = -1;
+ static GOnce once_init_dbus = G_ONCE_INIT;
+ 
+-static GStaticPrivate local_connections = G_STATIC_PRIVATE_INIT;
++typedef struct _ThreadLocalConnections ThreadLocalConnections;
++static void free_local_connections (ThreadLocalConnections *local);
++
++static GPrivate local_connections = G_PRIVATE_INIT((GDestroyNotify)free_local_connections);
+ 
+ /* dbus id -> async connection */
+ static GHashTable *async_map = NULL;
+@@ -862,10 +865,10 @@ _g_vfs_daemon_call_sync (DBusMessage *message,
+  *               get per-thread synchronous dbus connections             *
+  *************************************************************************/
+ 
+-typedef struct {
++struct _ThreadLocalConnections {
+   GHashTable *connections;
+   DBusConnection *session_bus;
+-} ThreadLocalConnections;
++};
+ 
+ static void
+ free_mount_connection (DBusConnection *conn)
+@@ -891,7 +894,7 @@ invalidate_local_connection (const char *dbus_id,
+   
+   _g_daemon_vfs_invalidate_dbus_id (dbus_id);
+ 
+-  local = g_static_private_get (&local_connections);
++  local = g_private_get (&local_connections);
+   if (local)
+     g_hash_table_remove (local->connections, dbus_id);
+   
+@@ -916,13 +919,13 @@ _g_dbus_connection_get_sync (const char *dbus_id,
+ 
+   g_once (&once_init_dbus, vfs_dbus_init, NULL);
+ 
+-  local = g_static_private_get (&local_connections);
++  local = g_private_get (&local_connections);
+   if (local == NULL)
+     {
+       local = g_new0 (ThreadLocalConnections, 1);
+       local->connections = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                  g_free, (GDestroyNotify)free_mount_connection);
+-      g_static_private_set (&local_connections, local, (GDestroyNotify)free_local_connections);
++      g_private_set (&local_connections, local);
+     }
+ 
+   if (dbus_id == NULL)
+diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
+index a4ba32c..7cfa81c 100644
+--- a/client/gvfsfusedaemon.c
++++ b/client/gvfsfusedaemon.c
+@@ -2425,7 +2425,6 @@ gint
+ main (gint argc, gchar *argv [])
+ {
+   g_type_init ();
+-  g_thread_init (NULL);
+ 
+   return fuse_main (argc, argv, &vfs_oper, NULL /* user data */);
+ }
+diff --git a/common/gmounttracker.c b/common/gmounttracker.c
+index 519cd47..135a2b2 100644
+--- a/common/gmounttracker.c
++++ b/common/gmounttracker.c
+@@ -49,7 +49,7 @@ struct _GMountTracker
+ {
+   GObject parent_instance;
+ 
+-  GMutex *lock;
++  GMutex lock;
+   GList *mounts;
+   DBusConnection *connection;
+ };
+@@ -258,8 +258,7 @@ g_mount_tracker_finalize (GObject *object)
+ 
+   tracker = G_MOUNT_TRACKER (object);
+ 
+-  if (tracker->lock)
+-    g_mutex_free (tracker->lock);
++  g_mutex_clear (&tracker->lock);
+   
+   g_list_foreach (tracker->mounts,
+                  (GFunc)g_mount_info_unref, NULL);
+@@ -382,21 +381,18 @@ static void
+ g_mount_tracker_add_mount (GMountTracker *tracker,
+                           GMountInfo *info)
+ {
+-  if (tracker->lock)
+-    g_mutex_lock (tracker->lock);
++  g_mutex_lock (&tracker->lock);
+   
+   /* Don't add multiple times */
+   if (g_mount_tracker_find (tracker, info))
+     {
+-      if (tracker->lock)
+-       g_mutex_unlock (tracker->lock);
++      g_mutex_unlock (&tracker->lock);
+       return;
+     }
+ 
+   tracker->mounts = g_list_prepend (tracker->mounts, g_mount_info_ref (info));
+ 
+-  if (tracker->lock)
+-    g_mutex_unlock (tracker->lock);
++  g_mutex_unlock (&tracker->lock);
+   
+   g_signal_emit (tracker, signals[MOUNTED], 0, info);
+ }
+@@ -408,16 +404,14 @@ g_mount_tracker_remove_mount (GMountTracker *tracker,
+   GList *l;
+   GMountInfo *old_info;
+ 
+-  if (tracker->lock)
+-    g_mutex_lock (tracker->lock);
++  g_mutex_lock (&tracker->lock);
+   
+   l = g_mount_tracker_find (tracker, info);
+   
+   /* Don't remove multiple times */
+   if (l == NULL)
+     {
+-      if (tracker->lock)
+-       g_mutex_unlock (tracker->lock);
++      g_mutex_unlock (&tracker->lock);
+       return;
+     }
+ 
+@@ -425,8 +419,7 @@ g_mount_tracker_remove_mount (GMountTracker *tracker,
+   
+   tracker->mounts = g_list_delete_link (tracker->mounts, l);
+   
+-  if (tracker->lock)
+-    g_mutex_unlock (tracker->lock);
++  g_mutex_unlock (&tracker->lock);
+ 
+   g_signal_emit (tracker, signals[UNMOUNTED], 0, old_info);
+   g_mount_info_unref (old_info);
+@@ -548,8 +541,6 @@ init_connection (GMountTracker *tracker)
+ static void
+ g_mount_tracker_init (GMountTracker *tracker)
+ {
+-  if (g_thread_supported ())
+-    tracker->lock = g_mutex_new ();
+ }
+ 
+ 
+@@ -588,8 +579,7 @@ g_mount_tracker_list_mounts (GMountTracker *tracker)
+   GList *res, *l;
+   GMountInfo *copy;
+ 
+-  if (tracker->lock)
+-    g_mutex_lock (tracker->lock);
++  g_mutex_lock (&tracker->lock);
+   
+   res = NULL;
+   for (l = tracker->mounts; l != NULL; l = l->next)
+@@ -598,8 +588,7 @@ g_mount_tracker_list_mounts (GMountTracker *tracker)
+       res = g_list_prepend (res, copy);
+     }
+ 
+-  if (tracker->lock)
+-    g_mutex_unlock (tracker->lock);
++  g_mutex_unlock (&tracker->lock);
+   
+   return g_list_reverse (res);
+ }
+@@ -611,8 +600,7 @@ g_mount_tracker_find_by_mount_spec (GMountTracker *tracker,
+   GList *l;
+   GMountInfo *info, *found;
+ 
+-  if (tracker->lock)
+-    g_mutex_lock (tracker->lock);
++  g_mutex_lock (&tracker->lock);
+ 
+   found = NULL;
+   for (l = tracker->mounts; l != NULL; l = l->next)
+@@ -626,8 +614,7 @@ g_mount_tracker_find_by_mount_spec (GMountTracker *tracker,
+        }
+     }
+ 
+-  if (tracker->lock)
+-    g_mutex_unlock (tracker->lock);
++  g_mutex_unlock (&tracker->lock);
+   
+   return found;
+ }
+@@ -641,8 +628,7 @@ g_mount_tracker_has_mount_spec (GMountTracker *tracker,
+   GMountInfo *info;
+   gboolean found;
+ 
+-  if (tracker->lock)
+-    g_mutex_lock (tracker->lock);
++  g_mutex_lock (&tracker->lock);
+ 
+   found = FALSE;
+   for (l = tracker->mounts; l != NULL; l = l->next)
+@@ -656,8 +642,7 @@ g_mount_tracker_has_mount_spec (GMountTracker *tracker,
+        }
+     }
+ 
+-  if (tracker->lock)
+-    g_mutex_unlock (tracker->lock);
++  g_mutex_unlock (&tracker->lock);
+   
+   return found;
+ }
+diff --git a/configure.ac b/configure.ac
+index ee2f90f..be0c6a1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,7 +46,7 @@ GTK_DOC_CHECK
+ DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
+ AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+ 
+-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.29.14 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 )
++PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.31.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 )
+ 
+ PKG_CHECK_MODULES(DBUS, dbus-1)
+ 
+diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
+index ef9025c..ff2bfde 100644
+--- a/daemon/daemon-main.c
++++ b/daemon/daemon-main.c
+@@ -63,7 +63,6 @@ daemon_init (void)
+   textdomain (GETTEXT_PACKAGE);
+   
+   dbus_threads_init_default ();
+-  g_thread_init (NULL);
+   g_type_init ();
+ 
+   g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, log_debug, NULL);
+diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c
+index f03d4b2..1efcf87 100644
+--- a/daemon/gvfsdaemonutils.c
++++ b/daemon/gvfsdaemonutils.c
+@@ -41,7 +41,7 @@
+ #include "gvfsdaemonprotocol.h"
+ 
+ static gint32 extra_fd_slot = -1;
+-static GStaticMutex extra_lock = G_STATIC_MUTEX_INIT;
++static GMutex extra_lock;
+ 
+ typedef struct {
+   int extra_fd;
+@@ -93,7 +93,7 @@ dbus_connection_send_fd (DBusConnection *connection,
+       return FALSE;
+     }
+ 
+-  g_static_mutex_lock (&extra_lock);
++  g_mutex_lock (&extra_lock);
+ 
+   if (_g_socket_send_fd (extra->extra_fd, fd) == -1)
+     {
+@@ -103,13 +103,13 @@ dbus_connection_send_fd (DBusConnection *connection,
+                   g_io_error_from_errno (errsv),
+                   _("Error sending file descriptor: %s"),
+                   g_strerror (errsv));
+-      g_static_mutex_unlock (&extra_lock);
++      g_mutex_unlock (&extra_lock);
+       return FALSE;
+     }
+ 
+   *fd_id = extra->fd_count++;
+ 
+-  g_static_mutex_unlock (&extra_lock);
++  g_mutex_unlock (&extra_lock);
+ 
+   return TRUE;
+ }
+diff --git a/daemon/main.c b/daemon/main.c
+index 4703562..2b2d549 100644
+--- a/daemon/main.c
++++ b/daemon/main.c
+@@ -52,8 +52,6 @@ main (int argc, char *argv[])
+   bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+   textdomain (GETTEXT_PACKAGE);
+-  
+-  g_thread_init (NULL);
+ 
+ #ifdef SIGPIPE
+   signal (SIGPIPE, SIG_IGN);
+diff --git a/metadata/metatree.c b/metadata/metatree.c
+index 3420ad0..850866e 100644
+--- a/metadata/metatree.c
++++ b/metadata/metatree.c
+@@ -68,7 +68,7 @@
+ 
+ #define KEY_IS_LIST_MASK (1<<31)
+ 
+-static GStaticRWLock metatree_lock = G_STATIC_RW_LOCK_INIT;
++static GRWLock metatree_lock;
+ 
+ typedef enum {
+   JOURNAL_OP_SET_KEY,
+@@ -591,7 +591,7 @@ meta_tree_lookup_by_name (const char *name,
+ MetaTree *
+ meta_tree_ref (MetaTree *tree)
+ {
+-  g_atomic_int_exchange_and_add ((int *)&tree->ref_count, 1);
++  g_atomic_int_inc ((int *)&tree->ref_count);
+   return tree;
+ }
+ 
+@@ -672,17 +672,17 @@ meta_tree_refresh (MetaTree *tree)
+ {
+   gboolean needs_refresh;
+ 
+-  g_static_rw_lock_reader_lock (&metatree_lock);
++  g_rw_lock_reader_lock (&metatree_lock);
+   needs_refresh =
+     meta_tree_needs_rereading (tree) ||
+     meta_tree_has_new_journal_entries (tree);
+-  g_static_rw_lock_reader_unlock (&metatree_lock);
++  g_rw_lock_reader_unlock (&metatree_lock);
+ 
+   if (needs_refresh)
+     {
+-      g_static_rw_lock_writer_lock (&metatree_lock);
++      g_rw_lock_writer_lock (&metatree_lock);
+       meta_tree_refresh_locked (tree);
+-      g_static_rw_lock_writer_unlock (&metatree_lock);
++      g_rw_lock_writer_unlock (&metatree_lock);
+     }
+ }
+ 
+@@ -1468,7 +1468,7 @@ meta_tree_lookup_key_type  (MetaTree                         *tree,
+   MetaKeyType type;
+   gpointer value;
+ 
+-  g_static_rw_lock_reader_lock (&metatree_lock);
++  g_rw_lock_reader_lock (&metatree_lock);
+ 
+   new_path = meta_journal_reverse_map_path_and_key (tree->journal,
+                                                    path,
+@@ -1492,7 +1492,7 @@ meta_tree_lookup_key_type  (MetaTree                         *tree,
+     type = META_KEY_TYPE_STRING;
+ 
+  out:
+-  g_static_rw_lock_reader_unlock (&metatree_lock);
++  g_rw_lock_reader_unlock (&metatree_lock);
+   return type;
+ }
+ 
+@@ -1506,7 +1506,7 @@ meta_tree_get_last_changed (MetaTree *tree,
+   gpointer value;
+   guint64 res, mtime;
+ 
+-  g_static_rw_lock_reader_lock (&metatree_lock);
++  g_rw_lock_reader_lock (&metatree_lock);
+ 
+   new_path = meta_journal_reverse_map_path_and_key (tree->journal,
+                                                    path,
+@@ -1526,7 +1526,7 @@ meta_tree_get_last_changed (MetaTree *tree,
+   g_free (new_path);
+ 
+  out:
+-  g_static_rw_lock_reader_unlock (&metatree_lock);
++  g_rw_lock_reader_unlock (&metatree_lock);
+ 
+   return res;
+ }
+@@ -1543,7 +1543,7 @@ meta_tree_lookup_string (MetaTree   *tree,
+   char *new_path;
+   char *res;
+ 
+-  g_static_rw_lock_reader_lock (&metatree_lock);
++  g_rw_lock_reader_lock (&metatree_lock);
+ 
+   new_path = meta_journal_reverse_map_path_and_key (tree->journal,
+                                                    path,
+@@ -1572,7 +1572,7 @@ meta_tree_lookup_string (MetaTree   *tree,
+     res = g_strdup (verify_string (tree, ent->value));
+ 
+  out:
+-  g_static_rw_lock_reader_unlock (&metatree_lock);
++  g_rw_lock_reader_unlock (&metatree_lock);
+ 
+   return res;
+ }
+@@ -1621,7 +1621,7 @@ meta_tree_lookup_stringv   (MetaTree                         *tree,
+   char **res;
+   guint32 num_strings, i;
+ 
+-  g_static_rw_lock_reader_lock (&metatree_lock);
++  g_rw_lock_reader_lock (&metatree_lock);
+ 
+   new_path = meta_journal_reverse_map_path_and_key (tree->journal,
+                                                    path,
+@@ -1658,7 +1658,7 @@ meta_tree_lookup_stringv   (MetaTree                         *tree,
+     }
+ 
+  out:
+-  g_static_rw_lock_reader_unlock (&metatree_lock);
++  g_rw_lock_reader_unlock (&metatree_lock);
+ 
+   return res;
+ }
+@@ -1876,7 +1876,7 @@ meta_tree_enumerate_dir (MetaTree                         *tree,
+   MetaFileDir *dir;
+   char *res_path;
+ 
+-  g_static_rw_lock_reader_lock (&metatree_lock);
++  g_rw_lock_reader_lock (&metatree_lock);
+ 
+   data.children = children =
+     g_hash_table_new_full (g_str_hash,
+@@ -1922,7 +1922,7 @@ meta_tree_enumerate_dir (MetaTree                         *tree,
+  out:
+   g_free (res_path);
+   g_hash_table_destroy (children);
+-  g_static_rw_lock_reader_unlock (&metatree_lock);
++  g_rw_lock_reader_unlock (&metatree_lock);
+ }
+ 
+ typedef struct {
+@@ -2116,7 +2116,7 @@ meta_tree_enumerate_keys (MetaTree                         *tree,
+   GHashTableIter iter;
+   char *res_path;
+ 
+-  g_static_rw_lock_reader_lock (&metatree_lock);
++  g_rw_lock_reader_lock (&metatree_lock);
+ 
+   keydata.keys = keys =
+     g_hash_table_new_full (g_str_hash,
+@@ -2170,7 +2170,7 @@ meta_tree_enumerate_keys (MetaTree                         *tree,
+  out:
+   g_free (res_path);
+   g_hash_table_destroy (keys);
+-  g_static_rw_lock_reader_unlock (&metatree_lock);
++  g_rw_lock_reader_unlock (&metatree_lock);
+ }
+ 
+ 
+@@ -2371,9 +2371,9 @@ meta_tree_flush (MetaTree *tree)
+ {
+   gboolean res;
+ 
+-  g_static_rw_lock_writer_lock (&metatree_lock);
++  g_rw_lock_writer_lock (&metatree_lock);
+   res = meta_tree_flush_locked (tree);
+-  g_static_rw_lock_writer_unlock (&metatree_lock);
++  g_rw_lock_writer_unlock (&metatree_lock);
+   return res;
+ }
+ 
+@@ -2386,7 +2386,7 @@ meta_tree_unset (MetaTree                         *tree,
+   guint64 mtime;
+   gboolean res;
+ 
+-  g_static_rw_lock_writer_lock (&metatree_lock);
++  g_rw_lock_writer_lock (&metatree_lock);
+ 
+   if (tree->journal == NULL ||
+       !tree->journal->journal_valid)
+@@ -2412,7 +2412,7 @@ meta_tree_unset (MetaTree                         *tree,
+   g_string_free (entry, TRUE);
+ 
+  out:
+-  g_static_rw_lock_writer_unlock (&metatree_lock);
++  g_rw_lock_writer_unlock (&metatree_lock);
+   return res;
+ }
+ 
+@@ -2426,7 +2426,7 @@ meta_tree_set_string (MetaTree                         *tree,
+   guint64 mtime;
+   gboolean res;
+ 
+-  g_static_rw_lock_writer_lock (&metatree_lock);
++  g_rw_lock_writer_lock (&metatree_lock);
+ 
+   if (tree->journal == NULL ||
+       !tree->journal->journal_valid)
+@@ -2452,7 +2452,7 @@ meta_tree_set_string (MetaTree                         *tree,
+   g_string_free (entry, TRUE);
+ 
+  out:
+-  g_static_rw_lock_writer_unlock (&metatree_lock);
++  g_rw_lock_writer_unlock (&metatree_lock);
+   return res;
+ }
+ 
+@@ -2466,7 +2466,7 @@ meta_tree_set_stringv (MetaTree                         *tree,
+   guint64 mtime;
+   gboolean res;
+ 
+-  g_static_rw_lock_writer_lock (&metatree_lock);
++  g_rw_lock_writer_lock (&metatree_lock);
+ 
+   if (tree->journal == NULL ||
+       !tree->journal->journal_valid)
+@@ -2492,7 +2492,7 @@ meta_tree_set_stringv (MetaTree                         *tree,
+   g_string_free (entry, TRUE);
+ 
+  out:
+-  g_static_rw_lock_writer_unlock (&metatree_lock);
++  g_rw_lock_writer_unlock (&metatree_lock);
+   return res;
+ }
+ 
+@@ -2504,7 +2504,7 @@ meta_tree_remove (MetaTree *tree,
+   guint64 mtime;
+   gboolean res;
+ 
+-  g_static_rw_lock_writer_lock (&metatree_lock);
++  g_rw_lock_writer_lock (&metatree_lock);
+ 
+   if (tree->journal == NULL ||
+       !tree->journal->journal_valid)
+@@ -2530,7 +2530,7 @@ meta_tree_remove (MetaTree *tree,
+   g_string_free (entry, TRUE);
+ 
+  out:
+-  g_static_rw_lock_writer_unlock (&metatree_lock);
++  g_rw_lock_writer_unlock (&metatree_lock);
+   return res;
+ }
+ 
+@@ -2543,7 +2543,7 @@ meta_tree_copy (MetaTree                         *tree,
+   guint64 mtime;
+   gboolean res;
+ 
+-  g_static_rw_lock_writer_lock (&metatree_lock);
++  g_rw_lock_writer_lock (&metatree_lock);
+ 
+   if (tree->journal == NULL ||
+       !tree->journal->journal_valid)
+@@ -2569,7 +2569,7 @@ meta_tree_copy (MetaTree                         *tree,
+   g_string_free (entry, TRUE);
+ 
+  out:
+-  g_static_rw_lock_writer_unlock (&metatree_lock);
++  g_rw_lock_writer_unlock (&metatree_lock);
+   return res;
+ }
+ 
+diff --git a/monitor/proxy/gvfsproxyvolumemonitordaemon.c b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
+index 4be64e0..fe2f1a7 100644
+--- a/monitor/proxy/gvfsproxyvolumemonitordaemon.c
++++ b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
+@@ -2050,7 +2050,6 @@ g_vfs_proxy_volume_monitor_daemon_init (void)
+   textdomain (GETTEXT_PACKAGE);
+ 
+   dbus_threads_init_default ();
+-  g_thread_init (NULL);
+   g_type_init ();
+ }
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0003-Adapt-to-glib-mutex-API-changes.patch b/meta-gnome/recipes-gnome/gvfs/files/0003-Adapt-to-glib-mutex-API-changes.patch
new file mode 100644
index 000000000..bb5d9c23d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/files/0003-Adapt-to-glib-mutex-API-changes.patch
@@ -0,0 +1,2454 @@
+From 185c4ac9c83aac035d2b49ecd95130aa5167e7c2 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Tue, 25 Oct 2011 18:41:47 +0200
+Subject: [PATCH 1/2] Adapt to glib mutex API changes
+
+A continuation to https://bugzilla.gnome.org/show_bug.cgi?id=661148
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ client/gvfsfusedaemon.c        |   80 ++++++++---------
+ common/gmountsource.c          |   60 ++++++-------
+ daemon/gvfsbackendafc.c        |   22 ++---
+ daemon/gvfsbackendftp.c        |   12 +--
+ daemon/gvfsbackendftp.h        |    4 +-
+ daemon/gvfsbackendgphoto2.c    |  112 +++++++++++-------------
+ daemon/gvfsbackendnetwork.c    |   10 +--
+ daemon/gvfsbackendobexftp.c    |  187 ++++++++++++++++++++--------------------
+ daemon/gvfsbackendsmbbrowse.c  |   39 ++++-----
+ daemon/gvfsdaemon.c            |   33 ++++----
+ daemon/gvfsftpdircache.c       |   21 ++---
+ daemon/gvfsftptask.c           |   33 ++++----
+ daemon/trashlib/trashexpunge.c |   33 ++++----
+ daemon/trashlib/trashitem.c    |   36 ++++----
+ 14 files changed, 325 insertions(+), 357 deletions(-)
+
+diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
+index 7cfa81c..c986f69 100644
+--- a/client/gvfsfusedaemon.c
++++ b/client/gvfsfusedaemon.c
+@@ -69,7 +69,7 @@ typedef enum {
+ typedef struct {
+   gint      refcount;
+ 
+-  GMutex   *mutex;
++  GMutex    mutex;
+   gchar    *path;
+   FileOp    op;
+   gpointer  stream;
+@@ -84,13 +84,13 @@ static GVolumeMonitor *volume_monitor        = NULL;
+ 
+ /* Contains pointers to MountRecord */
+ static GList          *mount_list            = NULL;
+-static GMutex         *mount_list_mutex;
++static GMutex          mount_list_mutex      = {NULL};
+ 
+ static time_t          daemon_creation_time;
+ static uid_t           daemon_uid;
+ static gid_t           daemon_gid;
+ 
+-static GStaticMutex    global_mutex          = G_STATIC_MUTEX_INIT;
++static GMutex          global_mutex          = {NULL};
+ static GHashTable     *global_path_to_fh_map = NULL;
+ static GHashTable     *global_active_fh_map  = NULL;
+ 
+@@ -212,7 +212,6 @@ file_handle_new (const gchar *path)
+ 
+   file_handle = g_new0 (FileHandle, 1);
+   file_handle->refcount = 1;
+-  file_handle->mutex = g_mutex_new ();
+   file_handle->op = FILE_OP_NONE;
+   file_handle->path = g_strdup (path);
+ 
+@@ -235,7 +234,7 @@ file_handle_unref (FileHandle *file_handle)
+     {
+       gint refs;
+ 
+-      g_static_mutex_lock (&global_mutex);
++      g_mutex_lock (&global_mutex);
+ 
+       /* Test again, since e.g. get_file_handle_for_path() might have
+        * snatched the global mutex and revived the file handle between
+@@ -246,7 +245,7 @@ file_handle_unref (FileHandle *file_handle)
+       if (refs == 0)
+         g_hash_table_remove (global_path_to_fh_map, file_handle->path);
+ 
+-      g_static_mutex_unlock (&global_mutex);
++      g_mutex_unlock (&global_mutex);
+     }
+ }
+ 
+@@ -283,7 +282,7 @@ file_handle_free (FileHandle *file_handle)
+   g_hash_table_remove (global_active_fh_map, file_handle);
+ 
+   file_handle_close_stream (file_handle);
+-  g_mutex_free (file_handle->mutex);
++  g_mutex_clear (&file_handle->mutex);
+   g_free (file_handle->path);
+   g_free (file_handle);
+ }
+@@ -293,14 +292,14 @@ get_file_handle_for_path (const gchar *path)
+ {
+   FileHandle *fh;
+ 
+-  g_static_mutex_lock (&global_mutex);
++  g_mutex_lock (&global_mutex);
+ 
+   fh = g_hash_table_lookup (global_path_to_fh_map, path);
+ 
+   if (fh)
+     file_handle_ref (fh);
+ 
+-  g_static_mutex_unlock (&global_mutex);
++  g_mutex_unlock (&global_mutex);
+   return fh;
+ }
+ 
+@@ -309,7 +308,7 @@ get_or_create_file_handle_for_path (const gchar *path)
+ {
+   FileHandle *fh;
+ 
+-  g_static_mutex_lock (&global_mutex);
++  g_mutex_lock (&global_mutex);
+ 
+   fh = g_hash_table_lookup (global_path_to_fh_map, path);
+ 
+@@ -323,7 +322,7 @@ get_or_create_file_handle_for_path (const gchar *path)
+       g_hash_table_insert (global_path_to_fh_map, fh->path, fh);
+     }
+ 
+-  g_static_mutex_unlock (&global_mutex);
++  g_mutex_unlock (&global_mutex);
+   return fh;
+ }
+ 
+@@ -332,7 +331,7 @@ get_file_handle_from_info (struct fuse_file_info *fi)
+ {
+   FileHandle *fh;
+ 
+-  g_static_mutex_lock (&global_mutex);
++  g_mutex_lock (&global_mutex);
+ 
+   fh = GET_FILE_HANDLE (fi);
+ 
+@@ -343,7 +342,7 @@ get_file_handle_from_info (struct fuse_file_info *fi)
+   if (fh)
+     file_handle_ref (fh);
+ 
+-  g_static_mutex_unlock (&global_mutex);
++  g_mutex_unlock (&global_mutex);
+   return fh;
+ }
+ 
+@@ -353,7 +352,7 @@ reindex_file_handle_for_path (const gchar *old_path, const gchar *new_path)
+   gchar      *old_path_internal;
+   FileHandle *fh;
+ 
+-  g_static_mutex_lock (&global_mutex);
++  g_mutex_lock (&global_mutex);
+ 
+   if (!g_hash_table_lookup_extended (global_path_to_fh_map, old_path,
+                                      (gpointer *) &old_path_internal,
+@@ -368,7 +367,7 @@ reindex_file_handle_for_path (const gchar *old_path, const gchar *new_path)
+   g_hash_table_insert (global_path_to_fh_map, fh->path, fh);
+ 
+  out:
+-  g_static_mutex_unlock (&global_mutex);
++  g_mutex_unlock (&global_mutex);
+ }
+ 
+ static MountRecord *
+@@ -405,13 +404,13 @@ mount_record_free (MountRecord *mount_record)
+ static void
+ mount_list_lock (void)
+ {
+-  g_mutex_lock (mount_list_mutex);
++  g_mutex_lock (&mount_list_mutex);
+ }
+ 
+ static void
+ mount_list_unlock (void)
+ {
+-  g_mutex_unlock (mount_list_mutex);
++  g_mutex_unlock (&mount_list_mutex);
+ }
+ 
+ static void
+@@ -866,9 +865,9 @@ vfs_getattr (const gchar *path, struct stat *sbuf)
+ 
+           if (fh != NULL)
+             {
+-              g_mutex_lock (fh->mutex);
++              g_mutex_lock (&fh->mutex);
+               getattr_for_file_handle (fh, sbuf);
+-              g_mutex_unlock (fh->mutex);
++              g_mutex_unlock (&fh->mutex);
+ 
+               file_handle_unref (fh);
+               result = 0;
+@@ -995,7 +994,7 @@ open_common (const gchar *path, struct fuse_file_info *fi, GFile *file, int outp
+   gint        result;
+   FileHandle *fh = get_or_create_file_handle_for_path (path);
+ 
+-  g_mutex_lock (fh->mutex);
++  g_mutex_lock (&fh->mutex);
+ 
+   SET_FILE_HANDLE (fi, fh);
+ 
+@@ -1009,7 +1008,7 @@ open_common (const gchar *path, struct fuse_file_info *fi, GFile *file, int outp
+   else
+     result = setup_input_stream (file, fh);
+ 
+-  g_mutex_unlock (fh->mutex);
++  g_mutex_unlock (&fh->mutex);
+ 
+   /* The added reference to the file handle is released in vfs_release() */
+   return result;
+@@ -1121,7 +1120,7 @@ vfs_create (const gchar *path, mode_t mode, struct fuse_file_info *fi)
+ 
+               /* Success */
+ 
+-              g_mutex_lock (fh->mutex);
++              g_mutex_lock (&fh->mutex);
+ 
+               SET_FILE_HANDLE (fi, fh);
+ 
+@@ -1129,7 +1128,7 @@ vfs_create (const gchar *path, mode_t mode, struct fuse_file_info *fi)
+               fh->stream = file_output_stream;
+               fh->op = FILE_OP_WRITE;
+ 
+-              g_mutex_unlock (fh->mutex);
++              g_mutex_unlock (&fh->mutex);
+ 
+               /* The reference added to the file handle is released in vfs_release() */
+             }
+@@ -1285,7 +1284,7 @@ vfs_read (const gchar *path, gchar *buf, size_t size,
+ 
+       if (fh)
+         {
+-          g_mutex_lock (fh->mutex);
++          g_mutex_lock (&fh->mutex);
+ 
+           result = setup_input_stream (file, fh);
+ 
+@@ -1298,7 +1297,7 @@ vfs_read (const gchar *path, gchar *buf, size_t size,
+               debug_print ("vfs_read: failed to setup input_stream!\n");
+             }
+ 
+-          g_mutex_unlock (fh->mutex);
++          g_mutex_unlock (&fh->mutex);
+           file_handle_unref (fh);
+         }
+       else
+@@ -1413,7 +1412,7 @@ vfs_write (const gchar *path, const gchar *buf, size_t len, off_t offset,
+ 
+       if (fh)
+         {
+-          g_mutex_lock (fh->mutex);
++          g_mutex_lock (&fh->mutex);
+ 
+           result = setup_output_stream (file, fh, 0);
+           if (result == 0)
+@@ -1421,7 +1420,7 @@ vfs_write (const gchar *path, const gchar *buf, size_t len, off_t offset,
+               result = write_stream (fh, buf, len, offset);
+             }
+ 
+-          g_mutex_unlock (fh->mutex);
++          g_mutex_unlock (&fh->mutex);
+           file_handle_unref (fh);
+         }
+       else
+@@ -1453,9 +1452,9 @@ vfs_flush (const gchar *path, struct fuse_file_info *fi)
+ 
+   if (fh)
+     {
+-      g_mutex_lock (fh->mutex);
++      g_mutex_lock (&fh->mutex);
+       file_handle_close_stream (fh);
+-      g_mutex_unlock (fh->mutex);
++      g_mutex_unlock (&fh->mutex);
+ 
+       /* get_file_handle_from_info () adds a "working ref", so release that. */
+       file_handle_unref (fh);
+@@ -1474,9 +1473,9 @@ vfs_fsync (const gchar *path, gint sync_data_only, struct fuse_file_info *fi)
+ 
+   if (fh)
+     {
+-      g_mutex_lock (fh->mutex);
++      g_mutex_lock (&fh->mutex);
+       file_handle_close_stream (fh);
+-      g_mutex_unlock (fh->mutex);
++      g_mutex_unlock (&fh->mutex);
+ 
+       /* get_file_handle_from_info () adds a "working ref", so release that. */
+       file_handle_unref (fh);
+@@ -1625,7 +1624,7 @@ vfs_rename (const gchar *old_path, const gchar *new_path)
+ 
+       if (fh)
+         {
+-          g_mutex_lock (fh->mutex);
++          g_mutex_lock (&fh->mutex);
+           file_handle_close_stream (fh);
+         }
+ 
+@@ -1645,7 +1644,7 @@ vfs_rename (const gchar *old_path, const gchar *new_path)
+ 
+       if (fh)
+         {
+-          g_mutex_unlock (fh->mutex);
++          g_mutex_unlock (&fh->mutex);
+           file_handle_unref (fh);
+         }
+ 
+@@ -1687,7 +1686,7 @@ vfs_unlink (const gchar *path)
+ 
+       if (fh)
+         {
+-          g_mutex_lock (fh->mutex);
++          g_mutex_lock (&fh->mutex);
+           file_handle_close_stream (fh);
+         }
+ 
+@@ -1695,7 +1694,7 @@ vfs_unlink (const gchar *path)
+ 
+       if (fh)
+         {
+-          g_mutex_unlock (fh->mutex);
++          g_mutex_unlock (&fh->mutex);
+           file_handle_unref (fh);
+         }
+ 
+@@ -1864,7 +1863,7 @@ vfs_ftruncate (const gchar *path, off_t size, struct fuse_file_info *fi)
+ 
+       if (fh)
+         {
+-          g_mutex_lock (fh->mutex);
++          g_mutex_lock (&fh->mutex);
+ 
+           result = setup_output_stream (file, fh, 0);
+ 
+@@ -1909,7 +1908,7 @@ vfs_ftruncate (const gchar *path, off_t size, struct fuse_file_info *fi)
+                 }
+             }
+ 
+-          g_mutex_unlock (fh->mutex);
++          g_mutex_unlock (&fh->mutex);
+           file_handle_unref (fh);
+         }
+       else
+@@ -1948,7 +1947,7 @@ vfs_truncate (const gchar *path, off_t size)
+       /* Get a file handle just to lock the path while we're working */
+       fh = get_file_handle_for_path (path);
+       if (fh)
+-        g_mutex_lock (fh->mutex);
++        g_mutex_lock (&fh->mutex);
+ 
+       if (size == 0)
+         {
+@@ -1975,7 +1974,7 @@ vfs_truncate (const gchar *path, off_t size)
+ 
+       if (fh)
+         {
+-          g_mutex_unlock (fh->mutex);
++          g_mutex_unlock (&fh->mutex);
+           file_handle_unref (fh);
+         }
+ 
+@@ -2315,7 +2314,6 @@ vfs_init (struct fuse_conn_info *conn)
+   daemon_uid = getuid ();
+   daemon_gid = getgid ();
+ 
+-  mount_list_mutex = g_mutex_new ();
+   global_path_to_fh_map = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                  NULL, (GDestroyNotify) file_handle_free);
+   global_active_fh_map = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+@@ -2374,7 +2372,7 @@ vfs_destroy (gpointer param)
+   mount_list_free ();
+   if (subthread_main_loop != NULL) 
+     g_main_loop_quit (subthread_main_loop);
+-  g_mutex_free (mount_list_mutex);
++  g_mutex_clear (&mount_list_mutex);
+   g_object_unref (gvfs);
+ }
+ 
+diff --git a/common/gmountsource.c b/common/gmountsource.c
+index d228726..af89ed2 100644
+--- a/common/gmountsource.c
++++ b/common/gmountsource.c
+@@ -27,6 +27,8 @@
+ #include <gio/gio.h>
+ #include <gvfsdaemonprotocol.h>
+ 
++#include <string.h>
++
+ struct _GMountSource
+ {
+   GObject parent_instance;
+@@ -137,8 +139,8 @@ typedef struct AskSyncData AskSyncData;
+ struct AskSyncData {
+ 
+   /* For sync calls */
+-  GMutex *mutex;
+-  GCond *cond;
++  GMutex mutex;
++  GCond cond;
+ 
+   /* results: */
+   GAsyncResult *result;
+@@ -356,9 +358,9 @@ ask_reply_sync  (GObject *source_object,
+   data->result = g_object_ref (res);
+ 
+   /* Wake up sync call thread */
+-  g_mutex_lock (data->mutex);
+-  g_cond_signal (data->cond);
+-  g_mutex_unlock (data->mutex);
++  g_mutex_lock (&data->mutex);
++  g_cond_signal (&data->cond);
++  g_mutex_unlock (&data->mutex);
+ }
+ 
+ gboolean
+@@ -375,12 +377,10 @@ g_mount_source_ask_password (GMountSource *source,
+                             GPasswordSave *password_save_out)
+ {
+   gboolean handled;
+-  AskSyncData data = {NULL};
+-  
+-  data.mutex = g_mutex_new ();
+-  data.cond = g_cond_new ();
++  AskSyncData data;
+ 
+-  g_mutex_lock (data.mutex);
++  memset (&data, 0, sizeof (data));
++  g_mutex_lock (&data.mutex);
+ 
+ 
+   g_mount_source_ask_password_async (source,
+@@ -391,11 +391,11 @@ g_mount_source_ask_password (GMountSource *source,
+                                      ask_reply_sync,
+                                      &data);
+   
+-  g_cond_wait(data.cond, data.mutex);
+-  g_mutex_unlock (data.mutex);
++  g_cond_wait (&data.cond, &data.mutex);
++  g_mutex_unlock (&data.mutex);
+ 
+-  g_cond_free (data.cond);
+-  g_mutex_free (data.mutex);
++  g_cond_clear (&data.cond);
++  g_mutex_clear (&data.mutex);
+ 
+ 
+   handled = g_mount_source_ask_password_finish (source,
+@@ -546,12 +546,10 @@ g_mount_source_ask_question (GMountSource *source,
+ {
+   gint choice;
+   gboolean handled, aborted;
+-  AskSyncData data = {NULL};
++  AskSyncData data;
+   
+-  data.mutex = g_mutex_new ();
+-  data.cond = g_cond_new ();
+-
+-  g_mutex_lock (data.mutex);
++  memset (&data, 0, sizeof (data));
++  g_mutex_lock (&data.mutex);
+ 
+   g_mount_source_ask_question_async (source,
+                                      message,
+@@ -560,11 +558,11 @@ g_mount_source_ask_question (GMountSource *source,
+                                      ask_reply_sync,
+                                      &data);
+   
+-  g_cond_wait(data.cond, data.mutex);
+-  g_mutex_unlock (data.mutex);
++  g_cond_wait (&data.cond, &data.mutex);
++  g_mutex_unlock (&data.mutex);
+ 
+-  g_cond_free (data.cond);
+-  g_mutex_free (data.mutex);
++  g_cond_clear (&data.cond);
++  g_mutex_clear (&data.mutex);
+ 
+   handled = g_mount_source_ask_question_finish (source,
+                                                 data.result,
+@@ -841,12 +839,10 @@ g_mount_source_show_processes (GMountSource *source,
+ {
+   gint choice;
+   gboolean handled, aborted;
+-  AskSyncData data = {NULL};
+-
+-  data.mutex = g_mutex_new ();
+-  data.cond = g_cond_new ();
++  AskSyncData data;
+ 
+-  g_mutex_lock (data.mutex);
++  memset (&data, 0, sizeof (data));
++  g_mutex_lock (&data.mutex);
+ 
+   g_mount_source_show_processes_async (source,
+                                        message,
+@@ -856,11 +852,11 @@ g_mount_source_show_processes (GMountSource *source,
+                                        ask_reply_sync,
+                                        &data);
+ 
+-  g_cond_wait (data.cond, data.mutex);
+-  g_mutex_unlock (data.mutex);
++  g_cond_wait (&data.cond, &data.mutex);
++  g_mutex_unlock (&data.mutex);
+ 
+-  g_cond_free (data.cond);
+-  g_mutex_free (data.mutex);
++  g_cond_clear (&data.cond);
++  g_mutex_clear (&data.mutex);
+ 
+   handled = g_mount_source_show_processes_finish (source,
+                                                   data.result,
+diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
+index 16c8a23..84227ed 100644
+--- a/daemon/gvfsbackendafc.c
++++ b/daemon/gvfsbackendafc.c
+@@ -87,7 +87,7 @@ struct _GVfsBackendAfc {
+   GHashTable *apps; /* hash table of AppInfo */
+   instproxy_client_t inst;
+   sbservices_client_t sbs;
+-  GMutex *apps_lock;
++  GMutex apps_lock;
+ };
+ 
+ struct afc_error_mapping {
+@@ -182,11 +182,7 @@ g_vfs_backend_afc_close_connection (GVfsBackendAfc *self)
+               sbservices_client_free (self->sbs);
+               self->sbs = NULL;
+             }
+-          if (self->apps_lock)
+-            {
+-              g_mutex_free (self->apps_lock);
+-              self->apps_lock = NULL;
+-            }
++          g_mutex_clear (&self->apps_lock);
+         }
+       g_free (self->model);
+       self->model = NULL;
+@@ -1910,14 +1906,14 @@ g_vfs_backend_afc_enumerate (GVfsBackend *backend,
+     {
+       char *app;
+ 
+-      g_mutex_lock (self->apps_lock);
++      g_mutex_lock (&self->apps_lock);
+       if (g_vfs_backend_load_apps (self) == FALSE)
+         {
+           g_vfs_backend_afc_check (AFC_E_INTERNAL_ERROR, G_VFS_JOB (job));
+-          g_mutex_unlock (self->apps_lock);
++          g_mutex_unlock (&self->apps_lock);
+           return;
+         }
+-      g_mutex_unlock (self->apps_lock);
++      g_mutex_unlock (&self->apps_lock);
+ 
+       app = g_vfs_backend_parse_house_arrest_path (self, TRUE, path, &new_path);
+ 
+@@ -2039,14 +2035,14 @@ g_vfs_backend_afc_query_info (GVfsBackend *backend,
+     {
+       char *app;
+ 
+-      g_mutex_lock (self->apps_lock);
++      g_mutex_lock (&self->apps_lock);
+       if (g_vfs_backend_load_apps (self) == FALSE)
+         {
+           g_vfs_backend_afc_check (AFC_E_INTERNAL_ERROR, G_VFS_JOB (job));
+-          g_mutex_unlock (self->apps_lock);
++          g_mutex_unlock (&self->apps_lock);
+           return;
+         }
+-      g_mutex_unlock (self->apps_lock);
++      g_mutex_unlock (&self->apps_lock);
+ 
+       app = g_vfs_backend_parse_house_arrest_path (self, TRUE, path, &new_path);
+ 
+@@ -2604,8 +2600,6 @@ g_vfs_backend_afc_init (GVfsBackendAfc *self)
+       /* enable full debugging */
+       idevice_set_debug_level (1);
+     }
+-
+-  self->apps_lock = g_mutex_new ();
+ }
+ 
+ static void
+diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
+index 35e0b71..3883ca3 100644
+--- a/daemon/gvfsbackendftp.c
++++ b/daemon/gvfsbackendftp.c
+@@ -382,8 +382,8 @@ g_vfs_backend_ftp_finalize (GObject *object)
+ 
+   /* has been cleared on unmount */
+   g_assert (ftp->queue == NULL);
+-  g_cond_free (ftp->cond);
+-  g_mutex_free (ftp->mutex);
++  g_cond_clear (&ftp->cond);
++  g_mutex_clear (&ftp->mutex);
+ 
+   g_free (ftp->user);
+   g_free (ftp->password);
+@@ -395,8 +395,6 @@ g_vfs_backend_ftp_finalize (GObject *object)
+ static void
+ g_vfs_backend_ftp_init (GVfsBackendFtp *ftp)
+ {
+-  ftp->mutex = g_mutex_new ();
+-  ftp->cond = g_cond_new ();
+ }
+ 
+ static void
+@@ -698,7 +696,7 @@ do_unmount (GVfsBackend *   backend,
+   GVfsBackendFtp *ftp = G_VFS_BACKEND_FTP (backend);
+   GVfsFtpConnection *conn;
+ 
+-  g_mutex_lock (ftp->mutex);
++  g_mutex_lock (&ftp->mutex);
+   while ((conn = g_queue_pop_head (ftp->queue)))
+     {
+       /* FIXME: properly quit */
+@@ -706,8 +704,8 @@ do_unmount (GVfsBackend *   backend,
+     }
+   g_queue_free (ftp->queue);
+   ftp->queue = NULL;
+-  g_cond_broadcast (ftp->cond);
+-  g_mutex_unlock (ftp->mutex);
++  g_cond_broadcast (&ftp->cond);
++  g_mutex_unlock (&ftp->mutex);
+   g_vfs_job_succeeded (G_VFS_JOB (job));
+ }
+ 
+diff --git a/daemon/gvfsbackendftp.h b/daemon/gvfsbackendftp.h
+index f5983b5..767ea35 100644
+--- a/daemon/gvfsbackendftp.h
++++ b/daemon/gvfsbackendftp.h
+@@ -100,8 +100,8 @@ struct _GVfsBackendFtp
+   GVfsFtpDirCache *     dir_cache;              /* directory cache */
+ 
+   /* connection collection - accessed from gvfsftptask.c */
+-  GMutex *              mutex;                  /* mutex protecting the following variables */
+-  GCond *               cond;                   /* cond used to signal tasks waiting on the mutex */
++  GMutex                mutex;                  /* mutex protecting the following variables */
++  GCond                 cond;                   /* cond used to signal tasks waiting on the mutex */
+   GQueue *              queue;                  /* queue containing the connections */
+   guint                        connections;            /* current number of connections */
+   guint                 busy_connections;       /* current number of connections being used for reads/writes */
+diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
+index 541dafe..9a1b6d8 100644
+--- a/daemon/gvfsbackendgphoto2.c
++++ b/daemon/gvfsbackendgphoto2.c
+@@ -207,7 +207,7 @@ struct _GVfsBackendGphoto2
+    *
+    * Must only be held for very short amounts of time (e.g. no IO).
+    */
+-  GMutex *lock;
++  GMutex lock;
+ 
+   /* CACHES */
+ 
+@@ -433,7 +433,7 @@ caches_invalidate_all (GVfsBackendGphoto2 *gphoto2_backend)
+ {
+   DEBUG ("caches_invalidate_all()");
+ 
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   if (gphoto2_backend->dir_name_cache != NULL)
+     g_hash_table_remove_all (gphoto2_backend->dir_name_cache);
+   if (gphoto2_backend->file_name_cache != NULL)
+@@ -442,7 +442,7 @@ caches_invalidate_all (GVfsBackendGphoto2 *gphoto2_backend)
+     g_hash_table_remove_all (gphoto2_backend->info_cache);
+   gphoto2_backend->capacity = -1;  
+   gphoto2_backend->free_space = -1;  
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ }
+ 
+ /* ------------------------------------------------------------------------------------------------- */
+@@ -450,9 +450,9 @@ caches_invalidate_all (GVfsBackendGphoto2 *gphoto2_backend)
+ static void
+ caches_invalidate_free_space (GVfsBackendGphoto2 *gphoto2_backend)
+ {
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   gphoto2_backend->free_space = -1;  
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ }
+ 
+ /* ------------------------------------------------------------------------------------------------- */
+@@ -461,11 +461,11 @@ static void
+ caches_invalidate_dir (GVfsBackendGphoto2 *gphoto2_backend, const char *dir)
+ {
+   DEBUG ("caches_invalidate_dir() for '%s'", dir);
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   g_hash_table_remove (gphoto2_backend->dir_name_cache, dir);
+   g_hash_table_remove (gphoto2_backend->file_name_cache, dir);
+   g_hash_table_remove (gphoto2_backend->info_cache, dir);
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ }
+ 
+ /* ------------------------------------------------------------------------------------------------- */
+@@ -477,14 +477,14 @@ caches_invalidate_file (GVfsBackendGphoto2 *gphoto2_backend, const char *dir, co
+ 
+   full_name = g_build_filename (dir, name, NULL);
+ 
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   /* this is essentially: caches_invalidate_dir (gphoto2_backend, dir); */
+   g_hash_table_remove (gphoto2_backend->dir_name_cache, dir);
+   g_hash_table_remove (gphoto2_backend->file_name_cache, dir);
+   g_hash_table_remove (gphoto2_backend->info_cache, dir);
+ 
+   g_hash_table_remove (gphoto2_backend->info_cache, full_name);
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ 
+   DEBUG ("caches_invalidate_file() for '%s'", full_name);
+   g_free (full_name);
+@@ -618,11 +618,7 @@ release_device (GVfsBackendGphoto2 *gphoto2_backend)
+   g_list_free (gphoto2_backend->file_monitor_proxies);
+   gphoto2_backend->file_monitor_proxies = NULL;
+ 
+-  if (gphoto2_backend->lock != NULL)
+-    {
+-      g_mutex_free (gphoto2_backend->lock);
+-      gphoto2_backend->lock = NULL;
+-    }
++  g_mutex_clear (&gphoto2_backend->lock);
+   gphoto2_backend->capacity = -1;
+   gphoto2_backend->free_space = -1;
+ }
+@@ -1099,17 +1095,17 @@ file_get_info (GVfsBackendGphoto2 *gphoto2_backend,
+ 
+ 
+   /* first look up cache */
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   cached_info = g_hash_table_lookup (gphoto2_backend->info_cache, full_path);
+   if (cached_info != NULL)
+     {
+       g_file_info_copy_into (cached_info, info);
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+       DEBUG ("  Using cached info %p for '%s'", cached_info, full_path);
+       ret = TRUE;
+       goto out;
+     }
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ 
+   if (try_cache_only)
+     goto out;
+@@ -1307,9 +1303,9 @@ file_get_info (GVfsBackendGphoto2 *gphoto2_backend,
+ #ifndef DEBUG_NO_CACHING
+       cached_info = g_file_info_dup (info);
+       DEBUG ("  Storing cached info %p for '%s'", cached_info, full_path);
+-      g_mutex_lock (gphoto2_backend->lock);
++      g_mutex_lock (&gphoto2_backend->lock);
+       g_hash_table_insert (gphoto2_backend->info_cache, g_strdup (full_path), cached_info);
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+ #endif
+     }
+ 
+@@ -1716,8 +1712,6 @@ do_mount (GVfsBackend *backend,
+ 
+   gphoto2_backend->free_space = -1;
+ 
+-  gphoto2_backend->lock = g_mutex_new ();
+-
+   gphoto2_mount_spec = g_mount_spec_new ("gphoto2");
+   g_mount_spec_set (gphoto2_mount_spec, "host", host);
+   g_vfs_backend_set_mount_spec (backend, gphoto2_mount_spec);
+@@ -1860,9 +1854,9 @@ do_open_for_read_real (GVfsBackend *backend,
+   DEBUG ("  data=%p size=%ld handle=%p get_preview=%d",
+          read_handle->data, read_handle->size, read_handle, get_preview);
+ 
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   gphoto2_backend->open_read_handles = g_list_prepend (gphoto2_backend->open_read_handles, read_handle);
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+       
+   read_handle->cursor = 0;
+ 
+@@ -2008,9 +2002,9 @@ do_close_read (GVfsBackend *backend,
+ 
+   DEBUG ("close_read() handle=%p", handle);
+ 
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   gphoto2_backend->open_read_handles = g_list_remove (gphoto2_backend->open_read_handles, read_handle);
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ 
+   free_read_handle (read_handle);
+   
+@@ -2140,11 +2134,11 @@ do_enumerate (GVfsBackend *backend,
+   g_free (as_name);
+ 
+   /* first, list the folders */
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   list = g_hash_table_lookup (gphoto2_backend->dir_name_cache, filename);
+   if (list == NULL)
+     {
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+ 
+       ensure_not_dirty (gphoto2_backend);
+ 
+@@ -2169,7 +2163,7 @@ do_enumerate (GVfsBackend *backend,
+       DEBUG ("  Using cached dir list for dir '%s'", filename);
+       using_cached_dir_list = TRUE;
+       gp_list_ref (list);
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+     }
+   for (n = 0; n < gp_list_count (list); n++) 
+     {
+@@ -2193,25 +2187,25 @@ do_enumerate (GVfsBackend *backend,
+   if (!using_cached_dir_list)
+     {
+ #ifndef DEBUG_NO_CACHING
+-      g_mutex_lock (gphoto2_backend->lock);
++      g_mutex_lock (&gphoto2_backend->lock);
+       g_hash_table_insert (gphoto2_backend->dir_name_cache, g_strdup (filename), list);
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+ #endif
+     }
+   else
+     {
+-      g_mutex_lock (gphoto2_backend->lock);
++      g_mutex_lock (&gphoto2_backend->lock);
+       gp_list_unref (list);
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+     }
+ 
+ 
+   /* then list the files in each folder */
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   list = g_hash_table_lookup (gphoto2_backend->file_name_cache, filename);
+   if (list == NULL)
+     {
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+       ensure_not_dirty (gphoto2_backend);
+ 
+       DEBUG ("  Generating file list for dir '%s'", filename);
+@@ -2235,7 +2229,7 @@ do_enumerate (GVfsBackend *backend,
+       DEBUG ("  Using cached file list for dir '%s'", filename);
+       using_cached_file_list = TRUE;
+       gp_list_ref (list);
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+     }
+   for (n = 0; n < gp_list_count (list); n++) 
+     {
+@@ -2260,16 +2254,16 @@ do_enumerate (GVfsBackend *backend,
+   if (!using_cached_file_list)
+     {
+ #ifndef DEBUG_NO_CACHING
+-      g_mutex_lock (gphoto2_backend->lock);
++      g_mutex_lock (&gphoto2_backend->lock);
+       g_hash_table_insert (gphoto2_backend->file_name_cache, g_strdup (filename), list);
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+ #endif
+     }
+   else
+     {
+-      g_mutex_lock (gphoto2_backend->lock);
++      g_mutex_lock (&gphoto2_backend->lock);
+       gp_list_unref (list);
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+     }
+ 
+   /* and we're done */
+@@ -2307,15 +2301,15 @@ try_enumerate (GVfsBackend *backend,
+   DEBUG ("try_enumerate (%s)", given_filename);
+ 
+   /* first, list the folders */
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   list = g_hash_table_lookup (gphoto2_backend->dir_name_cache, filename);
+   if (list == NULL)
+     {
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+       goto error_not_cached;
+     }
+   gp_list_ref (list);
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+   for (n = 0; n < gp_list_count (list); n++) 
+     {
+       gp_list_get_name (list, n, &name);
+@@ -2323,27 +2317,27 @@ try_enumerate (GVfsBackend *backend,
+       info = g_file_info_new ();
+       if (!file_get_info (gphoto2_backend, filename, name, info, &error, TRUE))
+         {
+-          g_mutex_lock (gphoto2_backend->lock);
++          g_mutex_lock (&gphoto2_backend->lock);
+           gp_list_unref (list);
+-          g_mutex_unlock (gphoto2_backend->lock);
++          g_mutex_unlock (&gphoto2_backend->lock);
+           goto error_not_cached;
+         }
+       l = g_list_append (l, info);
+     }
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   gp_list_unref (list);
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ 
+   /* then list the files in each folder */
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   list = g_hash_table_lookup (gphoto2_backend->file_name_cache, filename);
+   if (list == NULL)
+     {
+-      g_mutex_unlock (gphoto2_backend->lock);
++      g_mutex_unlock (&gphoto2_backend->lock);
+       goto error_not_cached;
+     }
+   gp_list_ref (list);
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+   for (n = 0; n < gp_list_count (list); n++) 
+     {
+       gp_list_get_name (list, n, &name);
+@@ -2352,16 +2346,16 @@ try_enumerate (GVfsBackend *backend,
+       info = g_file_info_new ();
+       if (!file_get_info (gphoto2_backend, filename, name, info, &error, TRUE))
+         {
+-          g_mutex_lock (gphoto2_backend->lock);
++          g_mutex_lock (&gphoto2_backend->lock);
+           gp_list_unref (list);
+-          g_mutex_unlock (gphoto2_backend->lock);
++          g_mutex_unlock (&gphoto2_backend->lock);
+           goto error_not_cached;
+         }
+       l = g_list_append (l, info);
+     }
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   gp_list_unref (list);
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ 
+   /* and we're done */
+ 
+@@ -2412,9 +2406,9 @@ do_query_fs_info (GVfsBackend *backend,
+           /* for now we only support a single storage head */
+           if (storage_info[0].fields & GP_STORAGEINFO_MAXCAPACITY)
+             {
+-              g_mutex_lock (gphoto2_backend->lock);
++              g_mutex_lock (&gphoto2_backend->lock);
+               gphoto2_backend->capacity = storage_info[0].capacitykbytes * 1024;
+-              g_mutex_unlock (gphoto2_backend->lock);
++              g_mutex_unlock (&gphoto2_backend->lock);
+               g_file_info_set_attribute_uint64 (info, 
+                                                 G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, 
+                                                 (guint64) gphoto2_backend->capacity);
+@@ -2422,9 +2416,9 @@ do_query_fs_info (GVfsBackend *backend,
+ 
+           if (storage_info[0].fields & GP_STORAGEINFO_FREESPACEKBYTES)
+             {
+-              g_mutex_lock (gphoto2_backend->lock);
++              g_mutex_lock (&gphoto2_backend->lock);
+               gphoto2_backend->free_space = storage_info[0].freekbytes * 1024;
+-              g_mutex_unlock (gphoto2_backend->lock);
++              g_mutex_unlock (&gphoto2_backend->lock);
+               g_file_info_set_attribute_uint64 (info, 
+                                                 G_FILE_ATTRIBUTE_FILESYSTEM_FREE, 
+                                                 (guint64) gphoto2_backend->free_space);
+@@ -2454,10 +2448,10 @@ try_query_fs_info (GVfsBackend *backend,
+ 
+   ret = FALSE;
+ 
+-  g_mutex_lock (gphoto2_backend->lock);
++  g_mutex_lock (&gphoto2_backend->lock);
+   free_space = gphoto2_backend->free_space;
+   capacity = gphoto2_backend->capacity;
+-  g_mutex_unlock (gphoto2_backend->lock);
++  g_mutex_unlock (&gphoto2_backend->lock);
+ 
+   if (free_space == -1 || capacity == -1)
+     {
+diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c
+index 80273e5..3c38514 100644
+--- a/daemon/gvfsbackendnetwork.c
++++ b/daemon/gvfsbackendnetwork.c
+@@ -65,7 +65,7 @@ struct _GVfsBackendNetwork
+   gboolean have_smb;
+   char *current_workgroup;
+   GFileMonitor *smb_monitor;
+-  GMutex *smb_mount_lock;
++  GMutex smb_mount_lock;
+   GVfsJobMount *mount_job;
+ 
+   /* DNS-SD Stuff */
+@@ -433,7 +433,7 @@ mount_smb_done_cb (GObject *object,
+       g_vfs_job_succeeded (G_VFS_JOB (backend->mount_job));
+       g_object_unref (backend->mount_job);
+     }  
+-  g_mutex_unlock (backend->smb_mount_lock);
++  g_mutex_unlock (&backend->smb_mount_lock);
+ }
+ 
+ static void
+@@ -442,7 +442,7 @@ remount_smb (GVfsBackendNetwork *backend, GVfsJobMount *job)
+   GFile *file;
+   char *workgroup;
+ 
+-  if (! g_mutex_trylock (backend->smb_mount_lock))
++  if (! g_mutex_trylock (&backend->smb_mount_lock))
+     /*  Do nothing when the mount operation is already active  */
+     return;
+   
+@@ -769,8 +769,6 @@ g_vfs_backend_network_init (GVfsBackendNetwork *network_backend)
+   const char * const* supported_vfs;
+   int i;
+ 
+-  network_backend->smb_mount_lock = g_mutex_new ();
+-
+   supported_vfs = g_vfs_get_supported_uri_schemes (g_vfs_get_default ());
+ 
+   network_backend->have_smb = FALSE;
+@@ -836,7 +834,7 @@ g_vfs_backend_network_finalize (GObject *object)
+   GVfsBackendNetwork *backend;
+   backend = G_VFS_BACKEND_NETWORK (object);
+ 
+-  g_mutex_free (backend->smb_mount_lock);
++  g_mutex_clear (&backend->smb_mount_lock);
+   g_mount_spec_unref (backend->mount_spec);
+   g_object_unref (backend->root_monitor);
+   g_object_unref (backend->workgroup_icon);
+diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c
+index 9630df8..62fe32f 100644
+--- a/daemon/gvfsbackendobexftp.c
++++ b/daemon/gvfsbackendobexftp.c
+@@ -85,8 +85,8 @@ struct _GVfsBackendObexftp
+   DBusGProxy *session_proxy;
+ 
+   /* Use for the async notifications and errors */
+-  GCond *cond;
+-  GMutex *mutex;
++  GCond cond;
++  GMutex mutex;
+   int status;
+   gboolean doing_io;
+   GError *error;
+@@ -494,8 +494,8 @@ g_vfs_backend_obexftp_finalize (GObject *object)
+ 
+   if (backend->session_proxy != NULL)
+         g_object_unref (backend->session_proxy);
+-  g_mutex_free (backend->mutex);
+-  g_cond_free (backend->cond);
++  g_mutex_clear (&backend->mutex);
++  g_cond_clear (&backend->cond);
+ 
+   if (G_OBJECT_CLASS (g_vfs_backend_obexftp_parent_class)->finalize)
+         (*G_OBJECT_CLASS (g_vfs_backend_obexftp_parent_class)->finalize) (object);
+@@ -530,8 +530,6 @@ g_vfs_backend_obexftp_init (GVfsBackendObexftp *backend)
+       return;
+   }
+ 
+-  backend->mutex = g_mutex_new ();
+-  backend->cond = g_cond_new ();
+   backend->manager_proxy = dbus_g_proxy_new_for_name (backend->connection,
+                                                       "org.openobex",
+                                                       "/org/openobex",
+@@ -759,18 +757,18 @@ error_occurred_cb (DBusGProxy *proxy, const gchar *error_name, const gchar *erro
+     }
+ 
+   /* Something is waiting on us */
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+   if (op_backend->doing_io)
+     {
+       op_backend->status = ASYNC_ERROR;
+       op_backend->error = g_error_new_literal (DBUS_GERROR,
+                                                DBUS_GERROR_REMOTE_EXCEPTION,
+                                                error_message);
+-      g_cond_signal (op_backend->cond);
+-      g_mutex_unlock (op_backend->mutex);
++      g_cond_signal (&op_backend->cond);
++      g_mutex_unlock (&op_backend->mutex);
+       return;
+     }
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   g_message ("Unhandled error, file a bug");
+   _exit (1);
+@@ -785,13 +783,13 @@ session_connect_error_cb (DBusGProxy *proxy,
+ {
+   GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+   op_backend->status = ASYNC_ERROR;
+   op_backend->error = g_error_new_literal (DBUS_GERROR,
+                                            DBUS_GERROR_REMOTE_EXCEPTION,
+                                            error_message);
+-  g_cond_signal (op_backend->cond);
+-  g_mutex_unlock (op_backend->mutex);
++  g_cond_signal (&op_backend->cond);
++  g_mutex_unlock (&op_backend->mutex);
+ }
+ 
+ static void
+@@ -801,10 +799,10 @@ session_connected_cb (DBusGProxy *proxy,
+ {
+   GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+   op_backend->status = ASYNC_SUCCESS;
+-  g_cond_signal (op_backend->cond);
+-  g_mutex_unlock (op_backend->mutex);
++  g_cond_signal (&op_backend->cond);
++  g_mutex_unlock (&op_backend->mutex);
+ }
+ 
+ static void
+@@ -814,10 +812,10 @@ cancelled_cb (DBusGProxy *proxy, gpointer user_data)
+ 
+   g_message ("transfer got cancelled");
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+   op_backend->status = ASYNC_ERROR;
+-  g_cond_signal (op_backend->cond);
+-  g_mutex_unlock (op_backend->mutex);
++  g_cond_signal (&op_backend->cond);
++  g_mutex_unlock (&op_backend->mutex);
+ }
+ 
+ static void
+@@ -979,17 +977,16 @@ do_mount (GVfsBackend *backend,
+ 
+   /* Now wait until the device is connected */
+   count = 0;
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   while (op_backend->status == ASYNC_PENDING && count < 100) {
+-      GTimeVal val;
+-      g_get_current_time (&val);
+-      g_time_val_add (&val, 100000);
++      gint64 end_time;
++      end_time = g_get_monotonic_time () + 100 * G_TIME_SPAN_MILLISECOND;
+       count++;
+-      if (g_cond_timed_wait (op_backend->cond, op_backend->mutex, &val) != FALSE)
++      if (g_cond_wait_until (&op_backend->cond, &op_backend->mutex, end_time) != FALSE)
+             break;
+   }
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   if (op_backend->status == ASYNC_ERROR || op_backend->status == ASYNC_PENDING)
+     {
+@@ -1026,10 +1023,10 @@ transfer_started_cb (DBusGProxy *proxy, const gchar *filename,
+ 
+   g_message ("transfer of %s to %s started", filename, local_path);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+   op_backend->status = ASYNC_SUCCESS;
+-  g_cond_signal (op_backend->cond);
+-  g_mutex_unlock (op_backend->mutex);
++  g_cond_signal (&op_backend->cond);
++  g_mutex_unlock (&op_backend->mutex);
+ }
+ 
+ static void
+@@ -1047,7 +1044,7 @@ do_open_for_read (GVfsBackend *backend,
+ 
+   g_debug ("+ do_open_for_read, filename: %s\n", filename);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+   op_backend->doing_io = TRUE;
+ 
+   /* Change into the directory and cache the file size */
+@@ -1055,7 +1052,7 @@ do_open_for_read (GVfsBackend *backend,
+   if (_query_file_info_helper (backend, filename, info, &error) == FALSE)
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       g_object_unref (info);
+@@ -1065,7 +1062,7 @@ do_open_for_read (GVfsBackend *backend,
+   if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_IS_DIRECTORY,
+                         _("Can't open directory"));
+@@ -1079,7 +1076,7 @@ do_open_for_read (GVfsBackend *backend,
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+                         _("Operation was cancelled"));
+@@ -1091,7 +1088,7 @@ do_open_for_read (GVfsBackend *backend,
+   if (fd < 0)
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+@@ -1100,7 +1097,7 @@ do_open_for_read (GVfsBackend *backend,
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                    G_IO_ERROR_CANCELLED,
+                                    _("Operation was cancelled"));
+@@ -1134,13 +1131,13 @@ do_open_for_read (GVfsBackend *backend,
+       close (fd);
+ 
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       return;
+     }
+ 
+   /* Wait for TransferStarted or ErrorOccurred to have happened */
+   while (op_backend->status == ASYNC_PENDING)
+-        g_cond_wait (op_backend->cond, op_backend->mutex);
++        g_cond_wait (&op_backend->cond, &op_backend->mutex);
+   success = op_backend->status;
+   dbus_g_proxy_disconnect_signal(op_backend->session_proxy, "TransferStarted",
+                                  G_CALLBACK(transfer_started_cb), op_backend);
+@@ -1158,7 +1155,7 @@ do_open_for_read (GVfsBackend *backend,
+   if (success == ASYNC_ERROR)
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       close (fd);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job),
+                                    op_backend->error);
+@@ -1179,7 +1176,7 @@ do_open_for_read (GVfsBackend *backend,
+   g_vfs_job_succeeded (G_VFS_JOB (job));
+ 
+   op_backend->doing_io = FALSE;
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ }
+ 
+ static int
+@@ -1266,7 +1263,7 @@ do_close_read (GVfsBackend *backend,
+         return;
+   }
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   if (busy > 0)
+     {
+@@ -1276,11 +1273,11 @@ do_close_read (GVfsBackend *backend,
+                          G_TYPE_INVALID, G_TYPE_INVALID) != FALSE)
+         {
+           while (op_backend->status == ASYNC_PENDING)
+-                g_cond_wait (op_backend->cond, op_backend->mutex);
++                g_cond_wait (&op_backend->cond, &op_backend->mutex);
+         }
+     }
+ 
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   close (backend_handle->fd);
+   g_free (backend_handle->source);
+@@ -1304,17 +1301,17 @@ do_query_info (GVfsBackend *backend,
+ 
+   g_debug ("+ do_query_info, filename: %s\n", filename);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   if (_query_file_info_helper (backend, filename, info, &error) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+     }
+ 
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   g_vfs_job_succeeded (G_VFS_JOB (job));
+ 
+@@ -1341,14 +1338,14 @@ do_query_fs_info (GVfsBackend *backend,
+ 
+   g_debug ("+ do_query_fs_info, filename: %s\n", filename);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   /* Get the capabilities */
+   if (dbus_g_proxy_call (op_backend->session_proxy, "GetCapability", &error,
+                          G_TYPE_INVALID,
+                          G_TYPE_STRING, &caps_str, G_TYPE_INVALID) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+@@ -1356,7 +1353,7 @@ do_query_fs_info (GVfsBackend *backend,
+ 
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+                         _("Operation was cancelled"));
+@@ -1368,7 +1365,7 @@ do_query_fs_info (GVfsBackend *backend,
+   if (caps_str == NULL)
+     {
+       /* Best effort, don't error out */
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_succeeded (G_VFS_JOB (job));
+       return;
+     }
+@@ -1377,7 +1374,7 @@ do_query_fs_info (GVfsBackend *backend,
+   g_free (caps_str);
+   if (caps == NULL)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+@@ -1395,7 +1392,7 @@ do_query_fs_info (GVfsBackend *backend,
+     }
+   if (has_free_memory == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       /* Best effort, don't error out */
+       g_vfs_job_succeeded (G_VFS_JOB (job));
+       return;
+@@ -1411,7 +1408,7 @@ do_query_fs_info (GVfsBackend *backend,
+ 
+   if (_query_file_info_helper (backend, filename, info, &error) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       ovu_caps_free (caps);
+@@ -1420,7 +1417,7 @@ do_query_fs_info (GVfsBackend *backend,
+ 
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+                         _("Operation was cancelled"));
+@@ -1457,7 +1454,7 @@ set_info_from_memory:
+ 
+   g_vfs_job_succeeded (G_VFS_JOB (job));
+ 
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   g_debug ("- do_query_fs_info\n");
+ }
+@@ -1476,11 +1473,11 @@ do_enumerate (GVfsBackend *backend,
+ 
+   g_debug ("+ do_enumerate, filename: %s\n", filename);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   if (_change_directory (op_backend, filename, &error) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+@@ -1489,7 +1486,7 @@ do_enumerate (GVfsBackend *backend,
+   files = NULL;
+   if (_retrieve_folder_listing (backend, filename, &files, &error) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+@@ -1497,7 +1494,7 @@ do_enumerate (GVfsBackend *backend,
+ 
+   if (gvfsbackendobexftp_fl_parser_parse (files, strlen (files), &elements, &error) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       /* See http://web.archive.org/web/20070826221251/http://docs.kde.org/development/en/extragear-pim/kdebluetooth/components.kio_obex.html#devices
+        * for the reasoning */
+       if (strstr (files, "SYSTEM\"obex-folder-listing.dtd") != NULL && _is_nokia_3650 (op_backend->bdaddr))
+@@ -1525,7 +1522,7 @@ do_enumerate (GVfsBackend *backend,
+   g_list_free (elements);
+   g_vfs_job_enumerate_done (job);
+ 
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   g_debug ("- do_enumerate\n");
+ }
+@@ -1549,7 +1546,7 @@ push_transfer_started_cb (DBusGProxy *proxy,
+ 
+   g_message ("transfer of %s to %s started", filename, local_path);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   op_backend->status = ASYNC_RUNNING;
+   job_data->total_bytes = (goffset) total_bytes;
+@@ -1557,8 +1554,8 @@ push_transfer_started_cb (DBusGProxy *proxy,
+     job_data->progress_callback (0, job_data->total_bytes,
+                                  job_data->progress_callback_data);
+ 
+-  g_cond_signal (op_backend->cond);
+-  g_mutex_unlock (op_backend->mutex);
++  g_cond_signal (&op_backend->cond);
++  g_mutex_unlock (&op_backend->mutex);
+ }
+ 
+ static void
+@@ -1570,12 +1567,12 @@ push_transfer_completed_cb (DBusGProxy *proxy,
+ 
+   g_message ("transfer completed");
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   op_backend->status = ASYNC_SUCCESS;
+ 
+-  g_cond_signal (op_backend->cond);
+-  g_mutex_unlock (op_backend->mutex);
++  g_cond_signal (&op_backend->cond);
++  g_mutex_unlock (&op_backend->mutex);
+ }
+ 
+ static void
+@@ -1657,7 +1654,7 @@ _push_single_file_helper (GVfsBackendObexftp *op_backend,
+ 
+   /* wait for the TransferStarted or ErrorOccurred signal */
+   while (op_backend->status == ASYNC_PENDING)
+-    g_cond_wait (op_backend->cond, op_backend->mutex);
++    g_cond_wait (&op_backend->cond, &op_backend->mutex);
+ 
+   dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferStarted",
+                                   G_CALLBACK (push_transfer_started_cb), job_data);
+@@ -1678,7 +1675,7 @@ _push_single_file_helper (GVfsBackendObexftp *op_backend,
+     }
+ 
+   while (op_backend->status == ASYNC_RUNNING)
+-    g_cond_wait (op_backend->cond, op_backend->mutex);
++    g_cond_wait (&op_backend->cond, &op_backend->mutex);
+ 
+   dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferCompleted", 
+                                   G_CALLBACK (push_transfer_completed_cb), job_data);
+@@ -1717,7 +1714,7 @@ do_push (GVfsBackend *backend,
+ 
+   g_debug ("+ do_push, destination: %s, local_path: %s\n", destination, local_path);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+   op_backend->doing_io = TRUE;
+ 
+   overwrite = (flags & G_FILE_COPY_OVERWRITE);
+@@ -1728,7 +1725,7 @@ do_push (GVfsBackend *backend,
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+ 
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+@@ -1743,7 +1740,7 @@ do_push (GVfsBackend *backend,
+       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
+         {
+           op_backend->doing_io = FALSE;
+-          g_mutex_unlock (op_backend->mutex);
++          g_mutex_unlock (&op_backend->mutex);
+ 
+           g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+           g_error_free (error);
+@@ -1766,7 +1763,7 @@ do_push (GVfsBackend *backend,
+   if (is_dir)
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+ 
+       if (target_type != 0)
+         {
+@@ -1799,7 +1796,7 @@ do_push (GVfsBackend *backend,
+       if (target_type != 0)
+         {
+           op_backend->doing_io = FALSE;
+-          g_mutex_unlock (op_backend->mutex);
++          g_mutex_unlock (&op_backend->mutex);
+ 
+           if (overwrite)
+             {
+@@ -1831,7 +1828,7 @@ do_push (GVfsBackend *backend,
+                                 &error, job_data) == FALSE)
+     {
+       op_backend->doing_io = FALSE;
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       push_data_free (job_data);
+ 
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+@@ -1859,7 +1856,7 @@ do_push (GVfsBackend *backend,
+     g_vfs_job_succeeded (G_VFS_JOB (job));
+ 
+   op_backend->doing_io = FALSE;
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   g_debug ("- do_push\n");
+ }
+@@ -1876,13 +1873,13 @@ do_delete (GVfsBackend *backend,
+ 
+   g_debug ("+ do_delete, filename: %s\n", filename);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   /* Check whether we have a directory */
+   info = g_file_info_new ();
+   if (_query_file_info_helper (backend, filename, info, &error) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       g_object_unref (info);
+@@ -1891,7 +1888,7 @@ do_delete (GVfsBackend *backend,
+ 
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+                         _("Operation was cancelled"));
+@@ -1910,7 +1907,7 @@ do_delete (GVfsBackend *backend,
+ 
+       if (_change_directory (op_backend, filename, &error) == FALSE)
+         {
+-          g_mutex_unlock (op_backend->mutex);
++          g_mutex_unlock (&op_backend->mutex);
+           g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+           g_error_free (error);
+           return;
+@@ -1918,7 +1915,7 @@ do_delete (GVfsBackend *backend,
+ 
+       if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+         {
+-          g_mutex_unlock (op_backend->mutex);
++          g_mutex_unlock (&op_backend->mutex);
+           g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                             G_IO_ERROR_CANCELLED,
+                             _("Operation was cancelled"));
+@@ -1928,7 +1925,7 @@ do_delete (GVfsBackend *backend,
+       files = NULL;
+       if (_retrieve_folder_listing (backend, filename, &files, &error) == FALSE)
+         {
+-          g_mutex_unlock (op_backend->mutex);
++          g_mutex_unlock (&op_backend->mutex);
+           g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+           g_error_free (error);
+           return;
+@@ -1936,7 +1933,7 @@ do_delete (GVfsBackend *backend,
+ 
+       if (gvfsbackendobexftp_fl_parser_parse (files, strlen (files), &elements, &error) == FALSE)
+         {
+-          g_mutex_unlock (op_backend->mutex);
++          g_mutex_unlock (&op_backend->mutex);
+           g_message ("gvfsbackendobexftp_fl_parser_parse failed");
+           g_free (files);
+           g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+@@ -1951,7 +1948,7 @@ do_delete (GVfsBackend *backend,
+ 
+       if (len != 0)
+         {
+-          g_mutex_unlock (op_backend->mutex);
++          g_mutex_unlock (&op_backend->mutex);
+           g_set_error_literal (&error, G_IO_ERROR,
+                               G_IO_ERROR_NOT_EMPTY,
+                               g_strerror (ENOTEMPTY));
+@@ -1969,7 +1966,7 @@ do_delete (GVfsBackend *backend,
+   if (strcmp (basename, G_DIR_SEPARATOR_S) == 0
+       || strcmp (basename, ".") == 0)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_free (basename);
+       g_vfs_job_failed_from_errno (G_VFS_JOB (job), EPERM);
+       return;
+@@ -1977,7 +1974,7 @@ do_delete (GVfsBackend *backend,
+ 
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+                         _("Operation was cancelled"));
+@@ -1988,7 +1985,7 @@ do_delete (GVfsBackend *backend,
+   parent = g_path_get_dirname (filename);
+   if (_change_directory (op_backend, parent, &error) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_free (basename);
+       g_free (parent);
+@@ -1999,7 +1996,7 @@ do_delete (GVfsBackend *backend,
+ 
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+                         _("Operation was cancelled"));
+@@ -2011,7 +2008,7 @@ do_delete (GVfsBackend *backend,
+                          G_TYPE_STRING, basename, G_TYPE_INVALID,
+                          G_TYPE_INVALID) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+@@ -2020,7 +2017,7 @@ do_delete (GVfsBackend *backend,
+ 
+   g_vfs_job_succeeded (G_VFS_JOB (job));
+ 
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   g_debug ("- do_delete\n");
+ }
+@@ -2037,13 +2034,13 @@ do_make_directory (GVfsBackend *backend,
+ 
+   g_debug ("+ do_make_directory, filename: %s\n", filename);
+ 
+-  g_mutex_lock (op_backend->mutex);
++  g_mutex_lock (&op_backend->mutex);
+ 
+   /* Check if the folder already exists */
+   info = g_file_info_new ();
+   if (_query_file_info_helper (backend, filename, info, &error) != FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_object_unref (info);
+       g_vfs_job_failed_from_errno (G_VFS_JOB (job), EEXIST);
+       return;
+@@ -2051,7 +2048,7 @@ do_make_directory (GVfsBackend *backend,
+   g_object_unref (info);
+   if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+@@ -2062,7 +2059,7 @@ do_make_directory (GVfsBackend *backend,
+ 
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+                         _("Operation was cancelled"));
+@@ -2072,7 +2069,7 @@ do_make_directory (GVfsBackend *backend,
+   parent = g_path_get_dirname (filename);
+   if (_change_directory (op_backend, parent, &error) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+       return;
+@@ -2081,7 +2078,7 @@ do_make_directory (GVfsBackend *backend,
+ 
+   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                         G_IO_ERROR_CANCELLED,
+                         _("Operation was cancelled"));
+@@ -2093,7 +2090,7 @@ do_make_directory (GVfsBackend *backend,
+                          G_TYPE_STRING, basename, G_TYPE_INVALID,
+                          G_TYPE_INVALID) == FALSE)
+     {
+-      g_mutex_unlock (op_backend->mutex);
++      g_mutex_unlock (&op_backend->mutex);
+       g_free (basename);
+       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+       g_error_free (error);
+@@ -2108,7 +2105,7 @@ do_make_directory (GVfsBackend *backend,
+ 
+   g_vfs_job_succeeded (G_VFS_JOB (job));
+ 
+-  g_mutex_unlock (op_backend->mutex);
++  g_mutex_unlock (&op_backend->mutex);
+ 
+   g_debug ("- do_make_directory\n");
+ }
+diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c
+index 01d7da6..f1055c5 100644
+--- a/daemon/gvfsbackendsmbbrowse.c
++++ b/daemon/gvfsbackendsmbbrowse.c
+@@ -94,8 +94,8 @@ struct _GVfsBackendSmbBrowse
+   gboolean password_in_keyring;
+   GPasswordSave password_save;
+ 
+-  GMutex *entries_lock;
+-  GMutex *update_cache_lock;
++  GMutex entries_lock;
++  GMutex update_cache_lock;
+   time_t last_entry_update;
+   GList *entries;
+   int entry_errno;
+@@ -226,8 +226,8 @@ g_vfs_backend_smb_browse_finalize (GObject *object)
+   g_free (backend->server);
+   g_free (backend->default_workgroup);
+   
+-  g_mutex_free (backend->entries_lock);
+-  g_mutex_free (backend->update_cache_lock);
++  g_mutex_clear (&backend->entries_lock);
++  g_mutex_clear (&backend->update_cache_lock);
+ 
+   smbc_free_context (backend->smb_context, TRUE);
+   
+@@ -244,9 +244,6 @@ g_vfs_backend_smb_browse_init (GVfsBackendSmbBrowse *backend)
+   char *workgroup;
+   GSettings *settings;
+ 
+-  backend->entries_lock = g_mutex_new ();
+-  backend->update_cache_lock = g_mutex_new ();
+-
+   if (mount_tracker == NULL)
+     mount_tracker = g_mount_tracker_new (NULL);
+ 
+@@ -592,7 +589,7 @@ update_cache (GVfsBackendSmbBrowse *backend, SMBCFILE *supplied_dir)
+   entry_errno = 0;
+   res = -1;
+ 
+-  g_mutex_lock (backend->update_cache_lock);
++  g_mutex_lock (&backend->update_cache_lock);
+   
+   DEBUG ("update_cache - updating...\n");
+   
+@@ -665,7 +662,7 @@ update_cache (GVfsBackendSmbBrowse *backend, SMBCFILE *supplied_dir)
+ 
+  out:
+ 
+-  g_mutex_lock (backend->entries_lock);
++  g_mutex_lock (&backend->entries_lock);
+   
+   /* Clear old cache */
+   g_list_foreach (backend->entries, (GFunc)browse_entry_free, NULL);
+@@ -676,8 +673,8 @@ update_cache (GVfsBackendSmbBrowse *backend, SMBCFILE *supplied_dir)
+ 
+   DEBUG ("update_cache - done.\n");
+ 
+-  g_mutex_unlock (backend->entries_lock);
+-  g_mutex_unlock (backend->update_cache_lock);
++  g_mutex_unlock (&backend->entries_lock);
++  g_mutex_unlock (&backend->update_cache_lock);
+ 
+   return (res >= 0);
+ }
+@@ -780,9 +777,9 @@ has_name (GVfsBackendSmbBrowse *backend,
+ {
+   gboolean res;
+   
+-  g_mutex_lock (backend->entries_lock);
++  g_mutex_lock (&backend->entries_lock);
+   res = (find_entry_unlocked (backend, filename) != NULL);
+-  g_mutex_unlock (backend->entries_lock);
++  g_mutex_unlock (&backend->entries_lock);
+   return res;
+ }
+ 
+@@ -793,11 +790,11 @@ cache_needs_updating (GVfsBackendSmbBrowse *backend)
+   gboolean res;
+ 
+   /*  If there's already cache update in progress, lock and wait until update is finished, then recheck  */
+-  g_mutex_lock (backend->update_cache_lock);
++  g_mutex_lock (&backend->update_cache_lock);
+   now = time (NULL);
+   res = now < backend->last_entry_update ||
+     (now - backend->last_entry_update) > DEFAULT_CACHE_EXPIRATION_TIME;
+-  g_mutex_unlock (backend->update_cache_lock);
++  g_mutex_unlock (&backend->update_cache_lock);
+   
+   return res; 
+ }
+@@ -1070,7 +1067,7 @@ run_mount_mountable (GVfsBackendSmbBrowse *backend,
+   GError *error = NULL;
+   GMountSpec *mount_spec;
+ 
+-  g_mutex_lock (backend->entries_lock);
++  g_mutex_lock (&backend->entries_lock);
+   
+   entry = find_entry_unlocked (backend, filename);
+ 
+@@ -1093,7 +1090,7 @@ run_mount_mountable (GVfsBackendSmbBrowse *backend,
+                         G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+                         _("File doesn't exist"));
+       
+-  g_mutex_unlock (backend->entries_lock);
++  g_mutex_unlock (&backend->entries_lock);
+ 
+   if (error)
+     {
+@@ -1316,14 +1313,14 @@ run_query_info (GVfsBackendSmbBrowse *backend,
+ {
+   BrowseEntry *entry;
+ 
+-  g_mutex_lock (backend->entries_lock);
++  g_mutex_lock (&backend->entries_lock);
+   
+   entry = find_entry_unlocked (backend, filename);
+ 
+   if (entry)
+     get_file_info_from_entry (backend, entry, info);
+       
+-  g_mutex_unlock (backend->entries_lock);
++  g_mutex_unlock (&backend->entries_lock);
+ 
+   if (entry)
+     g_vfs_job_succeeded (G_VFS_JOB (job));
+@@ -1408,7 +1405,7 @@ run_enumerate (GVfsBackendSmbBrowse *backend,
+   g_vfs_job_succeeded (G_VFS_JOB (job));
+ 
+   files = NULL;
+-  g_mutex_lock (backend->entries_lock);
++  g_mutex_lock (&backend->entries_lock);
+   for (l = backend->entries; l != NULL; l = l->next)
+     {
+       BrowseEntry *entry = l->data;
+@@ -1418,7 +1415,7 @@ run_enumerate (GVfsBackendSmbBrowse *backend,
+ 
+       files = g_list_prepend (files, info);
+     }
+-  g_mutex_unlock (backend->entries_lock);
++  g_mutex_unlock (&backend->entries_lock);
+   
+   files = g_list_reverse (files);
+ 
+diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
+index 9714b39..4f59b94 100644
+--- a/daemon/gvfsdaemon.c
++++ b/daemon/gvfsdaemon.c
+@@ -58,7 +58,7 @@ struct _GVfsDaemon
+ {
+   GObject parent_instance;
+ 
+-  GMutex *lock;
++  GMutex lock;
+   gboolean main_daemon;
+ 
+   GThreadPool *thread_pool;
+@@ -119,7 +119,7 @@ g_vfs_daemon_finalize (GObject *object)
+   g_assert (daemon->jobs == NULL);
+ 
+   g_hash_table_destroy (daemon->registered_paths);
+-  g_mutex_free (daemon->lock);
++  g_mutex_clear (&daemon->lock);
+ 
+   if (G_OBJECT_CLASS (g_vfs_daemon_parent_class)->finalize)
+     (*G_OBJECT_CLASS (g_vfs_daemon_parent_class)->finalize) (object);
+@@ -150,7 +150,6 @@ g_vfs_daemon_init (GVfsDaemon *daemon)
+   gint max_threads = 1; /* TODO: handle max threads */
+   DBusError error;
+   
+-  daemon->lock = g_mutex_new ();
+   daemon->session_bus = dbus_bus_get (DBUS_BUS_SESSION, NULL);
+   daemon->thread_pool = g_thread_pool_new (job_handler_callback,
+                                           daemon,
+@@ -326,7 +325,7 @@ static void
+ job_source_closed_callback (GVfsJobSource *job_source,
+                            GVfsDaemon *daemon)
+ {
+-  g_mutex_lock (daemon->lock);
++  g_mutex_lock (&daemon->lock);
+   
+   daemon->job_sources = g_list_remove (daemon->job_sources,
+                                       job_source);
+@@ -343,7 +342,7 @@ job_source_closed_callback (GVfsJobSource *job_source,
+   if (daemon->job_sources == NULL)
+     daemon_schedule_exit (daemon);
+   
+-  g_mutex_unlock (daemon->lock);
++  g_mutex_unlock (&daemon->lock);
+ }
+ 
+ static void
+@@ -351,7 +350,7 @@ g_vfs_daemon_re_register_job_sources (GVfsDaemon *daemon)
+ {
+   GList *l;
+   
+-  g_mutex_lock (daemon->lock);
++  g_mutex_lock (&daemon->lock);
+ 
+   for (l = daemon->job_sources; l != NULL; l = l->next)
+     {
+@@ -366,7 +365,7 @@ g_vfs_daemon_re_register_job_sources (GVfsDaemon *daemon)
+        }
+     }
+   
+-  g_mutex_unlock (daemon->lock);
++  g_mutex_unlock (&daemon->lock);
+ }
+ 
+ void
+@@ -375,7 +374,7 @@ g_vfs_daemon_add_job_source (GVfsDaemon *daemon,
+ {
+   g_debug ("Added new job source %p (%s)\n", job_source, g_type_name_from_instance ((gpointer)job_source));
+   
+-  g_mutex_lock (daemon->lock);
++  g_mutex_lock (&daemon->lock);
+ 
+   daemon_unschedule_exit (daemon);
+   
+@@ -387,7 +386,7 @@ g_vfs_daemon_add_job_source (GVfsDaemon *daemon,
+   g_signal_connect (job_source, "closed",
+                    (GCallback)job_source_closed_callback, daemon);
+   
+-  g_mutex_unlock (daemon->lock);
++  g_mutex_unlock (&daemon->lock);
+ }
+ 
+ /* This registers a dbus callback on *all* connections, client and session bus */
+@@ -437,9 +436,9 @@ job_finished_callback (GVfsJob *job,
+                                        (GCallback)job_finished_callback,
+                                        daemon);
+ 
+-  g_mutex_lock (daemon->lock);
++  g_mutex_lock (&daemon->lock);
+   daemon->jobs = g_list_remove (daemon->jobs, job);
+-  g_mutex_unlock (daemon->lock);
++  g_mutex_unlock (&daemon->lock);
+   
+   g_object_unref (job);
+ }
+@@ -454,9 +453,9 @@ g_vfs_daemon_queue_job (GVfsDaemon *daemon,
+   g_signal_connect (job, "finished", (GCallback)job_finished_callback, daemon);
+   g_signal_connect (job, "new_source", (GCallback)job_new_source_callback, daemon);
+   
+-  g_mutex_lock (daemon->lock);
++  g_mutex_lock (&daemon->lock);
+   daemon->jobs = g_list_prepend (daemon->jobs, job);
+-  g_mutex_unlock (daemon->lock);
++  g_mutex_unlock (&daemon->lock);
+   
+   /* Can we start the job immediately / async */
+   if (!g_vfs_job_try (job))
+@@ -949,7 +948,7 @@ daemon_message_func (DBusConnection *conn,
+                                 DBUS_TYPE_UINT32, &serial,
+                                 DBUS_TYPE_INVALID))
+        {
+-         g_mutex_lock (daemon->lock);
++         g_mutex_lock (&daemon->lock);
+          for (l = daemon->jobs; l != NULL; l = l->next)
+            {
+              GVfsJob *job = l->data;
+@@ -962,7 +961,7 @@ daemon_message_func (DBusConnection *conn,
+                  break;
+                }
+            }
+-         g_mutex_unlock (daemon->lock);
++         g_mutex_unlock (&daemon->lock);
+ 
+ 
+          if (job_to_cancel)
+@@ -1007,7 +1006,7 @@ peer_to_peer_filter_func (DBusConnection *conn,
+     {
+       GList *l;
+ 
+-      g_mutex_lock (daemon->lock);
++      g_mutex_lock (&daemon->lock);
+       for (l = daemon->jobs; l != NULL; l = l->next)
+         {
+           GVfsJob *job = l->data;
+@@ -1016,7 +1015,7 @@ peer_to_peer_filter_func (DBusConnection *conn,
+               G_VFS_JOB_DBUS (job)->connection == conn)
+             g_vfs_job_cancel (job);
+         }
+-      g_mutex_unlock (daemon->lock);
++      g_mutex_unlock (&daemon->lock);
+ 
+       /* The peer-to-peer connection was disconnected */
+       dbus_connection_unref (conn);
+diff --git a/daemon/gvfsftpdircache.c b/daemon/gvfsftpdircache.c
+index cd19c17..49023b1 100644
+--- a/daemon/gvfsftpdircache.c
++++ b/daemon/gvfsftpdircache.c
+@@ -98,7 +98,7 @@ struct _GVfsFtpDirCache
+ {
+   GHashTable *          directories;    /* GVfsFtpFile of directory => GVfsFtpDirCacheEntry mapping */
+   guint                 stamp;          /* used to identify validity of cache when flushing */
+-  GMutex *              lock;           /* mutex for thread safety of stamp and hash table */
++  GMutex                lock;           /* mutex for thread safety of stamp and hash table */
+   const GVfsFtpDirFuncs *funcs;         /* functions to call */
+ };
+ 
+@@ -114,7 +114,6 @@ g_vfs_ftp_dir_cache_new (const GVfsFtpDirFuncs *funcs)
+                                               g_vfs_ftp_file_equal,
+                                               (GDestroyNotify) g_vfs_ftp_file_free,
+                                               (GDestroyNotify) g_vfs_ftp_dir_cache_entry_unref);
+-  cache->lock = g_mutex_new();
+   cache->funcs = funcs;
+ 
+   return cache;
+@@ -126,7 +125,7 @@ g_vfs_ftp_dir_cache_free (GVfsFtpDirCache *cache)
+   g_return_if_fail (cache != NULL);
+ 
+   g_hash_table_destroy (cache->directories);
+-  g_mutex_free (cache->lock);
++  g_mutex_clear (&cache->lock);
+   g_slice_free (GVfsFtpDirCache, cache);
+ }
+ 
+@@ -138,11 +137,11 @@ g_vfs_ftp_dir_cache_lookup_entry (GVfsFtpDirCache *  cache,
+ {
+   GVfsFtpDirCacheEntry *entry;
+ 
+-  g_mutex_lock (cache->lock);
++  g_mutex_lock (&cache->lock);
+   entry = g_hash_table_lookup (cache->directories, dir);
+   if (entry)
+     g_vfs_ftp_dir_cache_entry_ref (entry);
+-  g_mutex_unlock (cache->lock);
++  g_mutex_unlock (&cache->lock);
+   if (entry && entry->stamp < stamp)
+     g_vfs_ftp_dir_cache_entry_unref (entry);
+   else if (entry)
+@@ -178,11 +177,11 @@ g_vfs_ftp_dir_cache_lookup_entry (GVfsFtpDirCache *  cache,
+       g_vfs_ftp_dir_cache_entry_unref (entry);
+       return NULL;
+     }
+-  g_mutex_lock (cache->lock);
++  g_mutex_lock (&cache->lock);
+   g_hash_table_insert (cache->directories,
+                        g_vfs_ftp_file_copy (dir),
+                        g_vfs_ftp_dir_cache_entry_ref (entry));
+-  g_mutex_unlock (cache->lock);
++  g_mutex_unlock (&cache->lock);
+   return entry;
+ }
+ 
+@@ -357,10 +356,10 @@ g_vfs_ftp_dir_cache_lookup_dir (GVfsFtpDirCache *  cache,
+ 
+   if (flush)
+     {
+-      g_mutex_lock (cache->lock);
++      g_mutex_lock (&cache->lock);
+       g_assert (cache->stamp != G_MAXUINT);
+       stamp = ++cache->stamp;
+-      g_mutex_unlock (cache->lock);
++      g_mutex_unlock (&cache->lock);
+     }
+   else
+     stamp = 0;
+@@ -390,9 +389,9 @@ g_vfs_ftp_dir_cache_purge_dir (GVfsFtpDirCache *  cache,
+   g_return_if_fail (cache != NULL);
+   g_return_if_fail (dir != NULL);
+ 
+-  g_mutex_lock (cache->lock);
++  g_mutex_lock (&cache->lock);
+   g_hash_table_remove (cache->directories, dir);
+-  g_mutex_unlock (cache->lock);
++  g_mutex_unlock (&cache->lock);
+ }
+ 
+ void
+diff --git a/daemon/gvfsftptask.c b/daemon/gvfsftptask.c
+index 8c5f7fb..f83882a 100644
+--- a/daemon/gvfsftptask.c
++++ b/daemon/gvfsftptask.c
+@@ -180,7 +180,7 @@ static gboolean
+ g_vfs_ftp_task_acquire_connection (GVfsFtpTask *task)
+ {
+   GVfsBackendFtp *ftp;
+-  GTimeVal now;
++  gint64 end_time;
+   gulong id;
+ 
+   g_return_val_if_fail (task != NULL, FALSE);
+@@ -190,10 +190,10 @@ g_vfs_ftp_task_acquire_connection (GVfsFtpTask *task)
+     return FALSE;
+ 
+   ftp = task->backend;
+-  g_mutex_lock (ftp->mutex);
++  g_mutex_lock (&ftp->mutex);
+   id = g_cancellable_connect (task->cancellable,
+                              G_CALLBACK (do_broadcast),
+-                             ftp->cond, NULL);
++                             &ftp->cond, NULL);
+   while (task->conn == NULL && ftp->queue != NULL)
+     {
+       if (g_cancellable_is_cancelled (task->cancellable))
+@@ -218,7 +218,7 @@ g_vfs_ftp_task_acquire_connection (GVfsFtpTask *task)
+ 
+           ftp->connections++;
+           last_thread = g_thread_self ();
+-          g_mutex_unlock (ftp->mutex);
++          g_mutex_unlock (&ftp->mutex);
+           task->conn = g_vfs_ftp_connection_new (ftp->addr, task->cancellable, &task->error);
+           if (G_LIKELY (task->conn != NULL))
+             {
+@@ -231,7 +231,7 @@ g_vfs_ftp_task_acquire_connection (GVfsFtpTask *task)
+ 
+           g_vfs_ftp_connection_free (task->conn);
+           task->conn = NULL;
+-          g_mutex_lock (ftp->mutex);
++          g_mutex_lock (&ftp->mutex);
+           ftp->connections--;
+           /* If this value is still equal to our thread it means there were no races 
+            * trying to open connections and the maybe_max_connections value is 
+@@ -253,10 +253,9 @@ g_vfs_ftp_task_acquire_connection (GVfsFtpTask *task)
+           continue;
+         }
+ 
+-      g_get_current_time (&now);
+-      g_time_val_add (&now, G_VFS_FTP_TIMEOUT_IN_SECONDS * 1000 * 1000);
++      end_time = g_get_monotonic_time () + G_VFS_FTP_TIMEOUT_IN_SECONDS * G_TIME_SPAN_SECOND;
+       if (ftp->busy_connections >= ftp->connections ||
+-          !g_cond_timed_wait (ftp->cond, ftp->mutex, &now))
++          !g_cond_wait_until (&ftp->cond, &ftp->mutex, end_time))
+         {
+           task->error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_BUSY,
+                                             _("The FTP server is busy. Try again later"));
+@@ -264,7 +263,7 @@ g_vfs_ftp_task_acquire_connection (GVfsFtpTask *task)
+         }
+     }
+   g_cancellable_disconnect (task->cancellable, id);
+-  g_mutex_unlock (ftp->mutex);
++  g_mutex_unlock (&ftp->mutex);
+ 
+   return task->conn != NULL;
+ }
+@@ -287,18 +286,18 @@ g_vfs_ftp_task_release_connection (GVfsFtpTask *task)
+   if (task->conn == NULL)
+     return;
+ 
+-  g_mutex_lock (task->backend->mutex);
++  g_mutex_lock (&task->backend->mutex);
+   if (task->backend->queue && g_vfs_ftp_connection_is_usable (task->conn))
+     {
+       g_queue_push_tail (task->backend->queue, task->conn);
+-      g_cond_signal (task->backend->cond);
++      g_cond_signal (&task->backend->cond);
+     }
+   else
+     {
+       task->backend->connections--;
+       g_vfs_ftp_connection_free (task->conn);
+     }
+-  g_mutex_unlock (task->backend->mutex);
++  g_mutex_unlock (&task->backend->mutex);
+   task->conn = NULL;
+ }
+ 
+@@ -434,10 +433,10 @@ g_vfs_ftp_task_give_connection (GVfsFtpTask *      task,
+ 
+   task->conn = conn;
+   /* this connection is not busy anymore */
+-  g_mutex_lock (task->backend->mutex);
++  g_mutex_lock (&task->backend->mutex);
+   g_assert (task->backend->busy_connections > 0);
+   task->backend->busy_connections--;
+-  g_mutex_unlock (task->backend->mutex);
++  g_mutex_unlock (&task->backend->mutex);
+ }
+ 
+ /**
+@@ -465,13 +464,13 @@ g_vfs_ftp_task_take_connection (GVfsFtpTask *task)
+ 
+   ftp = task->backend;
+   /* mark this connection as busy */
+-  g_mutex_lock (ftp->mutex);
++  g_mutex_lock (&ftp->mutex);
+   ftp->busy_connections++;
+   /* if all connections are busy, signal all waiting threads, 
+    * so they stop waiting and return BUSY earlier */
+   if (ftp->busy_connections >= ftp->connections)
+-    g_cond_broadcast (ftp->cond);
+-  g_mutex_unlock (ftp->mutex);
++    g_cond_broadcast (&ftp->cond);
++  g_mutex_unlock (&ftp->mutex);
+ 
+   return conn;
+ }
+diff --git a/daemon/trashlib/trashexpunge.c b/daemon/trashlib/trashexpunge.c
+index 782be54..a5cf975 100644
+--- a/daemon/trashlib/trashexpunge.c
++++ b/daemon/trashlib/trashexpunge.c
+@@ -11,8 +11,8 @@
+ static gsize trash_expunge_initialised;
+ static GHashTable *trash_expunge_queue;
+ static gboolean trash_expunge_alive;
+-static GMutex *trash_expunge_lock;
+-static GCond *trash_expunge_wait;
++static GMutex trash_expunge_lock;
++static GCond trash_expunge_wait;
+ 
+ static void
+ trash_expunge_delete_everything_under (GFile *directory)
+@@ -66,9 +66,9 @@ just_return_true (gpointer a,
+ static gpointer
+ trash_expunge_thread (gpointer data)
+ {
+-  GTimeVal timeval;
++  gint64 end_time;
+ 
+-  g_mutex_lock (trash_expunge_lock);
++  g_mutex_lock (&trash_expunge_lock);
+ 
+   do
+     {
+@@ -80,23 +80,22 @@ trash_expunge_thread (gpointer data)
+                                          just_return_true, NULL);
+           g_hash_table_remove (trash_expunge_queue, directory);
+ 
+-          g_mutex_unlock (trash_expunge_lock);
++          g_mutex_unlock (&trash_expunge_lock);
+           trash_expunge_delete_everything_under (directory);
+-          g_mutex_lock (trash_expunge_lock);
++          g_mutex_lock (&trash_expunge_lock);
+ 
+           g_object_unref (directory);
+         }
+ 
+-      g_get_current_time (&timeval);
+-      g_time_val_add (&timeval, 60 * 1000000); /* 1min */
++      end_time = g_get_monotonic_time () + 1 * G_TIME_SPAN_MINUTE;
+     }
+-  while (g_cond_timed_wait (trash_expunge_wait,
+-                            trash_expunge_lock,
+-                            &timeval));
++  while (g_cond_wait_until (&trash_expunge_wait,
++                            &trash_expunge_lock,
++                            end_time));
+ 
+   trash_expunge_alive = FALSE;
+ 
+-  g_mutex_unlock (trash_expunge_lock);
++  g_mutex_unlock (&trash_expunge_lock);
+ 
+   return NULL;
+ }
+@@ -108,13 +107,13 @@ trash_expunge (GFile *directory)
+     {
+       trash_expunge_queue = g_hash_table_new (g_file_hash,
+                                               (GEqualFunc) g_file_equal);
+-      trash_expunge_lock = g_mutex_new ();
+-      trash_expunge_wait = g_cond_new ();
++      g_mutex_init (&trash_expunge_lock);
++      g_cond_init (&trash_expunge_wait);
+ 
+       g_once_init_leave (&trash_expunge_initialised, 1);
+     }
+ 
+-  g_mutex_lock (trash_expunge_lock);
++  g_mutex_lock (&trash_expunge_lock);
+ 
+   if (!g_hash_table_lookup (trash_expunge_queue, directory))
+     g_hash_table_insert (trash_expunge_queue,
+@@ -130,7 +129,7 @@ trash_expunge (GFile *directory)
+       trash_expunge_alive = TRUE;
+     }
+   else
+-    g_cond_signal (trash_expunge_wait);
++    g_cond_signal (&trash_expunge_wait);
+ 
+-  g_mutex_unlock (trash_expunge_lock);
++  g_mutex_unlock (&trash_expunge_lock);
+ }
+diff --git a/daemon/trashlib/trashitem.c b/daemon/trashlib/trashitem.c
+index bcfc301..dbc9307 100644
+--- a/daemon/trashlib/trashitem.c
++++ b/daemon/trashlib/trashitem.c
+@@ -20,7 +20,7 @@ typedef struct
+ 
+ struct OPAQUE_TYPE__TrashRoot
+ {
+-  GStaticRWLock lock;
++  GRWLock lock;
+   GQueue *notifications;
+ 
+   trash_item_notify create_notify;
+@@ -297,12 +297,12 @@ trash_root_thaw (TrashRoot *root)
+   /* send notifications until we have none */
+   while (TRUE)
+     {
+-      g_static_rw_lock_writer_lock (&root->lock);
++      g_rw_lock_writer_lock (&root->lock);
+       if (g_queue_is_empty (root->notifications))
+         break;
+ 
+       closure = g_queue_pop_head (root->notifications);
+-      g_static_rw_lock_writer_unlock (&root->lock);
++      g_rw_lock_writer_unlock (&root->lock);
+ 
+       trash_item_invoke_closure (closure);
+     }
+@@ -312,7 +312,7 @@ trash_root_thaw (TrashRoot *root)
+   size_changed = root->old_size != size;
+   root->old_size = size;
+ 
+-  g_static_rw_lock_writer_unlock (&root->lock);
++  g_rw_lock_writer_unlock (&root->lock);
+ 
+   if (size_changed)
+     root->size_change (root->user_data);
+@@ -336,7 +336,7 @@ trash_root_new (trash_item_notify create,
+   TrashRoot *root;
+ 
+   root = g_slice_new (TrashRoot);
+-  g_static_rw_lock_init (&root->lock);
++  g_rw_lock_init (&root->lock);
+   root->create_notify = create;
+   root->delete_notify = delete;
+   root->size_change = size_change;
+@@ -376,11 +376,11 @@ trash_root_add_item (TrashRoot *list,
+ 
+   item = trash_item_new (list, file, in_homedir);
+ 
+-  g_static_rw_lock_writer_lock (&list->lock);
++  g_rw_lock_writer_lock (&list->lock);
+ 
+   if (g_hash_table_lookup (list->item_table, item->escaped_name))
+     {
+-      g_static_rw_lock_writer_unlock (&list->lock);
++      g_rw_lock_writer_unlock (&list->lock);
+ 
+       /* already exists... */
+       trash_item_unref (item);
+@@ -390,7 +390,7 @@ trash_root_add_item (TrashRoot *list,
+   g_hash_table_insert (list->item_table, item->escaped_name, item);
+   trash_item_queue_notify (item, item->root->create_notify);
+ 
+-  g_static_rw_lock_writer_unlock (&list->lock);
++  g_rw_lock_writer_unlock (&list->lock);
+ }
+ 
+ void
+@@ -402,9 +402,9 @@ trash_root_remove_item (TrashRoot *list,
+ 
+   escaped = trash_item_escape_name (file, in_homedir);
+ 
+-  g_static_rw_lock_writer_lock (&list->lock);
++  g_rw_lock_writer_lock (&list->lock);
+   g_hash_table_remove (list->item_table, escaped);
+-  g_static_rw_lock_writer_unlock (&list->lock);
++  g_rw_lock_writer_unlock (&list->lock);
+ 
+   g_free (escaped);
+ }
+@@ -414,13 +414,13 @@ trash_root_get_items (TrashRoot *root)
+ {
+   GList *items, *node;
+ 
+-  g_static_rw_lock_reader_lock (&root->lock);
++  g_rw_lock_reader_lock (&root->lock);
+ 
+   items = g_hash_table_get_values (root->item_table);
+   for (node = items; node; node = node->next)
+     trash_item_ref (node->data);
+ 
+-  g_static_rw_lock_reader_unlock (&root->lock);
++  g_rw_lock_reader_unlock (&root->lock);
+ 
+   return items;
+ }
+@@ -441,12 +441,12 @@ trash_root_lookup_item (TrashRoot  *root,
+ {
+   TrashItem *item;
+ 
+-  g_static_rw_lock_reader_lock (&root->lock);
++  g_rw_lock_reader_lock (&root->lock);
+ 
+   if ((item = g_hash_table_lookup (root->item_table, escaped)))
+     trash_item_ref (item);
+ 
+-  g_static_rw_lock_reader_unlock (&root->lock);
++  g_rw_lock_reader_unlock (&root->lock);
+ 
+   return item;
+ }
+@@ -456,9 +456,9 @@ trash_root_get_n_items (TrashRoot *root)
+ {
+   int size;
+ 
+-  g_static_rw_lock_reader_lock (&root->lock);
++  g_rw_lock_reader_lock (&root->lock);
+   size = g_hash_table_size (root->item_table);
+-  g_static_rw_lock_reader_unlock (&root->lock);
++  g_rw_lock_reader_unlock (&root->lock);
+ 
+   return size;
+ }
+@@ -517,9 +517,9 @@ trash_item_restore (TrashItem  *item,
+                    G_FILE_COPY_NO_FALLBACK_FOR_MOVE,
+                    NULL, NULL, NULL, error))
+     {
+-      g_static_rw_lock_writer_lock (&item->root->lock);
++      g_rw_lock_writer_lock (&item->root->lock);
+       g_hash_table_remove (item->root->item_table, item->escaped_name);
+-      g_static_rw_lock_writer_unlock (&item->root->lock);
++      g_rw_lock_writer_unlock (&item->root->lock);
+ 
+       {
+         GFile *trashinfo;
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0004-Adapt-to-glib-thread-API-changes.patch b/meta-gnome/recipes-gnome/gvfs/files/0004-Adapt-to-glib-thread-API-changes.patch
new file mode 100644
index 000000000..0fac60155
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/files/0004-Adapt-to-glib-thread-API-changes.patch
@@ -0,0 +1,44 @@
+From 008031adbe2fd118a4e9a3c7219a9777cab1bb75 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Wed, 26 Oct 2011 14:12:13 +0200
+Subject: [PATCH 2/2] Adapt to glib thread API changes
+
+Last piece in order to fix https://bugzilla.gnome.org/show_bug.cgi?id=661148
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ client/gvfsfusedaemon.c        |    2 +-
+ daemon/trashlib/trashexpunge.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
+index c986f69..5e79638 100644
+--- a/client/gvfsfusedaemon.c
++++ b/client/gvfsfusedaemon.c
+@@ -2358,7 +2358,7 @@ vfs_init (struct fuse_conn_info *conn)
+   volume_monitor = g_object_new (g_type_from_name ("GDaemonVolumeMonitor"), NULL);
+   
+   subthread_main_loop = g_main_loop_new (NULL, FALSE);
+-  subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
++  subthread = g_thread_new ("gvfs-fuse-sub", (GThreadFunc) subthread_main, NULL);
+ 
+   /* Indicate O_TRUNC support for open() */
+   conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
+diff --git a/daemon/trashlib/trashexpunge.c b/daemon/trashlib/trashexpunge.c
+index a5cf975..677fb81 100644
+--- a/daemon/trashlib/trashexpunge.c
++++ b/daemon/trashlib/trashexpunge.c
+@@ -124,7 +124,7 @@ trash_expunge (GFile *directory)
+     {
+       GThread *thread;
+ 
+-      thread = g_thread_create (trash_expunge_thread, NULL, FALSE, NULL);
++      thread = g_thread_new ("trash-expunge", trash_expunge_thread, NULL);
+       g_assert (thread != NULL);
+       trash_expunge_alive = TRUE;
+     }
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch b/meta-gnome/recipes-gnome/gvfs/files/0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch
new file mode 100644
index 000000000..c55a99db4
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/files/0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch
@@ -0,0 +1,36 @@
+From de7b06dea740900fa63e2e011c9f862fe4b9405c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 27 Oct 2014 10:43:40 +0100
+Subject: [PATCH] client/gdaemonfile.c: replace g_memmove by memmove
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+g_memmove was deprecated in glib 2.40 [1]
+
+Upstream-Status: pending [2]
+
+[1] https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-memmove
+[2] https://bugzilla.gnome.org/show_bug.cgi?id=739233
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ client/gdaemonfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
+index 15c368c..593ce7a 100644
+--- a/client/gdaemonfile.c
++++ b/client/gdaemonfile.c
+@@ -256,7 +256,7 @@ g_daemon_file_get_parent (GFile *file)
+   len = (guint) 1 + base - path;
+   
+   parent_path = g_new (gchar, len + 1);
+-  g_memmove (parent_path, path, len);
++  memmove (parent_path, path, len);
+   parent_path[len] = 0;
+ 
+   parent = new_file_for_new_path (daemon_file, parent_path);
+-- 
+1.8.3.1
+
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.10.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.10.1.bb
new file mode 100644
index 000000000..5c0e07c0c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.10.1.bb
@@ -0,0 +1,28 @@
+require gvfs.inc
+
+BPN = "gvfs"
+
+DEPENDS = "gvfs gnome-disk-utility libgnome-keyring intltool-native"
+PR = "${INC_PR}.0"
+
+# we need gdu files only: reduce files to delete in libexecdir
+EXTRA_OECONF += "--disable-gphoto2 \
+                 --disable-afc \
+                 --disable-samba"
+
+do_install_append() {
+    rm -rf ${D}${sysconfdir}
+    rm -rf ${D}${bindir}
+    rm -rf ${D}${includedir}
+    rm -rf ${D}${libdir}/gio
+    rm -rf ${D}${libdir}/lib*
+    rmdir --ignore-fail-on-non-empty ${D}${libdir}
+    rm -rf ${D}${datadir}/gvfs/mounts
+    rm -rf ${D}${datadir}/glib-2.0
+    rm -rf ${D}${datadir}/GConf
+    rm -f ${D}${datadir}/dbus-1/services/gvfs-*
+    rm -rf ${D}${datadir}/locale
+    rm -f ${D}${libexecdir}/gvfsd*
+    rm -f ${D}${libexecdir}/gvfs-fuse-daemon
+    rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor
+}
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
new file mode 100644
index 000000000..c516a40f1
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
@@ -0,0 +1,26 @@
+DESCRIPTION = "gvfs is a userspace virtual filesystem"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+inherit gnome
+
+INC_PR = "r0"
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI[archive.md5sum] = "0c968704be003d2f6eab29388c41664e"
+SRC_URI[archive.sha256sum] = "cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288"
+SRC_URI += " \
+    file://0001-Revert-Respect-UDISKS_AUTOMOUNT_HINT-available-in-re.patch \
+    file://0002-Adapt-to-GLib-2.31-deprecations-and-thread-API-chang.patch \
+    file://0003-Adapt-to-glib-mutex-API-changes.patch \
+    file://0004-Adapt-to-glib-thread-API-changes.patch \
+    file://0005-client-gdaemonfile.c-replace-g_memmove-by-memmove.patch \
+"
+
+EXTRA_OECONF = "--with-archive-includes=${STAGING_INCDIR} \
+                --with-archive-libs=${STAGING_LIBDIR} \
+"
+
+FILES_${PN} += "${datadir}/dbus-1/services/*"
+
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
new file mode 100644
index 000000000..131c84948
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
@@ -0,0 +1,33 @@
+require gvfs.inc
+
+DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 avahi gconf libgphoto2 intltool-native"
+# optional: obexftp libcdio libimobiledevice 
+
+PR = "${INC_PR}.0"
+
+# in case of gnome-disk-utility was alresdy built: avoid double files
+# afc is enabled when it detects libimobiledevice
+EXTRA_OECONF += "--disable-gdu --disable-afc"
+
+PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+FILES_${PN} += "${datadir}/glib-2.0 ${datadir}/GConf ${libdir}/gio/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
+FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
+
+FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount"
+FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount"
+FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount"
+
+RDEPENDS_${PN} = "gvfs-gdu-volume-monitor"
+RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh"
+
+PACKAGECONFIG ?= "${@base_contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'samba', d)}"
+
+PACKAGECONFIG[samba] = "--enable-samba --with-samba-includes=${STAGING_INCDIR} \
+                        --with-samba-libs=${STAGING_LIBDIR}, --disable-samba, samba"
+# needs meta-filesystems
+PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse"
+PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive"
+PACKAGECONFIG[obexftp] = "--enable-obexftp, --disable-obexftp, bluez4 expat"
+PACKAGECONFIG[cdda] = "--enable-cdda, --disable-cdda, libcdio"
diff --git a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
new file mode 100644
index 000000000..6e1997f77
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SECTION = "x11/gnome/libs"
+DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3"
+
+PNBLACKLIST[libgweather3] ?= "CONFLICT: 876 files are conflicting with libgweather"
+# e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd
+#      sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml
+
+BPN = "libgweather"
+
+inherit gnome
+SRC_URI[archive.md5sum] = "f1a96c6f19c9a0bc6b4e12acc9a8a85d"
+SRC_URI[archive.sha256sum] = "9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c"
+
+do_configure_prepend() {
+    sed -i -e 's: doc : :g' ${S}/Makefile.am
+}
+
+FILES_${PN} += "${datadir}/gnome* \
+                ${datadir}/icons"
+
+PACKAGES =+ "${PN}-locationdata"
+FILES_${PN}-locationdata = "${datadir}/libgweather/*ocations*"
+
+
+
diff --git a/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb b/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb
new file mode 100644
index 000000000..09388fb7f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb
@@ -0,0 +1,22 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SECTION = "x11/gnome/libs"
+DEPENDS = "libxml2 gconf libsoup-2.4 gtk+ libgnome-keyring"
+
+inherit gnome
+
+SRC_URI[archive.md5sum] = "bf6a0a05051341ecb250f332e3edfb88"
+SRC_URI[archive.sha256sum] = "b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c"
+
+do_configure_prepend() {
+    sed -i -e 's: doc : :g' ${S}/Makefile.am
+}
+
+FILES_${PN} += "${datadir}/gnome* \
+                ${datadir}/icons"
+
+PACKAGES =+ "${PN}-locationdata"
+FILES_${PN}-locationdata = "${datadir}/libgweather/Locations*"
+
+
diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb
new file mode 100644
index 000000000..5b367de7b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb
@@ -0,0 +1,15 @@
+SUMMARY = "GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE = "http://live.gnome.org/libgdata"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
+                    file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \
+                    file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef"
+
+DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native"
+
+inherit gnomebase pkgconfig autotools-brokensep gettext gtk-doc
+
+SRC_URI[archive.md5sum] = "ec5262cbcb07b63b58d45aa3ac636096"
+SRC_URI[archive.sha256sum] = "fb244138276a5ce98510b0e2408bbf6f9ce0fd8cdcf86f07cd4be38afbb7c2bc"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome/0001-libgnome-Makefile.am-allow-deprecated-symbols.patch b/meta-gnome/recipes-gnome/libgnome/libgnome/0001-libgnome-Makefile.am-allow-deprecated-symbols.patch
new file mode 100644
index 000000000..b6583034f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnome/0001-libgnome-Makefile.am-allow-deprecated-symbols.patch
@@ -0,0 +1,35 @@
+From ce1cd20fceea7dbcc5b983d94de771461eccf7cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 29 Apr 2013 14:17:13 +0200
+Subject: [PATCH] libgnome/Makefile.am: allow deprecated symbols
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fixes:
+
+| gnome-program.c: In function 'gnome_program_init_common':
+| gnome-program.c:2067:2: error: implicit declaration of function 'g_atexit' [-Werror=implicit-function-declaration]
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ libgnome/Makefile.am |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
+index 9c8cd3e..aa01f6c 100644
+--- a/libgnome/Makefile.am
++++ b/libgnome/Makefile.am
+@@ -17,7 +17,6 @@ INCLUDES = \
+        -I$(srcdir)/..                                          \
+        $(WARN_CFLAGS)                                          \
+        $(LIBGNOME_CFLAGS)                                      \
+-       -DG_DISABLE_DEPRECATED                                  \
+        -DLIBGNOME_PREFIX=\""$(prefix)"\"                       \
+        -DLIBGNOME_LIBDIR=\""$(libdir)"\"                       \
+        -DLIBGNOME_DATADIR=\""$(datadir)"\"                     \
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
new file mode 100644
index 000000000..0a2f41cea
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Gnome application programming libraries"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
+SECTION = "x11/gnome/libs"
+
+inherit gnome lib_package
+
+PR = "r2"
+
+SRC_URI[archive.md5sum] = "a4345e6087ae6195d65a4674ffdca559"
+SRC_URI[archive.sha256sum] = "b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4"
+SRC_URI += "file://0001-libgnome-Makefile.am-allow-deprecated-symbols.patch"
+
+DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound"
+
+EXTRA_OECONF += "--disable-gtk-doc"
+
+do_configure_prepend() {
+    sed -i -e s:docs::g ${S}/Makefile.am
+    echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
+    echo "EXTRA_DIST = version.xml" > gtk-doc.make
+}
+
+FILES_${PN} += "${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so \
+                ${datadir}/gnome-background-properties ${datadir}/pixmaps"
+FILES_${PN}-dev += "${libdir}/bonobo/monikers/*.la"
+FILES_${PN}-staticdev += "${libdir}/bonobo/monikers/*.a"
+
+PACKAGES =+ "gnome-common-schemas"
+
+FILES_gnome-common-schemas = "${datadir}/gnome-background-properties ${datadir}/pixmaps ${sysconfdir}"
+
+RDEPENDS_${PN} = "gnome-common-schemas"
+
+FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb
new file mode 100644
index 000000000..fd8f6898e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb
@@ -0,0 +1,19 @@
+SUMMARY = "A powerful object-oriented display"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
+SECTION = "x11/gnome/libs"
+
+inherit gnomebase gtk-doc
+
+# intltool to provide IT_PROG_INTLTOOL
+# configure: line 12654: syntax error near unexpected token `0.35.0'
+# configure: line 12654: `IT_PROG_INTLTOOL(0.35.0)'
+DEPENDS = "gtk+ libglade libart-lgpl xineramaproto intltool-native"
+
+SRC_URI[archive.md5sum] = "ffcbb719c671ff5cd86e59aeba8d0b92"
+SRC_URI[archive.sha256sum] = "859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas*.la"
+FILES_${PN}-staticdev += "${libdir}/libglade/*/libcanvas*.a"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
new file mode 100644
index 000000000..d14806215
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "GNOME keyboard library"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
+
+SECTION = "x11/gnome/libs"
+
+DEPENDS = "gconf gtk+ glib-2.0 libxklavier"
+
+inherit gnome
+
+SRC_URI[archive.md5sum] = "de32a6e3e3464b566eecdc4332bf34bd"
+SRC_URI[archive.sha256sum] = "ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256"
+
+do_configure_append() {
+    find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+    find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc b/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc
new file mode 100644
index 000000000..26997b851
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "GNOME User Interface Library"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+SECTION = "x11/gnome/libs"
+DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native"
+
+inherit gnome 
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
+                ${libdir}/libglade/*/lib*.so \
+                ${datadir}/pixmaps/gnome-about-logo.png"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la"
+FILES_${PN}-staticdev += "${libdir}/libglade/*/*.a"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
+
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_configure_prepend() {
+    install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
+}
+
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui/gnome-stock-pixbufs.h b/meta-gnome/recipes-gnome/libgnome/libgnomeui/gnome-stock-pixbufs.h
new file mode 100644
index 000000000..953a8aeb0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui/gnome-stock-pixbufs.h
@@ -0,0 +1,4030 @@
+/* gnome stock icons in GdmPixbuf usable rgb data
+ *
+ * Copyright (C) 1997 the Free Software Foundation
+ *
+ * the pixmaps for button_cancel, save_as, trash, mail_receive, stop
+ * right_arrow, home, save, book_blue, trash_full, undo, search, mail_forward
+ * revert, mail_compose, mic, copy, jump_to, convert, button_apply, timer
+ * mail, book_red, book_yellow, help, redo, new, mail_send, button_yes, cut
+ * properties, print, mail_reply, refresh, search_replace, open, preferences
+ * left_arrow, undelete, close, volume, button_no, exit, book_green
+ * book_open, paste, line_in, spellcheck, timer_stopped
+ * are Copyright (C) 1998 Tuomas Kuosmanen
+ */
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_attach)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_attach[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_attach[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0c\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\21\0\0\0\2\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\26\0"
+  "\0\0\"\0\0\0$\0\0\0%\0\0\0%\0\0\0\377\0\0\0l\0\0\0\377\0\0\0\377\0\0"
+  "\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\"\0\0\0\20\0"
+  "\0\0$\0\0\0~\1\1\1\377QQQ\377\232\232\232\377\317\317\317\377ooo\377"
+  "\0\0\0\377\0\0\0\16\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0x\0\0\0"
+  "\377FFF\377\245\245\245\377\342\342\342\377\377\377\377\377\377\377\377"
+  "\377\366\366\366\377\212\212\212\377999\377\0\0\0(\0\0\0\10\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\34\0\0\0"
+  "B\0\0\0\377\34\34\34\377\213\213\213\377\346\346\346\377\356\356\356"
+  "\377\341\341\341\377\377\377\377\377\370\370\370\377\367\367\367\377"
+  "\366\366\366\377\314\314\314\377VVV\377\0\0\0^\0\0\0\12\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\377>>>\377\201\201\201"
+  "\377\324\324\324\377\34\34\34\377\347\347\347\377\327\327\327\377\372"
+  "\372\372\377\371\371\371\377\370\370\370\377\302\302\302\377\313\313"
+  "\313\377\365\365\365\377\331\331\331\377\201\201\201\377\0\0\0\377\0"
+  "\0\0\25\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0:\3\3\3\377TTT\377\346\346"
+  "\346\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377\327"
+  "\327\327\377\336\336\336\377\263\263\263\377yyy\377\0\0\0\377\342\342"
+  "\342\377\366\366\366\377\365\365\365\377\364\364\364\377\235\235\235"
+  "\377(((\377\0\0\0)\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\366\366"
+  "\366\377\377\377\377\377\377\377\377\377\372\372\372\377\372\372\372"
+  "\377\373\373\373\377\0\0\0\377\246\246\246\377\305\305\305\377\360\360"
+  "\360\377\370\370\370\377\0\0\0\377\342\342\342\377\302\302\302\377\312"
+  "\312\312\377\364\364\364\377\307\307\307\377VVV\377\0\0\0^\0\0\0\12\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\362\362\362\377\370\370\370\377\371"
+  "\371\371\377\316\316\316\377\304\304\304\377\305\305\305\377\0\0\0\377"
+  "\325\325\325\377\371\371\371\377\370\370\370\377\370\370\370\377\0\0"
+  "\0\377\263\263\263\377\332\332\332\377\364\364\364\377\363\363\363\377"
+  "\363\363\363\377yyy\377\0\0\0\377\0\0\0\25\0\0\0\3\0\0\0\0\0\0\0\0\0"
+  "\0\0h\205\205\205\377\377\377\377\377\370\370\370\377\276\276\276\377"
+  "\371\371\371\377\371\371\371\377\0\0\0\377\323\323\323\377\334\334\334"
+  "\377\302\302\302\377\302\302\302\377\0\0\0\377\342\342\342\377\365\365"
+  "\365\377\364\364\364\377\363\363\363\377\362\362\362\377\234\234\234"
+  "\377(((\377\0\0\0)\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\40HHH\377\377\377\377"
+  "\377\367\367\367\377\367\367\367\377\370\370\370\377\370\370\370\377"
+  "\0\0\0\377\247\247\247\377\326\326\326\377\367\367\367\377\366\366\366"
+  "\377\0\0\0\377\342\342\342\377\364\364\364\377\304\304\304\377\310\310"
+  "\310\377\362\362\362\377\306\306\306\377LLL\377\0\0\0^\0\0\0\12\0\0\0"
+  "\0\0\0\0\0\0\0\0\1\0\0\0\377\352\352\352\377\377\377\377\377\366\366"
+  "\366\377\276\276\276\377\302\302\302\377\0\0\0\377\345\345\345\377\330"
+  "\330\330\377\366\366\366\377\365\365\365\377\0\0\0\377\255\255\255\377"
+  "\274\274\274\377\352\352\352\377\340\340\340\377\361\361\361\377\352"
+  "\352\352\377\220\220\220\377\0\0\0\377\0\0\0\25\0\0\0\3\0\0\0\0\0\0\0"
+  "\0\0\0\0ihhh\377\377\377\377\377\365\365\365\377\366\366\366\377\366"
+  "\366\366\377\242\242\242\377\0\0\0\377\300\300\300\377\301\301\301\377"
+  "\0\0\0\377xxx\377\326\326\326\377\363\363\363\377\362\362\362\377\361"
+  "\361\361\377\361\361\361\377\325\325\325\377\256\256\256\377\25\25\25"
+  "\377\0\0\0)\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\4""999\377\377\377\377\377"
+  "\364\364\364\377\365\365\365\377\365\365\365\377\332\332\332\377\232"
+  "\232\232\377\0\0\0\377\0\0\0\377yyy\377\326\326\326\377\362\362\362\377"
+  "\362\362\362\377\361\361\361\377\326\326\326\377\320\320\320\377\227"
+  "\227\227\377rrr\377JJJ\377\0\0\0.\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\377\354\354\354\377\377\377\377\377\364\364\364\377\254\254\254"
+  "\377\272\272\272\377\335\335\335\377\363\363\363\377\316\316\316\377"
+  "\333\333\333\377\354\354\354\377\327\327\327\377\326\326\326\377\261"
+  "\261\261\377\201\201\201\377VVV\377###\377\0\0\0\377\0\0\0q\0\0\0)\0"
+  "\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0hiii\377\377\377\377\377\363\363"
+  "\363\377\363\363\363\377\363\363\363\377\363\363\363\377\362\362\362"
+  "\377\362\362\362\377\327\327\327\377\267\267\267\377\202\202\202\377"
+  "@@@\377###\377\0\0\0\377\0\0\0\204\0\0\0""2\0\0\0.\0\0\0)\0\0\0\25\0"
+  "\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4(((\377\377\377\377\377\363\363"
+  "\363\377\362\362\362\377\362\362\362\377\327\327\327\377\276\276\276"
+  "\377\226\226\226\377222\377###\377\0\0\0\377\0\0\0u\0\0\0H\0\0\0/\0\0"
+  "\0*\0\0\0\31\0\0\0\13\0\0\0\10\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\346\346\346\377\350\350\350\377\314\314\314\377"
+  "\232\232\232\377@@@\377###\377\0\0\0\377\0\0\0\221\0\0\0I\0\0\0/\0\0"
+  "\0*\0\0\0\30\0\0\0\16\0\0\0\11\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0;999\377\202\202\202\377999\377"
+  "\22\22\22\377\0\0\0\204\0\0\0I\0\0\0/\0\0\0*\0\0\0\33\0\0\0\16\0\0\0"
+  "\11\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\377\0\0\0\377\0\0\0u\0\0"
+  "\0""1\0\0\0*\0\0\0\31\0\0\0\16\0\0\0\11\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\11\0\0\0&\0\0\0)\0\0\0\27\0\0\0"
+  "\12\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\7\0\0\0\10\0\0\0\3\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_book_blue)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_book_blue[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_book_blue[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0""9\0\0\0\302\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\357\0\0\0\356\0\0\0\346\0\0\0\342\0\0\0w\0\0\0\13\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32\21\26\35\377\227"
+  "\250\276\377}\223\254\377s\212\243\377l\204\234\377d|\226\377^v\217\377"
+  "Wo\210\377Pi\202\377Pi\202\377Pi\202\377Pi\202\377Pi\202\377Vn\206\377"
+  "IXi\377\21\30\"\376\0\0\0.\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\273v\213\242\377\216\242\270\377v\215\247\377Vr\220\377"
+  "Nj\210\377Fb\200\377=Zx\3775Rp\3771Nk\3771Nk\3776Ro\3776Ro\377<Ws\377"
+  "6Ro\3773@O\377\25\34%\372\0\0\0N\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\22\12\15\21\377\231\254\300\377\200\226\256\377[v\224\377"
+  "So\215\377Jg\205\377B_}\377:Wu\3772Om\3771Nk\3771Nk\3771Nk\3771Nk\377"
+  ";Wr\377-D\\\377#/6\377\0\0\0^\0\0\0D\0\0\0\16\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\255[iy\377\231\254\300\377u\215\246\377Ws\221\377Ok\210"
+  "\377Gc\201\377\77[y\3776Sq\3771Nk\3771Nk\3771Nk\3771Nk\3774Pm\377;Wr"
+  "\377)\77V\3775<A\375\0\0\0\377\0\0\0%\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\21\0\0\0\377\231\254\300\377\200\227\260\377\\x\226\377Tp\216"
+  "\377Kh\206\377C`~\377;Xv\3773Pn\3771Nk\3771Nk\3773Pk\3771Nk\3779Uq\377"
+  "-D\\\377\27\",\377~\202\205\377578\377\0\0\0F\0\0\0\15\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\232[iy\377\217\243\271\377u\215\246\377Xt\222\377Pl"
+  "\212\377Hd\202\377@\\z\3778Tr\3771Nk\3771Nk\3771Nk\3771Nk\3772Ol\377"
+  "=Yt\377)\77V\377!'.\376JLM\377\216\220\222\377\0\0\0Q\0\0\0\20\0\0\0"
+  "\0\0\0\0\0\0\0\0\20\0\0\0\377\230\253\277\375\177\226\257\377]y\227\377"
+  "Uq\217\377Mi\207\377Da\177\377<Yw\3774Qo\3771Nk\3771Nk\3771Nk\3771Nk"
+  "\3778Tp\377/F]\377\30$-\377TWY\366eij\377334\377\0\0\0Q\0\0\0\20\0\0"
+  "\0\0\0\0\0\0\0\0\0\335eu\203\377\215\242\271\377v\215\247\377Zu\223\377"
+  "Qm\213\377Ie\203\377A]{\3779Us\3771Nk\3771Nk\3771Nk\3771Nk\3771Nk\377"
+  "<Ws\377*BZ\377#+2\377FHJ\377\220\222\225\377\0\0\0\377\0\0\0c\0\0\0\21"
+  "\0\0\0\0\0\0\0!\0\0\0\377\233\254\273\377\207\234\264\377c~\233\377V"
+  "r\220\377Nj\210\377Fb\200\377=Zx\3775Rp\3771Nk\3771Nk\3771Nk\3771Nk\377"
+  "5Rn\3774Kb\377\31$-\377dhk\377mop\3770G]\377\0\0\0\373\0\0\0R\0\0\0\25"
+  "\0\0\0\0\0\0\0\245ep}\377\221\245\274\377q\213\246\377\\x\226\377Tp\216"
+  "\377Kh\206\377C`~\377;Xv\3773Pn\3771Nk\3771Nk\3771Nk\3771Nk\377=Yt\377"
+  ")\77V\377&.3\377WXY\377\213\217\225\377\11\15\21\372\0\0\0\234\0\0\0"
+  "I\0\0\0\17\0\0\0\13\0\0\0\377~\216\237\337\212\237\266\377l\205\241\377"
+  "Xt\222\377Pl\212\377Hd\202\377@\\z\3778Tr\3771Nk\3771Nk\3771Nk\3771N"
+  "k\3771Nk\3775Lc\377\32%0\377HLN\377suv\377C[s\370\0\0\0\364\0\0\0U\0"
+  "\0\0+\0\0\0\7\0\0\0\206uww\377\275\306\323\375\256\276\314\377\247\266"
+  "\306\377\243\262\302\377\236\255\275\377\232\252\271\377\220\240\260"
+  "\377{\217\241\377y\214\237\377y\214\237\377y\214\237\377y\214\237\377"
+  "p\204\231\377Ufy\37725;\377[^a\377\216\223\230\377\12\16\21\372\0\0\0"
+  "\233\0\0\0G\0\0\0\21\0\0\0\1\2\7\11\331\260\272\304\377,>Q\377$6J\377"
+  "$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377$6J\377"
+  "$6J\377+5\77\377^bh\377wxz\377F`z\377\0\0\0\365\0\0\0U\0\0\0*\0\0\0\6"
+  "\0\0\0\0\15\17\21\377\207\223\235\377@AE\377_``\373ttt\377\226\226\226"
+  "\377\261\261\261\377\257\257\260\377\305\305\306\377\316\316\317\377"
+  "\264\273\301\377\274\302\311\377\275\304\312\377\304\313\322\377\313"
+  "\322\331\377\326\332\336\377\220\226\233\377\205\212\217\377\24\33!\371"
+  "\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0\0\0\14\16\17\377k{\213\377WWW"
+  "\377}~\200\377\342\344\346\377\342\344\346\377\341\341\341\377\337\337"
+  "\340\377\337\337\340\377\362\362\362\377\375\375\376\377\361\363\365"
+  "\377\361\363\365\377\361\363\365\377\247\250\252\377\262\265\271\377"
+  "imq\377F`z\377\0\1\2\370\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\0\0\0\0$%'\377"
+  "cr\201\377i|\216\377Tk\203\377E]x\377\326\334\341\377\347\352\355\377"
+  "\355\357\361\377\355\357\362\377\345\346\347\377\336\336\337\377\341"
+  "\341\342\377\341\341\342\377\337\337\340\377\341\342\343\377rz\203\377"
+  "\213\217\224\377\25\33!\367\0\0\0\234\0\0\0I\0\0\0\22\0\0\0\1\0\0\0\0"
+  "\0\0\0\0\0\0\0""9\0\0\0\377\4\6\12\3548J]\363Mbx\351Th\177\357Sj\202"
+  "\377Wo\206\377\207\227\247\377\327\335\341\377\342\346\351\377\351\354"
+  "\356\377\370\371\372\377\370\371\372\377\201\205\212\377\245\247\250"
+  "\377\234\242\250\377\1\2\3\370\0\0\0U\0\0\0*\0\0\0\7\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0&\0\0\0e\0\0\0\276\0\0\0\346\0\0\0\360\0\0\0\363"
+  ";K^\371DVi\371Tg}\367Uk\200\366Vl\203\377\254\270\303\377\334\341\345"
+  "\377\350\353\355\377\237\243\246\377\25\35$\373\0\0\0\234\0\0\0H\0\0"
+  "\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\6\0\0\0\17\0\0\0"
+  "\34\0\0\0""4\0\0\0C\0\0\0g\0\0\0\251\0\0\0\344\0\0\0\361\0\0\0\3560>"
+  "M\365=N`\371O_s\372Se{\367Lc|\357\1\3\5\367\0\0\0U\0\0\0+\0\0\0\7\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12"
+  "\0\0\0\15\0\0\0\20\0\0\0\33\0\0\0""0\0\0\0C\0\0\0_\0\0\0\235\0\0\0\327"
+  "\0\0\0\356\0\0\0\354\0\0\0\347\0\0\0{\0\0\0F\0\0\0\21\0\0\0\1\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\3\0\0\0\10\0\0\0\15\0\0\0\20\0\0\0\30\0\0\0,\0\0\0"
+  "\77\0\0\0H\0\0\0H\0\0\0@\0\0\0\37\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\7\0\0\0\13\0\0\0\16\0"
+  "\0\0\16\0\0\0\14\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_book_green)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_book_green[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_book_green[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0""9\0\0\0\302\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\357\0\0\0\356\0\0\0\346\0\0\0\342\0\0\0w\0\0\0\13\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32\21\34\21\377\225"
+  "\276\225\377y\255y\377n\246n\377e\241e\377^\233^\377Y\222Y\377S\212S"
+  "\377O\202O\377O\202O\377O\202O\377O\202O\377O\202O\377R\210R\377CnC\377"
+  "\22\36\22\376\0\0\0.\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\273o\247o\377\214\271\214\377r\251r\377V\216V\377P\204P\377Jz"
+  "J\377CoC\377=e=\377:`:\377:`:\377=e=\377=e=\377AkA\377=e=\3770P0\377"
+  "\26#\26\372\0\0\0N\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22"
+  "\11\17\11\377\227\277\227\377}\260}\377Y\223Y\377T\213T\377M\177M\377"
+  "GuG\377AkA\377;a;\377:`:\377:`:\377:`:\377:`:\377@j@\3773T3\377!6!\377"
+  "\0\0\0^\0\0\0D\0\0\0\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\255O\203"
+  "O\377\227\277\227\377q\250q\377W\217W\377P\204P\377K|K\377ErE\377>f>"
+  "\377:`:\377:`:\377:`:\377:`:\377<c<\377@j@\377/N/\377,I,\375\0\0\0\377"
+  "\0\0\0%\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\21\0\0\0\377\227\277\227"
+  "\377~\260~\377[\226[\377U\214U\377N\201N\377HwH\377BmB\377<c<\377:`:"
+  "\377:`:\377;a;\377:`:\377@i@\3773T3\377\30(\30\377\201\201\201\377(B"
+  "(\377\0\0\0F\0\0\0\15\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\232O\203O\377\215"
+  "\271\215\377q\250q\377X\221X\377R\207R\377L}L\377FsF\377@i@\377:`:\377"
+  ":`:\377:`:\377:`:\377;a;\377BmB\377/N/\377\35""0\35\376KKK\377\220\220"
+  "\220\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\20\0\0\0\377\226\277\226"
+  "\375}\260}\377\\\227\\\377V\215V\377O\203O\377IxI\377CnC\377=d=\377:"
+  "`:\377:`:\377:`:\377:`:\377\77h\77\3774V4\377\31*\31\377VVV\366ggg\377"
+  "333\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\335W\217W\377\214\271\214"
+  "\377r\251r\377Y\222Y\377R\210R\377L~L\377FtF\377@j@\377:`:\377:`:\377"
+  ":`:\377:`:\377:`:\377AkA\3771Q1\377\37""3\37\377HHH\377w\254w\377\0\0"
+  "\0\377\0\0\0c\0\0\0\21\0\0\0\0\0\0\0!\0\0\0\377\226\277\226\377\204\264"
+  "\204\377_\235_\377V\216V\377P\204P\377JzJ\377CoC\377=e=\377:`:\377:`"
+  ":\377:`:\377:`:\377=d=\3778]8\377\32+\32\377ggg\377nnn\3774V4\377\0\0"
+  "\0\373\0\0\0R\0\0\0\25\0\0\0\0\0\0\0\245U\214U\377\220\273\220\377n\246"
+  "n\377[\226[\377U\214U\377N\201N\377HwH\377BmB\377<c<\377:`:\377:`:\377"
+  ":`:\377:`:\377BmB\377/N/\377!6!\377XXX\377t\253t\377\11\17\11\372\0\0"
+  "\0\234\0\0\0I\0\0\0\17\0\0\0\13\0\0\0\377t\247t\337\210\266\210\377h"
+  "\243h\377X\221X\377R\207R\377L}L\377FsF\377@i@\377:`:\377:`:\377:`:\377"
+  ":`:\377:`:\3779^9\377\33.\33\377KKK\377ttt\377EpE\370\0\0\0\364\0\0\0"
+  "U\0\0\0+\0\0\0\7\0\0\0\206Y\222Y\377\272\325\272\375\254\314\254\377"
+  "\243\307\243\377\237\304\237\377\230\300\230\377\223\275\223\377\210"
+  "\266\210\377r\251r\377o\247o\377o\247o\377o\247o\377o\247o\377e\241e"
+  "\377M\177M\377(B(\377^^^\377x\255x\377\11\17\11\372\0\0\0\233\0\0\0G"
+  "\0\0\0\21\0\0\0\1\3\5\3\331\250\312\250\377.L.\377)D)\377)D)\377)D)\377"
+  ")D)\377)D)\377)D)\377)D)\377)D)\377)D)\377)D)\377)D)\377)D)\377'A'\377"
+  "ccc\377xxx\377HwH\377\0\0\0\365\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\13\22\13"
+  "\377w\254w\3771Q1\377___\373ttt\377\226\226\226\377\261\261\261\377\257"
+  "\257\257\377\305\305\305\377\316\316\316\377\272\272\272\377\302\302"
+  "\302\377\303\303\303\377\313\313\313\377\322\322\322\377\332\332\332"
+  "\377\225\225\225\377m\246m\377\23\37\23\371\0\0\0\234\0\0\0H\0\0\0\22"
+  "\0\0\0\1\0\0\0\0\11\17\11\377\\\230\\\377AkA\377~~~\377\344\344\344\377"
+  "\344\344\344\377\341\341\341\377\337\337\337\377\337\337\337\377\362"
+  "\362\362\377\375\375\375\377\363\363\363\377\363\363\363\377\363\363"
+  "\363\377\250\250\250\377\265\265\265\377mmm\377HwH\377\0\1\0\370\0\0"
+  "\0U\0\0\0*\0\0\0\6\0\0\0\0\0\0\0\0\33.\33\377V\215V\377\\\230\\\377P"
+  "\204P\377FtF\377\333\333\333\377\352\352\352\377\357\357\357\377\357"
+  "\357\357\377\346\346\346\377\336\336\336\377\341\341\341\377\341\341"
+  "\341\377\337\337\337\377\342\342\342\377zzz\377s\252s\377\24\40\24\367"
+  "\0\0\0\234\0\0\0I\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\377"
+  "\5\10\5\3548[8\363MxM\351Q\200Q\357O\203O\377R\210R\377\227\227\227\377"
+  "\334\334\334\377\345\345\345\377\353\353\353\377\371\371\371\377\371"
+  "\371\371\377\205\205\205\377\246\246\246\377\213\270\213\377\1\2\1\370"
+  "\0\0\0U\0\0\0*\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0&\0\0\0e"
+  "\0\0\0\276\0\0\0\346\0\0\0\360\0\0\0\3639]9\371AjA\371O\200O\367Q\203"
+  "Q\366Q\206Q\377\245\310\245\377\340\340\340\377\352\352\352\377\213\270"
+  "\213\377\25\"\25\373\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\6\0\0\0\17\0\0\0\34\0\0\0""4\0\0\0C\0\0\0g\0"
+  "\0\0\251\0\0\0\344\0\0\0\361\0\0\0\356/L/\365;a;\371HvH\372M}M\367Lz"
+  "L\357\2\3\2\367\0\0\0U\0\0\0+\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12\0\0\0\15\0\0\0\20\0\0\0\33"
+  "\0\0\0""0\0\0\0C\0\0\0_\0\0\0\235\0\0\0\327\0\0\0\356\0\0\0\354\0\0\0"
+  "\347\0\0\0{\0\0\0F\0\0\0\21\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0"
+  "\10\0\0\0\15\0\0\0\20\0\0\0\30\0\0\0,\0\0\0\77\0\0\0H\0\0\0H\0\0\0@\0"
+  "\0\0\37\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\2\0\0\0\7\0\0\0\13\0\0\0\16\0\0\0\16\0\0\0\14\0\0\0\5\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_book_open)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_book_open[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_book_open[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3OOOD\0\0\0\377\4\5\6"
+  "\377\0\0\0;\0\0\0\20\0\0\0\6\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\3NNNE\13\17\22\377\225\237\252\377\303\306"
+  "\312\356\0\0\0\377\0\0\0&\0\0\0\22\0\0\0\5\0\0\0\1\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0.\13\17\22\377\202\220\236\377\361\361"
+  "\361\377\325\327\330\377\12\15\20\377\0\0\0_\0\0\0\40\0\0\0\13\0\0\0"
+  "\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0.\21\27\34\377\206\223\240"
+  "\377\357\360\360\377\336\336\336\377\325\325\325\377\233\237\244\324"
+  "\0\0\0\377\0\0\0/\0\0\0\24\0\0\0\5\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0"
+  ".\16\23\27\377\205\222\237\377\357\360\360\377\333\333\333\377\312\312"
+  "\312\377\310\310\310\377\310\311\312\377\14\17\23\377\0\0\0[\0\0\0\40"
+  "\0\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0.\24\32\40\377y\210\225\370\361\361"
+  "\361\377\325\325\325\377\312\312\312\377\322\322\322\377\303\303\303"
+  "\377\315\315\315\377ty~\275\0\0\0\377\0\0\0-\0\0\0\24\0\0\0\6\0\0\0\2"
+  "\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0-\27\37&\377\177\215\232\361\357\360\360\377\332\332\332\377\323\323"
+  "\323\377\304\304\304\377\316\316\316\377\300\300\300\377\312\312\312"
+  "\377\261\261\261\336\15\21\25\377\0\0\0Y\0\0\0#\0\0\0\22\0\0\0\14\0\0"
+  "\0\12\0\0\0\12\0\0\0\12\0\0\0\11\0\0\0\7\0\0\0\4\0\0\0\1\0\0\0\0\0\0"
+  "\0\377v\205\222\350\356\357\357\377\331\331\331\377\323\323\323\377\320"
+  "\320\320\377\302\302\302\377\313\313\313\377\311\311\311\377\274\274"
+  "\274\377\244\247\251\344hkl\351333\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\352\0\0\0\177\0\0\0=\0\0\0\20\0\0\0\6\0\0"
+  "\0\1AO]\377\255\265\274\363\352\352\352\377\322\322\322\377\277\277\277"
+  "\377\315\315\315\377\313\313\313\377\275\275\275\377\306\306\306\377"
+  "\265\266\267\365\211\220\226\370\270\270\270\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377@AB\342\0\0\0\177\0\0\0%\0\0\0\20\0\0\0\4\0\0"
+  "\0\377M`t\340\353\353\353\377\321\321\321\377\303\303\303\377\301\301"
+  "\301\377\310\310\310\377\267\267\267\377\303\303\303\377\227\237\247"
+  "\347\241\243\244\376\374\375\375\377\363\364\364\377\353\354\355\377"
+  "\352\353\354\377\351\352\353\377\356\357\361\377\366\367\370\377\344"
+  "\345\346\376\222\223\225\375\0\0\0\377\0\0\0""9\0\0\0\33\0\0\0\7\0\0"
+  "\0=2AO\377\214\230\242\362\347\347\347\377\311\311\311\377\273\273\273"
+  "\377\304\304\304\377\302\302\302\377\244\247\253\346\223\226\231\375"
+  "\327\330\330\377\374\375\375\377\372\374\374\377\371\372\373\377\370"
+  "\371\372\377\367\370\371\377\365\366\370\377\367\367\371\377\306\307"
+  "\307\377O^j\375\0\0\0\360\0\0\0B\0\0\0\37\0\0\0\11\0\0\0\23\0\0\0\377"
+  "L_r\340\350\350\350\377\306\306\306\377\276\276\276\377\270\270\270\377"
+  "\265\265\266\361\227\236\244\356\250\250\250\377\375\376\376\377\365"
+  "\366\366\377\347\351\351\377\353\354\355\377\352\353\354\377\360\361"
+  "\362\377\370\371\372\377\340\342\343\377\217\226\235\376\25\34\"\377"
+  "\0\0\0\201\0\0\0>\0\0\0\34\0\0\0\10\0\0\0\13\0\0\0A5DS\377\215\231\242"
+  "\363\343\343\343\377\301\301\301\377\276\276\276\377\216\224\232\316"
+  "\235\237\237\376\377\377\377\377\375\376\376\377\374\375\375\377\372"
+  "\374\374\377\362\363\364\377\361\362\363\377\367\370\371\377\366\366"
+  "\367\377\246\250\253\377s\177\212\376\4\5\6\377\0\0\0P\0\0\0""1\0\0\0"
+  "\24\0\0\0\5\0\0\0\5\0\0\0\24\0\0\0\377K_q\340\345\345\345\377\301\301"
+  "\301\377\236\237\240\326\227\231\233\375\331\331\331\377\377\377\377"
+  "\377\347\350\350\377\356\357\357\377\364\365\365\377\371\372\373\377"
+  "\370\371\372\377\373\373\373\377\330\330\332\377\223\233\243\377\17\24"
+  "\30\377\0\0\0t\0\0\0B\0\0\0\"\0\0\0\14\0\0\0\3\0\0\0\2\0\0\0\13\0\0\0"
+  "A9IW\377\202\217\227\360\333\333\333\370\212\216\222\347\264\264\264"
+  "\377\377\377\377\377\377\377\377\377\375\376\376\377\365\366\366\377"
+  "\354\356\356\377\346\347\350\377\372\372\373\377\365\365\367\377\256"
+  "\262\266\377\\l|\377\0\0\0\377\0\0\0P\0\0\0""1\0\0\0\25\0\0\0\6\0\0\0"
+  "\1\0\0\0\0\0\0\0\5\0\0\0\24\0\0\0\377J]p\336\273\273\273\321\253\253"
+  "\253\377\377\377\377\377\370\370\370\377\361\361\361\377\357\360\360"
+  "\377\374\375\375\377\372\373\373\377\371\372\373\377\373\374\374\377"
+  "\336\341\343\377\235\246\256\377\12\15\20\377\0\0\0t\0\0\0A\0\0\0\"\0"
+  "\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\13\0\0\0A$/:\377imq\346"
+  "wxy\377\362\363\363\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\360\360\360\377\363\363\363\377\373\374\374\377\371\371\372\377\273"
+  "\277\304\377Vgy\377\0\0\0\377\0\0\0P\0\0\0""1\0\0\0\25\0\0\0\6\0\0\0"
+  "\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\0\24\0\0\0\377J_t\3701>K\376\263"
+  "\275\306\375\321\327\335\377\331\336\343\377\366\367\367\377\365\365"
+  "\365\377\377\377\377\377\377\377\377\377\321\322\324\377\232\243\254"
+  "\377\4\5\6\377\0\0\0t\0\0\0A\0\0\0!\0\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\13\0\0\0""7\0\0\0\256+4<\366)2;\377O_"
+  "p\377^q\204\376\221\236\253\375\237\253\266\375\277\307\320\377\350\354"
+  "\356\377\262\270\276\377q}\210\376\0\0\0\377\0\0\0P\0\0\0""1\0\0\0\25"
+  "\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0"
+  "\0\22\0\0\0&\0\0\0:\0\0\0Y\0\0\0\200\0\0\0\301%-5\377Qar\377Vgy\375z"
+  "\206\225\375v\205\224\374\0\0\0\377\0\0\0r\0\0\0\77\0\0\0!\0\0\0\13\0"
+  "\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0"
+  "\6\0\0\0\20\0\0\0\34\0\0\0%\0\0\0-\0\0\0""8\0\0\0X\0\0\0\200\0\0\0\275"
+  ",4=\377!'.\377\0\0\0p\0\0\0D\0\0\0*\0\0\0\23\0\0\0\5\0\0\0\1\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0"
+  "\0\10\0\0\0\14\0\0\0\21\0\0\0\31\0\0\0\"\0\0\0,\0\0\0""7\0\0\0A\0\0\0"
+  "C\0\0\0;\0\0\0)\0\0\0\26\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2"
+  "\0\0\0\4\0\0\0\6\0\0\0\13\0\0\0\20\0\0\0\30\0\0\0\37\0\0\0\40\0\0\0\33"
+  "\0\0\0\21\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\6\0\0\0\10\0\0\0\11\0\0\0\7\0\0\0\4"
+  "\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_book_red)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_book_red[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_book_red[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0""9\0\0\0\302\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\357\0\0\0\356\0\0\0\346\0\0\0\342\0\0\0w\0\0\0\13\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32\37\21\16\377\310"
+  "\225\213\377\272ym\377\264n`\377\260fW\377\252^O\377\240YK\377\226SF"
+  "\377\216OC\377\216OC\377\216OC\377\216OC\377\216OC\377\225RF\377xC8\377"
+  "!\22\17\376\0\0\0.\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\273\265pb\377\303\214\201\377\266re\377\234WI\377\221PD\377\206"
+  "J>\377zD9\377o>4\377i;1\377i;1\377o>4\377o>4\377vA7\377o>4\377X0)\377"
+  "'\26\22\372\0\0\0N\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22"
+  "\21\11\10\377\311\227\215\377\274}q\377\241ZK\377\230TG\377\214MA\377"
+  "\201G<\377vA7\377k;2\377i;1\377i;1\377i;1\377i;1\377tA6\377\\3+\377;"
+  "!\33\377\0\0\0^\0\0\0D\0\0\0\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\255\217OC\377\311\227\215\377\265qc\377\235WI\377\221PD\377\210K\77"
+  "\377|E:\377p>4\377i;1\377i;1\377i;1\377i;1\377l<3\377tA6\377U/(\377O"
+  ",%\375\0\0\0\377\0\0\0%\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\21\0\0"
+  "\0\377\311\227\215\377\275~r\377\244[L\377\231UH\377\215NB\377\202H<"
+  "\377wB8\377l<3\377i;1\377i;1\377k;2\377i;1\377s@6\377\\3+\377,\30\24"
+  "\377\201\201\201\377I(\"\377\0\0\0F\0\0\0\15\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\232\217OC\377\304\215\202\377\265qc\377\237XJ\377\223RE\377\211"
+  "L@\377~F;\377s@6\377i;1\377i;1\377i;1\377i;1\377k;2\377wB8\377U/(\377"
+  "4\35\30\376KKK\377\220\220\220\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0"
+  "\0\0\20\0\0\0\377\310\226\214\375\274}q\377\245\\M\377\232VH\377\217"
+  "OC\377\203I=\377xC8\377m=3\377i;1\377i;1\377i;1\377i;1\377q\77""5\377"
+  "_4,\377-\31\25\377VVV\366ggg\377333\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0"
+  "\0\0\0\0\335\235WI\377\303\214\201\377\266re\377\240YK\377\225RF\377"
+  "\212L@\377\177G;\377tA6\377i;1\377i;1\377i;1\377i;1\377i;1\377vA7\377"
+  "Y1)\3778\37\32\377HHH\377\270wj\377\0\0\0\377\0\0\0c\0\0\0\21\0\0\0\0"
+  "\0\0\0!\0\0\0\377\310\226\214\377\300\205y\377\254`P\377\234WI\377\221"
+  "PD\377\206J>\377zD9\377o>4\377i;1\377i;1\377i;1\377i;1\377m=3\377f8/"
+  "\377/\32\26\377ggg\377nnn\377_4,\377\0\0\0\373\0\0\0R\0\0\0\25\0\0\0"
+  "\0\0\0\0\245\231UH\377\305\220\205\377\264n`\377\244[L\377\231UH\377"
+  "\215NB\377\202H<\377wB8\377l<3\377i;1\377i;1\377i;1\377i;1\377wB8\377"
+  "U/(\377;!\33\377XXX\377\267tg\377\21\11\10\372\0\0\0\234\0\0\0I\0\0\0"
+  "\17\0\0\0\13\0\0\0\377\262th\337\302\210}\377\261hY\377\237XJ\377\223"
+  "RE\377\211L@\377~F;\377s@6\377i;1\377i;1\377i;1\377i;1\377i;1\377g90"
+  "\3772\33\27\377KKK\377ttt\377zE:\370\0\0\0\364\0\0\0U\0\0\0+\0\0\0\7"
+  "\0\0\0\206\240YK\377\333\272\264\375\324\254\244\377\320\243\233\377"
+  "\315\237\226\377\312\231\217\377\307\224\211\377\302\210}\377\266re\377"
+  "\265pb\377\265pb\377\265pb\377\265pb\377\260fW\377\214MA\377I(\"\377"
+  "^^^\377\271xk\377\21\11\10\372\0\0\0\233\0\0\0G\0\0\0\21\0\0\0\1\6\3"
+  "\3\331\322\250\240\377T.'\377J)#\377J)#\377J)#\377J)#\377J)#\377J)#\377"
+  "J)#\377J)#\377J)#\377J)#\377J)#\377J)#\377G'!\377ccc\377xxx\377\202H"
+  "<\377\0\0\0\365\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\24\13\11\377\270wj\377"
+  "Y1)\377___\373ttt\377\226\226\226\377\261\261\261\377\257\257\257\377"
+  "\305\305\305\377\316\316\316\377\272\272\272\377\302\302\302\377\303"
+  "\303\303\377\313\313\313\377\322\322\322\377\332\332\332\377\225\225"
+  "\225\377\264m_\377\"\23\20\371\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0"
+  "\0\0\21\11\10\377\247]N\377vA7\377~~~\377\344\344\344\377\344\344\344"
+  "\377\341\341\341\377\337\337\337\377\337\337\337\377\362\362\362\377"
+  "\375\375\375\377\363\363\363\377\363\363\363\377\363\363\363\377\250"
+  "\250\250\377\265\265\265\377mmm\377\202H<\377\1\0\0\370\0\0\0U\0\0\0"
+  "*\0\0\0\6\0\0\0\0\0\0\0\0""2\33\27\377\232VH\377\247]N\377\221PD\377"
+  "\177G;\377\333\333\333\377\352\352\352\377\357\357\357\377\357\357\357"
+  "\377\346\346\346\377\336\336\336\377\341\341\341\377\341\341\341\377"
+  "\337\337\337\377\342\342\342\377zzz\377\267sf\377$\24\21\367\0\0\0\234"
+  "\0\0\0I\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\377\11\5\4\354"
+  "c80\363\203MB\351\214QE\357\217OC\377\225RF\377\227\227\227\377\334\334"
+  "\334\377\345\345\345\377\353\353\353\377\371\371\371\377\371\371\371"
+  "\377\205\205\205\377\246\246\246\377\303\213\200\377\2\1\1\370\0\0\0"
+  "U\0\0\0*\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0&\0\0\0e\0\0\0"
+  "\276\0\0\0\346\0\0\0\360\0\0\0\363f:1\371sA7\371\214OC\367\217QE\366"
+  "\222QD\377\320\245\234\377\340\340\340\377\352\352\352\377\303\213\200"
+  "\377%\25\21\373\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\6\0\0\0\17\0\0\0\34\0\0\0""4\0\0\0C\0\0\0g\0\0\0\251"
+  "\0\0\0\344\0\0\0\361\0\0\0\356S/(\365j;2\371\201I=\372\211MB\367\205"
+  "LA\357\3\2\1\367\0\0\0U\0\0\0+\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12\0\0\0\15\0\0\0\20\0\0\0\33"
+  "\0\0\0""0\0\0\0C\0\0\0_\0\0\0\235\0\0\0\327\0\0\0\356\0\0\0\354\0\0\0"
+  "\347\0\0\0{\0\0\0F\0\0\0\21\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0"
+  "\10\0\0\0\15\0\0\0\20\0\0\0\30\0\0\0,\0\0\0\77\0\0\0H\0\0\0H\0\0\0@\0"
+  "\0\0\37\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\2\0\0\0\7\0\0\0\13\0\0\0\16\0\0\0\16\0\0\0\14\0\0\0\5\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_book_yellow)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_book_yellow[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_book_yellow[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0""9\0\0\0\302\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\357\0\0\0\356\0\0\0\346\0\0\0\342\0\0\0w\0\0\0\13\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32(\40\5\377\352\315"
+  "i\377\344\300C\377\342\2733\377\341\267&\377\333\261\36\377\317\247\34"
+  "\377\303\235\32\377\270\224\31\377\270\224\31\377\270\224\31\377\270"
+  "\224\31\377\270\224\31\377\301\234\32\377\234~\25\377*\"\6\376\0\0\0"
+  ".\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\273\343\274"
+  "4\377\350\311]\377\343\2758\377\312\243\33\377\273\227\32\377\255\214"
+  "\30\377\236\177\25\377\220t\23\377\211n\22\377\211n\22\377\220t\23\377"
+  "\220t\23\377\230{\25\377\220t\23\377r\\\17\3771(\7\372\0\0\0N\0\0\0\20"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22\26\22\3\377\352\316m\377\345"
+  "\302H\377\321\250\34\377\304\236\33\377\264\222\31\377\246\206\27\377"
+  "\230{\25\377\212p\23\377\211n\22\377\211n\22\377\211n\22\377\211n\22"
+  "\377\227y\24\377w`\20\377M>\12\377\0\0\0^\0\0\0D\0\0\0\16\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\255\272\226\31\377\352\316m\377\343\2746\377"
+  "\313\244\34\377\273\227\32\377\257\215\30\377\241\202\26\377\221u\24"
+  "\377\211n\22\377\211n\22\377\211n\22\377\211n\22\377\214q\23\377\227"
+  "y\24\377nY\17\377fR\16\375\0\0\0\377\0\0\0%\0\0\0\5\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\21\0\0\0\377\352\316m\377\345\303J\377\324\253\35\377\306"
+  "\240\33\377\266\223\31\377\250\210\27\377\232|\25\377\214q\23\377\211"
+  "n\22\377\211n\22\377\212p\23\377\211n\22\377\225x\24\377w`\20\3779.\10"
+  "\377\201\201\201\377^L\15\377\0\0\0F\0\0\0\15\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\232\272\226\31\377\350\312_\377\343\2746\377\315\245\34\377\277"
+  "\232\32\377\261\217\30\377\243\203\26\377\225x\24\377\211n\22\377\211"
+  "n\22\377\211n\22\377\211n\22\377\212p\23\377\232|\25\377nY\17\377C6\11"
+  "\376KKK\377\220\220\220\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\20"
+  "\0\0\0\377\351\315k\375\345\302H\377\326\255\35\377\310\241\33\377\272"
+  "\226\31\377\252\211\27\377\234~\25\377\216r\23\377\211n\22\377\211n\22"
+  "\377\211n\22\377\211n\22\377\223w\24\377zc\21\377;0\10\377VVV\366ggg"
+  "\377333\377\0\0\0Q\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\335\313\244\34\377"
+  "\350\311]\377\343\2758\377\317\247\34\377\301\234\32\377\263\220\30\377"
+  "\245\205\26\377\227y\24\377\211n\22\377\211n\22\377\211n\22\377\211n"
+  "\22\377\211n\22\377\230{\25\377s]\20\377I;\12\377HHH\377\344\277\77\377"
+  "\0\0\0\377\0\0\0c\0\0\0\21\0\0\0\0\0\0\0!\0\0\0\377\352\316k\377\347"
+  "\306R\377\337\264\36\377\312\243\33\377\273\227\32\377\255\214\30\377"
+  "\236\177\25\377\220t\23\377\211n\22\377\211n\22\377\211n\22\377\211n"
+  "\22\377\216r\23\377\203j\22\377=1\10\377ggg\377nnn\377zc\21\377\0\0\0"
+  "\373\0\0\0R\0\0\0\25\0\0\0\0\0\0\0\245\306\240\33\377\351\313b\377\342"
+  "\2733\377\324\253\35\377\306\240\33\377\266\223\31\377\250\210\27\377"
+  "\232|\25\377\214q\23\377\211n\22\377\211n\22\377\211n\22\377\211n\22"
+  "\377\232|\25\377nY\17\377M>\12\377XXX\377\344\276;\377\25\21\3\372\0"
+  "\0\0\234\0\0\0I\0\0\0\17\0\0\0\13\0\0\0\377\326\266D\337\347\307X\377"
+  "\341\270*\377\315\245\34\377\277\232\32\377\261\217\30\377\243\203\26"
+  "\377\225x\24\377\211n\22\377\211n\22\377\211n\22\377\211n\22\377\211"
+  "n\22\377\205k\22\377A4\10\377KKK\377ttt\377\234\177\30\370\0\0\0\364"
+  "\0\0\0U\0\0\0+\0\0\0\7\0\0\0\206\317\247\34\377\360\336\236\375\356\330"
+  "\213\377\355\324~\377\354\322w\377\353\317n\377\352\314g\377\347\307"
+  "X\377\343\2758\377\343\2744\377\343\2744\377\343\2744\377\343\2744\377"
+  "\341\267&\377\264\222\31\377^L\15\377^^^\377\344\300A\377\25\21\3\372"
+  "\0\0\0\233\0\0\0G\0\0\0\21\0\0\0\1\7\6\1\331\356\326\205\377lW\17\377"
+  "`N\15\377`N\15\377`N\15\377`N\15\377`N\15\377`N\15\377`N\15\377`N\15"
+  "\377`N\15\377`N\15\377`N\15\377`N\15\377]K\14\377ccc\377xxx\377\250\210"
+  "\27\377\0\0\0\365\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\32\25\3\377\344\277\77"
+  "\377s]\20\377___\373ttt\377\226\226\226\377\261\261\261\377\257\257\257"
+  "\377\305\305\305\377\316\316\316\377\272\272\272\377\302\302\302\377"
+  "\303\303\303\377\313\313\313\377\322\322\322\377\332\332\332\377\225"
+  "\225\225\377\342\2721\377,#\6\371\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0"
+  "\0\0\0\26\22\3\377\330\256\35\377\230{\25\377~~~\377\344\344\344\377"
+  "\344\344\344\377\341\341\341\377\337\337\337\377\337\337\337\377\362"
+  "\362\362\377\375\375\375\377\363\363\363\377\363\363\363\377\363\363"
+  "\363\377\250\250\250\377\265\265\265\377mmm\377\250\210\27\377\1\1\0"
+  "\370\0\0\0U\0\0\0*\0\0\0\6\0\0\0\0\0\0\0\0A4\10\377\310\241\33\377\330"
+  "\256\35\377\273\227\32\377\245\205\26\377\333\333\333\377\352\352\352"
+  "\377\357\357\357\377\357\357\357\377\346\346\346\377\336\336\336\377"
+  "\341\341\341\377\341\341\341\377\337\337\337\377\342\342\342\377zzz\377"
+  "\343\275:\377-%\7\367\0\0\0\234\0\0\0I\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0"
+  "\0\0\0\0""9\0\0\0\377\13\10\1\354~e\25\363\243\206!\351\260\220\40\357"
+  "\272\226\31\377\301\234\32\377\227\227\227\377\334\334\334\377\345\345"
+  "\345\377\353\353\353\377\371\371\371\377\371\371\371\377\205\205\205"
+  "\377\246\246\246\377\350\310[\377\2\2\0\370\0\0\0U\0\0\0*\0\0\0\7\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0&\0\0\0e\0\0\0\276\0\0\0\346\0\0\0"
+  "\360\0\0\0\363\202i\24\371\224w\26\371\262\220\35\367\266\224\36\366"
+  "\275\231\32\377\355\325\200\377\340\340\340\377\352\352\352\377\350\310"
+  "[\3770&\6\373\0\0\0\234\0\0\0H\0\0\0\22\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\6\0\0\0\17\0\0\0\34\0\0\0""4\0\0\0C\0\0\0g\0\0\0\251"
+  "\0\0\0\344\0\0\0\361\0\0\0\356iU\21\365\207n\25\371\245\206\31\372\257"
+  "\215\33\367\250\211\36\357\4\3\0\367\0\0\0U\0\0\0+\0\0\0\7\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12\0\0\0"
+  "\15\0\0\0\20\0\0\0\33\0\0\0""0\0\0\0C\0\0\0_\0\0\0\235\0\0\0\327\0\0"
+  "\0\356\0\0\0\354\0\0\0\347\0\0\0{\0\0\0F\0\0\0\21\0\0\0\1\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\3\0\0\0\10\0\0\0\15\0\0\0\20\0\0\0\30\0\0\0,\0\0\0\77"
+  "\0\0\0H\0\0\0H\0\0\0@\0\0\0\37\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\7\0\0\0\13\0\0\0\16\0\0"
+  "\0\16\0\0\0\14\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_line_in)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_line_in[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_line_in[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0-..\257###\377\10\10\10x\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\25\25\25\377\345\345\346\377###\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0fff\315\356\356\356\377MMM\217\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\2\2\2\337\277\277\277\377\3\3\3\325\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\33\0\0\0i\0\0\0s\0\0\0_\0\0"
+  "\0=\0\0\0!\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\21"
+  "\21\22\377\354\354\355\377\22\22\22\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0`\0\0\0\262\216\216\216\260\210\210\210"
+  "\233TTT\210$$$v\0\0\0b\0\0\0F\0\0\0&\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0$$%\243\273\273\273\377\0\0\0O\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\212lll\326\316\316\316\311\245\245\245\274\0"
+  "\0\0\242\0\0\0\214\0\0\0v\0\0\0U\0\0\0;\0\0\0+\0\0\0\"\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\352\352\352\377\0\0\0\377\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\230mmm\347\316\316\316\345\10\10\10"
+  "\313\10\10\10\231\0\0\0G\0\0\0=\0\0\0""1\0\0\0:\0\0\0""2\0\0\0#\0\0\0"
+  "\37\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377RRR\377\332\332\334\377===\377\0"
+  "\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\343\265\265\265\363KK"
+  "K\351\0\0\0M\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\33"
+  "\0\0\0\35\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\373\373\373\377\234\233"
+  "\234\377\324\324\324\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\231"
+  "GGG\361\244\244\244\365\0\0\0\242\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\31\0\0\0\0\0\0\0\0\0\0\0\377\221\221"
+  "\221\377===\377===\377\36\36\36\377\77\77\77\377\0\0\0\377\0\0\0\0\0"
+  "\0\0\0\0\0\0\331___\367###\362\0\0\0B\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\377\221"
+  "\221\221\377===\377===\377\36\36\36\377BBB\377\0\0\0\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\342SSS\355\0\0\0\353\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\221\221\221\377===\377===\377\36\36\36\377BBB\377\0\0\0\377\0\0\0\0"
+  "\0\0\0\0\0\0\0\330SSS\353\0\0\0\355\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\377\221\221\221\377===\377===\377\36\36\36\377BBB\377\0\0\0\377\0\0"
+  "\0\0\0\0\0\0\0\0\0\262'''\332\"\"\"\367\0\0\0<\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\377\221\221\221\377===\377===\377\36\36\36\377BBB\377\0\0\0\377"
+  "\0\0\0\0\0\0\0\0\0\0\0D\0\0\0\315UUU\362\0\0\0\313\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\221\221\221\377===\377===\377\36\36\36\377EEE\377\0\0\0"
+  "\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\241LLL\322FFF\336\0\0\0\234\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\377AAA\377ddd\377%%%\377,,,\377<<<\377\0\0\0\377\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\35\0\0\0\236XXX\257FFF\273\0\0\0q\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\377\25\25\25\377\7\7\7\377(((\377\0\0\0\377\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\205ZZZ\233\0\0\0\236\0\0\0b\0\0"
+  "\0\"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\377+++\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0cXXX{\0\0\0{\0\0\0""3\0\0\0%\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\324"
+  "+++\324\0\0\0\324\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0""7\0\0\0T\0\0\0_\0\0\0^\0\0\0#\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\252+++\252\0\0\0\252"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\13\0\0\0@\0\0\0F\0\0\0J\0\0\0""2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\177+++\177\0\0\0\177\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""1"
+  "\0\0\0:\7\7\7@\0\0\0,\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0U+++U\0\0\0U\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\27\0\0\0/\0\0\0""2\10\10\10""5\0"
+  "\0\0+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0*+++*\0\0\0*\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\23\0\0\0""0\0\0\0-\14\14\14-\0\0\0+\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_mail)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_mail[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_mail[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2"
+  "\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0"
+  "\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0f\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0"
+  "\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377SSS\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\376\376\376\377"
+  "\375\375\375\377\374\374\374\377\373\373\373\377\371\371\371\377\370"
+  "\370\370\377\367\367\367\377\366\366\366\377\365\365\365\377\364\364"
+  "\364\377\343\343\343\377SSS\377\0\0\0\377\0\0\0\31\0\0\0\10\0\0\0\1\0"
+  "\0\0\0\0\0\0\2\0\0\0\377\356\356\356\377OOO\377\377\377\377\377\365\365"
+  "\365\377\364\364\364\377\363\363\363\377\362\362\362\377\362\362\362"
+  "\377\361\361\361\377\360\360\360\377\360\360\360\377\357\357\357\377"
+  "\356\356\356\377\355\355\355\377\343\343\343\377OOO\377\256\256\256\377"
+  "\0\0\0\377\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377"
+  "\377\377\344\344\344\377CCC\377\375\375\375\377\363\363\363\377\362\362"
+  "\362\377\362\362\362\377\361\361\361\377\360\360\360\377\357\357\357"
+  "\377\356\356\356\377\356\356\356\377\355\355\355\377\343\343\343\377"
+  "OOO\377\254\254\254\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0"
+  "\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\344\344"
+  "\344\377OOO\377\373\373\373\377\361\361\361\377\360\360\360\377\360\360"
+  "\360\377\357\357\357\377\356\356\356\377\355\355\355\377\355\355\355"
+  "\377\343\343\343\377CCC\377\240\240\240\377\324\324\324\377\310\310\310"
+  "\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377"
+  "\377\377\377\373\373\373\377\365\365\365\377\344\344\344\377CCC\377\370"
+  "\370\370\377\360\360\360\377\357\357\357\377\356\356\356\377\355\355"
+  "\355\377\354\354\354\377\343\343\343\377OOO\377\225\225\225\377\324\324"
+  "\324\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0"
+  "\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365"
+  "\365\365\377\365\365\365\377\344\344\344\377>>>\377\365\365\365\377\356"
+  "\356\356\377\355\355\355\377\354\354\354\377\343\343\343\377MMM\377\201"
+  "\201\201\377\306\306\306\377\344\344\344\377\344\344\344\377\310\310"
+  "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377"
+  "\377\377\377\377\373\373\373\377\365\365\365\377\365\365\365\377\344"
+  "\344\344\377jjj\377CCC\377\363\363\363\377\354\354\354\377\343\343\343"
+  "\377OOO\377jjj\377\306\306\306\377\306\306\306\377\365\365\365\377\344"
+  "\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0"
+  "\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365\365\365\377"
+  "\344\344\344\377ccc\377\377\377\377\377\271\271\271\377OOO\377\360\360"
+  "\360\377OOO\377\225\225\225\377\306\306\306\377sss\377\306\306\306\377"
+  "\365\365\365\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0"
+  "\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377"
+  "\344\344\344\377ccc\377\377\377\377\377\365\365\365\377\344\344\344\377"
+  "\324\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344\344\377"
+  "\344\344\344\377|||\377\344\344\344\377\344\344\344\377\310\310\310\377"
+  "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377"
+  "\377\377\344\344\344\377sss\377\377\377\377\377\365\365\365\377\365\365"
+  "\365\377\365\365\365\377\365\365\365\377\344\344\344\377\344\344\344"
+  "\377\365\365\365\377\365\365\365\377\365\365\365\377\344\344\344\377"
+  "|||\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0"
+  "\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377|||\377\377\377\377\377"
+  "\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344"
+  "\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344"
+  "\344\377\344\344\344\377\344\344\344\377\344\344\344\377|||\377\310\310"
+  "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377"
+  "sss\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377"
+  "\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274"
+  "\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274"
+  "\274\377\274\274\274\377\274\274\274\377ccc\377\0\0\0\377\0\0\0-\0\0"
+  "\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0m\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\207\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\1\0\0\0\10\0\0\0\31"
+  "\0\0\0(\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0"
+  "-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0(\0\0\0\31\0\0\0\10"
+  "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\16\0\0\0\21\0\0\0\21"
+  "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0"
+  "\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\16\0\0\0\10\0"
+  "\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0"
+  "\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0"
+  "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_mail_compose)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_mail_compose[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_mail_compose[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\321\257"
+  "a\377\361\343\254\377\373\251\17\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0V\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\265\265"
+  "\265\377\240k\11\377\361\343\254\377\373\251\17\377\201`\0\377\0\0\0"
+  "\377\340\340\340\377\301\301\301\377\0\0\0\377\0\0\0D\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\364\364\364\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\375\375\375\377\375\375\375\377\0\0\0\377\346\303p\377\361\323\207\377"
+  "\325\217\14\377\0\0\0\377\262\262\262\377\303\303\303\377\373\373\373"
+  "\377\250\250\250\377\0\0\0\377\0\0\0V\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\377\377\377\377\366\366\366\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\375\375\375\377\375\375\375\377\375\375\375\377\263\263"
+  "\263\377\240k\11\377\361\343\254\377\373\251\17\377\201`\0\377\0\0\0"
+  "\377\372\372\372\377\255\255\255\377vvv\377]]]\377@@@\377\0\0\0\377\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\377"
+  "\377\377\377\373\373\373\377\373\373\373\377\373\373\373\377\373\373"
+  "\373\377\370\370\370\377\0\0\0\377\346\303p\377\361\320~\377\325\217"
+  "\14\377\0\0\0\377\254\254\254\377\370\370\366\377\342\342\342\377\205"
+  "\205\205\377KKI\377\26\26\26\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\377\377\377\377\377\364\364\364\377\375\375\375\377\375\375\375"
+  "\377\373\373\373\377\373\373\373\377\373\373\372\377}}}\377\240k\11\377"
+  "\361\343\254\377\373\251\17\377\201`\0\377\0\0\0\377\364\364\364\377"
+  "\362\362\362\377\360\360\360\377\357\357\357\377\325\325\325\377\255"
+  "\255\255\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377"
+  "\377\362\362\362\377\371\371\371\377\366\366\366\377\366\366\366\377"
+  "\366\366\363\377\363\363\363\377\0\0\0\377\346\303p\377\361\320~\377"
+  "\325\217\14\377\0\0\0\377\207\207\206\377\345\345\345\377\342\342\342"
+  "\377\337\337\337\377\353\353\353\377\342\342\342\377\301\301\301\377"
+  "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\360\360"
+  "\360\377\370\370\370\377\370\370\370\377\370\370\370\377\370\370\366"
+  "\377\256\256\256\377{S\7\377\361\343\254\377\373\251\17\377\201`\0\377"
+  "\0\0\0\377\355\355\355\377\353\353\353\377\353\353\351\377\351\351\347"
+  "\377\351\351\347\377\340\340\336\377\277\277\277\377\0\0\0\377\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\357\357\357\377\363\363"
+  "\363\377\360\360\360\377\360\360\355\377\355\355\355\377\0\0\0\377\346"
+  "\303p\377\361\322\204\377\312\207\13\377\0\0\0\377\236\236\234\377\334"
+  "\334\331\377\331\331\331\377\331\331\326\377\326\326\324\377\345\345"
+  "\344\377\331\331\327\377\272\272\272\377\0\0\0\377\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\377\377\377\377\377\355\355\355\377\364\364\364\377\364"
+  "\364\364\377\362\362\362\377\252\252\252\377\240k\11\377\361\343\254"
+  "\377\373\251\17\377\201`\0\377\0\0\0\377\347\347\345\377\345\345\344"
+  "\377\345\345\344\377\344\344\342\377\340\340\336\377\342\342\340\377"
+  "\331\331\327\377\272\272\272\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\377\377\377\377\377\353\353\353\377\356\356\354\377\347\347\345"
+  "\377\345\345\345\377\0\0\0\377\346\303p\377\361\322\204\377\312\207\13"
+  "\377\0\0\0\377\227\227\226\377\324\324\321\377\342\342\340\377\340\340"
+  "\336\377\336\336\334\377\336\336\333\377\336\336\334\377\331\331\327"
+  "\377\275\275\274\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377"
+  "\377\377\377\347\347\347\377\357\357\355\377\353\353\353\377\246\246"
+  "\245\377\272|\12\377\373\251\17\377\373\251\17\377z[\0\377\0\0\0\377"
+  "\342\342\340\377\340\340\336\377\336\336\334\377\336\336\333\377\334"
+  "\334\331\377\333\333\331\377\333\333\331\377\325\325\323\377\274\274"
+  "\274\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377"
+  "\345\345\345\377\343\343\343\377\331\331\331\377\0\0\0\377\362\346\266"
+  "\377{{{\377pK\5\377\0\0\0\377ggd\377\313\313\307\377\311\311\307\377"
+  "\334\334\331\377\333\333\327\377\331\331\327\377\327\327\325\377\331"
+  "\331\327\377\327\327\323\377\264\264\264\377\0\0\0\377\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\377\377\377\342\342\340\377\345\345\344\377"
+  "\344\344\344\377\0\0\0\377\333\325\301\377~oW\377uX\0\377\0\0\0\377\334"
+  "\334\331\377\333\333\331\377\333\333\327\377\331\331\325\377\327\327"
+  "\323\377\325\325\323\377\325\325\321\377\327\327\323\377\320\320\316"
+  "\377\272\272\270\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377"
+  "\377\377\377\336\336\334\377\335\335\333\377\321\321\317\377\16\16\16"
+  "\377SSS\377\0\0\0\377\0\0\0\377\215\215\213\377\304\304\301\377\304\304"
+  "\277\377\301\301\274\377\325\325\321\377\325\325\321\377\323\323\320"
+  "\377\321\321\320\377\323\323\320\377\320\320\316\377\272\272\270\377"
+  "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\334\334"
+  "\333\377\340\340\334\377\335\335\333\377\0\0\0\377\0\0\0\377\211\211"
+  "\207\377\311\311\306\377\315\315\312\377\320\320\315\377\316\316\313"
+  "\377\320\320\315\377\320\320\315\377\320\320\315\377\320\320\315\377"
+  "\317\317\314\377\320\320\315\377\320\320\314\377\266\266\266\377\0\0"
+  "\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\333\333\331"
+  "\377\324\324\320\377\303\303\300\377[[[\377\221\221\215\377\221\221\217"
+  "\377\237\237\235\377\257\257\254\377\271\271\266\377\276\276\273\377"
+  "\303\303\300\377\305\305\302\377\310\310\305\377\312\312\307\377\313"
+  "\313\310\377\314\314\311\377\314\314\310\377\262\262\262\377\0\0\0\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\322\322\320\377\322"
+  "\322\317\377\317\317\314\377\277\277\275\377\237\237\234\377\210\210"
+  "\206\377\207\207\205\377\214\214\212\377\225\225\223\377\234\234\232"
+  "\377\250\250\245\377\261\261\256\377\265\265\263\377\273\273\270\377"
+  "\276\276\273\377\277\277\274\377\302\302\276\377\262\262\262\377\0\0"
+  "\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\321\321\316"
+  "\377\320\320\314\377\314\314\311\377\317\317\314\377\303\303\300\377"
+  "\256\256\253\377\235\235\232\377\227\227\224\377\227\227\224\377\224"
+  "\224\221\377\232\232\227\377\237\237\234\377\243\243\240\377\250\250"
+  "\245\377\252\252\247\377\260\260\254\377\270\270\265\377\260\260\256"
+  "\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\322"
+  "\322\317\377\321\321\316\377\321\321\316\377\321\321\316\377\317\317"
+  "\315\377\313\313\310\377\276\276\274\377\264\264\260\377\254\254\250"
+  "\377\244\244\242\377\240\240\234\377\240\240\234\377\244\244\240\377"
+  "\244\244\242\377\250\250\246\377\253\253\247\377\262\262\256\377\244"
+  "\244\244\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377"
+  "\377\321\321\320\377\321\321\316\377\320\320\316\377\316\316\314\377"
+  "\316\316\312\377\316\316\312\377\314\314\310\377\306\306\302\377\274"
+  "\274\271\377\263\263\257\377\264\264\260\377\253\253\251\377\246\246"
+  "\243\377\240\240\235\377\246\246\243\377\252\252\247\377\254\254\251"
+  "\377\241\241\241\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377"
+  "\377\377\377\261\261\257\377\264\264\263\377\264\264\261\377\264\264"
+  "\261\377\264\264\261\377\263\263\261\377\263\263\261\377\262\262\256"
+  "\377\256\256\252\377\247\247\244\377\242\242\240\377\245\245\241\377"
+  "\245\245\241\377\231\231\227\377\222\222\220\377\224\224\220\377\235"
+  "\235\233\377\205\205\203\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0r\0\0"
+  "\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_mail_forward)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_mail_forward[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_mail_forward[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1"
+  "\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0"
+  "\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2"
+  "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0f\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0m\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377"
+  "SSS\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\376\376\376\377\375\375\375\377\374\374\374\377\373\373\373\377\371"
+  "\371\371\377\370\370\370\377\367\367\367\377\366\366\366\377\365\365"
+  "\365\377\364\364\364\377\343\343\343\377SSS\377\0\0\0\377\0\0\0\31\0"
+  "\0\0\10\0\0\0\1\0\0\0\0\0\0\0\2\0\0\0\377\356\356\356\377OOO\377\377"
+  "\377\377\377\365\365\365\377\364\364\364\377\363\363\363\377\362\362"
+  "\362\377\362\362\362\377\361\361\361\377\360\360\360\377\360\360\360"
+  "\377\357\357\357\377\356\356\356\377\355\355\355\377\343\343\343\377"
+  "OOO\377\256\256\256\377\0\0\0\377\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0"
+  "\0\2\0\0\0\377\377\377\377\377\344\344\344\377CCC\377\375\375\375\377"
+  "\363\363\363\377\362\362\362\377\362\362\362\377\361\361\361\377\360"
+  "\360\360\377\357\357\357\377\356\356\356\377\356\356\356\377\355\355"
+  "\355\377\343\343\343\377OOO\377\254\254\254\377\310\310\310\377\0\0\0"
+  "\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377"
+  "\365\365\365\377\344\344\344\377OOO\377\373\373\373\377\361\361\361\377"
+  "\360\360\360\377\360\360\360\377\357\357\357\377\356\356\356\377\355"
+  "\355\355\377\355\355\355\377\343\343\343\377CCC\377\240\240\240\377\324"
+  "\324\324\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0"
+  "\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377\365\365\365\377"
+  "\344\344\344\377CCC\377\370\370\370\377\360\360\360\377\357\357\357\377"
+  "\356\356\356\377\355\355\355\377\354\354\354\377\343\343\343\377OOO\377"
+  "\225\225\225\377\324\324\324\377\344\344\344\377\310\310\310\377\0\0"
+  "\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377"
+  "\377\365\365\365\377\365\365\365\377\365\365\365\377\344\344\344\377"
+  ">>>\377\365\365\365\377\356\356\356\377\355\355\355\377\354\354\354\377"
+  "\343\343\343\377MMM\377\201\201\201\377\306\306\306\377\344\344\344\377"
+  "\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0"
+  "\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377\365\365\365"
+  "\377\365\365\365\377\344\344\344\377jjj\377CCC\377\363\363\363\377\354"
+  "\354\354\377\343\343\343\377OOO\377jjj\377\306\306\306\377\306\306\306"
+  "\377\365\365\365\377\0\0\0\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0"
+  "\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377"
+  "\365\365\365\377\344\344\344\377ccc\377\377\377\377\377\271\271\271\377"
+  "OOO\377\360\360\360\377OOO\377\225\225\225\377\306\306\306\377sss\377"
+  "\306\306\306\377\365\365\365\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0"
+  "-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373"
+  "\373\377\344\344\344\377ccc\377\377\377\377\377\365\365\365\377\344\344"
+  "\344\377\324\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344"
+  "\344\377\344\344\344\377|||\377\344\344\344\377\0\0\0\377[\210\262\377"
+  "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377"
+  "\377\377\344\344\344\377sss\377\377\377\377\377\365\365\365\377\365\365"
+  "\365\377\365\365\365\377\365\365\365\377\344\344\344\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\236\270\321"
+  "\377P\200\255\377\0\0\0\377\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377"
+  "\377\377\377\377|||\377\377\377\377\377\344\344\344\377\344\344\344\377"
+  "\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\0\0"
+  "\0\377\265\311\334\377\257\305\332\377\262\307\333\377\266\312\335\377"
+  "\266\312\335\377\266\312\335\377\244\275\325\377\234\267\321\377P\200"
+  "\255\377\10\15\21\377\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377sss\377\274\274"
+  "\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274"
+  "\377\274\274\274\377\274\274\274\377\274\274\274\377\0\0\0\377\233\266"
+  "\320\377\240\272\323\377\234\267\321\377\234\267\321\377\233\266\320"
+  "\377\232\265\317\377\240\272\323\377\234\267\321\377\227\263\316\377"
+  "_\213\264\377\0\0\0\377\0\0\0\0\0\0\0\2\0\0\0m\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\221\260\314\377\236\270\321\377\232\265\317\377\232\265\317"
+  "\377\233\266\320\377\234\267\321\377\234\267\321\377\234\267\321\377"
+  "\240\272\323\377\225\262\316\377Ly\243\377\0\0\0\377\0\0\0\1\0\0\0\10"
+  "\0\0\0\31\0\0\0(\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0"
+  "\0\377It\234\377\77e\210\377\77e\210\377\77e\210\377\77e\210\377\77e"
+  "\210\377\77e\210\377\77e\210\377\77e\210\377*C[\377\0\0\0\377\0\0\0\0"
+  "\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\16\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21"
+  "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\377Eo\226\3777Yx\3777Yx\3777Yx\377"
+  "7Yx\3777Yx\377\77e\210\377\77e\210\377*C[\377\0\0\0\377\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0"
+  "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\77e\210\377*C[\377\0\0\0\377\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\377*C[\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_mail_receive)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_mail_receive[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_mail_receive[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\377\311\333\307\377\311\332\307\377\311\332\307\377\201\232y\377"
+  "XuM\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\377\262\311\260\377\251\304\247\377\255\310\253"
+  "\377[yP\377MgD\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\273\320\271\377\256\307\254\377"
+  "\256\307\254\377[yP\377MgD\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\324\0\0\0\377\0\0\0\377\0\0\0\377\271\316\267"
+  "\377\256\307\254\377\252\307\250\377[yP\377MgD\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\315\336\313"
+  "\377\261\311\260\377\265\316\265\377\260\311\260\377\255\306\253\377"
+  "[yP\377[yP\377[yP\377MhD\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0"
+  "\0\0\2\0\0\0\2\0\0\0\377\315\336\313\377\264\313\262\377\263\312\261"
+  "\377\255\306\253\377[yP\377[yP\377MhD\377\0\0\0\377\0\0\0\2\0\0\0\2\0"
+  "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "f\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\315\336"
+  "\313\377\252\307\250\377\260\307\256\377[yP\377MhD\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0\0\0\10\0\0\0"
+  "\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377SSS\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\376\376\376\377\0\0\0\377\315\336"
+  "\313\377\255\310\253\377TqJ\377\0\0\0\377\367\367\367\377\366\366\366"
+  "\377\365\365\365\377\364\364\364\377\343\343\343\377SSS\377\0\0\0\377"
+  "\0\0\0\31\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\2\0\0\0\377\356\356\356\377"
+  "OOO\377\377\377\377\377\365\365\365\377\364\364\364\377\363\363\363\377"
+  "\362\362\362\377\0\0\0\377\317\337\314\377\0\0\0\377\360\360\360\377"
+  "\357\357\357\377\356\356\356\377\355\355\355\377\343\343\343\377OOO\377"
+  "\256\256\256\377\0\0\0\377\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\2\0"
+  "\0\0\377\377\377\377\377\344\344\344\377CCC\377\375\375\375\377\363\363"
+  "\363\377\362\362\362\377\362\362\362\377\361\361\361\377---\377\357\357"
+  "\357\377\356\356\356\377\356\356\356\377\355\355\355\377\343\343\343"
+  "\377OOO\377\254\254\254\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21"
+  "\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\344"
+  "\344\344\377OOO\377\373\373\373\377\361\361\361\377\360\360\360\377\360"
+  "\360\360\377\357\357\357\377\356\356\356\377\355\355\355\377\355\355"
+  "\355\377\343\343\343\377CCC\377\240\240\240\377\324\324\324\377\310\310"
+  "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377"
+  "\377\377\377\377\373\373\373\377\365\365\365\377\344\344\344\377CCC\377"
+  "\370\370\370\377\360\360\360\377\357\357\357\377\356\356\356\377\355"
+  "\355\355\377\354\354\354\377\343\343\343\377OOO\377\225\225\225\377\324"
+  "\324\324\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21"
+  "\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365"
+  "\365\365\377\365\365\365\377\344\344\344\377>>>\377\365\365\365\377\356"
+  "\356\356\377\355\355\355\377\354\354\354\377\343\343\343\377MMM\377\201"
+  "\201\201\377\306\306\306\377\344\344\344\377\344\344\344\377\310\310"
+  "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377"
+  "\377\377\377\377\373\373\373\377\365\365\365\377\365\365\365\377\344"
+  "\344\344\377jjj\377CCC\377\363\363\363\377\354\354\354\377\343\343\343"
+  "\377OOO\377jjj\377\306\306\306\377\306\306\306\377\365\365\365\377\344"
+  "\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0"
+  "\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365\365\365\377"
+  "\344\344\344\377ccc\377\377\377\377\377\271\271\271\377OOO\377\360\360"
+  "\360\377OOO\377\225\225\225\377\306\306\306\377sss\377\306\306\306\377"
+  "\365\365\365\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0"
+  "\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377"
+  "\344\344\344\377ccc\377\377\377\377\377\365\365\365\377\344\344\344\377"
+  "\324\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344\344\377"
+  "\344\344\344\377|||\377\344\344\344\377\344\344\344\377\310\310\310\377"
+  "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377"
+  "\377\377\344\344\344\377sss\377\377\377\377\377\365\365\365\377\365\365"
+  "\365\377\365\365\365\377\365\365\365\377\344\344\344\377\344\344\344"
+  "\377\365\365\365\377\365\365\365\377\365\365\365\377\344\344\344\377"
+  "|||\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0"
+  "\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377|||\377\377\377\377\377"
+  "\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344"
+  "\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344"
+  "\344\377\344\344\344\377\344\344\344\377\344\344\344\377|||\377\310\310"
+  "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377"
+  "sss\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377"
+  "\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274"
+  "\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274"
+  "\274\377\274\274\274\377\274\274\274\377ccc\377\0\0\0\377\0\0\0-\0\0"
+  "\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0m\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\207\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\1\0\0\0\10\0\0\0\31"
+  "\0\0\0(\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0"
+  "-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0(\0\0\0\31\0\0\0\10"
+  "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\16\0\0\0\21\0\0\0\21"
+  "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0"
+  "\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\16\0\0\0\10\0"
+  "\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0"
+  "\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0"
+  "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0"
+  "\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_mail_reply)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_mail_reply[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_mail_reply[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0"
+  "\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2"
+  "\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0f\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0"
+  "\0\0\0\1\0\0\0\377SSS\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\376\376\376\377\375\375\375\377\374\374\374\377"
+  "\373\373\373\377\371\371\371\377\370\370\370\377\367\367\367\377\366"
+  "\366\366\377\365\365\365\377\364\364\364\377\343\343\343\377SSS\377\0"
+  "\0\0\377\0\0\0\31\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\356\356"
+  "\356\377OOO\377\377\377\377\377\365\365\365\377\364\364\364\377\363\363"
+  "\363\377\362\362\362\377\362\362\362\377\361\361\361\377\360\360\360"
+  "\377\360\360\360\377\357\357\357\377\356\356\356\377\355\355\355\377"
+  "\343\343\343\377OOO\377\256\256\256\377\0\0\0\377\0\0\0(\0\0\0\17\0\0"
+  "\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\344\344\344\377CCC\377"
+  "\375\375\375\377\363\363\363\377\362\362\362\377\362\362\362\377\361"
+  "\361\361\377\360\360\360\377\357\357\357\377\356\356\356\377\356\356"
+  "\356\377\355\355\355\377\343\343\343\377OOO\377\254\254\254\377\310\310"
+  "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377"
+  "\377\377\377\377\365\365\365\377\344\344\344\377OOO\377\373\373\373\377"
+  "\361\361\361\377\360\360\360\377\360\360\360\377\357\357\357\377\356"
+  "\356\356\377\355\355\355\377\355\355\355\377\343\343\343\377CCC\377\240"
+  "\240\240\377\324\324\324\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21"
+  "\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377\365"
+  "\365\365\377\344\344\344\377CCC\377\370\370\370\377\360\360\360\377\357"
+  "\357\357\377\356\356\356\377\355\355\355\377\354\354\354\377\343\343"
+  "\343\377OOO\377\225\225\225\377\324\324\324\377\344\344\344\377\310\310"
+  "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377"
+  "\377\377\377\377\365\365\365\377\365\365\365\377\365\365\365\377\344"
+  "\344\344\377>>>\377\365\365\365\377\356\356\356\377\355\355\355\377\354"
+  "\354\354\377\343\343\343\377MMM\377\201\201\201\377\306\306\306\377\344"
+  "\344\344\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21"
+  "\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377=\32"
+  "\23\377\365\365\365\377\344\344\344\377jjj\377CCC\377\363\363\363\377"
+  "\354\354\354\377\343\343\343\377OOO\377jjj\377\306\306\306\377\306\306"
+  "\306\377\365\365\365\377\344\344\344\377\310\310\310\377\0\0\0\377\0"
+  "\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\0\0"
+  "\0\377\0\0\0\377\344\344\344\377ccc\377\377\377\377\377\271\271\271\377"
+  "OOO\377\360\360\360\377OOO\377\225\225\225\377\306\306\306\377sss\377"
+  "\306\306\306\377\365\365\365\377\344\344\344\377\310\310\310\377\0\0"
+  "\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\0\0\0\377\352"
+  "\300\272\377\0\0\0\377ccc\377\377\377\377\377\365\365\365\377\344\344"
+  "\344\377\324\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344"
+  "\344\377\344\344\344\377|||\377\344\344\344\377\344\344\344\377\310\310"
+  "\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377"
+  "\352\300\272\377\337\236\225\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\344\344\344\377\365\365\365\377\365"
+  "\365\365\377\365\365\365\377\344\344\344\377|||\377\344\344\344\377\310"
+  "\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\0\0\0\0\377\352"
+  "\300\272\377\340\241\230\377\341\245\235\377\342\247\236\377\343\253"
+  "\243\377\342\247\236\377\343\252\242\377\337\236\225\377\314bS\377\0"
+  "\0\0\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344"
+  "\377\344\344\344\377\344\344\344\377|||\377\310\310\310\377\0\0\0\377"
+  "\0\0\0-\0\0\0\21\0\0\0\0\0\0\0\377\352\300\272\377\335\227\215\377\337"
+  "\237\227\377\337\236\225\377\336\232\220\377\335\226\214\377\335\226"
+  "\214\377\336\232\220\377\335\224\212\377\261C4\377\0\0\0\377\274\274"
+  "\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274"
+  "\377\274\274\274\377\274\274\274\377ccc\377\0\0\0\377\0\0\0-\0\0\0\21"
+  "C\31\23\377\352\302\274\377\336\232\220\377\337\234\222\377\335\231\217"
+  "\377\335\231\217\377\335\227\215\377\336\232\220\377\336\232\220\377"
+  "\336\232\220\377\336\232\220\377\265E5\377\0\0\0\377\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\207\0\0\0(\0\0\0\17\0\0\0\0\0\0\0\377e&\35\377\230:,\377\230:,\377"
+  "\230:,\377\230:,\377\230:,\377\230:,\377\230:,\377\230:,\377|/$\377\0"
+  "\0\0\377\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0"
+  "\0(\0\0\0\31\0\0\0\10\0\0\0\0\0\0\0\0\0\0\0\377e&\35\377\230:,\377\230"
+  ":,\377c%\35\377c%\35\377c%\35\377c%\35\377c%\35\377l)\37\377\0\0\0\377"
+  "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0"
+  "\21\0\0\0\16\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377e&\35"
+  "\377\230:,\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0"
+  "\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\377e&\35\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_mail_send)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_mail_send[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_mail_send[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0O\77\12\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\364\346\265\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\364\345"
+  "\263\377\355\326\204\377u_\20\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\364\345"
+  "\263\377\355\325\200\377\356\326\205\377\257\215\30\377u_\20\377\0\0"
+  "\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\377\364\345\263\377\357\331\214\377\356\330\213\377\355\325\202"
+  "\377\257\215\30\377\257\215\30\377u_\20\377\0\0\0\377\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\377\364\345\263\377\356\330\211\377"
+  "\357\332\222\377\356\330\211\377\355\325\202\377\257\215\30\377\257\215"
+  "\30\377\257\215\30\377u_\20\377\0\0\0\377\0\0\0\2\0\0\0\2\0\0\0\2\0\0"
+  "\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0f\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\360\333\223\377\355\326\204"
+  "\377\355\325\200\377\257\215\30\377s]\20\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0\0\0\10\0\0\0\2\0\0\0\0"
+  "\0\0\0\0\0\0\0\1\0\0\0\377SSS\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\0\0\0\377\360\334\227\377\355\326\204\377"
+  "\355\326\204\377\257\215\30\377s]\20\377\0\0\0\377\366\366\366\377\365"
+  "\365\365\377\364\364\364\377\343\343\343\377SSS\377\0\0\0\377\0\0\0\31"
+  "\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\2\0\0\0\377\356\356\356\377OOO\377\377"
+  "\377\377\377\365\365\365\377\364\364\364\377\0\0\0\377\356\330\211\377"
+  "\355\323|\377\355\326\204\377\257\215\30\377s]\20\377\0\0\0\377\356\356"
+  "\356\377\355\355\355\377\343\343\343\377OOO\377\256\256\256\377\0\0\0"
+  "\377\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377"
+  "\344\344\344\377CCC\377\375\375\375\377\363\363\363\377\0\0\0\377\344"
+  "\277=\377\313\244\34\377\321\250\34\377\220t\23\377|d\21\377\0\0\0\377"
+  "\355\355\355\377\343\343\343\377OOO\377\254\254\254\377\310\310\310\377"
+  "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377"
+  "\377\377\365\365\365\377\344\344\344\377OOO\377\373\373\373\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\343"
+  "\343\343\377CCC\377\240\240\240\377\324\324\324\377\310\310\310\377\0"
+  "\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377"
+  "\377\373\373\373\377\365\365\365\377\344\344\344\377CCC\377\370\370\370"
+  "\377\360\360\360\377\357\357\357\377\356\356\356\377\355\355\355\377"
+  "\354\354\354\377\343\343\343\377OOO\377\225\225\225\377\324\324\324\377"
+  "\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0"
+  "\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365\365\365"
+  "\377\365\365\365\377\344\344\344\377>>>\377\365\365\365\377\356\356\356"
+  "\377\355\355\355\377\354\354\354\377\343\343\343\377MMM\377\201\201\201"
+  "\377\306\306\306\377\344\344\344\377\344\344\344\377\310\310\310\377"
+  "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377"
+  "\377\377\373\373\373\377\365\365\365\377\365\365\365\377\344\344\344"
+  "\377jjj\377CCC\377\363\363\363\377\354\354\354\377\343\343\343\377OO"
+  "O\377jjj\377\306\306\306\377\306\306\306\377\365\365\365\377\344\344"
+  "\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0"
+  "\0\0\2\0\0\0\377\377\377\377\377\365\365\365\377\365\365\365\377\344"
+  "\344\344\377ccc\377\377\377\377\377\271\271\271\377OOO\377\360\360\360"
+  "\377OOO\377\225\225\225\377\306\306\306\377sss\377\306\306\306\377\365"
+  "\365\365\377\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21"
+  "\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\373\373\373\377\344"
+  "\344\344\377ccc\377\377\377\377\377\365\365\365\377\344\344\344\377\324"
+  "\324\324\377OOO\377\254\254\254\377\306\306\306\377\344\344\344\377\344"
+  "\344\344\377|||\377\344\344\344\377\344\344\344\377\310\310\310\377\0"
+  "\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377"
+  "\377\344\344\344\377sss\377\377\377\377\377\365\365\365\377\365\365\365"
+  "\377\365\365\365\377\365\365\365\377\344\344\344\377\344\344\344\377"
+  "\365\365\365\377\365\365\365\377\365\365\365\377\344\344\344\377|||\377"
+  "\344\344\344\377\310\310\310\377\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0"
+  "\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377|||\377\377\377\377\377\344\344"
+  "\344\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344"
+  "\377\344\344\344\377\344\344\344\377\344\344\344\377\344\344\344\377"
+  "\344\344\344\377\344\344\344\377\344\344\344\377|||\377\310\310\310\377"
+  "\0\0\0\377\0\0\0-\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\2\0\0\0\377sss\377\274"
+  "\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274"
+  "\274\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274"
+  "\377\274\274\274\377\274\274\274\377\274\274\274\377\274\274\274\377"
+  "\274\274\274\377\274\274\274\377ccc\377\0\0\0\377\0\0\0-\0\0\0\21\0\0"
+  "\0\2\0\0\0\0\0\0\0\2\0\0\0m\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\207"
+  "\0\0\0(\0\0\0\17\0\0\0\2\0\0\0\0\0\0\0\1\0\0\0\10\0\0\0\31\0\0\0(\0\0"
+  "\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0"
+  "\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0-\0\0\0(\0\0\0\31\0\0\0\10\0\0\0\1\0"
+  "\0\0\0\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\16\0\0\0\21\0\0\0\21\0\0\0\21\0"
+  "\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21"
+  "\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\21\0\0\0\16\0\0\0\10\0\0\0\2\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0"
+  "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0"
+  "\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_menu_about)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_menu_about[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_menu_about[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (1024) */
+  "\0\0\4\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (64) */
+  "\0\0\0@"
+  /* width (16) */
+  "\0\0\0\20"
+  /* height (16) */
+  "\0\0\0\20"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!\"\10\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0LN\23l\0\0\0\377\25\26\6#\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\11\0\0\0\377\356\366>\377\0\0\0\377\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\21\4\7dg\32"
+  "x\0\0\0\377\0\0\0\377\352\361=\377\360\370\77\377\313\3225\370\0\0\0"
+  "\377\0\0\0\377JL\23k\0\0\0\0\20\21\4\0dg\32\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\34\35\7\0\0\0\0\377\360\370\77\377\360\370\77\377\360\370\77\377\360"
+  "\370\77\377\360\370\77\377\360\370\77\377\351\360=\377\0\0\0\377\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\37\37\10%\0\0\0"
+  "\377\360\370\77\377\360\370\77\377\360\370\77\377\360\370\77\377\345"
+  "\354<\377\0\0\0\377\5\5\1\7\0\0\0\0\0\0\0\0\37\37\10\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\350\360=\377\360\370\77\377\360"
+  "\370\77\377\360\370\77\377\253\260-\372\0\0\0\377\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\360\370"
+  "\77\377\354\363>\377\0\0\0\377\357\367\77\377\316\3266\377\0\0\0\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\377\264\272/\363\0\0\0\377\30\30\6\77\0\0\0\377\315\3245\375"
+  "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\36\37\10g\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\26\27\5F\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_menu_blank)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_menu_blank[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_menu_blank[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (1024) */
+  "\0\0\4\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (64) */
+  "\0\0\0@"
+  /* width (16) */
+  "\0\0\0\20"
+  /* height (16) */
+  "\0\0\0\20"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_scores)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_scores[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_scores[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\4\0\0\0\4\0\0"
+  "\0\3\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\215\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\227\0\0\0\22\0\0\0\6\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\2\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\341\341\341\377\0\0\0\377\0\0\0""2\0\0\0\22\0\0\0\2\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\377\377\377\377\377\353"
+  "\353\353\377\0\0\0\377\355\355\355\377\322\322\322\377\0\0\0\377\0\0"
+  "\0L\0\0\0\34\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0"
+  "\0\377\377\377\377\377\0\0\0\377\0\0\0\377\356\356\356\377\322\322\322"
+  "\377\0\0\0\377\0\0\0T\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\3\0"
+  "\0\0\4\0\0\0\10\0\0\0\377\377\377\377\377\355\355\355\377\0\0\0\377\357"
+  "\357\357\377\323\323\323\377\0\0\0\377\0\0\0U\0\0\0\40\0\0\0\4\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\215\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377"
+  "\377\356\356\356\377\0\0\0\377\360\360\360\377\324\324\324\377\0\0\0"
+  "\377\0\0\0W\0\0\0$\0\0\0\10\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\325\325\325\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\205\0\0\0\20\0\0\0\5\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\377\377\377\377\377\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\355\355\355\377\356\356\356\377\357\357\357\377\361\361"
+  "\361\377\362\362\362\377\363\363\363\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0"
+  "1\0\0\0\21\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\377\377\377"
+  "\377\377\353\353\353\377\354\354\354\377\0\0\0\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\361\361\361\377\363\363\363\377\364\364"
+  "\364\377\365\365\365\377\0\0\0\377\0\0\0\377\0\0\0\377\333\333\333\377"
+  "\0\0\0\377\0\0\0K\0\0\0\34\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0"
+  "\0\0\377\377\377\377\377\0\0\0\377\0\0\0\377\0\0\0\377\357\357\357\377"
+  "\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363\377\365"
+  "\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\0\0\0\377"
+  "\334\334\334\377\0\0\0\377\0\0\0T\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\4\0\0\0\377\377\377\377\377\0\0\0\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\367\367\367\377\370\370\370"
+  "\377\0\0\0\377\0\0\0\377\335\335\335\377\0\0\0\377\0\0\0U\0\0\0\40\0"
+  "\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\377\377\377\377\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\361\361\361\377\362\362\362\377\363\363\363"
+  "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377"
+  "\371\371\371\377\372\372\372\377\0\0\0\377\336\336\336\377\0\0\0\377"
+  "\0\0\0U\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\377\377"
+  "\377\377\377\357\357\357\377\360\360\360\377\361\361\361\377\362\362"
+  "\362\377\363\363\363\377\364\364\364\377\365\365\365\377\366\366\366"
+  "\377\367\367\367\377\370\370\370\377\0\0\0\377\0\0\0\377\0\0\0\377\337"
+  "\337\337\377\0\0\0\377\0\0\0U\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\4\0\0\0\377\341\341\341\377\323\323\323\377\324\324\324\377"
+  "\325\325\325\377\326\326\326\377\327\327\327\377\330\330\330\377\331"
+  "\331\331\377\331\331\331\377\332\332\332\377\333\333\333\377\334\334"
+  "\334\377\335\335\335\377\337\337\337\377\340\340\340\377\0\0\0\377\0"
+  "\0\0T\0\0\0\40\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\254\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\273\0\0\0L\0\0\0\34\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\2\0\0\0\23\0\0\0""5\0\0\0M\0\0\0T\0\0\0U\0\0\0U\0\0\0U\0\0\0U"
+  "\0\0\0U\0\0\0U\0\0\0U\0\0\0U\0\0\0U\0\0\0U\0\0\0U\0\0\0T\0\0\0L\0\0\0"
+  "2\0\0\0\22\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\6\0\0\0\23\0"
+  "\0\0\35\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40"
+  "\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\40\0\0\0\37\0\0\0\34\0\0\0"
+  "\22\0\0\0\6\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0"
+  "\0\0\3\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0"
+  "\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_mic)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_mic[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_mic[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0<\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0<\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<RRR\377\332"
+  "\332\333\377\372\372\373\377\361\361\363\377\370\370\371\377\335\334"
+  "\335\377\0\0\0\377\0\0\0E\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\377\332\331\332\377\363\362\365\377\326\325\334\377\350"
+  "\350\353\377\267\265\275\377\324\322\327\377ifl\377\0\0\0\377\0\0\0\13"
+  "\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\372\372\373\377"
+  "\334\334\342\377\354\353\356\377\301\277\307\377\330\326\333\377\220"
+  "\217\226\377\214\212\217\377\0\0\0\377\0\0\0\26\0\0\0\4\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\363\361\364\377\357\357\362\377\312"
+  "\307\321\377\337\336\343\377\235\234\244\377\275\273\301\377CBF\377\0"
+  "\0\0\377\0\0\0\31\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0\0]\0\0\0\1\0\0\0\377"
+  "\372\372\372\377\324\322\331\377\350\346\353\377\261\260\272\377\311"
+  "\307\316\377tqz\377qpv\377\0\0\0\377\0\0\0\31\0\0\0_\0\0\0J\0\0\0\1\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "]\0\0\0\377\0\0\0\377\0\0\0\377\361\360\363\377\355\354\360\377\303\301"
+  "\312\377\330\326\335\377\214\211\225\377\250\246\257\377226\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0b\0\0\0\7\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377\0\0\0\26\0\0\0\377"
+  "\371\371\372\377\317\316\326\377\344\342\347\377\250\247\261\377\303"
+  "\301\310\377ebl\377aae\377\0\0\0\377\0\0\0\34\0\0\0\377\0\0\0\27\0\0"
+  "\0\12\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\377\0\0\0\25\0\0\0\377\360\356\361\377\353\352\356\377"
+  "\276\273\306\377\325\324\332\377\204\200\214\377\236\235\246\377-,0\377"
+  "\0\0\0\377\0\0\0\32\0\0\0\377\0\0\0\25\0\0\0\6\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24"
+  "\0\0\0\377\370\370\371\377\312\307\321\377\337\336\342\377\234\232\244"
+  "\377\270\266\276\377YW_\377][a\377\0\0\0\377\0\0\0\31\0\0\0\377\0\0\0"
+  "\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24\0\0\0\377\354\352\355\377\343\342\346"
+  "\377\250\247\260\377\307\305\314\377rqx\377\222\220\231\377(&*\377\0"
+  "\0\0\377\0\0\0\31\0\0\0\377\0\0\0\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24\0"
+  "\0\0\377\350\347\352\377\265\263\272\377\314\314\322\377\205\204\212"
+  "\377\245\244\253\377JIO\377MLQ\377\0\0\0\377\0\0\0\31\0\0\0\377\0\0\0"
+  "\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24\0\0\0C\0\0\0\377\206\204\210\37776"
+  ":\377aac\377$#&\377DDI\377\0\0\0\377\0\0\0\232\0\0\0\30\0\0\0\377\0\0"
+  "\0\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\24\0\0\0\6\0\0\0D\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232\0\0\0\32\0\0\0\17\0\0\0\377"
+  "\0\0\0\24\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0k\0\0\0\206\0\0\0\6\0\0\0\3\0\0\0\13\0\0\0"
+  "\26\0\0\0{\0\0\0\32\0\0\0\31\0\0\0\27\0\0\0\17\0\0\0\200\0\0\0m\0\0\0"
+  "\22\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\2\0\0\0o\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0m\0\0\0\13\0"
+  "\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\13\0\0\0\22\0\0\0\24KKK\377"
+  "aaa\377\0\0\0\377\0\0\0\30\0\0\0\25\0\0\0\24\0\0\0\22\0\0\0\13\0\0\0"
+  "\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\4\0\0\0\5KKK\377\177\177"
+  "\177\377\0\0\0\377\0\0\0m\0\0\0;\0\0\0\6\0\0\0\5\0\0\0\2\0\0\0\33\0\0"
+  "\0]\0\0\0\34\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0KKK\377\177\177\177\377"
+  "\0\0\0\377\0\0\0\32\0\0\0\12\0\0\0L\0\0\0\2\0\0\0\0\0\0\0I\0\0\0\4\0"
+  "\0\0M\0\0\0\37\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""3\40\40\40\377hhh\377\0\0\0"
+  "\377\0\0\0G\0\0\0\7\0\0\0\2\0\0\0k\0\0\0]\0\0\0\2\0\0\0\5\0\0\0\3\0\0"
+  "\0l\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\\\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377gd[\377\0\0\0\377VRH\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0`\0\0\0"
+  "\2\0\0\0o\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\33\33\33\377\257\255"
+  "\251\377\205\202{\377wtl\377VRH\377VRH\377VRH\377VRH\377VRH\377VRH\377"
+  "VRH\377VRH\377VRH\377LI@\377;:2\377\40\37\32\377\0\0\0\377\0\0\0\14\0"
+  "\0\0\37\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\27\0\0\0\5\0\0\0K\0\0\0W\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\4\0\0\0\25\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0"
+  "\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31\0\0\0\31"
+  "\0\0\0\31\0\0\0\25\0\0\0\4\0\0\0\1\0\0\0\5"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_multiple_file)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_multiple_file[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_multiple_file[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (4096) */
+  "\0\0\20\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (128) */
+  "\0\0\0\200"
+  /* width (32) */
+  "\0\0\0\40"
+  /* height (32) */
+  "\0\0\0\40"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\33\0\0\0\14\0\0\0\2\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\340\340\340\377"
+  "\301\301\301\377\0\0\0\377\0\0\0+\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\377\377\377\377\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0-\0"
+  "\0\0\16\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\340\340\340\377\301\301\301\377\0\0\0\377\0\0\0"
+  "-\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\375\375\375\377\373\373\373\377"
+  "\372\372\371\377\303\303\303\377\373\373\373\377\250\250\250\377\0\0"
+  "\0\377\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\4\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\33\0\0\0\14\0\0\0\2\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\340\340\340\377\301\301"
+  "\301\377\0\0\0\377\0\0\0+\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\377\377\377\377\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\0\0\0\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\375\375\375\377\373\373\373\377\372"
+  "\372\371\377\303\303\303\377\373\373\373\377\250\250\250\377\0\0\0\377"
+  "\0\0\0-\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\0\0\0\377\377\377\377\377\377\377\377\377\321\321\321\377"
+  "\252\252\252\377\323\323\323\377\377\377\377\377\323\323\323\377\377"
+  "\377\377\377\252\252\252\377\252\252\252\377\375\375\375\377\320\320"
+  "\320\377\372\372\372\377\371\371\370\377\367\367\366\377\255\255\255"
+  "\377vvv\377]]]\377@@@\377\0\0\0\377\0\0\0+\0\0\0\14\0\0\0\0\0\0\0\377"
+  "\377\377\377\377\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\375\375\375\377\374\374\374\377\0\0\0\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\376\376\376\377\374\374\374\377"
+  "\373\373\372\377\371\371\371\377\367\367\367\377\366\366\365\377\364"
+  "\364\364\377\342\342\342\377\205\205\205\377KKI\377\26\26\26\377\0\0"
+  "\0\377\0\0\0N\0\0\0\33\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377"
+  "\377\377\377\376\376\376\377\374\374\374\377\373\373\372\377\371\371"
+  "\371\377\0\0\0\377\377\377\377\377\377\377\377\377\252\252\252\377\271"
+  "\271\271\377\323\323\323\377\323\323\323\377\376\376\376\377\250\250"
+  "\250\377\236\236\236\377\235\235\235\377\245\245\244\377\366\366\366"
+  "\377\243\243\242\377\311\311\310\377\362\362\361\377\360\360\357\377"
+  "\356\356\355\377\355\355\353\377\235\235\235\377\0\0\0\377\0\0\0]\0\0"
+  "\0#\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\373\373"
+  "\373\377\371\371\371\377\370\370\367\377\366\366\366\377\0\0\0\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\375\375\375\377\373\373\373\377\372\372\371\377\370\370\370"
+  "\377\367\367\366\377\365\365\364\377\364\364\363\377\362\362\361\377"
+  "\360\360\357\377\357\357\356\377\355\355\354\377\354\354\352\377\352"
+  "\352\350\377\244\244\243\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377"
+  "\377\377\377\377\0\0\0\377\377\377\377\377\370\370\370\377\367\367\366"
+  "\377\365\365\364\377\364\364\363\377\0\0\0\377\377\377\377\377\377\377"
+  "\377\377\252\252\252\377\321\321\321\377\374\374\374\377\316\316\316"
+  "\377\371\371\370\377\244\244\244\377\243\243\243\377\232\232\231\377"
+  "\257\257\256\377\361\361\360\377\237\237\236\377rrq\377\225\225\224\377"
+  "\223\223\223\377\351\351\347\377\347\347\346\377\244\244\244\377\0\0"
+  "\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377"
+  "\377\377\377\365\365\365\377\364\364\363\377\362\362\361\377\361\361"
+  "\360\377\0\0\0\377\377\377\377\377\376\376\376\377\374\374\374\377\373"
+  "\373\372\377\371\371\371\377\367\367\367\377\366\366\365\377\364\364"
+  "\364\377\363\363\362\377\361\361\360\377\360\360\356\377\356\356\355"
+  "\377\354\354\353\377\353\353\351\377\351\351\350\377\350\350\346\377"
+  "\346\346\344\377\345\345\343\377\242\242\242\377\0\0\0\377\0\0\0_\0\0"
+  "\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\363\363"
+  "\362\377\361\361\360\377\360\360\356\377\356\356\355\377\0\0\0\377\377"
+  "\377\377\377\373\373\373\377\264\264\264\377\263\263\263\377\366\366"
+  "\366\377\261\261\261\377\260\260\257\377\230\230\230\377\227\227\226"
+  "\377\356\356\355\377oon\377nnn\377nnm\377mml\377llk\377kkj\377\343\343"
+  "\341\377\342\342\340\377\242\242\242\377\0\0\0\377\0\0\0_\0\0\0$\0\0"
+  "\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\360\360\357"
+  "\377\356\356\355\377\355\355\353\377\353\353\352\377\0\0\0\377\377\377"
+  "\377\377\370\370\370\377\367\367\366\377\365\365\364\377\364\364\363"
+  "\377\362\362\361\377\360\360\357\377\357\357\356\377\355\355\354\377"
+  "\354\354\352\377nnm\377\207\226\245\377\206\226\244\377\205\225\243\377"
+  "\205\224\243\377jji\377\341\341\336\377\337\337\335\377\243\243\242\377"
+  "\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377"
+  "\377\377\377\377\355\355\354\377\354\354\352\377\352\352\350\377\351"
+  "\351\347\377\0\0\0\377\377\377\377\377\365\365\365\377\261\261\260\377"
+  "\230\230\230\377\307\307\306\377\305\305\304\377\356\356\354\377\303"
+  "\303\302\377\301\301\300\377\351\351\347\377lll\377\217\236\254\377\275"
+  "\270\225\377p|i\377\214\233\252\377iih\377\336\336\333\377\334\334\332"
+  "\377\243\243\242\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377"
+  "\377\377\0\0\0\377\377\377\377\377\352\352\351\377\351\351\347\377\347"
+  "\347\346\377\346\346\344\377\0\0\0\377\377\377\377\377\363\363\362\377"
+  "\361\361\360\377\360\360\356\377\356\356\355\377\354\354\353\377\353"
+  "\353\351\377\351\351\350\377\350\350\346\377\346\346\344\377kkj\377\226"
+  "\245\264\377\323\307\215\377\237\234d\377o\177w\377hhf\377\333\333\330"
+  "\377\332\332\327\377\240\240\237\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0"
+  "\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377\377\350\350\346\377"
+  "\346\346\344\377\345\345\343\377\343\343\341\377\0\0\0\377\377\377\377"
+  "\377\360\360\357\377\243\243\242\377\225\225\224\377\224\224\223\377"
+  "\251\251\250\377\232\232\231\377\247\247\246\377\275\275\273\377\343"
+  "\343\341\377jji\377\235\254\273\377\315\304\226\377fsW\377\233\252\271"
+  "\377ffe\377\330\330\325\377\327\327\324\377\242\242\241\377\0\0\0\377"
+  "\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0\377\377\377\377"
+  "\377\345\345\343\377\343\343\341\377\342\342\340\377\340\340\336\377"
+  "\0\0\0\377\377\377\377\377\355\355\354\377\354\354\352\377\352\352\350"
+  "\377\351\351\347\377\347\347\345\377\345\345\343\377\344\344\342\377"
+  "\342\342\340\377\341\341\336\377hhh\377\245\264\303\377\313\305\235\377"
+  "l}o\377o\200s\377eec\377\326\326\322\377\324\324\321\377\242\242\241"
+  "\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\377\377\377\377\0\0\0"
+  "\377\377\377\377\377\342\342\340\377\341\341\336\377\337\337\335\377"
+  "\336\336\333\377\0\0\0\377\377\377\377\377\352\352\351\377\233\233\232"
+  "\377\215\215\214\377\346\346\344\377\274\274\273\377\217\217\215\377"
+  "\216\216\214\377\271\271\266\377\336\336\333\377ggf\377gge\377ffd\377"
+  "eed\377ddc\377ddb\377\323\323\320\377\321\321\316\377\241\241\240\377"
+  "\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\377\320\320\320\377\0\0\0\377"
+  "\377\377\377\377\340\340\335\377\336\336\333\377\334\334\332\377\333"
+  "\333\330\377\0\0\0\377\377\377\377\377\350\350\346\377\346\346\344\377"
+  "\345\345\343\377\343\343\341\377\341\341\337\377\340\340\336\377\336"
+  "\336\334\377\335\335\332\377\333\333\330\377\332\332\327\377\330\330"
+  "\325\377\326\326\323\377\325\325\322\377\323\323\320\377\322\322\316"
+  "\377\320\320\315\377\317\317\313\377\240\240\237\377\0\0\0\377\0\0\0"
+  "_\0\0\0$\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377\377\335\335"
+  "\332\377\333\333\330\377\332\332\327\377\330\330\325\377\0\0\0\377\377"
+  "\377\377\377\345\345\343\377\227\227\226\377\216\216\215\377\215\215"
+  "\214\377\214\214\212\377\335\335\333\377\222\222\220\377\236\236\233"
+  "\377\234\234\232\377\207\207\205\377\325\325\322\377\257\257\254\377"
+  "\230\230\226\377\213\213\210\377\253\253\247\377\315\315\312\377\314"
+  "\314\310\377\242\242\241\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\40"
+  "\0\0\0T\0\0\0\377\320\320\320\377\261\261\257\377\264\264\263\377\264"
+  "\264\261\377\240\240\235\377\0\0\0\377\377\377\377\377\342\342\340\377"
+  "\341\341\336\377\337\337\335\377\336\336\333\377\334\334\331\377\332"
+  "\332\330\377\331\331\326\377\327\327\324\377\326\326\322\377\324\324"
+  "\321\377\323\323\317\377\321\321\315\377\317\317\314\377\316\316\312"
+  "\377\314\314\310\377\314\314\307\377\314\314\307\377\242\242\240\377"
+  "\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\12\0\0\0\37\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377\377\340"
+  "\340\335\377\224\224\222\377\266\266\264\377\333\333\330\377\235\235"
+  "\233\377\210\210\206\377\326\326\323\377\325\325\321\377\214\214\212"
+  "\377\217\217\215\377\203\203\200\377\316\316\312\377\224\224\221\377"
+  "\224\224\220\377\314\314\307\377\314\314\307\377\314\314\307\377\237"
+  "\237\237\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0%"
+  "\0\0\0T\0\0\0j\0\0\0m\0\0\0m\0\0\0o\0\0\0\377\377\377\377\377\335\335"
+  "\332\377\333\333\330\377\332\332\327\377\330\330\325\377\326\326\323"
+  "\377\325\325\322\377\323\323\320\377\322\322\316\377\320\320\315\377"
+  "\317\317\313\377\315\315\311\377\314\314\307\377\314\314\307\377\314"
+  "\314\307\377\314\314\307\377\314\314\307\377\314\314\307\377\240\240"
+  "\237\377\0\0\0\377\0\0\0_\0\0\0$\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\13\0\0"
+  "\0\34\0\0\0&\0\0\0(\0\0\0(\0\0\0,\0\0\0\377\320\320\320\377\261\261\257"
+  "\377\264\264\263\377\264\264\261\377\240\240\235\377\240\240\235\377"
+  "\237\237\235\377\237\237\235\377\237\237\233\377\231\231\225\377\215"
+  "\215\211\377\213\213\211\377\213\213\211\377\213\213\211\377\211\211"
+  "\211\377\211\211\211\377\203\203\177\377\204\204\202\377]]\\\377\0\0"
+  "\0\377\0\0\0^\0\0\0$\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\4\0\0\0\6"
+  "\0\0\0\7\0\0\0\7\0\0\0\13\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\263\0\0\0T\0\0\0\37\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0!\0\0\0S\0\0"
+  "\0i\0\0\0m\0\0\0m\0\0\0m\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0"
+  "\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0n\0\0\0l\0\0\0`\0\0\0:"
+  "\0\0\0\23\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\1\0\0\0\12\0\0\0\34\0\0\0&\0\0\0(\0\0\0(\0\0\0(\0\0\0)\0\0"
+  "\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0\0\0)\0"
+  "\0\0)\0\0\0)\0\0\0(\0\0\0#\0\0\0\25\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\4\0\0\0"
+  "\6\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0"
+  "\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0\7\0\0\0"
+  "\7\0\0\0\6\0\0\0\4\0\0\0\1"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_not)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_not[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_not[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0b\0\0\0\260\0\0\0\342"
+  "\0\0\0\373\0\0\0\373\0\0\0\343\0\0\0\263\0\0\0j\0\0\0\13\0\0\0\5\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0b\0\0\0\341n\35\15\377\2670\25\377\315"
+  "4\27\377\3173\27\377\3152\26\377\310/\25\377\260(\22\377h\27\12\377\0"
+  "\0\0\345\0\0\0o\0\0\0\14\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\225K\24\11\377\3105\27\377"
+  "\3237\31\377\3215\30\377\3173\27\377\3151\26\377\3140\25\377\312.\25"
+  "\377\310,\24\377\306+\23\377\270'\21\377D\16\5\377\0\0\0\243\0\0\0\24"
+  "\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0"
+  "\0\225o\36\15\377\3238\31\377\3236\30\377\331_H\377\361\317\311\377\371"
+  "\364\363\377\371\371\371\377\364\353\352\377\350\273\265\377\325vj\377"
+  "\307\77-\377\302'\21\377\300%\21\377c\22\10\377\0\0\0\246\0\0\0\26\0"
+  "\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0bK\24\11\377\323"
+  "8\31\377\3226\30\377\353\261\246\377\372\372\372\377\372\372\372\377"
+  "\372\372\372\377\371\371\371\377\370\370\370\377\370\370\370\377\355"
+  "\324\320\377\277#\20\377\277#\20\377\276#\20\377\274!\17\377B\13\5\377"
+  "\0\0\0|\0\0\0\24\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\341\307"
+  "4\27\377\3226\30\377\353\261\246\377\373\373\373\377\372\372\372\377"
+  "\372\372\372\377\371\371\371\377\370\370\370\377\370\370\370\377\355"
+  "\324\320\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377\272\37\16"
+  "\377\255\34\14\377\0\0\0\351\0\0\0(\0\0\0\14\0\0\0\1\0\0\0\0\0\0\0\0"
+  "\0\0\0bm\34\14\377\3225\30\377\326WA\377\372\372\372\377\372\372\372"
+  "\377\372\372\372\377\371\371\371\377\370\370\370\377\370\370\370\377"
+  "\355\324\320\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377\277"
+  "#\20\377\303C6\377\266\34\14\377^\16\5\377\0\0\0\204\0\0\0\31\0\0\0\5"
+  "\0\0\0\0\0\0\0\1\0\0\0\260\266.\24\377\3173\27\377\341\232\220\377\372"
+  "\372\372\377\371\371\371\377\371\371\371\377\370\370\370\377\370\370"
+  "\370\377\355\324\320\377\277#\20\377\277#\20\377\277#\20\377\277#\20"
+  "\377\277#\20\377\347\306\302\377\335\247\242\377\264\32\13\377\233\25"
+  "\11\377\0\0\0\304\0\0\0'\0\0\0\13\0\0\0\1\0\0\0\2\0\0\0\342\3132\26\377"
+  "\3151\26\377\353\306\302\377\371\371\371\377\371\371\371\377\370\370"
+  "\370\377\367\367\367\377\355\324\320\377\277#\20\377\277#\20\377\277"
+  "#\20\377\277#\20\377\277#\20\377\347\306\302\377\362\362\362\377\347"
+  "\312\306\377\262\30\12\377\255\26\12\377\0\0\0\352\0\0\0""4\0\0\0\22"
+  "\0\0\0\2\0\0\0\3\0\0\0\373\3141\26\377\313/\25\377\361\337\335\377\371"
+  "\371\371\377\370\370\370\377\367\367\367\377\355\324\320\377\277#\20"
+  "\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377\347\306\302\377"
+  "\362\362\362\377\361\361\361\377\355\343\342\377\260\26\12\377\256\24"
+  "\11\377\0\0\0\374\0\0\0<\0\0\0\26\0\0\0\3\0\0\0\3\0\0\0\373\312/\25\377"
+  "\311-\24\377\361\337\335\377\370\370\370\377\367\367\367\377\355\324"
+  "\320\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377\277#\20\377"
+  "\347\306\302\377\362\362\362\377\361\361\361\377\361\361\361\377\351"
+  "\327\325\377\256\24\11\377\254\22\10\377\0\0\0\374\0\0\0A\0\0\0\30\0"
+  "\0\0\3\0\0\0\3\0\0\0\343\305,\23\377\307+\23\377\347\272\265\377\367"
+  "\367\367\377\355\324\320\377\277#\20\377\277#\20\377\277#\20\377\277"
+  "#\20\377\277#\20\377\347\306\302\377\362\362\362\377\361\361\361\377"
+  "\361\361\361\377\360\360\360\377\346\321\316\377\255\22\10\377\247\20"
+  "\7\377\0\0\0\353\0\0\0A\0\0\0\30\0\0\0\3\0\0\0\3\0\0\0\263\255%\20\377"
+  "\305)\22\377\335\226\215\377\352\310\304\377\277#\20\377\277#\20\377"
+  "\277#\20\377\277#\20\377\277#\20\377\347\306\302\377\362\362\362\377"
+  "\361\361\361\377\361\361\361\377\360\360\360\377\357\357\357\377\333"
+  "\254\250\377\253\20\7\377\223\14\5\377\0\0\0\310\0\0\0=\0\0\0\26\0\0"
+  "\0\3\0\0\0\2\0\0\0jf\25\11\377\302'\21\377\307A1\377\277#\20\377\277"
+  "#\20\377\277#\20\377\277#\20\377\277#\20\377\347\305\301\377\362\362"
+  "\362\377\361\361\361\377\360\360\360\377\360\360\360\377\357\357\357"
+  "\377\356\356\356\377\267:3\377\250\16\6\377V\6\2\377\0\0\0\222\0\0\0"
+  "4\0\0\0\22\0\0\0\2\0\0\0\1\0\0\0\13\0\0\0\345\264#\20\377\277#\20\377"
+  "\277#\20\377\277#\20\377\277#\20\377\277#\20\377\347\305\301\377\362"
+  "\362\362\377\361\361\361\377\360\360\360\377\360\360\360\377\357\357"
+  "\357\377\356\356\356\377\321\223\217\377\250\16\6\377\233\13\5\377\0"
+  "\0\0\353\0\0\0I\0\0\0'\0\0\0\13\0\0\0\1\0\0\0\0\0\0\0\5\0\0\0oC\14\5"
+  "\377\274!\17\377\273\40\16\377\277#\20\377\277#\20\377\344\273\266\377"
+  "\362\362\362\377\361\361\361\377\360\360\360\377\360\360\360\377\357"
+  "\357\357\377\355\355\355\377\321\223\217\377\247\15\6\377\245\13\5\377"
+  "9\3\1\377\0\0\0\224\0\0\0;\0\0\0\31\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\1\0"
+  "\0\0\14\0\0\0\243a\20\7\377\270\36\15\377\267\34\14\377\300=1\377\326"
+  "\212\201\377\337\255\246\377\344\303\276\377\354\343\341\377\346\321"
+  "\316\377\332\253\247\377\26780\377\247\15\5\377\244\13\5\377U\5\1\377"
+  "\0\0\0\267\0\0\0F\0\0\0(\0\0\0\14\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\4\0\0\0\24\0\0\0\246@\12\3\377\251\31\12\377\263\30\13\377\261\26"
+  "\12\377\257\25\11\377\255\23\10\377\253\21\10\377\252\20\7\377\250\16"
+  "\6\377\246\14\5\377\232\12\4\3779\3\1\377\0\0\0\267\0\0\0I\0\0\0/\0\0"
+  "\0\24\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0\26"
+  "\0\0\0|\0\0\0\351\\\13\5\377\230\22\10\377\252\23\10\377\253\21\7\377"
+  "\251\17\7\377\244\16\6\377\221\13\4\377U\5\2\377\0\0\0\353\0\0\0\224"
+  "\0\0\0F\0\0\0/\0\0\0\26\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0\24\0\0\0(\0\0\0\204\0\0\0\304\0\0\0"
+  "\352\0\0\0\374\0\0\0\374\0\0\0\353\0\0\0\310\0\0\0\222\0\0\0I\0\0\0;"
+  "\0\0\0(\0\0\0\24\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\14\0\0\0\31\0\0\0'\0\0\0""4"
+  "\0\0\0<\0\0\0A\0\0\0A\0\0\0<\0\0\0""4\0\0\0'\0\0\0\31\0\0\0\14\0\0\0"
+  "\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\13\0\0\0\22\0\0\0\26\0\0"
+  "\0\30\0\0\0\30\0\0\0\26\0\0\0\22\0\0\0\13\0\0\0\5\0\0\0\1\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0"
+  "\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_table_borders)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_table_borders[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_table_borders[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\375\375\375\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\336\336\336\377\0\0"
+  "\0\377\0\0\0E\0\0\0\16\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360"
+  "\377\360\360\360\377\360\360\360\377\360\360\360\377\360\360\360\377"
+  "\360\360\360\377\360\360\360\377\362\362\362\377nnn\377\363\363\363\377"
+  "\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366"
+  "\366\366\377\366\366\366\377\367\367\367\377\346\346\346\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360\377\360"
+  "\360\360\377\360\360\360\377\360\360\360\377\360\360\360\377\360\360"
+  "\360\377\360\360\360\377\362\362\362\377\362\362\362\377\363\363\363"
+  "\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365\377"
+  "\366\366\366\377\366\366\366\377\367\367\367\377\346\346\346\377\0\0"
+  "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360"
+  "\377\360\360\360\377\360\360\360\377\360\360\360\377\360\360\360\377"
+  "\360\360\360\377\361\361\361\377\362\362\362\377jjj\377\363\363\363\377"
+  "\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\366"
+  "\366\366\377\367\367\367\377\367\367\367\377\347\347\347\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360\377\360"
+  "\360\360\377\360\360\360\377\360\360\360\377\360\360\360\377\361\361"
+  "\361\377\362\362\362\377\363\363\363\377\363\363\363\377\364\364\364"
+  "\377\365\365\365\377\365\365\365\377\366\366\366\377\366\366\366\377"
+  "\367\367\367\377\367\367\367\377\370\370\370\377\350\350\350\377\0\0"
+  "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360"
+  "\377\360\360\360\377\360\360\360\377\360\360\360\377\361\361\361\377"
+  "\362\362\362\377\362\362\362\377\363\363\363\377kkk\377\365\365\365\377"
+  "\365\365\365\377\366\366\366\377\366\366\366\377\367\367\367\377\367"
+  "\367\367\377\370\370\370\377\371\371\371\377\350\350\350\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360\377\360"
+  "\360\360\377\360\360\360\377\361\361\361\377\362\362\362\377\362\362"
+  "\362\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365"
+  "\377\366\366\366\377\366\366\366\377\367\367\367\377\367\367\367\377"
+  "\370\370\370\377\371\371\371\377\371\371\371\377\351\351\351\377\0\0"
+  "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\360\360\360"
+  "\377\360\360\360\377\361\361\361\377\362\362\362\377\362\362\362\377"
+  "\363\363\363\377\363\363\363\377\365\365\365\377kkk\377\366\366\366\377"
+  "\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370\377\371"
+  "\371\371\377\371\371\371\377\372\372\372\377\351\351\351\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\361\361\361\377\361"
+  "\361\361\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\366\366\366\377\366\366\366"
+  "\377\367\367\367\377\367\367\367\377\370\370\370\377\371\371\371\377"
+  "\371\371\371\377\372\372\372\377\372\372\372\377\352\352\352\377\0\0"
+  "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\376\376\376\377kkk\377\362\362"
+  "\362\377jjj\377\363\363\363\377jjj\377\364\364\364\377kkk\377\366\366"
+  "\366\377lll\377\367\367\367\377lll\377\370\370\370\377mmm\377\371\371"
+  "\371\377mmm\377\372\372\372\377nnn\377\353\353\353\377\0\0\0\377\0\0"
+  "\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\362\362\362\377\362\362"
+  "\362\377\363\363\363\377\363\363\363\377\364\364\364\377\365\365\365"
+  "\377\365\365\365\377\366\366\366\377\367\367\367\377\367\367\367\377"
+  "\370\370\370\377\371\371\371\377\371\371\371\377\372\372\372\377\372"
+  "\372\372\377\373\373\373\377\374\374\374\377\353\353\353\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\363\363\363\377\363"
+  "\363\363\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365"
+  "\365\377\366\366\366\377\367\367\367\377lll\377\370\370\370\377\371\371"
+  "\371\377\371\371\371\377\372\372\372\377\372\372\372\377\373\373\373"
+  "\377\374\374\374\377\374\374\374\377\354\354\354\377\0\0\0\377\0\0\0"
+  "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\363\363\363\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366"
+  "\377\366\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377"
+  "\371\371\371\377\372\372\372\377\372\372\372\377\373\373\373\377\374"
+  "\374\374\377\374\374\374\377\375\375\375\377\354\354\354\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\364\364\364\377\364"
+  "\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\366\366"
+  "\366\377\367\367\367\377\370\370\370\377mmm\377\371\371\371\377\372\372"
+  "\372\377\372\372\372\377\373\373\373\377\374\374\374\377\374\374\374"
+  "\377\375\375\375\377\375\375\375\377\355\355\355\377\0\0\0\377\0\0\0"
+  "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\365\365\365\377\365\365"
+  "\365\377\365\365\365\377\366\366\366\377\366\366\366\377\367\367\367"
+  "\377\367\367\367\377\371\371\371\377\371\371\371\377\372\372\372\377"
+  "\372\372\372\377\373\373\373\377\374\374\374\377\374\374\374\377\375"
+  "\375\375\377\375\375\375\377\376\376\376\377\356\356\356\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\365\365\365\377\365"
+  "\365\365\377\366\366\366\377\366\366\366\377\367\367\367\377\367\367"
+  "\367\377\370\370\370\377\371\371\371\377mmm\377\372\372\372\377\373\373"
+  "\373\377\374\374\374\377\374\374\374\377\375\375\375\377\375\375\375"
+  "\377\376\376\376\377\377\377\377\377\356\356\356\377\0\0\0\377\0\0\0"
+  "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\366\366"
+  "\366\377\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370"
+  "\377\371\371\371\377\372\372\372\377\372\372\372\377\373\373\373\377"
+  "\374\374\374\377\374\374\374\377\375\375\375\377\375\375\375\377\376"
+  "\376\376\377\377\377\377\377\377\377\377\377\356\356\356\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\366"
+  "\366\366\377\367\367\367\377\367\367\367\377\370\370\370\377\371\371"
+  "\371\377\371\371\371\377\372\372\372\377nnn\377\374\374\374\377\374\374"
+  "\374\377\375\375\375\377\375\375\375\377\376\376\376\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\356\356\356\377\0\0\0\377\0\0\0"
+  "R\0\0\0\20\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0R\0\0\0\20\0"
+  "\0\0\0\0\0\0\15\0\0\0D\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0"
+  "\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0"
+  "\0\0R\0\0\0R\0\0\0R\0\0\0E\0\0\0\16\0\0\0\0\0\0\0\2\0\0\0\15\0\0\0\20"
+  "\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0"
+  "\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0"
+  "\0\0\20\0\0\0\20\0\0\0\20\0\0\0\16\0\0\0\3"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_table_fill)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_table_fill[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_table_fill[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\16\0\0\0\3\0\0\0\0\0\0\0\377\262\262\262\377\262\262\262\377\262"
+  "\262\262\377\262\262\262\377\262\262\262\377\262\262\262\377\262\262"
+  "\262\377\262\262\262\377\262\262\262\377\260\260\260\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\336\336\336\377\0\0"
+  "\0\377\0\0\0E\0\0\0\16\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247"
+  "\377\247\247\247\377\247\247\247\377\247\247\247\377\247\247\247\377"
+  "\247\247\247\377\247\247\247\377\250\250\250\377LLL\377\363\363\363\377"
+  "\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366"
+  "\366\366\377\366\366\366\377\367\367\367\377\346\346\346\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247\377\247"
+  "\247\247\377\247\247\247\377\247\247\247\377\247\247\247\377\247\247"
+  "\247\377\247\247\247\377\250\250\250\377\250\250\250\377\363\363\363"
+  "\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365\365\377"
+  "\366\366\366\377\366\366\366\377\367\367\367\377\346\346\346\377\0\0"
+  "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247"
+  "\377\247\247\247\377\247\247\247\377\247\247\247\377\247\247\247\377"
+  "\247\247\247\377\250\250\250\377\250\250\250\377III\377\363\363\363\377"
+  "\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\366"
+  "\366\366\377\367\367\367\377\367\367\367\377\347\347\347\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247\377\247"
+  "\247\247\377\247\247\247\377\247\247\247\377\247\247\247\377\250\250"
+  "\250\377\250\250\250\377\251\251\251\377\251\251\251\377\364\364\364"
+  "\377\365\365\365\377\365\365\365\377\366\366\366\377\366\366\366\377"
+  "\367\367\367\377\367\367\367\377\370\370\370\377\350\350\350\377\0\0"
+  "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247"
+  "\377\247\247\247\377\247\247\247\377\247\247\247\377\250\250\250\377"
+  "\250\250\250\377\250\250\250\377\251\251\251\377JJJ\377\365\365\365\377"
+  "\365\365\365\377\366\366\366\377\366\366\366\377\367\367\367\377\367"
+  "\367\367\377\370\370\370\377\371\371\371\377\350\350\350\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247\377\247"
+  "\247\247\377\247\247\247\377\250\250\250\377\250\250\250\377\250\250"
+  "\250\377\251\251\251\377\252\252\252\377\253\253\253\377\365\365\365"
+  "\377\366\366\366\377\366\366\366\377\367\367\367\377\367\367\367\377"
+  "\370\370\370\377\371\371\371\377\371\371\371\377\351\351\351\377\0\0"
+  "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\247\247\247"
+  "\377\247\247\247\377\250\250\250\377\250\250\250\377\250\250\250\377"
+  "\251\251\251\377\251\251\251\377\253\253\253\377JJJ\377\366\366\366\377"
+  "\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370\377\371"
+  "\371\371\377\371\371\371\377\372\372\372\377\351\351\351\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\262\262\262\377\250\250\250\377\250"
+  "\250\250\377\250\250\250\377\250\250\250\377\251\251\251\377\251\251"
+  "\251\377\252\252\252\377\253\253\253\377\253\253\253\377\366\366\366"
+  "\377\367\367\367\377\367\367\367\377\370\370\370\377\371\371\371\377"
+  "\371\371\371\377\372\372\372\377\372\372\372\377\352\352\352\377\0\0"
+  "\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\261\261\261\377JJJ\377\250\250"
+  "\250\377III\377\251\251\251\377III\377\252\252\252\377JJJ\377\253\253"
+  "\253\377KKK\377\254\254\254\377KKK\377\255\255\255\377LLL\377\255\255"
+  "\255\377LLL\377\256\256\256\377LLL\377\244\244\244\377\0\0\0\377\0\0"
+  "\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\362\362\362\377\362\362"
+  "\362\377\363\363\363\377\363\363\363\377\364\364\364\377\365\365\365"
+  "\377\365\365\365\377\366\366\366\377\254\254\254\377\254\254\254\377"
+  "\255\255\255\377\255\255\255\377\255\255\255\377\256\256\256\377\256"
+  "\256\256\377\257\257\257\377\257\257\257\377\244\244\244\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\363\363\363\377\363"
+  "\363\363\377\363\363\363\377\364\364\364\377\365\365\365\377\365\365"
+  "\365\377\366\366\366\377\367\367\367\377KKK\377\255\255\255\377\255\255"
+  "\255\377\255\255\255\377\256\256\256\377\256\256\256\377\257\257\257"
+  "\377\257\257\257\377\257\257\257\377\244\244\244\377\0\0\0\377\0\0\0"
+  "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\363\363\363\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366"
+  "\377\366\366\366\377\367\367\367\377\255\255\255\377\255\255\255\377"
+  "\255\255\255\377\256\256\256\377\256\256\256\377\257\257\257\377\257"
+  "\257\257\377\257\257\257\377\260\260\260\377\244\244\244\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\364\364\364\377\364"
+  "\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\366\366"
+  "\366\377\367\367\367\377\370\370\370\377LLL\377\255\255\255\377\256\256"
+  "\256\377\256\256\256\377\257\257\257\377\257\257\257\377\257\257\257"
+  "\377\260\260\260\377\260\260\260\377\245\245\245\377\0\0\0\377\0\0\0"
+  "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\365\365\365\377\365\365"
+  "\365\377\365\365\365\377\366\366\366\377\366\366\366\377\367\367\367"
+  "\377\367\367\367\377\371\371\371\377\255\255\255\377\256\256\256\377"
+  "\256\256\256\377\257\257\257\377\257\257\257\377\257\257\257\377\260"
+  "\260\260\377\260\260\260\377\261\261\261\377\246\246\246\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\365\365\365\377\365"
+  "\365\365\377\366\366\366\377\366\366\366\377\367\367\367\377\367\367"
+  "\367\377\370\370\370\377\371\371\371\377LLL\377\256\256\256\377\257\257"
+  "\257\377\257\257\257\377\257\257\257\377\260\260\260\377\260\260\260"
+  "\377\261\261\261\377\262\262\262\377\246\246\246\377\0\0\0\377\0\0\0"
+  "R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\366\366"
+  "\366\377\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370"
+  "\377\371\371\371\377\372\372\372\377\256\256\256\377\257\257\257\377"
+  "\257\257\257\377\257\257\257\377\260\260\260\377\260\260\260\377\261"
+  "\261\261\377\262\262\262\377\262\262\262\377\246\246\246\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\377\377\377\377\366\366\366\377\366"
+  "\366\366\377\367\367\367\377\367\367\367\377\370\370\370\377\371\371"
+  "\371\377\371\371\371\377\372\372\372\377LLL\377\257\257\257\377\257\257"
+  "\257\377\260\260\260\377\260\260\260\377\261\261\261\377\262\262\262"
+  "\377\262\262\262\377\262\262\262\377\246\246\246\377\0\0\0\377\0\0\0"
+  "R\0\0\0\20\0\0\0\0\0\0\0\377\356\356\356\377\346\346\346\377\346\346"
+  "\346\377\346\346\346\377\347\347\347\377\350\350\350\377\350\350\350"
+  "\377\351\351\351\377\352\352\352\377\244\244\244\377\244\244\244\377"
+  "\244\244\244\377\244\244\244\377\245\245\245\377\246\246\246\377\246"
+  "\246\246\377\246\246\246\377\246\246\246\377\232\232\232\377\0\0\0\377"
+  "\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0R\0\0\0\20\0\0\0\0\0\0\0\15\0\0\0"
+  "D\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0"
+  "\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0\0\0R\0"
+  "\0\0E\0\0\0\16\0\0\0\0\0\0\0\2\0\0\0\15\0\0\0\20\0\0\0\20\0\0\0\20\0"
+  "\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20"
+  "\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0\20\0\0\0"
+  "\20\0\0\0\16\0\0\0\3"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_text_bulleted_list)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_text_bulleted_list[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_text_bulleted_list[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\27\0\0\0\224\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232"
+  "\0\0\0'\0\0\0\6\0\0\0\1\0\0\0\224\342\342\342\377\362\362\362\377\362"
+  "\362\362\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363"
+  "\363\377\363\363\363\377\364\364\364\377\364\364\364\377\364\364\364"
+  "\377\365\365\365\377\365\365\365\377\365\365\365\377\366\366\366\377"
+  "\366\366\366\377\367\367\367\377\367\367\367\377\364\364\364\377\333"
+  "\333\333\377\0\0\0\243\0\0\0\25\0\0\0\6\0\0\0\377\360\360\360\377\340"
+  "\340\340\377\340\340\340\377\341\341\341\377\342\342\342\377\343\343"
+  "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347"
+  "\377\350\350\350\377\350\350\350\377\351\351\351\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\355\355\355\377\0\0\0\377\0\0\0)\0\0\0\16\0\0\0\377\362"
+  "\362\362\377\341\341\341\377\341\341\341\377\342\342\342\377\343\343"
+  "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347"
+  "\377\350\350\350\377\351\351\351\377\352\352\352\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\361\361\361\377\0\0\0\377\0\0\0""8\0\0\0"
+  "\25\0\0\0\377\362\362\362\377\342\342\342\377\343\343\343\377\236\236"
+  "\236\377mmm\377\237\237\237\377\346\346\346\377\347\347\347\377ooo\377"
+  "ppp\377ppp\377qqq\377qqq\377qqq\377rrr\377rrr\377sss\377\360\360\360"
+  "\377\361\361\361\377\362\362\362\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0"
+  "\377\363\363\363\377\343\343\343\377\344\344\344\377nnn\377nnn\377nn"
+  "n\377\347\347\347\377\350\350\350\377\351\351\351\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\355\355\355\377\355\355\355\377\356"
+  "\356\356\377\357\357\357\377\360\360\360\377\361\361\361\377\362\362"
+  "\362\377\363\363\363\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363"
+  "\363\377\344\344\344\377\345\345\345\377\240\240\240\377ooo\377\241\241"
+  "\241\377\350\350\350\377\351\351\351\377ppp\377qqq\377qqq\377rrr\377"
+  "rrr\377sss\377sss\377sss\377ttt\377\362\362\362\377\363\363\363\377\364"
+  "\364\364\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\345"
+  "\345\345\377\346\346\346\377\347\347\347\377\350\350\350\377\351\351"
+  "\351\377\351\351\351\377\352\352\352\377\353\353\353\377\354\354\354"
+  "\377\355\355\355\377\356\356\356\377\357\357\357\377\360\360\360\377"
+  "\356\356\356\377\360\360\360\377\361\361\361\377\363\363\363\377\364"
+  "\364\364\377\365\365\365\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364"
+  "\364\364\377\346\346\346\377\347\347\347\377\350\350\350\377\351\351"
+  "\351\377\352\352\352\377\352\352\352\377\353\353\353\377qqq\377rrr\377"
+  "rrr\377sss\377sss\377ttt\377\362\362\362\377\363\363\363\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\366\366\366\377\0\0\0\377\0"
+  "\0\0=\0\0\0\27\0\0\0\377\364\364\364\377\347\347\347\377\350\350\350"
+  "\377\351\351\351\377\352\352\352\377\353\353\353\377\354\354\354\377"
+  "\354\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\360"
+  "\360\360\377\361\361\361\377\362\362\362\377\363\363\363\377\364\364"
+  "\364\377\365\365\365\377\365\365\365\377\366\366\366\377\367\367\367"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\350\350\350"
+  "\377\351\351\351\377\352\352\352\377\353\353\353\377\354\354\354\377"
+  "\355\355\355\377\356\356\356\377\356\356\356\377\357\357\357\377\360"
+  "\360\360\377\361\361\361\377\362\362\362\377\363\363\363\377\364\364"
+  "\364\377\365\365\365\377\366\366\366\377\367\367\367\377\367\367\367"
+  "\377\370\370\370\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365"
+  "\377\351\351\351\377\352\352\352\377\353\353\353\377\354\354\354\377"
+  "\355\355\355\377\356\356\356\377\357\357\357\377\360\360\360\377\360"
+  "\360\360\377\361\361\361\377\362\362\362\377\363\363\363\377\364\364"
+  "\364\377\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370"
+  "\377\370\370\370\377\371\371\371\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0"
+  "\377\365\365\365\377\352\352\352\377\353\353\353\377\354\354\354\377"
+  "\355\355\355\377\356\356\356\377\357\357\357\377\360\360\360\377\361"
+  "\361\361\377\362\362\362\377\362\362\362\377\363\363\363\377\364\364"
+  "\364\377\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370"
+  "\377\371\371\371\377\372\372\372\377\372\372\372\377\0\0\0\377\0\0\0"
+  "=\0\0\0\27\0\0\0\377\366\366\366\377\353\353\353\377\354\354\354\377"
+  "\303\303\303\377rrr\377\304\304\304\377\360\360\360\377\361\361\361\377"
+  "ttt\377uuu\377\203\203\203\377uuu\377vvv\377vvv\377www\377www\377xxx"
+  "\377\372\372\372\377\373\373\373\377\374\374\374\377\0\0\0\377\0\0\0"
+  "=\0\0\0\27\0\0\0\377\367\367\367\377\355\355\355\377\355\355\355\377"
+  "rrr\377sss\377sss\377\361\361\361\377\362\362\362\377\363\363\363\377"
+  "\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366\377\367"
+  "\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377\373\373"
+  "\373\377\374\374\374\377\375\375\375\377\0\0\0\377\0\0\0=\0\0\0\27\0"
+  "\0\0\377\367\367\367\377\356\356\356\377\357\357\357\377\304\304\304"
+  "\377sss\377\306\306\306\377\362\362\362\377\363\363\363\377uuu\377vv"
+  "v\377vvv\377www\377www\377www\377xxx\377xxx\377\373\373\373\377\374\374"
+  "\374\377\375\375\375\377\376\376\376\377\0\0\0\377\0\0\0=\0\0\0\27\0"
+  "\0\0\377\370\370\370\377\360\360\360\377\361\361\361\377\362\362\362"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377"
+  "\366\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377\372"
+  "\372\372\377\373\373\373\377\373\373\373\377\374\374\374\377\375\375"
+  "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\0\0\0\377\0"
+  "\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\361\361\361\377\362\362\362"
+  "\377\363\363\363\377\364\364\364\377\364\364\364\377\365\365\365\377"
+  "\366\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377\372"
+  "\372\372\377\373\373\373\377\374\374\374\377\375\375\375\377\375\375"
+  "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\362\362\362\377\362\362\362"
+  "\377\363\363\363\377\364\364\364\377\365\365\365\377\366\366\366\377"
+  "\366\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377\372"
+  "\372\372\377\373\373\373\377\374\374\374\377\375\375\375\377\376\376"
+  "\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\354\354\354\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\232\311\311\311"
+  "\377\355\355\355\377\370\370\370\377\365\365\365\377\366\366\366\377"
+  "\367\367\367\377\370\370\370\377\370\370\370\377\371\371\371\377\372"
+  "\372\372\377\373\373\373\377\374\374\374\377\375\375\375\377\376\376"
+  "\376\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\356\356\356\377\275\275\275\377\0\0\0\324\0\0\0:\0\0\0\26\0\0\0"
+  "\34\0\0\0\243\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\324\0"
+  "\0\0Y\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\24\0\0\0)\0\0\0""8\0\0\0<\0\0\0="
+  "\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0"
+  "=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0""9\0\0\0-\0\0\0\31\0\0\0\7\0\0\0"
+  "\1\0\0\0\6\0\0\0\16\0\0\0\24\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0"
+  "\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27"
+  "\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\25\0\0\0\20\0\0\0\7\0\0\0"
+  "\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0"
+  "\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0"
+  "\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_text_indent)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_text_indent[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_text_indent[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\27\0\0\0\224\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232"
+  "\0\0\0'\0\0\0\6\0\0\0\1\0\0\0\224\342\342\342\377\362\362\362\377\362"
+  "\362\362\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363"
+  "\363\377\363\363\363\377\364\364\364\377\364\364\364\377\364\364\364"
+  "\377\365\365\365\377\365\365\365\377\365\365\365\377\366\366\366\377"
+  "\366\366\366\377\367\367\367\377\367\367\367\377\364\364\364\377\333"
+  "\333\333\377\0\0\0\243\0\0\0\25\0\0\0\6\0\0\0\377\360\360\360\377\340"
+  "\340\340\377\340\340\340\377\341\341\341\377\342\342\342\377\343\343"
+  "\343\377\344\344\344\377\345\345\345\377\256\256\256\377\347\347\347"
+  "\377\350\350\350\377\350\350\350\377\351\351\351\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\343\343\343\377\0\0\0\377\0\0\0)\0\0\0\16\0\0\0\377\362"
+  "\362\362\377\341\341\341\377\341\341\341\377\342\342\342\377\343\343"
+  "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347"
+  "\377\350\350\350\377\351\351\351\377\352\352\352\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\347\347\347\377\0\0\0\377\0\0\0""8\0\0\0"
+  "\25\0\0\0\377\362\362\362\377\342\342\342\377\254\254\254\377\254\254"
+  "\254\377\255\255\255\377\256\256\256\377\256\256\256\377\257\257\257"
+  "\377\260\260\260\377\261\261\261\377\262\262\262\377\262\262\262\377"
+  "\263\263\263\377\263\263\263\377\264\264\264\377\265\265\265\377\265"
+  "\265\265\377\266\266\266\377\361\361\361\377\350\350\350\377\0\0\0\377"
+  "\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\343\343\343\377\344\344\344"
+  "\377\345\345\345\377\345\345\345\377\346\346\346\377\347\347\347\377"
+  "\350\350\350\377\351\351\351\377\352\352\352\377\353\353\353\377\354"
+  "\354\354\377\355\355\355\377\355\355\355\377\356\356\356\377\357\357"
+  "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\351\351\351"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\344\344\344"
+  "\377\345\345\345\377\346\346\346\377\347\347\347\377\347\347\347\377"
+  "\350\350\350\377\351\351\351\377\352\352\352\377\353\353\353\377\354"
+  "\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\357\357"
+  "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363"
+  "\377\352\352\352\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363"
+  "\377\345\345\345\377\346\346\346\377\347\347\347\377\350\350\350\377"
+  "\351\351\351\377\351\351\351\377\352\352\352\377uuu\377vvv\377vvv\377"
+  "www\377www\377xxx\377xxx\377xxx\377yyy\377yyy\377\364\364\364\377\353"
+  "\353\353\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364\364\364\377\346"
+  "\346\346\377\347\347\347\377\350\350\350\377\252\252\252\377\352\352"
+  "\352\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355"
+  "\377\356\356\356\377\357\357\357\377\360\360\360\377\361\361\361\377"
+  "\362\362\362\377\363\363\363\377\363\363\363\377\364\364\364\377\365"
+  "\365\365\377\354\354\354\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364"
+  "\364\364\377\347\347\347\377\350\350\350\377\351\351\351\377\0\0\0\377"
+  "\254\254\254\377\354\354\354\377\354\354\354\377vvv\377www\377www\377"
+  "xxx\377xxx\377yyy\377yyy\377zzz\377zzz\377zzz\377\366\366\366\377\355"
+  "\355\355\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\255\255\255\377\356\356"
+  "\356\377\356\356\356\377\357\357\357\377\360\360\360\377\361\361\361"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377"
+  "\366\366\366\377\367\367\367\377\367\367\367\377\356\356\356\377\0\0"
+  "\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\351\351\351\377\352"
+  "\352\352\377\353\353\353\377\0\0\0\377\255\255\255\377\356\356\356\377"
+  "\357\357\357\377xxx\377xxx\377xxx\377yyy\377yyy\377zzz\377zzz\377{{{"
+  "\377{{{\377|||\377\370\370\370\377\357\357\357\377\0\0\0\377\0\0\0=\0"
+  "\0\0\27\0\0\0\377\365\365\365\377\352\352\352\377\353\353\353\377\354"
+  "\354\354\377\255\255\255\377\356\356\356\377\357\357\357\377\360\360"
+  "\360\377\361\361\361\377\362\362\362\377\362\362\362\377\363\363\363"
+  "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377"
+  "\370\370\370\377\371\371\371\377\372\372\372\377\360\360\360\377\0\0"
+  "\0\377\0\0\0=\0\0\0\27\0\0\0\377\366\366\366\377\353\353\353\377\354"
+  "\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\360\360"
+  "\360\377\361\361\361\377yyy\377yyy\377zzz\377zzz\377zzz\377\366\366\366"
+  "\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377"
+  "\373\373\373\377\362\362\362\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377"
+  "\367\367\367\377\355\355\355\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366"
+  "\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377"
+  "\373\373\373\377\374\374\374\377\363\363\363\377\0\0\0\377\0\0\0=\0\0"
+  "\0\27\0\0\0\377\367\367\367\377\356\356\356\377\357\357\357\377\357\357"
+  "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363"
+  "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377"
+  "\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377\373"
+  "\373\373\377\374\374\374\377\375\375\375\377\364\364\364\377\0\0\0\377"
+  "\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\360\360\360\377\267\267\267"
+  "\377\270\270\270\377\270\270\270\377\270\270\270\377\271\271\271\377"
+  "\272\272\272\377\273\273\273\377\273\273\273\377\274\274\274\377\275"
+  "\275\275\377\276\276\276\377\276\276\276\377\276\276\276\377\277\277"
+  "\277\377\300\300\300\377\301\301\301\377\377\377\377\377\365\365\365"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\361\361\361"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\364\364\364\377"
+  "\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\371"
+  "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375"
+  "\375\377\375\375\375\377\376\376\376\377\377\377\377\377\377\377\377"
+  "\377\365\365\365\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\362\362\362"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377"
+  "\366\366\366\377\366\366\366\377\367\367\367\377\274\274\274\377\371"
+  "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375"
+  "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\331\331\331\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0"
+  "\232\311\311\311\377\332\332\332\377\356\356\356\377\353\353\353\377"
+  "\354\354\354\377\355\355\355\377\356\356\356\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\365\365\365"
+  "\377\365\365\365\377\344\344\344\377\275\275\275\377\0\0\0\324\0\0\0"
+  ":\0\0\0\26\0\0\0\34\0\0\0\243\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\324\0\0\0Y\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\24\0\0\0)\0\0\0""8\0"
+  "\0\0<\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0="
+  "\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0""9\0\0\0-\0\0\0\31\0"
+  "\0\0\7\0\0\0\1\0\0\0\6\0\0\0\16\0\0\0\24\0\0\0\27\0\0\0\27\0\0\0\27\0"
+  "\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27"
+  "\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\25\0\0\0\20\0\0\0"
+  "\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0\0\3\0"
+  "\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0"
+  "\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_text_numbered_list)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_text_numbered_list[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_text_numbered_list[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\27\0\0\0\224\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232"
+  "\0\0\0'\0\0\0\6\0\0\0\1\0\0\0\224\342\342\342\377\362\362\362\377\362"
+  "\362\362\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363"
+  "\363\377\363\363\363\377\364\364\364\377\364\364\364\377\364\364\364"
+  "\377\365\365\365\377\365\365\365\377\365\365\365\377\366\366\366\377"
+  "\366\366\366\377\367\367\367\377\367\367\367\377\364\364\364\377\333"
+  "\333\333\377\0\0\0\243\0\0\0\25\0\0\0\6\0\0\0\377\360\360\360\377\340"
+  "\340\340\377\340\340\340\377\341\341\341\377\342\342\342\377\343\343"
+  "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347"
+  "\377\350\350\350\377\350\350\350\377\351\351\351\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\355\355\355\377\0\0\0\377\0\0\0)\0\0\0\16\0\0\0\377\362"
+  "\362\362\377\341\341\341\377\341\341\341\377\314\314\314\377mmm\377\344"
+  "\344\344\377\345\345\345\377\346\346\346\377\347\347\347\377\350\350"
+  "\350\377\351\351\351\377\352\352\352\377\352\352\352\377\353\353\353"
+  "\377\354\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377"
+  "\360\360\360\377\361\361\361\377\0\0\0\377\0\0\0""8\0\0\0\25\0\0\0\377"
+  "\362\362\362\377\342\342\342\377\315\315\315\377mmm\377mmm\377\345\345"
+  "\345\377\346\346\346\377\347\347\347\377ooo\377ppp\377ppp\377qqq\377"
+  "qqq\377qqq\377rrr\377rrr\377sss\377\360\360\360\377\361\361\361\377\362"
+  "\362\362\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\343"
+  "\343\343\377\344\344\344\377\345\345\345\377nnn\377\346\346\346\377\347"
+  "\347\347\377\350\350\350\377\351\351\351\377\352\352\352\377\353\353"
+  "\353\377\354\354\354\377\355\355\355\377\355\355\355\377\356\356\356"
+  "\377\357\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377"
+  "\363\363\363\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377"
+  "\344\344\344\377\345\345\345\377\346\346\346\377ooo\377\347\347\347\377"
+  "\350\350\350\377\351\351\351\377ppp\377qqq\377qqq\377rrr\377rrr\377s"
+  "ss\377sss\377sss\377ttt\377\362\362\362\377\363\363\363\377\364\364\364"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\345\345\345"
+  "\377\346\346\346\377\347\347\347\377ooo\377\351\351\351\377\351\351\351"
+  "\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355\377"
+  "\356\356\356\377\357\357\357\377\360\360\360\377\356\356\356\377\360"
+  "\360\360\377\361\361\361\377\363\363\363\377\364\364\364\377\365\365"
+  "\365\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364\364\364\377\346\346"
+  "\346\377\347\347\347\377\350\350\350\377\351\351\351\377\352\352\352"
+  "\377\352\352\352\377\353\353\353\377\206\206\206\377rrr\377rrr\377ss"
+  "s\377sss\377ttt\377\362\362\362\377\363\363\363\377\363\363\363\377\364"
+  "\364\364\377\365\365\365\377\366\366\366\377\0\0\0\377\0\0\0=\0\0\0\27"
+  "\0\0\0\377\364\364\364\377\347\347\347\377\350\350\350\377\351\351\351"
+  "\377\352\352\352\377\353\353\353\377\354\354\354\377\354\354\354\377"
+  "\355\355\355\377\356\356\356\377\357\357\357\377\360\360\360\377\361"
+  "\361\361\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365"
+  "\365\377\365\365\365\377\366\366\366\377\367\367\367\377\0\0\0\377\0"
+  "\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\350\350\350\377\351\351\351"
+  "\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355\377"
+  "\356\356\356\377\356\356\356\377\357\357\357\377\360\360\360\377\361"
+  "\361\361\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365"
+  "\365\377\366\366\366\377\367\367\367\377\367\367\367\377\370\370\370"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\351\351\351"
+  "\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355\377"
+  "\356\356\356\377\357\357\357\377\360\360\360\377\360\360\360\377\361"
+  "\361\361\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365"
+  "\365\377\366\366\366\377\367\367\367\377\370\370\370\377\370\370\370"
+  "\377\371\371\371\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365"
+  "\377\352\352\352\377\353\353\353\377\303\303\303\377rrr\377\327\327\327"
+  "\377\357\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377"
+  "\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377\366"
+  "\366\366\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372"
+  "\372\377\372\372\372\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\366\366"
+  "\366\377\353\353\353\377\354\354\354\377rrr\377\356\356\356\377sss\377"
+  "\360\360\360\377\361\361\361\377ttt\377uuu\377\203\203\203\377uuu\377"
+  "vvv\377vvv\377www\377www\377xxx\377\372\372\372\377\373\373\373\377\374"
+  "\374\374\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\367\367\367\377\355"
+  "\355\355\377\355\355\355\377\356\356\356\377\330\330\330\377sss\377\361"
+  "\361\361\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365"
+  "\365\377\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370"
+  "\377\371\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377"
+  "\375\375\375\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\367\367\367\377"
+  "\356\356\356\377\357\357\357\377\330\330\330\377sss\377\332\332\332\377"
+  "\362\362\362\377\363\363\363\377uuu\377vvv\377vvv\377www\377www\377w"
+  "ww\377xxx\377xxx\377\373\373\373\377\374\374\374\377\375\375\375\377"
+  "\376\376\376\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377"
+  "\360\360\360\377\361\361\361\377ttt\377ttt\377uuu\377\364\364\364\377"
+  "\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\371"
+  "\371\371\377\372\372\372\377\373\373\373\377\373\373\373\377\374\374"
+  "\374\377\375\375\375\377\376\376\376\377\377\377\377\377\377\377\377"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\361\361\361"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\364\364\364\377"
+  "\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\371"
+  "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375"
+  "\375\377\375\375\375\377\376\376\376\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\362\362\362"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377"
+  "\366\366\366\377\366\366\366\377\367\367\367\377\370\370\370\377\371"
+  "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375"
+  "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\354\354\354\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0"
+  "\232\311\311\311\377\355\355\355\377\370\370\370\377\365\365\365\377"
+  "\366\366\366\377\367\367\367\377\370\370\370\377\370\370\370\377\371"
+  "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375"
+  "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\356\356\356\377\275\275\275\377\0\0\0\324\0\0\0"
+  ":\0\0\0\26\0\0\0\34\0\0\0\243\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\324\0\0\0Y\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\24\0\0\0)\0\0\0""8\0"
+  "\0\0<\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0="
+  "\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0""9\0\0\0-\0\0\0\31\0"
+  "\0\0\7\0\0\0\1\0\0\0\6\0\0\0\16\0\0\0\24\0\0\0\27\0\0\0\27\0\0\0\27\0"
+  "\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27"
+  "\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\25\0\0\0\20\0\0\0"
+  "\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0\0\3\0"
+  "\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0"
+  "\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_text_unindent)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_text_unindent[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_text_unindent[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\27\0\0\0\224\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\232"
+  "\0\0\0'\0\0\0\6\0\0\0\1\0\0\0\224\342\342\342\377\362\362\362\377\362"
+  "\362\362\377\362\362\362\377\362\362\362\377\363\363\363\377\363\363"
+  "\363\377\363\363\363\377\364\364\364\377\364\364\364\377\364\364\364"
+  "\377\365\365\365\377\365\365\365\377\365\365\365\377\366\366\366\377"
+  "\366\366\366\377\367\367\367\377\367\367\367\377\364\364\364\377\333"
+  "\333\333\377\0\0\0\243\0\0\0\25\0\0\0\6\0\0\0\377\360\360\360\377\340"
+  "\340\340\377\340\340\340\377\341\341\341\377\342\342\342\377\343\343"
+  "\343\377\344\344\344\377\345\345\345\377\256\256\256\377\347\347\347"
+  "\377\350\350\350\377\350\350\350\377\351\351\351\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\343\343\343\377\0\0\0\377\0\0\0)\0\0\0\16\0\0\0\377\362"
+  "\362\362\377\341\341\341\377\341\341\341\377\342\342\342\377\343\343"
+  "\343\377\344\344\344\377\345\345\345\377\346\346\346\377\347\347\347"
+  "\377\350\350\350\377\351\351\351\377\352\352\352\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\347\347\347\377\0\0\0\377\0\0\0""8\0\0\0"
+  "\25\0\0\0\377\362\362\362\377\342\342\342\377\254\254\254\377\254\254"
+  "\254\377\255\255\255\377\256\256\256\377\256\256\256\377\257\257\257"
+  "\377\260\260\260\377\261\261\261\377\262\262\262\377\262\262\262\377"
+  "\263\263\263\377\263\263\263\377\264\264\264\377\265\265\265\377\265"
+  "\265\265\377\266\266\266\377\361\361\361\377\350\350\350\377\0\0\0\377"
+  "\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\343\343\343\377\344\344\344"
+  "\377\345\345\345\377\345\345\345\377\346\346\346\377\347\347\347\377"
+  "\350\350\350\377\351\351\351\377\352\352\352\377\353\353\353\377\354"
+  "\354\354\377\355\355\355\377\355\355\355\377\356\356\356\377\357\357"
+  "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\351\351\351"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363\377\344\344\344"
+  "\377\345\345\345\377\346\346\346\377\347\347\347\377\347\347\347\377"
+  "\350\350\350\377\351\351\351\377\352\352\352\377\353\353\353\377\354"
+  "\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\357\357"
+  "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363"
+  "\377\352\352\352\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\363\363\363"
+  "\377\345\345\345\377\346\346\346\377\347\347\347\377\350\350\350\377"
+  "\351\351\351\377\351\351\351\377\352\352\352\377uuu\377vvv\377vvv\377"
+  "www\377www\377xxx\377xxx\377xxx\377yyy\377yyy\377\364\364\364\377\353"
+  "\353\353\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364\364\364\377\346"
+  "\346\346\377\347\347\347\377\252\252\252\377\351\351\351\377\352\352"
+  "\352\377\352\352\352\377\353\353\353\377\354\354\354\377\355\355\355"
+  "\377\356\356\356\377\357\357\357\377\360\360\360\377\361\361\361\377"
+  "\362\362\362\377\363\363\363\377\363\363\363\377\364\364\364\377\365"
+  "\365\365\377\354\354\354\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\364"
+  "\364\364\377\347\347\347\377\252\252\252\377\0\0\0\377\352\352\352\377"
+  "\353\353\353\377\354\354\354\377\354\354\354\377vvv\377www\377www\377"
+  "xxx\377xxx\377yyy\377yyy\377zzz\377zzz\377zzz\377\366\366\366\377\355"
+  "\355\355\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\252"
+  "\252\252\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\356\356"
+  "\356\377\356\356\356\377\357\357\357\377\360\360\360\377\361\361\361"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377"
+  "\366\366\366\377\367\367\367\377\367\367\367\377\356\356\356\377\0\0"
+  "\0\377\0\0\0=\0\0\0\27\0\0\0\377\365\365\365\377\351\351\351\377\253"
+  "\253\253\377\0\0\0\377\354\354\354\377\355\355\355\377\356\356\356\377"
+  "\357\357\357\377xxx\377xxx\377xxx\377yyy\377yyy\377zzz\377zzz\377{{{"
+  "\377{{{\377|||\377\370\370\370\377\357\357\357\377\0\0\0\377\0\0\0=\0"
+  "\0\0\27\0\0\0\377\365\365\365\377\352\352\352\377\353\353\353\377\255"
+  "\255\255\377\355\355\355\377\356\356\356\377\357\357\357\377\360\360"
+  "\360\377\361\361\361\377\362\362\362\377\362\362\362\377\363\363\363"
+  "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377"
+  "\370\370\370\377\371\371\371\377\372\372\372\377\360\360\360\377\0\0"
+  "\0\377\0\0\0=\0\0\0\27\0\0\0\377\366\366\366\377\353\353\353\377\354"
+  "\354\354\377\355\355\355\377\356\356\356\377\357\357\357\377\360\360"
+  "\360\377\361\361\361\377yyy\377yyy\377zzz\377zzz\377zzz\377\366\366\366"
+  "\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377"
+  "\373\373\373\377\362\362\362\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377"
+  "\367\367\367\377\355\355\355\377\355\355\355\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\366\366\366"
+  "\377\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377"
+  "\373\373\373\377\374\374\374\377\363\363\363\377\0\0\0\377\0\0\0=\0\0"
+  "\0\27\0\0\0\377\367\367\367\377\356\356\356\377\357\357\357\377\357\357"
+  "\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363\363"
+  "\377\364\364\364\377\365\365\365\377\366\366\366\377\367\367\367\377"
+  "\367\367\367\377\370\370\370\377\371\371\371\377\372\372\372\377\373"
+  "\373\373\377\374\374\374\377\375\375\375\377\364\364\364\377\0\0\0\377"
+  "\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\360\360\360\377\267\267\267"
+  "\377\270\270\270\377\270\270\270\377\270\270\270\377\271\271\271\377"
+  "\272\272\272\377\273\273\273\377\273\273\273\377\274\274\274\377\275"
+  "\275\275\377\276\276\276\377\276\276\276\377\276\276\276\377\277\277"
+  "\277\377\300\300\300\377\301\301\301\377\377\377\377\377\365\365\365"
+  "\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\370\370\370\377\361\361\361"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\364\364\364\377"
+  "\365\365\365\377\366\366\366\377\367\367\367\377\370\370\370\377\371"
+  "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375"
+  "\375\377\375\375\375\377\376\376\376\377\377\377\377\377\377\377\377"
+  "\377\365\365\365\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0\377\362\362\362"
+  "\377\362\362\362\377\363\363\363\377\364\364\364\377\365\365\365\377"
+  "\366\366\366\377\366\366\366\377\367\367\367\377\274\274\274\377\371"
+  "\371\371\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375"
+  "\375\377\376\376\376\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\331\331\331\377\0\0\0\377\0\0\0=\0\0\0\27\0\0\0"
+  "\232\311\311\311\377\332\332\332\377\356\356\356\377\353\353\353\377"
+  "\354\354\354\377\355\355\355\377\356\356\356\377\356\356\356\377\357"
+  "\357\357\377\360\360\360\377\361\361\361\377\362\362\362\377\363\363"
+  "\363\377\364\364\364\377\365\365\365\377\365\365\365\377\365\365\365"
+  "\377\365\365\365\377\344\344\344\377\275\275\275\377\0\0\0\324\0\0\0"
+  ":\0\0\0\26\0\0\0\34\0\0\0\243\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\324\0\0\0Y\0\0\0-\0\0\0\20\0\0\0\6\0\0\0\24\0\0\0)\0\0\0""8\0"
+  "\0\0<\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0="
+  "\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0=\0\0\0""9\0\0\0-\0\0\0\31\0"
+  "\0\0\7\0\0\0\1\0\0\0\6\0\0\0\16\0\0\0\24\0\0\0\27\0\0\0\27\0\0\0\27\0"
+  "\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27"
+  "\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\27\0\0\0\25\0\0\0\20\0\0\0"
+  "\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\3\0\0\0\3\0"
+  "\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0"
+  "\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\1\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_timer)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_timer[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_timer[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\23\0"
+  "\0\0o\0\0\0\266\0\0\0\344\0\0\0\373\0\0\0\373\0\0\0\345\0\0\0\270\0\0"
+  "\0t\0\0\0\31\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\205\0\0\0"
+  "\373\207\207\207\377\300\300\300\377\323\323\323\377\326\326\326\377"
+  "\325\325\325\377\322\322\322\377\275\275\275\377\204\204\204\377\0\0"
+  "\0\374\0\0\0\217\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377[\210\262\377\0\0\0\377\324\324"
+  "\324\377\342\342\342\377\365\365\365\377\374\374\374\377\374\374\374"
+  "\377\374\374\374\377\373\373\373\377\363\363\363\377\354\354\354\377"
+  "\341\341\341\377\220\220\220\377\0\0\0\324\0\0\0""6\0\0\0\3\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\236"
+  "\270\321\377P\200\255\377\0\0\0\377\375\375\375\377\375\375\375\377\375"
+  "\375\375\377\316\316\316\377\310\310\310\377\374\374\374\377\373\373"
+  "\373\377\373\373\373\377\367\367\367\377\350\350\350\377\272\272\272"
+  "\377\0\0\0\352\0\0\0\77\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\377\277\321\341"
+  "\377\257\305\332\377\262\307\333\377\266\312\335\377\244\275\325\377"
+  "\234\267\321\377P\200\255\377\10\15\21\377\375\375\375\377\375\375\375"
+  "\377\277\277\277\377\270\270\270\377\373\373\373\377\373\373\373\377"
+  "\372\372\372\377\371\371\371\377\370\370\370\377\350\350\350\377\301"
+  "\301\301\377\0\0\0\330\0\0\0\32\0\0\0\4\0\0\0\0\0\0\0\377\302\322\341"
+  "\377\240\272\323\377\234\267\321\377\232\265\317\377\240\272\323\377"
+  "\234\267\321\377\227\263\316\377_\213\264\377\0\0\0\377\375\375\375\377"
+  "\260\260\260\377\251\251\251\377\373\373\373\377\373\373\373\377\371"
+  "\371\371\377\371\371\371\377\367\367\367\377\366\366\366\377\345\345"
+  "\345\377\217\217\217\377\0\0\0\242\0\0\0\20\0\0\0\1\0\0\0\377\310\326"
+  "\344\377\236\270\321\377\232\265\317\377\234\267\321\377\234\267\321"
+  "\377\234\267\321\377\240\272\323\377\225\262\316\377Ly\243\377\0\0\0"
+  "\377\241\241\241\377\231\231\231\377\373\373\373\377\372\372\372\377"
+  "\371\371\371\377\370\370\370\377\367\367\367\377\365\365\365\377\363"
+  "\363\363\377\350\350\350\377\0\0\0\374\0\0\0>\0\0\0\11\0\0\0\377g\213"
+  "\254\377\77e\210\377\77e\210\377\77e\210\377\77e\210\377\77e\210\377"
+  "\77e\210\377*C[\377\0\0\0\377\375\375\375\377\221\221\221\377\212\212"
+  "\212\377\373\373\373\377\372\372\372\377\371\371\371\377\370\370\370"
+  "\377\366\366\366\377\365\365\365\377\363\363\363\377\355\355\355\377"
+  "\216\216\216\377\0\0\0\227\0\0\0\25\0\0\0\377d\207\247\3777Yx\3777Yx"
+  "\3777Yx\377\77e\210\377\77e\210\377*C[\377\0\0\0\377\377\377\377\377"
+  "\376\376\376\377\201\201\201\377zzz\377\373\373\373\377\371\371\371\377"
+  "\370\370\370\377\367\367\367\377\365\365\365\377\364\364\364\377\362"
+  "\362\362\377\357\357\357\377\323\323\323\377\0\0\0\314\0\0\0(\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\77e\210\377*C[\377\0\0\0\377"
+  "\375\375\375\377\376\376\376\377\375\375\375\377rrr\377kkk\377\356\356"
+  "\356\377\371\371\371\377\370\370\370\377\366\366\366\377\364\364\364"
+  "\377\363\363\363\377\361\361\361\377\357\357\357\377\367\367\367\377"
+  "\0\0\0\354\0\0\0""9\0\0\0\0\0\0\0\373\350\350\350\377\372\372\372\377"
+  "\0\0\0\377*C[\377\0\0\0\377\374\374\374\377\374\374\374\377\374\374\374"
+  "\377\374\374\374\377ccc\377[[[\377\313\313\313\377\345\345\345\377\367"
+  "\367\367\377\365\365\365\377\364\364\364\377\362\362\362\377\273\273"
+  "\273\377\356\356\356\377\370\370\370\377\0\0\0\374\0\0\0D\0\0\0\0\0\0"
+  "\0\373\336\336\336\377\371\371\371\377\0\0\0\377\0\0\0\377\373\373\373"
+  "\377\373\373\373\377\373\373\373\377\373\373\373\377\373\373\373\377"
+  "\221\221\221\377LLL\377EEE\377bbb\377\300\300\300\377\335\335\335\377"
+  "\362\362\362\377\361\361\361\377\265\265\265\377\355\355\355\377\370"
+  "\370\370\377\0\0\0\374\0\0\0J\0\0\0\0\0\0\0\346\332\332\332\377\370\370"
+  "\370\377\0\0\0\377\371\371\371\377\371\371\371\377\371\371\371\377\372"
+  "\372\372\377\372\372\372\377\372\372\372\377\352\352\352\377\276\276"
+  "\276\377ddd\377...\377'''\377III\377\361\361\361\377\357\357\357\377"
+  "\355\355\355\377\371\371\371\377\367\367\367\377\0\0\0\355\0\0\0J\0\0"
+  "\0\0\0\0\0\273\275\275\275\377\365\365\365\377\367\367\367\377\370\370"
+  "\370\377\370\370\370\377\370\370\370\377\370\370\370\377\370\370\370"
+  "\377\370\370\370\377\367\367\367\377\366\366\366\377\335\335\335\377"
+  "\276\276\276\377WWW\377xxx\377\357\357\357\377\356\356\356\377\354\354"
+  "\354\377\371\371\371\377\323\323\323\377\0\0\0\316\0\0\0D\0\0\0\0\0\0"
+  "\0t\177\177\177\377\341\341\341\377\366\366\366\377\366\366\366\377\366"
+  "\366\366\377\366\366\366\377\367\367\367\377\366\366\366\377\366\366"
+  "\366\377\365\365\365\377\364\364\364\377\364\364\364\377\362\362\362"
+  "\377\361\361\361\377\357\357\357\377\356\356\356\377\355\355\355\377"
+  "\364\364\364\377\370\370\370\377\214\214\214\377\0\0\0\237\0\0\0""9\0"
+  "\0\0\0\0\0\0\31\0\0\0\374\320\320\320\377\353\353\353\377\364\364\364"
+  "\377\364\364\364\377\365\365\365\377\364\364\364\377\364\364\364\377"
+  "\364\364\364\377\363\363\363\377\362\362\362\377\361\361\361\377\360"
+  "\360\360\377\357\357\357\377\356\356\356\377\355\355\355\377\354\354"
+  "\354\377\370\370\370\377\361\361\361\377\0\0\0\374\0\0\0_\0\0\0(\0\0"
+  "\0\0\0\0\0\2\0\0\0\217\211\211\211\377\324\324\324\377\362\362\362\377"
+  "\362\362\362\377\362\362\362\377\362\362\362\377\362\362\362\377\361"
+  "\361\361\377\361\361\361\377\360\360\360\377\360\360\360\377\357\357"
+  "\357\377\356\356\356\377\355\355\355\377\354\354\354\377\371\371\371"
+  "\377\370\370\370\377\230\230\230\377\0\0\0\260\0\0\0H\0\0\0\25\0\0\0"
+  "\0\0\0\0\0\0\0\0\10\0\0\0\324\253\253\253\377\323\323\323\377\360\360"
+  "\360\377\360\360\360\377\360\360\360\377\360\360\360\377\360\360\360"
+  "\377\357\357\357\377\357\357\357\377\356\356\356\377\356\356\356\377"
+  "\355\355\355\377\354\354\354\377\371\371\371\377\370\370\370\377\304"
+  "\304\304\377\0\0\0\335\0\0\0Q\0\0\0.\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\1"
+  "\0\0\0""6\0\0\0\352\253\253\253\377\322\322\322\377\344\344\344\377\356"
+  "\356\356\377\356\356\356\377\356\356\356\377\256\256\256\377\255\255"
+  "\255\377\355\355\355\377\354\354\354\377\353\353\353\377\370\370\370"
+  "\377\370\370\370\377\302\302\302\377\0\0\0\355\0\0\0p\0\0\0<\0\0\0\20"
+  "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\77\0\0\0\330\202\202\202"
+  "\377\315\315\315\377\331\331\331\377\354\354\354\377\354\354\354\377"
+  "\354\354\354\377\354\354\354\377\353\353\353\377\364\364\364\377\370"
+  "\370\370\377\367\367\367\377\214\214\214\377\0\0\0\335\0\0\0q\0\0\0B"
+  "\0\0\0\32\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0"
+  "\0\32\0\0\0\242\0\0\0\374\210\210\210\377\310\310\310\377\335\335\335"
+  "\377\370\370\370\377\370\370\370\377\367\367\367\377\361\361\361\377"
+  "\300\300\300\377\0\0\0\374\0\0\0\260\0\0\0Q\0\0\0<\0\0\0\32\0\0\0\5\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0"
+  "\20\0\0\0>\0\0\0\227\0\0\0\314\0\0\0\354\0\0\0\374\0\0\0\374\0\0\0\355"
+  "\0\0\0\316\0\0\0\237\0\0\0_\0\0\0H\0\0\0.\0\0\0\20\0\0\0\4\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\1\0\0\0\10\0\0\0\25\0\0\0(\0\0\0""9\0\0\0D\0\0\0J\0\0\0J\0\0\0D\0\0"
+  "\0""9\0\0\0(\0\0\0\25\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\1\0\0\0\6\0\0\0\12\0\0\0\15\0\0\0\17\0\0\0\17\0\0\0\15\0\0\0\12"
+  "\0\0\0\6\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_timer_stopped)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_timer_stopped[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_timer_stopped[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\23\0\0"
+  "\0o\0\0\0\266\0\0\0\344\0\0\0\373\0\0\0\373\0\0\0\345\0\0\0\270\0\0\0"
+  "t\0\0\0\31\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\205\0\0\0\373\207"
+  "\207\207\377\300\300\300\377\323\323\323\377\326\326\326\377\325\325"
+  "\325\377\322\322\322\377\275\275\275\377\204\204\204\377\0\0\0\374\0"
+  "\0\0\217\0\0\0\10\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0)\0\0\0\314\223\223\223\377\324\324\324\377"
+  "\342\342\342\377\365\365\365\377\374\374\374\377\374\374\374\377\374"
+  "\374\374\377\373\373\373\377\363\363\363\377\354\354\354\377\341\341"
+  "\341\377\220\220\220\377\0\0\0\324\0\0\0""6\0\0\0\3\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0)\0\0\0\344\277\277\277\377\336\336"
+  "\336\377\360\360\360\377\375\375\375\377\375\375\375\377\375\375\375"
+  "\377\316\316\316\377\310\310\310\377\374\374\374\377\373\373\373\377"
+  "\373\373\373\377\367\367\367\377\350\350\350\377\272\272\272\377\0\0"
+  "\0\352\0\0\0\77\0\0\0\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\314\267\267\267\377\342\342\342\377\373\373\373\377\375\375\375\377"
+  "\375\375\375\377\375\375\375\377\375\375\375\377\277\277\277\377\270"
+  "\270\270\377\373\373\373\377\373\373\373\377\372\372\372\377\371\371"
+  "\371\377\370\370\370\377\350\350\350\377\301\301\301\377\0\0\0\330\0"
+  "\0\0\32\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\205\207\207\207\377\336"
+  "\336\336\377\373\373\373\377\375\375\375\377\375\375\375\377\375\375"
+  "\375\377\375\375\375\377\375\375\375\377\260\260\260\377\251\251\251"
+  "\377\373\373\373\377\373\373\373\377\371\371\371\377\371\371\371\377"
+  "\367\367\367\377\366\366\366\377\345\345\345\377\217\217\217\377\0\0"
+  "\0\242\0\0\0\20\0\0\0\1\0\0\0\0\0\0\0\23\0\0\0\373\324\324\324\377\367"
+  "\367\367\377\375\375\375\377\375\375\375\377\375\375\375\377\375\375"
+  "\375\377\375\375\375\377\375\375\375\377\241\241\241\377\231\231\231"
+  "\377\373\373\373\377\372\372\372\377\371\371\371\377\370\370\370\377"
+  "\367\367\367\377\365\365\365\377\363\363\363\377\350\350\350\377\0\0"
+  "\0\374\0\0\0>\0\0\0\11\0\0\0\0\0\0\0o\207\207\207\377\342\342\342\377"
+  "\374\374\374\377\375\375\375\377\375\375\375\377\375\375\375\377\375"
+  "\375\375\377\376\376\376\377\375\375\375\377\221\221\221\377\212\212"
+  "\212\377\373\373\373\377\372\372\372\377\371\371\371\377\370\370\370"
+  "\377\366\366\366\377\365\365\365\377\363\363\363\377\355\355\355\377"
+  "\216\216\216\377\0\0\0\227\0\0\0\25\0\0\0\0\0\0\0\266\300\300\300\377"
+  "\364\364\364\377\374\374\374\377\374\374\374\377\375\375\375\377\375"
+  "\375\375\377\376\376\376\377\377\377\377\377\376\376\376\377\201\201"
+  "\201\377zzz\377\373\373\373\377\371\371\371\377\370\370\370\377\367\367"
+  "\367\377\365\365\365\377\364\364\364\377\362\362\362\377\357\357\357"
+  "\377\323\323\323\377\0\0\0\314\0\0\0(\0\0\0\0\0\0\0\346\323\323\323\377"
+  "\372\372\372\377\373\373\373\377\374\374\374\377\374\374\374\377\375"
+  "\375\375\377\375\375\375\377\376\376\376\377\375\375\375\377rrr\377k"
+  "kk\377\356\356\356\377\371\371\371\377\370\370\370\377\366\366\366\377"
+  "\364\364\364\377\363\363\363\377\361\361\361\377\357\357\357\377\367"
+  "\367\367\377\0\0\0\354\0\0\0""9\0\0\0\0\0\0\0\373\350\350\350\377\372"
+  "\372\372\377\337\337\337\377\373\373\373\377\374\374\374\377\374\374"
+  "\374\377\374\374\374\377\374\374\374\377\374\374\374\377ccc\377[[[\377"
+  "\313\313\313\377\345\345\345\377\367\367\367\377\365\365\365\377\364"
+  "\364\364\377\362\362\362\377\273\273\273\377\356\356\356\377\370\370"
+  "\370\377\0\0\0\374\0\0\0D\0\0\0\0\0\0\0\373\336\336\336\377\371\371\371"
+  "\377\332\332\332\377\372\372\372\377\373\373\373\377\373\373\373\377"
+  "\373\373\373\377\373\373\373\377\373\373\373\377\221\221\221\377LLL\377"
+  "EEE\377bbb\377\300\300\300\377\335\335\335\377\362\362\362\377\361\361"
+  "\361\377\265\265\265\377\355\355\355\377\370\370\370\377\0\0\0\374\0"
+  "\0\0J\0\0\0\0\0\0\0\346\332\332\332\377\370\370\370\377\371\371\371\377"
+  "\371\371\371\377\371\371\371\377\371\371\371\377\372\372\372\377\372"
+  "\372\372\377\372\372\372\377\352\352\352\377\276\276\276\377ddd\377."
+  "..\377'''\377III\377\361\361\361\377\357\357\357\377\355\355\355\377"
+  "\371\371\371\377\367\367\367\377\0\0\0\355\0\0\0J\0\0\0\0\0\0\0\273\275"
+  "\275\275\377\365\365\365\377\367\367\367\377\370\370\370\377\370\370"
+  "\370\377\370\370\370\377\370\370\370\377\370\370\370\377\370\370\370"
+  "\377\367\367\367\377\366\366\366\377\335\335\335\377\276\276\276\377"
+  "WWW\377xxx\377\357\357\357\377\356\356\356\377\354\354\354\377\371\371"
+  "\371\377\323\323\323\377\0\0\0\316\0\0\0D\0\0\0\0\0\0\0t\177\177\177"
+  "\377\341\341\341\377\366\366\366\377\366\366\366\377\366\366\366\377"
+  "\366\366\366\377\367\367\367\377\366\366\366\377\366\366\366\377\365"
+  "\365\365\377\364\364\364\377\364\364\364\377yyy\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\234"
+  "\0\0\0\0\0\0\0\31\0\0\0\374\320\320\320\377\353\353\353\377\364\364\364"
+  "\377\364\364\364\377\365\365\365\377\364\364\364\377\364\364\364\377"
+  "\364\364\364\377\363\363\363\377\362\362\362\377\361\361\361\377\0\0"
+  "\0\377\351\\\23\377\362g\37\377\356b\32\377\345Y\23\377\333T\22\377\322"
+  "S\27\377\312R\33\377\276D\17\377\0\0\0\377\0\0\0\0\0\0\0\2\0\0\0\217"
+  "\211\211\211\377\324\324\324\377\362\362\362\377\362\362\362\377\362"
+  "\362\362\377\362\362\362\377\362\362\362\377\361\361\361\377\361\361"
+  "\361\377\360\360\360\377\360\360\360\377\0\0\0\377\353a\33\377\376\362"
+  "\353\377\374\346\333\377\350k,\377\337e)\377\370\342\330\377\373\361"
+  "\355\377\300K\30\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\10\0\0\0\324\253"
+  "\253\253\377\323\323\323\377\360\360\360\377\360\360\360\377\360\360"
+  "\360\377\360\360\360\377\360\360\360\377\357\357\357\377\357\357\357"
+  "\377\356\356\356\377\0\0\0\377\345[\26\377\372\337\322\377\377\377\377"
+  "\377\372\346\334\377\372\344\331\377\377\377\377\377\364\334\322\377"
+  "\275G\23\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0""6\0\0\0\352\253"
+  "\253\253\377\322\322\322\377\344\344\344\377\356\356\356\377\356\356"
+  "\356\377\356\356\356\377\256\256\256\377\255\255\255\377\355\355\355"
+  "\377\0\0\0\377\335U\22\377\342d%\377\371\340\324\377\377\377\377\377"
+  "\377\377\377\377\365\336\323\377\307U\"\377\271B\16\377\0\0\0\377\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\77\0\0\0\330\202\202\202\377\315\315"
+  "\315\377\331\331\331\377\354\354\354\377\354\354\354\377\354\354\354"
+  "\377\354\354\354\377\353\353\353\377\0\0\0\377\323O\21\377\332a)\377"
+  "\371\343\331\377\377\377\377\377\377\377\377\377\366\344\333\377\304"
+  "W(\377\265@\16\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5"
+  "\0\0\0\32\0\0\0\242\0\0\0\374\210\210\210\377\310\310\310\377\335\335"
+  "\335\377\370\370\370\377\370\370\370\377\367\367\367\377\0\0\0\377\312"
+  "N\23\377\367\341\327\377\377\377\377\377\364\335\323\377\364\335\323"
+  "\377\377\377\377\377\364\342\332\377\262B\23\377\0\0\0\377\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\20\0\0\0>\0\0\0\227\0\0"
+  "\0\314\0\0\0\354\0\0\0\374\0\0\0\374\0\0\0\355\0\0\0\377\302K\26\377"
+  "\370\353\345\377\363\333\321\377\304S\"\377\300R\"\377\361\332\320\377"
+  "\367\353\347\377\255A\25\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\10\0\0\0\25\0\0\0(\0\0\0""9\0\0\0D\0"
+  "\0\0J\0\0\0J\0\0\0\377\267@\16\377\272E\23\377\270C\21\377\266@\16\377"
+  "\263>\15\377\260>\20\377\253\77\23\377\2447\14\377\0\0\0\377\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0"
+  "\0\6\0\0\0\12\0\0\0\15\0\0\0\17\0\0\0\17\0\0\0\206\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\177"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_trash)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_trash[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_trash[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0R\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0"
+  "X\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\0\220\34\34"
+  "\34\377vvv\377\346\346\346\377\323\323\323\377\303\303\303\377\220\220"
+  "\220\377III\377\0\0\0\377\0\0\0\276\0\0\0,\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0E\0\0\0\240\0\0\0"
+  "\377\0\0\0\377HG=\377\272\270\246\377\342\342\337\377\361\361\360\377"
+  "\352\351\346\377\362\362\356\377\353\352\345\377\301\300\265\377WVJ\377"
+  "RQF\377\0\0\0\377\0\0\0\377\0\0\0\227\0\0\0""3\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0T\0\0\0\377\250\246\217\377\275\273\241\377\300"
+  "\276\243\377\243\241\212\377ml\\\377||r\377LLI\377EE\77\377DC:\377oo"
+  "g\377\306\305\271\377\266\265\233\377ml]\377\263\261\233\377\247\246"
+  "\216\377\220\217z\377\0\0\0\377\0\0\0E\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\252\251\223\377\314\313\265\377\320\316\272\377\325\323"
+  "\301\377\256\255\243\377\224\223\212\377EDB\377##!\377541\377)(#\377"
+  "\36\36\32\377SRF\377\255\254\223\377\222\221\211\377\302\301\257\377"
+  "\261\257\226\377\254\252\222\377\223\222}\377\0\0\0\377\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\10\10\10\377\321\320\301\377\314\313\265\377\326\325"
+  "\304\377\337\336\321\377\316\315\300\377\254\254\246\377\220\217\212"
+  "\377~}w\377\\\\U\377GF>\377edV\377wve\377\200~o\377\276\275\247\377\265"
+  "\263\232\377\266\265\233\377\265\263\232\377\241\237\210\377\0\0\0\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\331\330\314\377\366\365\362"
+  "\377\333\332\321\377\332\331\316\377\345\344\331\377\320\317\303\377"
+  "\323\323\311\377\312\311\274\377\267\266\246\377\270\266\241\377\260"
+  "\257\226\377\241\237\210\377\271\270\235\377\271\267\235\377\270\266"
+  "\234\377\304\302\251\377\257\255\227\377\213\211v\377\0\0\0\377\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\252\251\230\377\266\266\262\377"
+  "\371\371\367\377\372\372\370\377\364\364\360\377\342\341\332\377\331"
+  "\331\316\377\333\332\317\377\325\323\301\377\323\321\276\377\304\302"
+  "\251\377\300\276\243\377\305\304\254\377\326\325\303\377\315\314\277"
+  "\377\273\272\255\377|zi\377qp`\377\0\0\0\336\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\23\23\23\316\231\230\202\377\257\256\235\377\303\303\276\377"
+  "\336\336\334\377\351\351\350\377\373\373\372\377\375\375\374\377\375"
+  "\375\375\377\374\373\372\377\371\371\367\377\362\362\357\377\352\351"
+  "\343\377\333\332\321\377\300\277\261\377\225\224\204\377xwf\377nm]\377"
+  "[[M\377\0\0\0\315\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\222]\\O\377\223"
+  "\222}\377\243\242\223\377\270\267\246\377\330\327\320\377\333\333\324"
+  "\377\323\322\312\377\310\310\303\377\306\305\275\377\275\274\255\377"
+  "\272\270\250\377\237\236\213\377\216\214x\377\214\213w\377\216\214x\377"
+  "zyh\377lk]\377NME\377\0\0\0y\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2"
+  "\0\0\0\377BBB\377{{s\377\237\237\226\377\322\321\307\377\334\333\322"
+  "\377\314\313\276\377\321\320\302\377\304\303\266\377\261\257\226\377"
+  "\261\257\226\377\261\257\226\377\232\230\203\377\200\177m\377}|k\377"
+  "ji^\377@@>\377\0\0\0\377\0\0\0""3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\37777-\377\17\17\17\377874\377xxu\377\231\230\223\377\212"
+  "\211~\377\263\262\244\377\252\252\236\377\243\241\212\377\207\206s\377"
+  "\217\215y\377baU\377TTQ\37711.\377\0\0\0\377++#\377\0\0\0\377\0\0\0\17"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377qq]\377WWK\377BB:\377"
+  "&&\40\377!!!\377\33\33\33\377\0\0\0\377$$$\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\26\26\23\377**\"\37700'\377\77\77""4\377\0\0\0\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377zze\377[[Q"
+  "\377\205\205v\377vvk\377\230\230\216\377uuk\377QQF\377\177\177t\377j"
+  "jX\377@@5\377bbQ\377TTE\377>>3\377UUF\37744+\377QQC\377\0\0\0\377\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\205\205n\377]"
+  "]T\377\221\221\202\377\202\202x\377\252\252\243\377zzq\377NNE\377\212"
+  "\212\200\377||m\377BB7\377``R\377ZZJ\377<<2\377NNA\37755,\377TTE\377"
+  "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\3\0\0\0\377"
+  "\205\205n\377[[Q\377\254\254\234\377\205\205{\377\273\273\263\377\243"
+  "\243\232\377TTK\377\223\223\212\377\221\221\205\377BB7\377``R\377hhV"
+  "\377AA6\377jjX\377CC7\377jjX\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\1\0\0\0\5\0\0\0\10\0\0\0\377\205\205n\377[[Q\377\244\244\223\377"
+  "\205\205{\377\301\301\266\377\261\261\242\377kk_\377\261\261\242\377"
+  "\235\235\213\377TTE\377\204\204p\377qq^\377CC7\377jjX\377CC7\377jjX\377"
+  "\0\0\0\377\0\0\0\6\0\0\0\3\0\0\0\0\0\0\0\2\0\0\0\12\0\0\0\24\0\0\0\377"
+  "\205\205n\377[[Q\377\245\245\224\377\205\205{\377\302\302\267\377\261"
+  "\261\242\377kk_\377\261\261\242\377\235\235\213\377TTE\377\204\204p\377"
+  "qq^\377CC7\377jjX\377CC7\377jjX\377\0\0\0\377\0\0\0\26\0\0\0\13\0\0\0"
+  "\2\0\0\0\3\0\0\0\26\0\0\0+\0\0\0\377\205\205n\377[[Q\377\235\235\213"
+  "\377\205\205{\377\301\301\266\377\261\261\242\377kk_\377\261\261\242"
+  "\377\235\235\213\377TTE\377\204\204p\377qq^\377CC7\377jjX\377CC7\377"
+  "jjX\377\0\0\0\377\0\0\0""1\0\0\0\32\0\0\0\4\0\0\0\7\0\0\0#\0\0\0I\0\0"
+  "\0\377{{e\377[[Q\377\244\244\223\377\205\205{\377\301\301\266\377\261"
+  "\261\242\377kk_\377\261\261\242\377\235\235\213\377TTE\377\204\204p\377"
+  "qq^\377CC7\377jjX\377CC7\377__O\377\0\0\0\377\0\0\0H\0\0\0*\0\0\0\7\0"
+  "\0\0\12\0\0\0,\0\0\0X\0\0\0\377ffT\377[[Q\377\244\244\223\377\202\202"
+  "x\377\301\301\266\377\261\261\242\377kk_\377\261\261\242\377\235\235"
+  "\213\377TTE\377\204\204p\377qq^\377CC7\377jjX\377II<\377WWH\377\0\0\0"
+  "\377\0\0\0P\0\0\0*\0\0\0\7\0\0\0\6\0\0\0\35\0\0\0C\0\0\0r\0\0\0\377W"
+  "WJ\377}}m\377vvi\377\263\263\250\377\241\241\224\377mma\377\263\263\245"
+  "\377\235\235\213\377TTE\377\204\204p\377iiW\377AA5\377VVG\377DD8\377"
+  "\0\0\0\377\0\0\0\177\0\0\0C\0\0\0\35\0\0\0\4\0\0\0\1\0\0\0\13\0\0\0\34"
+  "\0\0\0""2\0\0\0g\0\0\0\320\0\0\0\377\0\0\0\377YYQ\377XXI\377NN@\377t"
+  "tg\377aaS\377NNA\377II<\377II<\377\0\0\0\377\0\0\0\377\0\0\0\304\0\0"
+  "\0t\0\0\0>\0\0\0%\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0\17\0"
+  "\0\0\31\0\0\0\37\0\0\0r\0\0\0\264\0\0\0\302\0\0\0\377\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\271\0\0\0\217\0\0\0S\0\0\0,"
+  "\0\0\0*\0\0\0\33\0\0\0\10\0\0\0\1\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_trash_full)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_trash_full[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_trash_full[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\10\10"
+  "\10\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\6\6\6\21\6\6\6K\16\16\16\377BBB\377JJJ\377>>>\377,,,\377\0"
+  "\0\0\377\6\6\6>\6\6\6!\0\0\0\0\0\0\0\0\0\0\0\0\10\10\10\377\10\10\10"
+  "\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\6\6\6:\0\0\0\377\0\0\0\377\205\203q\377\360\355\330\377\362\361\351"
+  "\377\356\355\344\377\307\306\272\377SRF\377\0\0\0\377\0\0\0\377\6\6\6"
+  "K\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\6\6\6>\20\20\20\377\302\300\245\377\301\277\245"
+  "\377zyg\377HG@\377''%\37765.\377\207\205r\377\240\236\210\377\243\241"
+  "\212\377\245\243\214\377\0\0\0\377\6\6\6!\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0+++\377\323\321\274"
+  "\377\334\332\304\377\342\340\317\377\271\267\242\377db[\377986\377<<"
+  "3\377a`S\377\232\230\203\377\267\265\233\377\263\262\230\377\244\242"
+  "\213\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\10\10\10\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\350\344\323\377\364\361\351"
+  "\377\362\361\344\377\352\351\332\377\345\342\322\377\325\322\276\377"
+  "\303\301\247\377\257\255\224\377\300\276\244\377\306\304\254\377\270"
+  "\266\234\377ywf\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\10\10\10\377\10\10\10\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\212\211"
+  "u\377\361\355\322\377\373\370\351\377\371\365\355\377\370\367\356\377"
+  "\370\367\354\377\365\363\346\377\354\352\331\377\336\335\313\377\0\0"
+  "\0\377\0\0\0\377BA8\377\0\0\0\377\0\0\0\0\0\0\0>\0\0\0\377\0\0\0W\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\202RQF\377sqe\377"
+  "\237\235\221\377\344\341\310\377\351\345\317\377\342\340\313\377\321"
+  "\321\313\377\216\215\177\377\0\0\0\377\377\377\377\377\301\301\301\377"
+  "\0\0\0\377\0\0\0\240\0\0\0L\0\0\0\377\377\377\377\377\0\0\0\377\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\37\37\33\377440\377"
+  "KID\377hgb\377pof\377kkd\377nl]\377XWK\377++%\377\0\0\0\377\377\377\377"
+  "\377\222\222\222\377\2\2\2\377\0\0\0\377\346\346\346\377\0\0\0\377\0"
+  "\0\0>\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0**#\377"
+  "\240\240\225\377MM@\377660\377**&\377//*\377\17\17\15\377\13\13\11\377"
+  "\20\20\15\377(($\377\0\0\0\377\274\274\274\377nnn\377\355\355\355\377"
+  "\0\0\0\377\0\0\0L\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0++$\377\245\244\231\377\267\266\256\377qpg\377\241\241\222"
+  "\377tsc\377@@5\377ii[\377%%\36\377\34\34\34\377\354\354\354\377\317\317"
+  "\317\377ooo\377\257\257\257\377\0\0\0\377\0\0\0!\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0,,%\377\255\255\243\377\331"
+  "\331\322\377\213\213\177\377\326\325\316\377\210\210{\377XWO\377\177"
+  "\177u\377\0\0\0\377\336\336\336\377\377\377\377\377\336\336\336\377\336"
+  "\336\336\377\311\311\311\377\0\0\0\377\0\0\0\77\0\0\0\1\0\0\0\1\0\0\0"
+  "\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6,,%\377\255\255\243\377\332"
+  "\332\323\377\217\216\201\377\335\335\324\377\254\253\231\377]]R\377i"
+  "i`\377mmm\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\347\347\347\377\223\223\223\377\0\0\0\377\0\0\0+\0\0\0\13\0"
+  "\0\0\7\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\5\0\0\0\21++$\377~~u\377\330\330"
+  "\321\377\215\215\200\377\335\335\323\377\254\253\231\377PPG\377\30\30"
+  "\30\377\311\311\311\377\307\340\307\377x\265x\377\233\310\233\377\377"
+  "\377\377\377\347\347\347\377\306\306\306\377\0\0\0\377\0\0\0U\0\0\0\35"
+  "\0\0\0\27\0\0\0\15\0\0\0\3\0\0\0\1\0\0\0\11\0\0\0\34''!\377CC=\377\216"
+  "\216\206\377^^U\377\332\332\320\377\254\253\231\37755.\377]]]\377\324"
+  "\347\324\377]\246]\377\307\340\307\377\377\377\377\377]\246]\377\215"
+  "\272\215\377\345\345\345\377\206\206\206\377\0\0\0\377\0\0\0G\0\0\0'"
+  "\0\0\0\31\0\0\0\10\0\0\0\1\0\0\0\11\0\0\0\34\4\4\4k\6\6\6\377\6\6\6\377"
+  "BA:\377\217\217{\377zzl\377\0\0\0\377\304\304\304\377s\262s\377\307\340"
+  "\307\377\377\377\377\377\377\377\377\377x\265x\377n\253n\377\345\345"
+  "\345\377\220\220\220\377\0\0\0\377\0\0\0w\0\0\0.\0\0\0\"\0\0\0\16\0\0"
+  "\0\1\0\0\0\5\0\0\0\23\0\0\0&\0\0\0""0\4\4\4y\6\6\6\377\0\0\0\377\17\17"
+  "\17\377\0\0\0\377\327\327\327\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\364\364\364\377S\235S\377"
+  "\277\277\277\377JJJ\377\0\0\0\377\0\0\0""1\0\0\0(\0\0\0\23\0\0\0\0\0"
+  "\0\0\1\0\0\0\6\0\0\0\23\0\0\0\40\0\0\0)\0\0\0-\0\0\0.\0\0\0""0\0\0\0"
+  "\377\354\354\354\377x\265x\377\377\377\377\377\377\377\377\377\307\340"
+  "\307\377\377\377\377\377\272\323\272\377\212\270\212\377\212\267\212"
+  "\377qqq\377\0\0\0\377\0\0\0""2\0\0\0*\0\0\0\27\0\0\0\0\0\0\0\0\0\0\0"
+  "\1\0\0\0\3\0\0\0\12\0\0\0\21\0\0\0\26\0\0\0\33\0\0\0\"\0\0\0\377\254"
+  "\254\254\377\354\354\354\377o\254o\377o\254o\377n\253n\377T\235T\377"
+  "\262\314\262\377\212\270\212\377\222\222\222\377aaa\377\0\0\0\377\0\0"
+  "\0""1\0\0\0'\0\0\0\23\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1"
+  "\0\0\0\2\0\0\0\10\0\0\0\22\0\0\0U\0\0\0\377\0\0\0\377iii\377\200\200"
+  "\200\377}\220}\377\241\241\241\377\203\203\203\377zzz\377CCC\377\0\0"
+  "\0\377\0\0\0w\0\0\0*\0\0\0\34\0\0\0\12\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\7\0\0\0\21\0\0\0""9\0\0\0p\0"
+  "\0\0\234\0\0\0\304\0\0\0\377\0\0\0\377\0\0\0\377(((\377444\263888q\0"
+  "\0\0#\0\0\0\32\0\0\0\13\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0\14\0\0\0\21\0\0\0\23"
+  "\0\0\0\24\0\0\0\26\0\0\0\26\0\0\0\26\0\0\0\25\0\0\0\25\0\0\0\24\0\0\0"
+  "\17\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\6\0\0"
+  "\0\6\0\0\0\7\0\0\0\10\0\0\0\7\0\0\0\6\0\0\0\6\0\0\0\4\0\0\0\2\0\0\0\1"
+  "\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_volume)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_volume[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_volume[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0,\0\0\0\377\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0I@f\320I@f+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0-\0\0\0\377"
+  "\0\0\0\377\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0I@f\377I@f+\0\0\0\0I@f+I@f"
+  "\252I@f+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0-\0\0\0\377\256\253\237\377\0\0\0\377\0\0\0"
+  "\21\0\0\0\2\0\0\0\0\0\0\0\0I@f+I@f\377I@f+\0\0\0\0I@f\213I@fO\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0o\0\0\0\377\256\253\237\377\334\331\323\377\0\0\0\377\0\0\0\221"
+  "\0\0\0\4I@f\377I@f+\0\0\0\0I@f\252I@fO\0\0\0\0I@fcI@f\213\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\7\0\0\0\377\233\230\212\377\200~r"
+  "\377\0\0\0\377\256\253\237\377\342\341\334\377\362\362\360\377\0\0\0"
+  "\377\0\0\0\347\0\0\0\12I@f+I@f\377\0\0\0\0I@fOI@f\252\0\0\0\0I@f@I@f"
+  "\252\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\22\0\0\0\377\343\342"
+  "\335\377\266\266\261\377\0\0\0\377\356\355\352\377\352\352\346\377\305"
+  "\301\267\377\0\0\0\377III\377\0\0\0\24\0\0\0\0I@f\377\0\0\0\0I@f+I@f"
+  "\320\0\0\0\0I@f#I@f\320\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0"
+  "\30\0\0\0\377\260\254\234\377\222\216\201\377\0\0\0\377\315\312\301\377"
+  "\270\264\246\377\277\273\257\377\0\0\0\377\11\11\11\377\0\0\0\30\0\0"
+  "\0\0I@f\377\0\0\0\0\0\0\0\0I@f\377\0\0\0\0\0\0\0\0I@f\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\31\0\0\0\377\233\230\212\377\200~"
+  "r\377\0\0\0\377\236\232\214\377\260\254\234\377\260\254\234\377\0\0\0"
+  "\377+++\377\0\0\0\27\0\0\0\0I@f\377\0\0\0\0I@f+I@f\320\0\0\0\0I@f#I@"
+  "f\320\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\31\0\0\0\377yvl\377"
+  "dbY\377\0\0\0\377\236\232\214\377\236\232\214\377\236\232\214\377\0\0"
+  "\0\377\10\10\10\376\0\0\0\27I@f+I@f\377\0\0\0\0I@fOI@f\252\0\0\0\0I@"
+  "f@I@f\252\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\31\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\240\0\0\0\377\215\212}\377\236\232\214\377"
+  "\0\0\0\377\0\0\0\300\0\0\0\30I@f\377I@f+\0\0\0\0I@f\252I@fO\0\0\0\0I"
+  "@fYI@f\213\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\30\0\0\0>\0"
+  "\0\0S\0\0\0S\0\0\0Q\0\0\0r\0\0\0\377~{p\377\0\0\0\377\0\0\0=\0\0\0\32"
+  "\0\0\0\0\0\0\0\0I@f+I@f\320I@f+\0\0\0\0I@f\213I@fO\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\2\0\0\0\22\0\0\0/\0\0\0=\0\0\0;\0\0\0""8\0\0\0C"
+  "\0\0\0o\0\0\0\377\0\0\0\377\0\0\0""1\0\0\0\26\0\0\0\0\0\0\0\0I@f\377"
+  "I@f+\0\0\0\0I@f+I@f\213I@f+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0"
+  "\0\0\7\0\0\0\22\0\0\0\27\0\0\0\26\0\0\0\26\0\0\0%\0\0\0>\0\0\0l\0\0\0"
+  "\377\0\0\0\"\0\0\0\13\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0I@f\320"
+  "I@f+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2"
+  "\0\0\0\3\0\0\0\3\0\0\0\4\0\0\0\15\0\0\0#\0\0\0;\0\0\0""8\0\0\0\30\0\0"
+  "\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\3\0\0\0\15\0\0\0\37\0\0\0%\0\0\0\21\0\0\0\2\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\3\0\0\0\11\0\0\0\15\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_midi)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_midi[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_midi[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (2304) */
+  "\0\0\11\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (96) */
+  "\0\0\0`"
+  /* width (24) */
+  "\0\0\0\30"
+  /* height (24) */
+  "\0\0\0\30"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\24\0\0\0n\0\0\0\24\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\36\0\0"
+  "\0\206\0\0\0$\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0$\0\0\0^\0\0\0u\0\0\0\231\0\0\0\231\0\0\0Q\0\0\0<\0\0\0"
+  "(\0\0\0\17\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0.\0\0\0\276\0\0\0X\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "^\0\0\0C\0\0\0u\0\0\0$\0\0\0\24\0\0\0E\0\0\0w\0\0\0}\0\0\0X\0\0\0""7"
+  "\0\0\0\15\0\0\0A\0\0\0\225\0\0\0""8\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\271\0\0\0$\0\0\0"
+  "\177\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!\0\0\0>\0\0\0\201\0\0\0\311"
+  "\0\0\0\200\0\0\0G\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0E\0\0\0\364\0\0\0b\0\0\0\362\0\0\0"
+  "U\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\355\377\377\377\377\0\0\0\355\377\377\377\377"
+  "\0\0\0\356\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\376\250\250\250\377\0\0\0\355\267\267"
+  "\267\377\0\0\0\356\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0{\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0z\0\0\0\0\0\0\0\0\0\0\0\377\323\321\316\377\274\272\265"
+  "\377\254\252\244\377\230\226\217\377\230\226\217\377\230\226\217\377"
+  "\230\226\217\377\230\226\217\377\230\226\217\377\230\226\217\377\230"
+  "\226\217\377\230\226\217\377\230\226\217\377\230\226\217\377\230\226"
+  "\217\377\230\226\217\377\230\226\217\377zxr\377b`[\377USO\377\0\0\0\377"
+  "\0\0\0\23\0\0\0\0\0\0\0\377\257\255\251\377\234\232\225\377\204\202|"
+  "\377fd]\377fd]\377fd]\377fd]\377fd]\377fd]\377fd]\377fd]\377fd]\377f"
+  "d]\377fd]\377fd]\377fd]\377fd]\377RPJ\377RPJ\377A@;\377\0\0\0\377\0\0"
+  "\0,\0\0\0\3\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0""6\0\0\0\7\0\0\0\377\315\315\315\377VVV\377"
+  "\0\0\0\377\312\312\312\377VVV\377\0\0\0\377\310\310\310\377VVV\377\0"
+  "\0\0\377\305\305\305\377\302\302\302\377\271\271\271\377\303\303\303"
+  "\377VVV\377\0\0\0\377\300\300\300\377VVV\377\0\0\0\377\276\276\276\377"
+  "\270\270\270\377\0\0\0\377\0\0\0\77\0\0\0\14\0\0\0\377\377\377\377\377"
+  "kkk\377\0\0\0\377\374\374\374\377kkk\377\0\0\0\377\370\370\370\377kk"
+  "k\377\0\0\0\377\366\366\366\377\361\361\361\377\346\346\346\377\362\362"
+  "\362\377kkk\377\0\0\0\377\360\360\360\377kkk\377\0\0\0\377\355\355\355"
+  "\377\346\346\346\377\0\0\0\377\0\0\0E\0\0\0\22\0\0\0\377\377\377\377"
+  "\377kkk\377\0\0\0\377\373\373\373\377kkk\377\0\0\0\377\367\367\367\377"
+  "kkk\377\0\0\0\377\365\365\365\377\361\361\361\377\345\345\345\377\362"
+  "\362\362\377kkk\377\0\0\0\377\357\357\357\377kkk\377\0\0\0\377\354\354"
+  "\354\377\345\345\345\377\0\0\0\377\0\0\0D\0\0\0\23\0\0\0\377\377\377"
+  "\377\377kkk\377\0\0\0\377\372\372\372\377kkk\377\0\0\0\377\367\367\367"
+  "\377kkk\377\0\0\0\377\365\365\365\377\360\360\360\377\344\344\344\377"
+  "\362\362\362\377kkk\377\0\0\0\377\356\356\356\377kkk\377\0\0\0\377\353"
+  "\353\353\377\344\344\344\377\0\0\0\377\0\0\0D\0\0\0\20\0\0\0\377\376"
+  "\376\376\377NNN\377\0\0\0\377\372\372\372\377NNN\377\0\0\0\377\366\366"
+  "\366\377NNN\377\0\0\0\377\365\365\365\377\357\357\357\377\344\344\344"
+  "\377\361\361\361\377NNN\377\0\0\0\377\356\356\356\377NNN\377\0\0\0\377"
+  "\353\353\353\377\343\343\343\377\0\0\0\377\0\0\0D\0\0\0\16\0\0\0\377"
+  "\375\375\375\377\374\374\374\377\360\360\360\377\372\372\372\377\367"
+  "\367\367\377\354\354\354\377\366\366\366\377\363\363\363\377\347\347"
+  "\347\377\364\364\364\377\356\356\356\377\343\343\343\377\360\360\360"
+  "\377\352\352\352\377\336\336\336\377\356\356\356\377\346\346\346\377"
+  "\332\332\332\377\353\353\353\377\343\343\343\377\0\0\0\377\0\0\0D\0\0"
+  "\0\16\0\0\0\377\374\374\374\377\373\373\373\377\357\357\357\377\372\372"
+  "\372\377\366\366\366\377\353\353\353\377\366\366\366\377\362\362\362"
+  "\377\347\347\347\377\363\363\363\377\356\356\356\377\342\342\342\377"
+  "\360\360\360\377\351\351\351\377\336\336\336\377\355\355\355\377\345"
+  "\345\345\377\331\331\331\377\352\352\352\377\342\342\342\377\0\0\0\377"
+  "\0\0\0D\0\0\0\16\0\0\0\377\374\374\374\377\373\373\373\377\370\370\370"
+  "\377\373\373\373\377\373\373\373\377\366\366\366\377\373\373\373\377"
+  "\371\371\371\377\366\366\366\377\371\371\371\377\370\370\370\377\363"
+  "\363\363\377\370\370\370\377\366\366\366\377\361\361\361\377\370\370"
+  "\370\377\364\364\364\377\360\360\360\377\370\370\370\377\341\341\341"
+  "\377\0\0\0\377\0\0\0D\0\0\0\16\0\0\0\377\301\301\301\377\300\300\300"
+  "\377\267\267\267\377\301\301\301\377\275\275\275\377\270\270\270\377"
+  "\275\275\275\377\272\272\272\377\264\264\264\377\272\272\272\377\270"
+  "\270\270\377\251\251\251\377\272\272\272\377\263\263\263\377\251\251"
+  "\251\377\266\266\266\377\257\257\257\377\246\246\246\377\264\264\264"
+  "\377\255\255\255\377\0\0\0\377\0\0\0D\0\0\0\16\0\0\0n\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\227\0\0\0\77\0"
+  "\0\0\14\0\0\0\6\0\0\0#\0\0\0>\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0"
+  "\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0\0\0D\0"
+  "\0\0D\0\0\0D\0\0\0D\0\0\0\77\0\0\0#\0\0\0\6\0\0\0\1\0\0\0\6\0\0\0\14"
+  "\0\0\0\15\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0"
+  "\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0\0\0\16\0"
+  "\0\0\16\0\0\0\16\0\0\0\16\0\0\0\14\0\0\0\6\0\0\0\1"};
+
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (stock_authentication)
+#endif
+#ifdef __GNUC__
+static const guint8 stock_authentication[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 stock_authentication[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (9216) */
+  "\0\0$\30"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (192) */
+  "\0\0\0\300"
+  /* width (48) */
+  "\0\0\0""0"
+  /* height (48) */
+  "\0\0\0""0"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\3"
+  "\0\0\0\4\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\1\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\1\0\0\0\2\0\0\0\4\0\0\0\7\0\0\0\12\0\0\0\16\0\0\0\21\0\0\0\23\0\0"
+  "\0\23\0\0\0\23\0\0\0\21\0\0\0\16\0\0\0\12\0\0\0\7\0\0\0\4\0\0\0\2\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\10\0\0"
+  "\0\16\0\0\0g\0\0\0\253\0\0\0\332\0\0\0\366\1\1\1\377\0\0\0\366\0\0\0"
+  "\334\0\0\0\260\0\0\0q\0\0\0\36\0\0\0\25\0\0\0\16\0\0\0\10\0\0\0\4\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\14\0\0\0\203\0\0\0\354"
+  "\1\1\1\377\233\233\233\377\320\320\320\377\343\343\343\377\351\351\351"
+  "\377\335\335\335\377\306\306\306\377\221\221\221\377\1\1\1\377\0\0\0"
+  "\356\0\0\0\221\0\0\0#\0\0\0\27\0\0\0\15\0\0\0\5\0\0\0\2\0\0\0\1\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0"
+  "\0\0\7\0\0\0>\0\0\0\320\1\1\1\377\276\276\276\377\352\352\352\377\361"
+  "\361\361\377\363\363\363\377\361\361\361\377\355\355\355\377\352\352"
+  "\352\377\346\346\346\377\342\342\342\377\330\330\330\377\234\234\234"
+  "\377\1\1\1\377\0\0\0\330\0\0\0W\0\0\0\36\0\0\0\20\0\0\0\7\0\0\0\2\0\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\7"
+  "\0\0\0R\0\0\0\366```\377\343\343\343\377\363\363\363\377\360\360\360"
+  "\377\354\354\354\377\346\346\346\377\344\344\344\377\343\343\343\377"
+  "\342\342\342\377\342\342\342\377\342\342\342\377\341\341\341\377\326"
+  "\326\326\377\267\267\267\377EEE\377\0\0\0\367\0\0\0m\0\0\0\"\0\0\0\22"
+  "\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0"
+  "\0\5\0\0\0>\0\0\0\366\205\205\205\377\354\354\354\377\363\363\363\377"
+  "\352\352\352\377\343\343\343\377\331\331\331\377\316\316\316\377\302"
+  "\302\302\377\302\302\302\377\314\314\314\377\325\325\325\377\334\334"
+  "\334\377\340\340\340\377\335\335\335\377\310\310\310\377\271\271\271"
+  "\377bbb\377\0\0\0\370\0\0\0Y\0\0\0!\0\0\0\17\0\0\0\5\0\0\0\1\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\15\0\0\0\320^^^\377\354\354\354"
+  "\377\363\363\363\377\350\350\350\377\334\334\334\377\274\274\274\370"
+  "XXX\360\24\24\24\341\0\0\0\333\0\0\0\326\0\0\0\324{{{\352\276\276\276"
+  "\366\340\340\340\377\337\337\337\377\334\334\334\377\303\303\303\377"
+  "\273\273\273\377LLL\377\0\0\0\273\0\0\0""5\0\0\0\33\0\0\0\13\0\0\0\3"
+  "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\10\0\0\0\203\1\1\1\377\342\342"
+  "\342\377\363\363\363\377\351\351\351\377\330\330\330\377\227\227\227"
+  "\354\0\0\0\352\0\0\0\274\0\0\0g\0\0\0Y\0\0\0S\0\0\0Q\0\0\0Y\0\0\0\305"
+  "\234\234\234\351\335\335\335\371\340\340\340\377\330\330\330\377\273"
+  "\273\273\377\266\266\266\377\1\1\1\377\0\0\0x\0\0\0*\0\0\0\23\0\0\0\7"
+  "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\3\0\0\0\15\0\0\0\354\271\271\271\377\363"
+  "\363\363\377\353\353\353\377\330\330\330\377\212\212\212\356\0\0\0\342"
+  "\0\0\0}\0\0\0W\0\0\0F\0\0\0""9\0\0\0""0\0\0\0.\0\0\0""1\0\0\0;\0\0\0"
+  "\224\222\222\222\337\333\333\333\367\337\337\337\377\316\316\316\377"
+  "\263\263\263\377\223\223\223\377\0\0\0\313\0\0\0:\0\0\0\36\0\0\0\13\0"
+  "\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\1\0\0\0\6\0\0\0E\1\1\1\377\352\352\352\377\361\361"
+  "\361\377\335\335\335\377\300\300\300\377\2\2\2\350\0\0\0\214\0\0\0T\0"
+  "\0\0<\0\0\0)\0\0\0\34\0\0\0\25\0\0\0\23\0\0\0\26\0\0\0\37\0\0\0.\0\0"
+  "\0\240\242\242\242\337\345\345\345\377\335\335\335\377\300\300\300\377"
+  "\266\266\266\377\1\1\1\377\0\0\0a\0\0\0)\0\0\0\22\0\0\0\5\0\0\0\1\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\2\0\0\0\11\0\0\0p\240\240\240\377\361\361\361\377\350\350\350\377"
+  "\306\306\306\377\201\201\201\354\0\0\0\322\0\0\0Z\0\0\0>\0\0\0%\0\0\0"
+  "\24\0\0\0\13\0\0\0\7\0\0\0\5\0\0\0\7\0\0\0\15\0\0\0\30\0\0\0""0\2\2\2"
+  "\313\334\334\334\357\352\352\352\377\321\321\321\377\256\256\256\377"
+  "vvv\377\0\0\0\220\0\0\0""4\0\0\0\30\0\0\0\10\0\0\0\2\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\14"
+  "\0\0\0\223\320\320\320\377\362\362\362\377\331\331\331\377\300\300\300"
+  "\377///\345\0\0\0\213\0\0\0J\0\0\0,\0\0\0\25\0\0\0\11\0\0\0\3\0\0\0\1"
+  "\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\13\0\0\0\31\0\0\0n\202\202\202\340\356"
+  "\356\356\377\334\334\334\377\265\265\265\377\237\237\237\377\0\0\0\274"
+  "\0\0\0>\0\0\0\37\0\0\0\13\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\16\0\0\0\325\341\341\341"
+  "\377\361\361\361\377\314\314\314\377\300\300\300\377\17\17\17\331\0\0"
+  "\0e\0\0\0=\0\0\0\40\0\0\0\16\0\0\0\5\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1"
+  "\0\0\0\2\0\0\0\5\0\0\0\17\0\0\0#\37\37\37\323\354\354\354\377\342\342"
+  "\342\377\300\300\300\377\250\250\250\377\0\0\0\325\0\0\0G\0\0\0%\0\0"
+  "\0\16\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\2\0\0\0\7\0\0\0\24\0\0\0\336\346\346\346\377\357\357\357\377"
+  "\313\313\313\377\267\267\267\377\0\0\0\322\0\0\0W\0\0\0""6\0\0\0\34\0"
+  "\0\0\15\0\0\0\10\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\10\0\0"
+  "\0\16\0\0\0\35\0\0\0\301\351\351\351\377\345\345\345\377\305\305\305"
+  "\377\256\256\256\377\0\0\0\360\0\0\0O\0\0\0.\0\0\0\25\0\0\0\10\0\0\0"
+  "\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\6\0\0\0"
+  "\17\0\0\0\37\0\0\0\354\332\332\332\377\353\353\353\377\312\312\312\377"
+  "\253\253\253\377\0\0\0\322\0\0\0Y\0\0\0<\0\0\0%\0\0\0\32\0\0\0\26\0\0"
+  "\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\26\0\0\0\32\0\0\0&\0"
+  "\0\0\300\344\344\344\377\343\343\343\377\312\312\312\377\255\254\252"
+  "\377\0\0\0\371\0\0\0Y\0\0\0;\0\0\0\"\0\0\0\23\0\0\0\12\0\0\0\5\0\0\0"
+  "\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5""1\26\7f7\31\10\3777\31\10\377"
+  "7\31\10\377\234R\27\377\270n%\377\271k&\377\247Z\34\3777\31\10\3777\31"
+  "\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10"
+  "\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\377"
+  "7\31\10\377\245^\37\377\274s*\377\270o'\377\227U\32\3777\31\10\3777\31"
+  "\10\3777\31\10\3777\31\10\377%\20\5_\0\0\0\33\0\0\0\16\0\0\0\5\0\0\0"
+  "\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\3\0\0\0\12""7\31\10\377\311\234b\377\364\341\313"
+  "\377\364\340\311\377\357\333\276\377\354\325\267\377\353\322\264\377"
+  "\352\322\263\377\353\317\260\377\351\316\256\377\350\314\253\377\347"
+  "\314\250\377\350\307\241\377\346\306\241\377\346\306\241\377\346\306"
+  "\241\377\346\306\241\377\346\306\241\377\350\307\241\377\350\307\241"
+  "\377\346\306\241\377\345\305\240\377\345\305\240\377\343\302\232\377"
+  "\340\300\233\377\340\275\223\377\337\272\222\377\337\272\216\377\335"
+  "\263\206\377\325\254|\377\242a\33\3777\31\10\377\0\0\0""1\0\0\0\32\0"
+  "\0\0\12\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\20""7\31\10\377\365\346\320"
+  "\377\352\323\257\377\352\317\257\377\343\302\232\377\332\270\213\377"
+  "\332\266\207\377\330\260\201\377\326\256\177\377\323\253|\377\321\251"
+  "t\377\317\245n\377\314\243m\377\312\237g\377\312\237g\377\312\237g\377"
+  "\312\237g\377\312\237g\377\312\237g\377\312\237g\377\310\236g\377\306"
+  "\233c\377\302\230a\377\302\223[\377\277\220R\377\274\210K\377\275\204"
+  "@\377\272~=\377\263v4\377\247j\"\377\215S\24\3777\31\10\377\0\0\0E\0"
+  "\0\0&\0\0\0\17\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\23""7\31\10\377\365"
+  "\344\316\377\351\316\256\377\347\315\250\377\337\275\220\377\330\261"
+  "\203\377\325\255~\377\322\252{\377\322\246w\377\320\247q\377\315\243"
+  "l\377\310\237h\377\305\233d\377\304\231a\377\304\231a\377\304\231a\377"
+  "\305\232b\377\305\232b\377\305\232b\377\305\232b\377\304\231a\377\302"
+  "\230]\377\301\224Z\377\277\220T\377\276\216O\377\274\207I\377\272\202"
+  "\77\377\272~=\377\261t2\377\247j\"\377\213R\24\3777\31\10\377\0\0\0Q"
+  "\0\0\0.\0\0\0\23\0\0\0\5\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\24""7\31\10\377\365"
+  "\346\320\377\353\317\260\377\351\316\256\377\340\277\227\377\333\264"
+  "\206\377\330\260\201\377\327\257\200\377\322\254{\377\322\246w\377\320"
+  "\246o\377\314\243m\377\265\216\\\377\240~P\377\232yM\377\232yM\377\262"
+  "\214Y\377\307\234d\377\307\234d\377\307\234d\377\305\232b\377\302\227"
+  "_\377\302\223[\377\277\220T\377\276\216O\377\274\204A\377\272\202\77"
+  "\377\265|8\377\257s,\377\243f\36\377\207P\24\3777\31\10\377\0\0\0W\0"
+  "\0\0""2\0\0\0\25\0\0\0\5\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365"
+  "\344\316\377\352\317\257\377\350\315\251\377\337\274\222\377\325\255"
+  "~\377\322\253}\377\322\252{\377\320\253u\377\320\246o\377\315\243l\377"
+  "\263\216]\377\224tJ\377w^<\377\40\31\20\377\0\0\0\377\40\31\20\377y`"
+  ">\377\310\237h\377\312\237g\377\307\235f\377\305\233d\377\304\231a\377"
+  "\302\230]\377\277\221V\377\276\216O\377\276\206E\377\274\203\77\377\266"
+  "|7\377\252l#\377\215U\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0"
+  "\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365\344\316\377\351\316"
+  "\256\377\350\316\251\377\341\274\224\377\332\264\207\377\330\262\201"
+  "\377\327\257\200\377\322\252{\377\320\250s\377\317\245n\377\222tM\377"
+  "z`>\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377y`\77\377\312"
+  "\237g\377\305\233d\377\305\232b\377\302\227_\377\301\224Z\377\276\217"
+  "Q\377\274\207I\377\272\201=\377\267~:\377\263y4\377\246i!\377\213R\24"
+  "\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5"
+  "\0\0\0\25""7\31\10\377\364\341\313\377\350\315\251\377\345\311\244\377"
+  "\335\272\220\377\325\255~\377\322\252{\377\322\252{\377\322\245u\377"
+  "\321\247p\377\314\243m\377\225uL\377\40\32\20\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377!\32\20\377\327\267\216\377\310\236g\377"
+  "\306\233c\377\304\231a\377\302\227_\377\277\221V\377\275\214L\377\274"
+  "\210E\377\273\202>\377\266|7\377\251k\"\377\215S\24\3777\31\10\377\0"
+  "\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10"
+  "\377\365\344\316\377\351\315\254\377\347\313\246\377\337\274\222\377"
+  "\330\260\201\377\326\256\177\377\322\253}\377\322\252{\377\321\245r\377"
+  "\315\243l\377\226wN\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\341\313\255\377\307\235f\377\304\231a\377\302"
+  "\227_\377\300\223Y\377\276\217Q\377\275\214L\377\274\205C\377\272~=\377"
+  "\263x2\377\247j\"\377\213R\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25"
+  "\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\364\341\313\377\350"
+  "\314\247\377\345\312\244\377\334\271\217\377\326\256\177\377\323\253"
+  "|\377\322\252{\377\322\245u\377\317\245n\377\312\241k\377\225uL\377\40"
+  "\31\20\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\40\31\17"
+  "\377\336\306\247\377\302\230a\377\301\222V\377\277\220T\377\275\215N"
+  "\377\274\207I\377\272\202\77\377\265}:\377\265x6\377\255r,\377\244f\35"
+  "\377\207P\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365\344\316\377\351\315\254\377\347"
+  "\313\246\377\335\272\220\377\325\255~\377\322\253y\377\321\250r\377\317"
+  "\245n\377\312\241k\377\310\237h\377\305\232b\377u\\8\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377u[7\377\335\307\247\377\302\223"
+  "[\377\301\222V\377\277\220R\377\276\216O\377\274\210K\377\274\203\77"
+  "\377\267\177<\377\266|7\377\260u/\377\244h!\377\211Q\24\3777\31\10\377"
+  "\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10"
+  "\377\365\346\320\377\352\317\257\377\351\316\252\377\341\274\224\377"
+  "\333\264\206\377\332\263\205\377\332\263\205\377\326\256\177\377\322"
+  "\253y\377\320\250s\377\317\245n\377\314\243m\377z`>\377!\32\20\377\0"
+  "\0\0\377\40\32\21\377\222~c\377\343\317\263\377\324\263\210\377\306\233"
+  "c\377\302\230]\377\301\224Z\377\277\220T\377\275\214L\377\273\204D\377"
+  "\267\177<\377\266z9\377\261v0\377\244h!\377\213R\24\3777\31\10\377\0"
+  "\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10"
+  "\377\364\341\313\377\351\316\252\377\345\311\244\377\332\270\213\377"
+  "\322\254w\377\322\245u\377\321\250r\377\315\244n\377\312\241k\377\310"
+  "\236g\377\304\231a\377\302\230]\377\245}M\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\331\277\236\377\312\243q\377\304\231a\377\302\230a\377\302\223"
+  "[\377\277\221V\377\277\220T\377\275\214L\377\274\210E\377\272\202\77"
+  "\377\267}8\377\263x2\377\255o&\377\211Q\24\3777\31\10\377\0\0\0X\0\0"
+  "\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365"
+  "\344\316\377\351\316\252\377\347\313\246\377\334\271\217\377\326\256"
+  "\177\377\323\253|\377\322\252{\377\322\245u\377\320\246o\377\312\241"
+  "k\377\310\236g\377\272\223^\377\225tJ\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\305\263\233\377\304\231a\377\304\231a\377\302\230a\377\301\222V\377"
+  "\277\221V\377\276\216O\377\274\207I\377\274\203\77\377\267~:\377\265"
+  "y8\377\255v.\377\257r*\377\207P\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0"
+  "\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365\346\320\377"
+  "\352\317\257\377\351\316\252\377\341\275\226\377\333\264\206\377\330"
+  "\260\201\377\326\256\177\377\322\254{\377\320\250s\377\315\243l\377\312"
+  "\240i\377\265\217]\377\203fA\377\0\0\0\377\0\0\0\377\0\0\0\377\217uT"
+  "\377\336\306\247\377\304\231a\377\302\230]\377\301\222V\377\277\220T"
+  "\377\275\215N\377\274\211G\377\274\203\77\377\267~:\377\265y8\377\257"
+  "s,\377\275\202B\377\207P\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0"
+  "\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\364\341\313\377\347"
+  "\314\250\377\346\306\241\377\333\270\216\377\323\253|\377\322\253y\377"
+  "\321\247v\377\320\246o\377\314\242k\377\312\237g\377\305\232b\377\264"
+  "\215Y\377lT3\377\0\0\0\377\0\0\0\377\0\0\0\377mU6\377\336\306\247\377"
+  "\304\231a\377\302\230a\377\302\223[\377\301\222V\377\277\220R\377\274"
+  "\210K\377\273\204D\377\272~=\377\264{7\377\261v0\377\300\215Q\377\211"
+  "N\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0"
+  "\0\5\0\0\0\25""7\31\10\377\364\340\311\377\347\313\246\377\346\306\241"
+  "\377\334\263\207\377\321\253v\377\321\245r\377\320\246o\377\315\243l"
+  "\377\310\237h\377\304\231a\377\262\213W\377\254\203N\377\77""0\34\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377@2\36\377\322\275\237\377\310\242q\377"
+  "\302\223[\377\277\221V\377\277\220T\377\275\215N\377\274\211G\377\270"
+  "\200=\377\265|8\377\265x6\377\257t.\377\300\215Q\377\206L\23\3777\31"
+  "\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25"
+  "7\31\10\377\364\341\313\377\346\312\245\377\346\306\241\377\333\264\206"
+  "\377\321\253v\377\320\247q\377\317\245n\377\312\241k\377\310\236g\377"
+  "\304\231a\377\262\207S\377\232uE\377\77""0\34\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\77""0\34\377\211h>\377\332\301\240\377\275\216P\377\275\215"
+  "N\377\274\210K\377\273\204D\377\272\202\77\377\267~:\377\264{7\377\261"
+  "w2\377\255q*\377\312\235c\377\207M\24\3777\31\10\377\0\0\0X\0\0\0""3"
+  "\0\0\0\25\0\0\0\6\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\5\0\0\0\25""7\31\10\377\364\341\313"
+  "\377\350\314\247\377\344\310\243\377\332\270\215\377\323\253|\377\322"
+  "\246w\377\320\253u\377\320\246o\377\313\242l\377\310\237h\377\267\217"
+  "[\377\177c\77\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377r"
+  "Y8\377\323\263\211\377\302\230a\377\301\222V\377\277\221V\377\276\217"
+  "Q\377\274\210K\377\274\204A\377\265}:\377\265|8\377\261v0\377\314\237"
+  "i\377\211Q\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\1\0\0\0\5\0\0\0\25""7\31\10\377\365\344\316\377\350\315\251\377\345"
+  "\311\244\377\334\271\217\377\325\255~\377\322\252{\377\322\253y\377\321"
+  "\247p\377\317\245n\377\312\241k\377\310\237h\377\305\232b\377\305\232"
+  "b\377\305\232b\377\305\232b\377\305\232b\377\305\232b\377\305\232b\377"
+  "\305\232b\377\304\231a\377\302\223[\377\277\221V\377\277\220R\377\274"
+  "\207I\377\274\203\77\377\267~:\377\270\177;\377\274\202=\377\316\241"
+  "k\377\211N\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\1\0\0\0\5\0\0\0\25""7\31\10\377\364\341\313\377\350\313\245\377\345"
+  "\311\244\377\332\270\213\377\322\252{\377\322\245u\377\321\247p\377\315"
+  "\244n\377\312\237g\377\307\234d\377\304\231a\377\301\227\\\377\300\223"
+  "Y\377\300\222W\377\300\222W\377\300\222W\377\300\222W\377\300\222W\377"
+  "\300\222W\377\277\221V\377\277\220R\377\276\216O\377\274\211G\377\273"
+  "\204D\377\271\201>\377\265|8\377\270\177;\377\274\205E\377\315\240j\377"
+  "\207P\24\3777\31\10\377\0\0\0X\0\0\0""3\0\0\0\25\0\0\0\6\0\0\0\1\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1"
+  "\0\0\0\5\0\0\0\25""7\31\10\377\364\340\311\377\346\311\243\377\345\305"
+  "\240\377\331\270\210\377\323\246v\377\320\247q\377\317\245n\377\313\242"
+  "l\377\312\237g\377\306\233c\377\305\232b\377\304\231a\377\302\230]\377"
+  "\302\230a\377\302\230a\377\304\231a\377\304\231a\377\305\232b\377\305"
+  "\232b\377\304\231a\377\301\224Z\377\300\223Y\377\277\220T\377\274\214"
+  "M\377\274\211G\377\276\212M\377\304\231a\377\276\213O\377\307\235`\377"
+  "\211N\24\3777\31\10\377\0\0\0W\0\0\0""3\0\0\0\25\0\0\0\5\0\0\0\1\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1"
+  "\0\0\0\5\0\0\0\24""7\31\10\377\364\340\311\377\346\310\241\377\341\303"
+  "\234\377\332\263\205\377\321\245r\377\317\245n\377\315\243l\377\310\237"
+  "h\377\305\233d\377\302\231_\377\302\223[\377\300\222W\377\277\221V\377"
+  "\277\221V\377\300\222W\377\302\223[\377\301\227\\\377\305\232b\377\310"
+  "\236g\377\315\243l\377\315\243l\377\316\241k\377\316\241k\377\322\253"
+  "y\377\322\252w\377\321\245r\377\324\247s\377\277\212L\377\261s0\377\207"
+  "M\24\3777\31\10\377\0\0\0T\0\0\0""0\0\0\0\24\0\0\0\5\0\0\0\1\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0"
+  "\0\5\0\0\0\22""3\27\7\301\262u-\377\307\235`\377\304\232]\377\275\214"
+  "L\377\272~=\377\270~9\377\266z9\377\265x6\377\263u2\377\257w.\377\255"
+  "r,\377\254t+\377\252r)\377\252r)\377\252r)\377\256q)\377\256q)\377\256"
+  "q)\377\256q)\377\252r)\377\251m&\377\252l#\377\245i\"\377\243g\40\377"
+  "\242e\35\377\236a\31\377\233_\30\377\231]\26\377\222V\25\377X0\15\377"
+  "&\21\5\264\0\0\0K\0\0\0*\0\0\0\21\0\0\0\4\0\0\0\1\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\4\0\0\0\16"
+  "+\23\6q1\26\7\3077\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10"
+  "\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\377"
+  "7\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31"
+  "\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10\3777\31\10"
+  "\3777\31\10\3777\31\10\3777\31\10\3777\31\10\377&\21\5\264\14\5\1e\0"
+  "\0\0;\0\0\0\40\0\0\0\14\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\11\0\0\0\30"
+  "\0\0\0,\0\0\0A\0\0\0O\0\0\0U\0\0\0W\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0"
+  "X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0"
+  "\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0X\0\0\0W\0\0\0S\0"
+  "\0\0K\0\0\0;\0\0\0'\0\0\0\24\0\0\0\7\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0"
+  "\0\4\0\0\0\15\0\0\0\30\0\0\0$\0\0\0,\0\0\0""0\0\0\0""3\0\0\0""3\0\0\0"
+  "3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0"
+  "\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3"
+  "\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""3\0\0\0""2\0\0\0""0\0\0\0"
+  "*\0\0\0\40\0\0\0\24\0\0\0\11\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\2\0\0\0\4\0\0\0\11\0\0\0\16\0\0\0\22\0\0\0\24\0\0\0\25\0\0\0\25\0"
+  "\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25"
+  "\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0"
+  "\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\25\0\0\0\24\0"
+  "\0\0\21\0\0\0\14\0\0\0\7\0\0\0\3\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\5\0\0"
+  "\0\5\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6"
+  "\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0\0\6\0\0"
+  "\0\6\0\0\0\6\0\0\0\6\0\0\0\5\0\0\0\5\0\0\0\5\0\0\0\4\0\0\0\3\0\0\0\2"
+  "\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0"
+  "\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1"
+  "\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0"
+  "\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0"};
+
+
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui/no-pixbuf-csource.patch b/meta-gnome/recipes-gnome/libgnome/libgnomeui/no-pixbuf-csource.patch
new file mode 100644
index 000000000..e0765bae1
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui/no-pixbuf-csource.patch
@@ -0,0 +1,11 @@
+--- libgnomeui-2.6.1.1/configure.in.old 2004-08-04 00:28:43.582266664 +0100
++++ libgnomeui-2.6.1.1/configure.in     2004-08-04 00:29:27.496590672 +0100
+@@ -235,7 +235,7 @@
+ 
+ dnl This is installed from GTK+ 2.0's gdk-pixbuf
+ AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
+-test -z "$GDK_PIXBUF_CSOURCE" && AC_MSG_ERROR([
++test -z "$GDK_PIXBUF_CSOURCE" && AC_MSG_WARN([
+ *** You need the gdk-pixbuf-csource tool which is installed
+ *** from GTK+ 2.0's gdk-pixbuf.
+ ***
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb
new file mode 100644
index 000000000..597c2ff99
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb
@@ -0,0 +1,6 @@
+require libgnomeui.inc
+
+PR = "r1"
+
+SRC_URI[archive.md5sum] = "ceab6f4370581d1a03c09f15cc103099"
+SRC_URI[archive.sha256sum] = "04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803"
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
new file mode 100644
index 000000000..d7bbd3baf
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
@@ -0,0 +1,27 @@
+SUMMARY = "GNOME Structured File Library"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
+                    file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63"
+
+SECTION = "libs"
+
+DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
+
+inherit autotools pkgconfig gnome gconf
+
+SRC_URI[archive.md5sum] = "3056b94bb3281dbc8311371bfc23cf72"
+SRC_URI[archive.sha256sum] = "4d8bca33424eb711acdb6a060cb488b132063d699c4fa201db24c2c89c62529c"
+
+GNOME_COMPRESS_TYPE = "xz"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf"
+
+EXTRA_OECONF = "\
+    --disable-gtk-doc \
+    --with-bz2 \
+"
+
+RDEPENDS_${PN} = "gconf" 
+
+FILES_${PN} += "${datadir}/thumbnailers"
diff --git a/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh b/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh
new file mode 100644
index 000000000..b1302ede0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+GTK_MODULES=libgtkstylus.so
+
+export GTK_MODULES
diff --git a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
new file mode 100644
index 000000000..3cd791076
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
@@ -0,0 +1,27 @@
+SUMMARY = "GTK plugin for stylus based systems"
+SECTION = "libs"
+DEPENDS = "gtk+"
+LICENSE = "LGPL-2.0+"
+LIC_FILES_CHKSUM = "file://tap.c;beginline=1;endline=20;md5=71756eeb144e9eeb177c69aa672b1635"
+PR = "r4"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://burtonini.com/temp/${BP}.tar.gz \
+    file://gtkstylus.sh"
+SRC_URI[md5sum] = "fa1c82cd9fd2fafd7ff10d78eb5781c5"
+SRC_URI[sha256sum] = "383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c"
+
+do_install_append() {
+    install -d ${D}/${sysconfdir}/X11/Xsession.d
+    install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus
+}
+
+# Horrible but rpm falls over if you use '*'
+GTKVER = "2.10.0"
+
+FILES_${PN} = "${sysconfdir} \
+               ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so.*"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/${GTKVER}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so"
+FILES_${PN}-staticdev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.*a"
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
new file mode 100644
index 000000000..69a0f5c03
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
@@ -0,0 +1,9 @@
+SUMMARY = "LibGTop2"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://copyright.txt;md5=dbc839bf158d19a20e661db14db7a58c"
+
+inherit gnomebase lib_package gtk-doc
+SRC_URI[archive.md5sum] = "ed44d736efd97d062b77621de6aff439"
+SRC_URI[archive.sha256sum] = "49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d"
+
+DEPENDS = "glib-2.0 intltool-native libxau"
diff --git a/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.13.bb b/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.13.bb
new file mode 100644
index 000000000..834f4af42
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.13.bb
@@ -0,0 +1,10 @@
+SECTION = "libs"
+require libidl_${PV}.bb
+inherit native
+
+PR = "r1"
+
+DEPENDS = "bison-native glib-2.0-native"
+
+SRC_URI[md5sum] = "b43b289a859eb38a710f70622c46e571"
+SRC_URI[sha256sum] = "bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71"
diff --git a/meta-gnome/recipes-gnome/libidl/libidl.inc b/meta-gnome/recipes-gnome/libidl/libidl.inc
new file mode 100644
index 000000000..a40203776
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libidl/libidl.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Library for parsing CORBA IDL files"
+SECTION = "x11/gnome/libs"
+LICENSE = "LGPLv2+"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
+
+S = "${WORKDIR}/libIDL-${PV}"
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += " ${bindir}"
diff --git a/meta-gnome/recipes-gnome/libidl/libidl_0.8.13.bb b/meta-gnome/recipes-gnome/libidl/libidl_0.8.13.bb
new file mode 100644
index 000000000..d658cf8c7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libidl/libidl_0.8.13.bb
@@ -0,0 +1,13 @@
+require libidl.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+DEPENDS = "glib-2.0 flex-native libidl-native"
+
+PR = "r1"
+
+BINCONFIG_GLOB = "*-config-2"
+inherit autotools pkgconfig binconfig
+
+SRC_URI[md5sum] = "b43b289a859eb38a710f70622c46e571"
+SRC_URI[sha256sum] = "bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71"
diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
new file mode 100644
index 000000000..b66fe973e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Send desktop notifications to a notification daemon"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+DEPENDS = "dbus gtk+3"
+
+# conflicts with libnotify, mixing them in build breaks couple of packages
+EXCLUDE_FROM_WORLD = "1"
+
+BPN = "libnotify"
+
+inherit gnome lib_package
+
+SRC_URI[archive.md5sum] = "d20676bde7bd2d276508d019dc7276f1"
+SRC_URI[archive.sha256sum] = "322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88"
diff --git a/meta-gnome/recipes-gnome/libsecret/libsecret_0.18.bb b/meta-gnome/recipes-gnome/libsecret/libsecret_0.18.bb
new file mode 100644
index 000000000..06e94bdd4
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libsecret/libsecret_0.18.bb
@@ -0,0 +1,14 @@
+SUMMARY = "libsecret is a library for storing and retrieving passwords and other secrets"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
+
+inherit gnomebase gtk-doc
+
+DEPENDS = "glib-2.0 libgcrypt intltool-native"
+
+GNOME_COMPRESS_TYPE = "xz"
+
+EXTRA_OECONF += "--disable-manpages"
+
+SRC_URI[archive.md5sum] = "279d723cd005e80d1d304f74a3488acc"
+SRC_URI[archive.sha256sum] = "0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3"
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
new file mode 100644
index 000000000..fd0ecd9b3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Window navigation construction toolkit"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+BPN = "libwnck"
+
+SECTION = "x11/libs"
+DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native libxres"
+
+PR = "r1"
+
+PACKAGECONFIG ??= "startup-notification"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+
+inherit gnomebase
+SRC_URI[archive.md5sum] = "e4ea87320dd0600a81c50186e3804aae"
+SRC_URI[archive.sha256sum] = "4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083"
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
new file mode 100644
index 000000000..61836d260
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Window navigation construction toolkit"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+PR = "r2"
+
+SECTION = "x11/libs"
+DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native libxres"
+
+PACKAGECONFIG ??= "startup-notification"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+
+inherit gnomebase
+SRC_URI[archive.md5sum] = "4162d5b96151e6d24ec02ae3a822203c"
+SRC_URI[archive.sha256sum] = "56b6681e89cd45491bb640165d62276d81369a08974042b26645dc1e0e954cc1"
diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb
new file mode 100644
index 000000000..e93c378ab
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Helper lib for keyboard management"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
+
+DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2"
+
+GNOME_COMPRESS_TYPE = "xz"
+
+inherit gnomebase gettext
+SRC_URI[archive.md5sum] = "290ea2a8abc40f78a3a16bdae6f02808"
+SRC_URI[archive.sha256sum] = "ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404"
+
+EXTRA_OECONF = "--with-xkb-bin-base=${bindir}"
+
+do_configure_append() {
+    find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+    find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
+do_compile_append() {
+    sed -i -e s:${STAGING_DIR_TARGET}::g \
+           -e s:/${TARGET_SYS}::g \
+              libxklavier.pc
+}
+
+
diff --git a/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch b/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch
new file mode 100644
index 000000000..1970e9afb
--- /dev/null
+++ b/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch
@@ -0,0 +1,28 @@
+Remove unused variable (YELP_HELP_RULES)
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+Index: metacity-2.34.13/doc/creating_themes/Makefile.am
+===================================================================
+--- metacity-2.34.13.orig/doc/creating_themes/Makefile.am
++++ metacity-2.34.13/doc/creating_themes/Makefile.am
+@@ -1,6 +1,5 @@
+ ### This part of Makefile.am can be customized by you.
+ 
+-@YELP_HELP_RULES@
+ 
+ # The name of the directory in /usr/share/gnome/help/, 
+ # and the name of the main .xml file:
+Index: metacity-2.34.13/doc/creating_themes/Makefile.in
+===================================================================
+--- metacity-2.34.13.orig/doc/creating_themes/Makefile.in
++++ metacity-2.34.13/doc/creating_themes/Makefile.in
+@@ -455,7 +455,6 @@ uninstall-am:
+        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ 
+-@YELP_HELP_RULES@
+ 
+ # 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.
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
new file mode 100644
index 000000000..9c48238ff
--- /dev/null
+++ b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
@@ -0,0 +1,30 @@
+SECTION = "x11/wm"
+SUMMARY = "Metacity is the boring window manager for the adult in you"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
+
+DEPENDS = "gsettings-desktop-schemas startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils libgtop intltool-native"
+PR = "r1"
+
+inherit gnomebase update-alternatives
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI += "file://remove-yelp-help-rules-var.patch"
+SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6"
+SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075"
+
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity"
+ALTERNATIVE_PRIORITY = "10"
+
+EXTRA_OECONF += "--disable-xinerama"
+
+do_configure_prepend() {
+    sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
+}
+
+FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"
+RDEPENDS_${PN} += "gsettings-desktop-schemas"
+
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch
new file mode 100644
index 000000000..0062cfb11
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch
@@ -0,0 +1,7 @@
+Index: nautilus-2.24.2/add-include-prefix
+===================================================================
+--- nautilus-2.24.2.orig/add-include-prefix     2008-10-06 17:22:21.000000000 +0000
++++ nautilus-2.24.2/add-include-prefix  2009-04-09 16:00:05.000000000 +0000
+@@ -1 +1 @@
+-sed -e 's/^/ /' -e 's/  */ /g' -e 's/ / -I /g' -e 's/ -I $//'
++sed -e 's:^: :' -e 's:  *: :g' -e 's: : -I '"$SYSROOT"':g' -e 's: -I '"$SYSROOT"'$::'
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch
new file mode 100644
index 000000000..43a6152d8
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch
@@ -0,0 +1,44 @@
+From e7233d98c114b03c7c8b96d1f41770452da14aa7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
+Date: Mon, 17 Oct 2011 00:59:01 +0200
+Subject: [PATCH] nautilus build fails for newer glib versions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+build with glib-2.0 v2.30.0 run into errors for at least G_CONST_RETURN missing
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
+---
+ configure.in    |    2 +-
+ eel/Makefile.am |    1 -
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 97e171e..859a097 100644
+--- a/configure.in
++++ b/configure.in
+@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS)
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+ AC_SUBST(CORE_LIBS)
+ 
+-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
++DISABLE_DEPRECATED_CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED"
+ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+ 
+ dnl Multimedia keys
+diff --git a/eel/Makefile.am b/eel/Makefile.am
+index b1fe356..c1d56cd 100644
+--- a/eel/Makefile.am
++++ b/eel/Makefile.am
+@@ -10,7 +10,6 @@ INCLUDES =                                            \
+        -DDATADIR=\""$(datadir)"\"                      \
+        -DSOURCE_DATADIR=\""$(top_srcdir)/data"\"       \
+        -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"  \
+-       -DG_DISABLE_DEPRECATED                          \
+        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+        -DGMENU_I_KNOW_THIS_IS_UNSTABLE                 \
+        $(NULL)
+-- 
+1.7.4.4
+
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff b/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff
new file mode 100644
index 000000000..ccd2934b3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff
@@ -0,0 +1,28 @@
+--- /tmp/configure.in   2009-04-13 11:26:43.000000000 +0200
++++ nautilus-2.26.1/configure.in        2009-04-13 11:28:37.000000000 +0200
+@@ -375,25 +375,6 @@
+ 
+ dnl ===========================================================================
+ 
+-dnl strftime checks
+-
+-AC_TRY_RUN([#include <time.h>
+-                int main ()
+-                {
+-                  char buf[100];
+-                  struct tm tm = {0};
+-                  tm.tm_year = 99;
+-                  if (strftime(buf, 100, "%EY", &tm) == 4 &&
+-                     strcmp (buf, "1999")==0)
+-                    return 0;
+-                  return 1;
+-                }
+-            ],
+-           AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
+-            )
+-
+-dnl ===========================================================================
+-
+ #
+ # Checks for Xft/XRender
+ #
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus3/no-try-run-strftime.diff b/meta-gnome/recipes-gnome/nautilus/nautilus3/no-try-run-strftime.diff
new file mode 100644
index 000000000..56d2e159d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus3/no-try-run-strftime.diff
@@ -0,0 +1,41 @@
+From dc9c8cf2676c8c91ea0ae250cfedf863352f3ccd Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 24 Jun 2011 20:24:08 +0200
+Subject: [PATCH] hack out check that tries to run generated binaries
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.in |   17 +----------------
+ 1 files changed, 1 insertions(+), 16 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index c3aa371..1d3ecdc 100644
+--- a/configure.in
++++ b/configure.in
+@@ -251,22 +251,7 @@ AC_SUBST(WARNING_CFLAGS)
+ 
+ dnl ===========================================================================
+ 
+-dnl strftime checks
+-
+-AC_TRY_RUN([#include <time.h>
+-                int main ()
+-                {
+-                  char buf[100];
+-                  struct tm tm = {0};
+-                  tm.tm_year = 99;
+-                  if (strftime(buf, 100, "%EY", &tm) == 4 &&
+-                     strcmp (buf, "1999")==0)
+-                    return 0;
+-                  return 1;
+-                }
+-            ],
+-           AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
+-            )
++AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
+ 
+ dnl ==========================================================================
+        
+-- 
+1.6.6.1
+
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb
new file mode 100644
index 000000000..1acf8d3e9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb
@@ -0,0 +1,53 @@
+# nautilus OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+LICENSE="GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426 \
+                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
+
+PR = "r4"
+
+DEPENDS = "libnotify3 gtk+3 libunique gvfs librsvg libexif gnome-desktop3"
+# optional: tracker
+
+# needs libnotify3 which conflicts with libnotify, mixing them in build breaks couple of packages
+EXCLUDE_FROM_WORLD = "1"
+
+# to include nautilus3/no-try-run-strftime.diff before the rest
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+BPN = "nautilus"
+inherit gnome
+
+SRC_URI += "file://no-try-run-strftime.diff"
+SRC_URI[archive.md5sum] = "ecd100ed94431363fa68b217351649c0"
+SRC_URI[archive.sha256sum] = "584e97d3eb093ee16a779809b679150a636bcd4a3767fb604993013b523d2df1"
+
+EXTRA_OECONF = " --disable-gtk-doc  --disable-update-mimedb --enable-nst-extension"
+export SYSROOT = "${STAGING_DIR_HOST}"
+
+do_configure() {
+    sed -i -e /docs/d Makefile.am
+    autotools_do_configure
+}
+
+RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-2.0-utils"
+FILES_${PN} += "${datadir}/icons \
+                /usr/libexec/ \
+                ${datadir}/nautilus* \
+                ${datadir}/dbus-1 \
+                ${libdir}/nautilus/extensions*/*.so \
+"
+FILES_${PN}-dbg += "/usr/libexec/.debug \
+    ${libdir}/nautilus/extensions*/.debug"
+
+# Don't make nautils drag us in
+PRIVATE_LIBS = "libnautilus-extension.so.1"
+
+pkg_postinst_${PN} () {
+if [ -n "$D" ]; then
+    exit 1
+fi
+
+glib-compile-schemas ${datadir}/glib-2.0/schemas
+}
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
new file mode 100644
index 000000000..4be3f084e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
@@ -0,0 +1,40 @@
+# nautilus OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+LICENSE="GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7c0048536e43642a1f3a724c2909872b \
+                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
+
+PR = "r6"
+
+DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop orbit2-native"
+# optional: tracker
+
+inherit gnome
+
+SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911"
+SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2"
+
+SRC_URI += "file://idl-sysroot.patch \
+            file://no-try-run-strftime.diff \
+            file://no-G_DISABLE_DEPRECATED.patch \
+"
+
+
+EXTRA_OECONF = " --disable-gtk-doc  --disable-update-mimedb "
+export SYSROOT = "${STAGING_DIR_HOST}"
+
+do_configure() {
+    sed -i -e /docs/d ${S}/Makefile.am
+    autotools_do_configure
+    # We need native orbit-idl with target idl files. No way to say it in a clean way:
+    find ${B} -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \;
+}
+
+RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking"
+FILES_${PN} += "${datadir}/icons"
+
+# Don't make nautils3 drag us in
+PRIVATE_LIBS = "libnautilus-extension.so.1"
+
diff --git a/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool/fix-includedir.patch b/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool/fix-includedir.patch
new file mode 100644
index 000000000..aeb02ab2c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool/fix-includedir.patch
@@ -0,0 +1,31 @@
+---
+ Makefile.am           |    2 +-
+ gcalctool/Makefile.am |    2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+Index: gcalctool-5.8.17/gcalctool/Makefile.am
+===================================================================
+--- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000
++++ gcalctool-5.8.17/gcalctool/Makefile.am      2007-05-16 16:03:26.000000000 +0100
+@@ -1,8 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ INCLUDES = \
+-       -I$(includedir) \
+-       -DG_DISABLE_DEPRECATED \
+        -DGDK_PIXBUF_DISABLE_DEPRECATED \
+        -DGDK_DISABLE_DEPRECATED \
+        -DGNOME_DISABLE_DEPRECATED \
+Index: gcalctool-5.8.17/Makefile.am
+===================================================================
+--- gcalctool-5.8.17.orig/Makefile.am   2007-05-16 15:35:44.000000000 +0100
++++ gcalctool-5.8.17/Makefile.am        2007-05-16 16:06:46.000000000 +0100
+@@ -29,7 +29,7 @@ DISTCLEANFILES =                \
+        gnome-doc-utils.make    \
+        gcalctool.desktop
+ 
+-SUBDIRS = po gcalctool help
++SUBDIRS = po gcalctool
+ 
+ SCHEMAS_FILE = gcalctool.schemas
+ 
diff --git a/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool_5.32.0.bb b/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool_5.32.0.bb
new file mode 100644
index 000000000..4812fe387
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool_5.32.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "gcalctool is a powerful calculator"
+SECTION = "x11"
+DEPENDS = "gtk+ gnome-doc-utils"
+
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
+SRC_URI = "http://download.gnome.org/sources/${BPN}/${SHRT_VER}/${BP}.tar.gz"
+
+SRC_URI[md5sum] = "48db927c6e7ee1d5395f953a8c184c98"
+SRC_URI[sha256sum] = "346f645c0fdef900642f6e9a2c18e7ba9a7ca9bc62fe2b08eb418f065a425c89"
+
+inherit autotools pkgconfig gsettings
+
+do_configure_prepend() {
+    sed -i -e "s: help: :g" ${S}/Makefile.am
+}
diff --git a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch
new file mode 100644
index 000000000..cb03fd86e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch
@@ -0,0 +1,41 @@
+From b5084616a3bc2a0d485f43aeae69c6025f3f857e Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 10 Jun 2011 18:44:21 +0200
+Subject: [PATCH] add support for the angstrom distribtion
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ Utils/Platform.pm |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/Utils/Platform.pm b/Utils/Platform.pm
+index fc76360..8b8c770 100644
+--- a/Utils/Platform.pm
++++ b/Utils/Platform.pm
+@@ -92,6 +92,7 @@ my $PLATFORM_INFO = {
+   "nexenta-1.0"     => [ "Nexenta GNU/Solaris", "1.0", "Ellate" ],
+   "yellowdog-4.1"   => [ "Yellow Dog Linux", "4.1", "Sagitta" ],
+   "guadalinex-v4"   => [ "Guadalinex", "v4", "Toro" ],
++  "angstrom"        => [ "Angstrom", "", "" ],
+ };
+ 
+ sub get_platform_info
+@@ -143,6 +144,7 @@ sub ensure_distro_map
+      "vine-3.1"         => "vine-3.0",
+      "vlos-1.2"         => "gentoo",
+      "nexenta-1.0"      => "solaris-2.11",
++     "angstrom"         => "debian",
+      );
+ 
+   return $metamap{$distro} if ($metamap{$distro});
+@@ -375,6 +377,7 @@ sub guess
+                   [ \&check_ark ],
+                   [ \&check_yoper ],
+                   [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ],
++                  [ \&check_file_exists, "/etc/angstrom-version", "angstrom" ],
+                  ],
+     "FreeBSD" => [[ \&check_freebsd ]],
+     "SunOS"   => [[ \&check_solaris ]]
+-- 
+1.6.6.1
+
diff --git a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/system-tools-backends b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/system-tools-backends
new file mode 100644
index 000000000..704c36dbf
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends-2.10.2/system-tools-backends
@@ -0,0 +1,74 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          system-tools-backends
+# Required-Start:    $local_fs dbus
+# Required-Stop:     $local_fs dbus
+# Should-Start:      $syslog
+# Should-Stop:       $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      1
+# Short-Description: Gnome System Tools Backends
+# Description:       The Gnome System Tools Backends daemon handles root-needed
+#                    operations to configure your machine with the Gnome System
+#                    Tools.
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/system-tools-backends
+PIDDIR=/var/run
+PIDFILE=$PIDDIR/system-tools-backends.pid
+NAME=system-tools-backends
+DESC="System Tools Backends"
+
+test -x $DAEMON || exit 0
+
+set -e
+
+do_start() {
+    echo "Starting $DESC"
+    start-stop-daemon --start --startas $DAEMON --quiet --pidfile $PIDFILE
+}
+
+do_stop() {
+    echo "Stopping $DESC"
+    start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --startas $DAEMON
+}
+
+case "$1" in
+  start)
+    do_start
+    ;;
+  stop)
+    do_stop
+    ;;
+  #reload)
+    #
+    # If the daemon can reload its config files on the fly
+    # for example by sending it SIGHUP, do it here.
+    #
+    # If the daemon responds to changes in its config file
+    # directly anyway, make this a do-nothing entry.
+    #
+    # echo "Reloading $DESC configuration files."
+    # start-stop-daemon --stop --signal 1 --quiet --pidfile \
+    #   /var/run/$NAME.pid --exec $DAEMON
+  #;;
+  restart|force-reload)
+    #
+    #   If the "reload" option is implemented, move the "force-reload"
+    #   option to the "reload" entry above. If not, "force-reload" is
+    #   just the same as "restart".
+    #
+    do_stop
+    sleep 5
+    do_start
+    ;;
+  *)
+    N=/etc/init.d/$NAME
+    echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2
+    exit 1
+    ;;
+esac
+
+exit 0
+
diff --git a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb
new file mode 100644
index 000000000..584d796c0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb
@@ -0,0 +1,52 @@
+SUMMARY = "gnome system tools backends"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = "dbus dbus-glib glib-2.0 polkit"
+
+inherit gnome pkgconfig update-rc.d gettext
+
+SRC_URI[archive.md5sum] = "edae148b31342aecae035051adc70c74"
+SRC_URI[archive.sha256sum] = "1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670"
+
+SRC_URI += " \
+            file://system-tools-backends \
+"
+
+# This needs to move to meta-angstrom
+SRC_URI_append_angstrom = " \
+            file://add-angstrom-distro.patch \
+"
+
+EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 "
+
+do_configure() {
+    rm missing || true
+    automake --add-missing
+    sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am
+    sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in
+    libtoolize --force --install
+    aclocal
+    gnu-configize
+    oe_runconf
+    cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S}
+}
+
+do_install_append () {
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/    
+}
+
+INITSCRIPT_NAME = "system-tools-backends"
+INITSCRIPT_PARAMS = "start 50 2 3 4 5 . stop 70 1 ."
+
+# Shadow added so there is a full adduser/deluser
+# (Gnome images tend to pull in shadow anyway)
+RDEPENDS_${PN} = "shadow"
+
+FILES_${PN} += " ${sysconfdir}/dbus-1/system.d"
+FILES_${PN} += " ${libdir}/pkgconfig"
+FILES_${PN} += " ${datadir}/dbus-1/system-services"
+FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files"
+FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts"
+FILES_${PN} += " ${datadir}/polkit*"
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch
new file mode 100644
index 000000000..daf7464c3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch
@@ -0,0 +1,34 @@
+From 10bd8094e1d94e5c737791c7f4b6b844f535c120 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 3 May 2013 10:00:16 +0200
+Subject: [PATCH] linc2/src/Makefile.am: fix build with glib 2.36
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [1]
+
+[1] https://bugzilla.gnome.org/show_bug.cgi?id=696900
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ linc2/src/Makefile.am |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/linc2/src/Makefile.am b/linc2/src/Makefile.am
+index 357a2dd..ba0e347 100644
+--- a/linc2/src/Makefile.am
++++ b/linc2/src/Makefile.am
+@@ -12,8 +12,7 @@ INCLUDES =                         \
+        -I$(top_builddir)/linc2/include  \
+        -I$(top_srcdir)/linc2/include    \
+        $(LINC_CFLAGS)             \
+-       $(WARN_CFLAGS)             \
+-       -DG_DISABLE_DEPRECATED
++       $(WARN_CFLAGS)
+ 
+ if OS_WIN32
+ else
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
new file mode 100644
index 000000000..7993abb92
--- /dev/null
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
@@ -0,0 +1,42 @@
+From d91dbb42dc3b6073720027f68827acd0abee6d75 Mon Sep 17 00:00:00 2001
+From: Kjartan Maraas <kmaraas@gnome.org>
+Date: Tue, 14 May 2013 13:29:53 +0200
+Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES and fix problem using
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://git.gnome.org/browse/ORBit2/commit/test/everything/Makefile.am?id=d91dbb42dc3b6073720027f68827acd0abee6d75
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ test/everything/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am
+index 32beb36..cb4b1d6 100644
+--- a/test/everything/Makefile.am
++++ b/test/everything/Makefile.am
+@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT =          \
+        $(EVERYTHING_BUILT)  \
+        everything-imodule.c
+ 
+-INCLUDES =                                 \
++AM_CPPFLAGS =                              \
+        -I$(top_srcdir)/include            \
+        -I$(top_builddir)/include          \
+        -I$(top_builddir)/src              \
+@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared
+ BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
+ CLEANFILES = ${BUILT_SOURCES} iorfile
+ 
+-TESTS = $(srcdir)/test.sh
++TESTS = $(top_builddir)/test/everything/test.sh
+ 
+ EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
+ 
+-- 
+1.8.3.1
+
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch
new file mode 100644
index 000000000..5fc1de561
--- /dev/null
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch
@@ -0,0 +1,37 @@
+--- ORBit2-2.14.17/configure.in-orig    2009-01-10 09:36:18.000000000 -0800
++++ ORBit2-2.14.17/configure.in 2009-06-17 15:10:59.000000000 -0700
+@@ -217,20 +217,20 @@ dnl
+ dnl   So many people with broken linking setups asked about this
+ dnl it turned out to be necessary to check for this.
+ dnl
+-dofus_save_libs="$LIBS"
+-LIBS="$ORBIT_LIBS $LIBS"
+-AC_TRY_RUN([ #include <stdio.h>
+-             main ()
+-             {
+-               return 0;
+-             } ],,
+-           AC_MSG_ERROR([
+-Linking is badly borked on your system. Please ensure your library path is correct
+-Check config.log for details - check near the end of the log above 'failed program was'
+-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
+-prefix you're compiling on: '${prefix}' ]), 
+-AC_MSG_WARN([Could not check for borked linking while cross-compiling]))
+-LIBS="$dofus_save_libs"
++dnl dofus_save_libs="$LIBS"
++dnl LIBS="$ORBIT_LIBS $LIBS"
++dnl AC_TRY_RUN([ #include <stdio.h>
++dnl             main ()
++dnl              {
++dnl                return 0;
++dnl              } ],,
++dnl            AC_MSG_ERROR([
++dnl Linking is badly borked on your system. Please ensure your library path is correct
++dnl Check config.log for details - check near the end of the log above 'failed program was'
++dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
++dnl prefix you're compiling on: '${prefix}' ]), 
++dnl AC_MSG_WARN([Could not check for borked linking while cross-compiling]))
++dnl LIBS="$dofus_save_libs"
+ 
+ orig_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS"
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch
new file mode 100644
index 000000000..f629e506d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch
@@ -0,0 +1,12 @@
+diff -urN ORBit2-2.14.12.orig/ORBit-2.0.pc.in ORBit2-2.14.12/ORBit-2.0.pc.in
+--- ORBit2-2.14.12.orig/ORBit-2.0.pc.in 2008-01-29 13:45:22.000000000 +0100
++++ ORBit2-2.14.12/ORBit-2.0.pc.in      2008-09-23 20:13:07.000000000 +0200
+@@ -2,7 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-orbit_idl=@bindir@/orbit-idl-2@EXEEXT@
++orbit_idl=@exec_prefix@/bin/orbit-idl-2@EXEEXT@
+ 
+ 
+ Name: ORBit-2.0
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
new file mode 100644
index 000000000..88f164fc5
--- /dev/null
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
@@ -0,0 +1,41 @@
+SUMMARY = "CORBA ORB"
+SECTION = "x11/gnome/libs"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+SRC_NAME = "ORBit2"
+SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
+SRC_URI = " \
+    ${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \
+    file://configure-lossage.patch \
+    file://pkgconfig-fix.patch \
+    file://0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch \
+    file://0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch \
+"
+SRC_URI[md5sum] = "7082d317a9573ab338302243082d10d1"
+SRC_URI[sha256sum] = "55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550"
+
+BBCLASSEXTEND = "native"
+
+IDL_COMPILER_DEPENDS = "orbit2-native"
+IDL_COMPILER_DEPENDS_virtclass-native = " "
+DEPENDS = "libidl popt ${IDL_COMPILER_DEPENDS}"
+
+# IDL_COMPILER_DEPENDS_virtclass-native for some reason didn't work and orbit2-native
+# was still in orbit2-native DEPENDS causing circular dependency
+DEPENDS_virtclass-native = "libidl-native popt-native"
+PARALLEL_MAKE = ""
+
+
+FILES_${PN} += "${libdir}/orbit-2.0/*.so"
+FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la"
+FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a"
+FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug"
+
+S = "${WORKDIR}/${SRC_NAME}-${PV}"
+
+LEAD_SONAME = "libORBit-2.so"
+
+inherit autotools pkgconfig gtk-doc
+
+EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
+EXTRA_OEMAKE_virtclass-native = " "
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts.inc b/meta-gnome/recipes-gnome/pimlico/contacts.inc
new file mode 100644
index 000000000..6535bbf54
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/contacts.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "Address-book application."
+HOMEPAGE = "http://pimlico-project.org/contacts.html"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ evolution-data-server intltool-native"
+RDEPENDS_${PN} = "libedata-book"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--disable-gnome-vfs"
+EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+
+do_install_append () {
+    install -d ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
+}
+
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+        ${datadir}/pixmaps/stock_person.png \
+        ${datadir}/icons/hicolor"
+
+SRC_URI = "file://stock_contact.png \
+           file://stock_person.png \
+           file://contacts-conditionally-install-schema.patch \
+"
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch b/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch
new file mode 100644
index 000000000..2ab7882c8
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch
@@ -0,0 +1,37 @@
+Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not
+be installed.
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+Upstream-Status: Pending
+---
+ data/Makefile.am |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index f790823..b6fd643 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -14,13 +14,14 @@ dist_man1_MANS = contacts.1
+ 
+ if HAVE_GCONF
+ install-data-local:
+-       GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
++       if [ "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" != "1" ]; then \
++               GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+                $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || \
+                (echo ;\
+                echo "*****************************************************"; \
+                echo "Installation of schemas failed, install them manually"; \
+-               echo "*****************************************************";)
+-               @true
++               echo "*****************************************************";); \
++       fi
+ endif
+ 
+ CLEANFILES = $(desktop_DATA)
+-- 
+1.7.7.6
+
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch b/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch
new file mode 100644
index 000000000..a7cfee3a0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch
@@ -0,0 +1,16 @@
+Fix for stricter parser in make 3.82. This fix has been pushed to upstream git.
+
+JL - 15/12/10
+
+Upstream-Status: Accepted
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT)
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++       $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png b/meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png
new file mode 100644
index 000000000..123b4485a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png b/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png
new file mode 100644
index 000000000..2b1328b4e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb b/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb
new file mode 100644
index 000000000..bdc7f4886
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb
@@ -0,0 +1,18 @@
+require contacts.inc
+
+PR = "r8"
+
+SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "aab5affbf93d6fa7b978b323a8d44de0"
+SRC_URI[sha256sum] = "9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/contacts-main.h;endline=18;md5=0371af46fbc72e33575e0072dca5fb19 \
+                    file://src/contacts-dbus.c;endline=18;md5=e4da9ac1a0539fafc7df431010904fd5 \
+                    file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee"
+
+do_configure_prepend () {
+    # It used 8 spaces to instead of a tab, but it doesn't work for us
+    sed -i 's/^        $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am
+}
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb
new file mode 100644
index 000000000..8a4a07166
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb
@@ -0,0 +1,19 @@
+require contacts.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \
+                    file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \
+                    file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
+
+SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933"
+PV = "0.12+git${SRCPV}"
+PR = "r4"
+
+S = "${WORKDIR}/git"
+
+SRC_URI =+ "git://git.gnome.org/${BPN} \
+        file://make-382.patch"
+
+S = "${WORKDIR}/git"
+
+
diff --git a/meta-gnome/recipes-gnome/pimlico/dates.inc b/meta-gnome/recipes-gnome/pimlico/dates.inc
new file mode 100644
index 000000000..12d2f83f9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Dates is a calendar application."
+HOMEPAGE = "http://pimlico-project.org/dates.html"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"
+
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ libglade evolution-data-server intltool-native"
+RDEPENDS_${PN} = "libedata-cal"
+
+inherit autotools gettext pkgconfig gtk-icon-cache
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/0001-Update-to-new-evolution-data-server-e_source_-color-.patch b/meta-gnome/recipes-gnome/pimlico/dates/0001-Update-to-new-evolution-data-server-e_source_-color-.patch
new file mode 100644
index 000000000..4550d298d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates/0001-Update-to-new-evolution-data-server-e_source_-color-.patch
@@ -0,0 +1,72 @@
+From a8ddfc4b91f2ab3d955fe528ddb98ce2c5545795 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sun, 4 Aug 2013 13:44:50 +0200
+Subject: [PATCH] Update to new evolution-data-server e_source_*color APIs
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/dates_gtk.c  | 6 +++---
+ src/dates_main.c | 2 +-
+ src/dates_view.c | 6 +++++-
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/dates_gtk.c b/src/dates_gtk.c
+index 78e71bb..ac539d2 100644
+--- a/src/dates_gtk.c
++++ b/src/dates_gtk.c
+@@ -1072,7 +1072,7 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d)
+ #endif
+ 
+                        /* Set the colour */
+-                       e_source_set_color (source, new_colour);
++                       e_source_set_color_spec (source, new_colour);
+ 
+                        /* Set the group for the source */
+                        e_source_set_group (source, group);
+@@ -1335,7 +1335,7 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d)
+        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ 
+        /* Get the colour from the the source */
+-       e_source_get_color (source, &raw_colour);
++       raw_colour = e_source_peek_color_spec (source);
+ 
+        /* Munge this into something usable */
+        colour.red = (guint16)(((raw_colour & 0xff0000) >> 16) << 8);
+@@ -1459,7 +1459,7 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d)
+                        new_colour <<= 8;
+ #endif
+                        /* Update the colour */
+-                       e_source_set_color (source, new_colour);
++                       e_source_set_color_spec (source, new_colour);
+ 
+                        /* And the name */
+                        e_source_set_name (source, (gtk_entry_get_text (GTK_ENTRY (name_entry))));
+diff --git a/src/dates_main.c b/src/dates_main.c
+index ce05fe8..7273c63 100644
+--- a/src/dates_main.c
++++ b/src/dates_main.c
+@@ -112,7 +112,7 @@ dates_load_calendars (DatesData *d)
+                system_source = e_source_new (_("Personal"), "system");
+ 
+                /* Default Evolution colour */
+-               e_source_set_color (system_source, 0xBECEDD);
++               e_source_set_color_spec (system_source, 0xBECEDD);
+ 
+                /* Set the group for the source and put it in the group */
+                e_source_set_group (system_source, local_group);
+diff --git a/src/dates_view.c b/src/dates_view.c
+index d65db2f..f8efb9c 100644
+--- a/src/dates_view.c
++++ b/src/dates_view.c
+@@ -4876,7 +4880,7 @@ dates_view_add_calendar (DatesView *view, ECal *ecal)
+        cal->text_gc = gdk_gc_new (
+                GDK_DRAWABLE (priv->main->window));
+ 
+-       if (e_source_get_color (source, &colour)) {
++       if (colour = e_source_peek_color_spec (source)) {
+                GdkColor gcolour, dgcolour, tgcolour;
+                gcolour.red = ((colour & 0xFF0000) >> 16) * 0x101;
+                gcolour.green = ((colour & 0xFF00) >> 8)  * 0x101;
+-- 
+1.8.3.2
+
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch b/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
new file mode 100644
index 000000000..649d59d91
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
@@ -0,0 +1,44 @@
+after gcc linking has changed, all the libraries must be explicitely specified 
+This patch avoids these linking errors:
+
+
+| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/dates-0.4.11+git0+514185dc1f6588085fda41eb59898b93d0487dd4-r2/git/src'^M
+...
+| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: e: invalid DSO for symbol `pow@@GLIBC_2.0' definition^M
+| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libm.so: could not read symbols: Bad value^M
+| collect2: ld returned 1 exit status^M
+| make[2]: *** [dates] Error 1
+
+
+
+| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: z: invalid DSO for symbol `pango_layout_get_extents' definition
+| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so: could not read symbols: Bad value
+| collect2: ld returned 1 exit status
+| make[2]: *** [dates] Error 1
+
+
+Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: 2011/01/11
+
+Update:
+This is identified as a libtool issue. While creating the libgtkdatesview.la 
+file, libtool should have added these needed libraries in there.
+ A bug has been created for this issue: 
+   http://bugzilla.pokylinux.org/show_bug.cgi?id=664
+Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: 2011/01/19
+
+Upstream-Status: Pending
+
+Index: git/src/Makefile.am
+===================================================================
+--- git.orig/src/Makefile.am
++++ git/src/Makefile.am
+@@ -34,6 +34,6 @@ dates_SOURCES = $(platform)   \
+        gconf-bridge.h          \
+        gconf-bridge.c
+ 
+-dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la
++dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la -lm -lpango-1.0
+ 
+ MAINTAINERCLEANFILES = config.h.in Makefile.in
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch b/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch
new file mode 100644
index 000000000..fad3c5826
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates/make-382.patch
@@ -0,0 +1,18 @@
+Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed
+in upstream git.
+
+JL - 15/12/10
+
+Upstream-Status: Accepted
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto
+ MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++       $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ 
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch b/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
new file mode 100644
index 000000000..6ade4708f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
@@ -0,0 +1,37 @@
+uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY
+therefore we introduce a check in configure for the this define
+and then we make sure that we use it when it really exists
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac       2011-07-18 10:34:15.000000000 -0700
++++ git/configure.ac    2011-07-18 10:54:26.403798188 -0700
+@@ -98,6 +98,8 @@
+                src/libgtkdatesview.pc
+ ])
+ 
++AC_CHECK_DECLS([_NL_TIME_FIRST_WEEKDAY],[],[],[[#include <langinfo.h>]])
++
+ AC_OUTPUT
+ 
+ echo " "
+Index: git/src/dates_view.c
+===================================================================
+--- git.orig/src/dates_view.c   2011-07-18 10:34:15.000000000 -0700
++++ git/src/dates_view.c        2011-07-18 10:58:46.093798136 -0700
+@@ -1505,7 +1505,11 @@
+        priv->days = 1;
+        priv->months = 0;
+        priv->months_in_row = 4;
++#if HAVE_DECL__NL_TIME_FIRST_WEEKDAY
+        priv->week_start = *nl_langinfo (_NL_TIME_FIRST_WEEKDAY) - 1;
++#else
++       priv->week_start = 0;
++#endif
+        priv->dragbox = TRUE;
+        priv->single_click = TRUE;
+        priv->double_click = FALSE;
diff --git a/meta-gnome/recipes-gnome/pimlico/dates_git.bb b/meta-gnome/recipes-gnome/pimlico/dates_git.bb
new file mode 100644
index 000000000..a4a572f85
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/dates_git.bb
@@ -0,0 +1,19 @@
+require dates.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+                    file://src/dates_view.h;endline=22;md5=29f934f356eb970309cdeb6693b3123a \
+                    file://src/dates_hildon.c;endline=19;md5=63938904198b25de429abb65fbdbdb8a \
+                    file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
+
+SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4"
+PV = "0.4.11+git${SRCPV}"
+PR = "r9"
+
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://git.gnome.org/${BPN} \
+    file://make-382.patch \
+    file://dso_linking_change_build_fix.patch \
+    file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
+    file://0001-Update-to-new-evolution-data-server-e_source_-color-.patch \
+"
diff --git a/meta-gnome/recipes-gnome/pimlico/tasks.inc b/meta-gnome/recipes-gnome/pimlico/tasks.inc
new file mode 100644
index 000000000..f8217dc3a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/tasks.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Task list application"
+HOMEPAGE = "http://pimlico-project.org/tasks.html"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2 & GPLv2+"
+
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ evolution-data-server intltool-native"
+
+inherit autotools pkgconfig gtk-icon-cache
diff --git a/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb b/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb
new file mode 100644
index 000000000..992596eaf
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb
@@ -0,0 +1,13 @@
+require tasks.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \
+                    file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \
+                    file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52"
+
+SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08"
+SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e"
+
+PR = "r3"
diff --git a/meta-gnome/recipes-gnome/pimlico/tasks_git.bb b/meta-gnome/recipes-gnome/pimlico/tasks_git.bb
new file mode 100644
index 000000000..6a06da336
--- /dev/null
+++ b/meta-gnome/recipes-gnome/pimlico/tasks_git.bb
@@ -0,0 +1,9 @@
+require tasks.inc
+
+SRC_URI = "git://git.gnome.org/${BPN}"
+
+SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65"
+PV = "0.13+git${SRCPV}"
+PR = "r3"
+
+S = "${WORKDIR}/git"
diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch b/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch
new file mode 100644
index 000000000..1b4096dd0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch
@@ -0,0 +1,52 @@
+
+The patch is ported from sato-icon-theme.
+
+pkg-config will only search the target sysroot and we want the native script. This 
+patch adds an option to allow the path to the tool to be specified.
+
+Upstream-Status: Pending
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ configure.in |   26 ++++++++++++++++----------
+ 1 file changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 5f7a18c..e8fc31e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -74,16 +74,22 @@ AC_ARG_ENABLE([icon-mapping],
+ ICONMAP="true"
+ if test "x$enable_mapping" != "xno"; then
+    UTILS_REQUIRED=0.8.7
+-
+-   AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
+-   PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, have_utils=yes, have_utils=no)
+-   if test "x$have_utils" = "xyes"; then
+-      UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
+-      ICONMAP="$UTILS_PATH/icon-name-mapping"
+-      AC_MSG_RESULT([yes])
+-   else
+-       AC_MSG_RESULT([no])
+-       AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-themes])
++   PKG_PROG_PKG_CONFIG()
++   AC_ARG_WITH(iconmap,
++           AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
++           ICONMAP=$withval, ICONMAP="")
++   if test "x$ICONMAP" = "x"; then
++      AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
++      PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, have_utils=yes, have_utils=no)
++      if test "x$have_utils" = "xyes"; then
++         UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
++         ICONMAP="$UTILS_PATH/icon-name-mapping"
++
++         AC_MSG_RESULT([yes])
++      else
++         AC_MSG_RESULT([no])
++         AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-themes"])
++      fi
+    fi
+ fi
+ AC_SUBST(ICONMAP)
+-- 
+1.7.9.5
+
diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
new file mode 100644
index 000000000..a2b7e0c6a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
@@ -0,0 +1,30 @@
+SUMMARY = "GNOME themes"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2b543dc97eb7594d026af39d9b54204b"
+
+PR = "r3"
+
+SECTION = "x11/gnome"
+DEPENDS = "gtk-engines icon-naming-utils icon-naming-utils-native glib-2.0 intltool-native libxml-simple-perl-native"
+RDEPENDS_${PN} = "gnome-icon-theme"
+
+EXTRA_OECONF += "--enable-all-themes \
+    --with-iconmap=${STAGING_LIBDIR_NATIVE}/icon-naming-utils/icon-name-mapping \
+"
+
+inherit gnomebase perlnative
+
+PACKAGES =+ " gnome-theme-crux gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-mist"
+FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux"
+FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast"
+FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse"
+FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint"
+FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse"
+FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint"
+FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist"
+
+FILES_${PN} += "${datadir}/themes ${datadir}/icons"
+
+SRC_URI += "file://iconpath-option.patch" 
+SRC_URI[archive.md5sum] = "41db9e3cb25d35af2675c599e67944d1"
+SRC_URI[archive.sha256sum] = "8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a"
diff --git a/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch b/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
new file mode 100644
index 000000000..a8c5bc796
--- /dev/null
+++ b/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
@@ -0,0 +1,29 @@
+From eebe1f27f4b27b05eb4b9b55f9df1124acf4d092 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 1 Aug 2014 12:25:24 +0200
+Subject: [PATCH] configure: use 'foreign' mode to avoid errors with missing
+ NEWS/AUTHORS/etc
+
+Upstream-status: Pending
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3d7eef6..1784bdd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,7 +41,7 @@ VERSION=$WV_VERSION
+ PACKAGE=wv
+ 
+ dnl Initialize automake stuff
+-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
++AM_INIT_AUTOMAKE([foreign])
+ 
+ # Specify a configuration file
+ AM_CONFIG_HEADER(config.h)
+-- 
+1.9.0
+
diff --git a/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch b/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch
new file mode 100644
index 000000000..136d89341
--- /dev/null
+++ b/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch
@@ -0,0 +1,13 @@
+Index: wv-1.2.0/wv-1.0.pc.in
+===================================================================
+--- wv-1.2.0.orig/wv-1.0.pc.in  2008-03-19 22:25:18.000000000 +0000
++++ wv-1.2.0/wv-1.0.pc.in       2008-03-19 22:26:32.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: wvWare
+ Description: Word Document Filter library and utilities
+ Version: @VERSION@
+-Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
+-Cflags: -I${includedir}/wv @GSF_CFLAGS@
++Requires: libgsf-1
++Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
++Cflags: -I${includedir}/wv
diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
new file mode 100644
index 000000000..6489c6f19
--- /dev/null
+++ b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Programs for accessing Microsoft Word documents"
+HOMEPAGE = "http://wvware.sourceforge.net/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f"
+
+DEPENDS = "libgsf glib-2.0 libpng"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
+           file://pkgconfig.patch \
+           file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \
+          "
+
+SRC_URI[md5sum] = "c1861c560491f121e12917fa76970ac5"
+SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+EXTRA_OECONF = ""
diff --git a/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch b/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch
new file mode 100644
index 000000000..50c9cb99f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch
@@ -0,0 +1,39 @@
+From 17e5606f8c4c8ff26ba18489aad4c484cf8e2949 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 29 Apr 2013 11:34:27 +0200
+Subject: [PATCH] Makefile.am: don't build help
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+it crashes with:
+
+| warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"
+| cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
+| make[2]: *** [zenity-bg.omf] Error 1
+| make[2]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/zenity/2.32.1-r2/zenity-2.32.1/help'
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile.am |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 03accc1..caec7f0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,7 @@
+ SUBDIRS = \
+        src     \
+        po      \
+-       data    \
+-       help
++       data
+ 
+ EXTRA_DIST = \
+        autogen.sh              \
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
new file mode 100644
index 000000000..4e01c5c93
--- /dev/null
+++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Display dialog boxes from the commandline and shell scripts"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+PR = "r2"
+
+PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S"
+
+DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils"
+
+inherit gnomebase
+SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch"
+SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170"
+SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac"
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+# remove -I/usr/include from zenity_CPPFLAGS
+do_configure_prepend() {
+    sed -i -e '/-I$(includedir)/d' src/Makefile.am
+}
+
diff --git a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
new file mode 100644
index 000000000..83e598e6a
--- /dev/null
+++ b/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
@@ -0,0 +1,33 @@
+From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 15 May 2012 13:40:05 +0200
+Subject: [PATCH] Fix glib includes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Upstream-Status: unknown
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/trace.c |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/src/trace.c b/src/trace.c
+index 5ea5c13..774c56d 100644
+--- a/src/trace.c
++++ b/src/trace.c
+@@ -21,10 +21,7 @@
+ 
+ #include "trace.h"
+ #include "system.h"
+-#include <glib/gprintf.h>
+-#include <glib/gutils.h>
+-#include <glib/gslist.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-support/florence/florence_0.5.1.bb b/meta-gnome/recipes-support/florence/florence_0.5.1.bb
new file mode 100644
index 000000000..9eab38575
--- /dev/null
+++ b/meta-gnome/recipes-support/florence/florence_0.5.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Florence is a virtual keyboard (also called on-screen-keyboard), which allows the user to input text through a touchscreen."
+HOMEPAGE = "http://florence.sourceforge.net/english.html"
+
+#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once.
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+PR = "r1"
+
+DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify"
+
+SRC_URI = "http://switch.dl.sourceforge.net/project/florence/florence/0.5.1/florence-0.5.1.tar.bz2 \
+           file://0001-Fix-glib-includes.patch"
+SRC_URI[md5sum] = "56d12e5b47c100d9df172aa5ddc0f609"
+SRC_URI[sha256sum] = "7b06ed84ef2b7b22d8d2cf0c7d013a05409bd82028240ac8719a68b192d5bc62"
+
+inherit gettext autotools gconf pkgconfig
+
+EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet"
diff --git a/meta-gnome/recipes-support/goffice/goffice/c99math.patch b/meta-gnome/recipes-support/goffice/goffice/c99math.patch
new file mode 100644
index 000000000..24e6c31a7
--- /dev/null
+++ b/meta-gnome/recipes-support/goffice/goffice/c99math.patch
@@ -0,0 +1,12 @@
+Index: goffice-0.7.14/configure.in
+===================================================================
+--- goffice-0.7.14.orig/configure.in    2009-11-14 19:14:37.106109501 +0100
++++ goffice-0.7.14/configure.in 2009-11-14 19:19:40.907333188 +0100
+@@ -66,6 +66,7 @@
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
++AC_PROG_CC_C99
+ AC_PROG_YACC
+ AM_PROG_LEX
+ AC_PROG_LN_S
diff --git a/meta-gnome/recipes-support/goffice/goffice/nodolt.patch b/meta-gnome/recipes-support/goffice/goffice/nodolt.patch
new file mode 100644
index 000000000..ea1777a99
--- /dev/null
+++ b/meta-gnome/recipes-support/goffice/goffice/nodolt.patch
@@ -0,0 +1,12 @@
+Index: goffice-0.7.14/configure.in
+===================================================================
+--- goffice-0.7.14.orig/configure.in
++++ goffice-0.7.14/configure.in
+@@ -71,7 +71,6 @@ AC_PROG_YACC
+ AM_PROG_LEX
+ AC_PROG_LN_S
+ AM_PROG_LIBTOOL
+-DOLT
+ AC_STDC_HEADERS
+ AC_SYS_LARGEFILE
+ 
diff --git a/meta-gnome/recipes-support/goffice/goffice/pcre-8.30.patch b/meta-gnome/recipes-support/goffice/goffice/pcre-8.30.patch
new file mode 100644
index 000000000..ae9370cfc
--- /dev/null
+++ b/meta-gnome/recipes-support/goffice/goffice/pcre-8.30.patch
@@ -0,0 +1,19 @@
+Taken from http://trac.macports.org/ticket/34812
+
+Fixes abiword build failing with:
+/usr/lib/libgoffice-0.8.so: undefined reference to `pcre_info'
+
+Upstream-Status: pending
+
+http://www.linuxfromscratch.org/blfs/view/cvs/x/goffice.html
+--- a/goffice/utils/regutf8.c.orig      2009-09-05 18:52:09.000000000 -0500
++++ b/goffice/utils/regutf8.c   2012-06-09 18:04:29.000000000 -0500
+@@ -155,7 +155,7 @@
+                default: return GO_REG_BADPAT;
+                }
+        } else {
+-               gor->re_nsub = pcre_info (r, NULL, NULL);
++               gor->re_nsub = pcre_fullinfo (r, NULL, 0, NULL);
+                gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+                return 0;
+        }
diff --git a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
new file mode 100644
index 000000000..1e9ec4cfd
--- /dev/null
+++ b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
@@ -0,0 +1,47 @@
+DESCRIPTION="Gnome Office Library"
+
+LICENSE="GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6dc33ff21e1ba1ac1a2a1069d361e29e"
+
+DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg intltool"
+
+inherit gnomebase pkgconfig perlnative
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI[archive.md5sum] = "90fd17c6fe205b779571e00d9b0b4727"
+SRC_URI[archive.sha256sum] = "5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0"
+
+FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug"
+
+RRECOMMENDS_${PN} = " \
+    goffice-plugin-plot-barcol \
+    goffice-plugin-plot-distrib \
+    goffice-plugin-plot-pie \
+    goffice-plugin-plot-radar \
+    goffice-plugin-plot-surface \
+    goffice-plugin-plot-xy \
+    goffice-plugin-reg-linear \
+    goffice-plugin-reg-logfit \
+    goffice-plugin-smoothing \
+"
+
+FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
+    ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+    ${base_bindir}/* ${base_sbindir}/* \
+    ${base_libdir}/*${SOLIBS} \
+    ${datadir}/${PN} \
+    ${datadir}/pixmaps ${datadir}/applications \
+    ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+    ${libdir}/bonobo/servers"
+
+FILES_${PN}-locale = "${libdir}/locale"
+
+PACKAGES_DYNAMIC += "^goffice-plugin-.*"
+
+python populate_packages_prepend () {
+    goffice_libdir = d.expand('${libdir}/goffice/${PV}/plugins/')
+
+    do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
+}
+
diff --git a/meta-gnome/recipes-support/tracker/files/90tracker b/meta-gnome/recipes-support/tracker/files/90tracker
new file mode 100644
index 000000000..9594b9168
--- /dev/null
+++ b/meta-gnome/recipes-support/tracker/files/90tracker
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/trackerd -m &
+
diff --git a/meta-gnome/recipes-support/tracker/files/tracker-dbus.service b/meta-gnome/recipes-support/tracker/files/tracker-dbus.service
new file mode 100644
index 000000000..c97f49a89
--- /dev/null
+++ b/meta-gnome/recipes-support/tracker/files/tracker-dbus.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=tracker DBus session bus handler
+Before=tracker-store.service
+After=dbus.service
+Requires=dbus.service
+BindTo=tracker-store.service
+
+[Service]
+Type=forking
+EnvironmentFile=-/tmp/tracker.env
+ExecStartPre=@BASE_BINDIR@/rm -rf /tmp/tracker.env
+ExecStart=/bin/sh -c 'echo "DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --fork --session --print-address`" > /tmp/tracker.env'
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service b/meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service
new file mode 100644
index 000000000..34d9a1e68
--- /dev/null
+++ b/meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=tracker-miner-fs
+After=syslog.target local-fs.target udev.service dbus.service tracker-store.service
+Requires=tracker-store.service
+
+[Service]
+Environment=HOME=/home/root
+EnvironmentFile=-/tmp/tracker.env
+ExecStart=@LIBEXECDIR@/tracker-miner-fs
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-gnome/recipes-support/tracker/files/tracker-store.service b/meta-gnome/recipes-support/tracker/files/tracker-store.service
new file mode 100644
index 000000000..c5037f3ab
--- /dev/null
+++ b/meta-gnome/recipes-support/tracker/files/tracker-store.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=tracker-store
+After=syslog.target local-fs.target dbus.service
+Requires=dbus.service tracker-dbus.service
+BindTo=tracker-dbus.service
+
+[Service]
+EnvironmentFile=-/tmp/tracker.env
+ExecStart=@LIBEXECDIR@/tracker-store
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch
new file mode 100644
index 000000000..8701f5854
--- /dev/null
+++ b/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch
@@ -0,0 +1,17 @@
+diff -Naur ../tracker-0.10.8/configure.ac tracker-0.10.8//configure.ac
+--- ../tracker-0.10.8/configure.ac      2011-04-08 15:03:30.000000000 +0300
++++ tracker-0.10.8//configure.ac        2011-04-11 13:47:16.625914002 +0300
+@@ -218,7 +218,12 @@
+ 
+ # Needed to generate .gir files,
+ # see http://live.gnome.org/GnomeGoals/AddGObjectIntrospectionSupport
+-GOBJECT_INTROSPECTION_CHECK([0.9.5])
++#GOBJECT_INTROSPECTION_CHECK([0.9.5])
++# Satisfy missing introspection foo
++AM_CONDITIONAL(HAVE_INTROSPECTION, test "0" == "1")
++
++INTROSPECTION_CFLAGS=""
++AC_SUBST(INTROSPECTION_CFLAGS)
+ 
+ # NOTE: dbus and dbus-glib-1 are only used now for libtracker-client
+ # which is deprecated and tracker-writeback which will be refactored
diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch
new file mode 100644
index 000000000..5dadda2a2
--- /dev/null
+++ b/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch
@@ -0,0 +1,13 @@
+Index: tracker-0.10.17/m4/sqlite-threadsafe.m4
+===================================================================
+--- tracker-0.10.17.orig/m4/sqlite-threadsafe.m4
++++ tracker-0.10.17/m4/sqlite-threadsafe.m4
+@@ -45,7 +45,7 @@ int main ()
+   ]])],
+        [ax_cv_sqlite_threadsafe=yes],
+        [ax_cv_sqlite_threadsafe=no],
+-       [ax_cv_sqlite_threadsafe=no])])
++       [ax_cv_sqlite_threadsafe=yes])])
+ 
+   LIBS="$save_LIBS"
+ ])
diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch
new file mode 100644
index 000000000..6c3d9de10
--- /dev/null
+++ b/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch
@@ -0,0 +1,30 @@
+Index: tracker-0.14.2/src/libtracker-miner/tracker-storage.c
+===================================================================
+--- tracker-0.14.2.orig/src/libtracker-miner/tracker-storage.c  2011-08-03 13:53:16.000000000 +0100
++++ tracker-0.14.2/src/libtracker-miner/tracker-storage.c       2012-09-10 08:25:18.322215126 +0100
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ 
+ #include <string.h>
++#include <sys/stat.h>
+ 
+ #include <gio/gio.h>
+ #include <gio/gunixmounts.h>
+@@ -646,6 +647,17 @@
+                                gchar *content_type;
+                                gboolean is_multimedia;
+                                gboolean is_blank;
++                                struct stat st;
++
++                                /*
++                                 * Consider all files under /media to be
++                                 * removable unless the file .this-is-root is
++                                 * present.
++                                 */
++                                if (!strncmp (mount_path, "/media/",
++                                              strlen ("/media/")) &&
++                                    stat ("/media/.this-is-root", &st))
++                                  is_removable = TRUE;
+ 
+                                content_type = mount_guess_content_type (mount, &is_optical, &is_multimedia, &is_blank);
+ 
diff --git a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb
new file mode 100644
index 000000000..104e490a3
--- /dev/null
+++ b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb
@@ -0,0 +1,79 @@
+DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ee31012bf90e7b8c108c69f197f3e3a4"
+DEPENDS = "file gstreamer gamin dbus libexif gettext sqlite3 icu gst-plugins-base libgnome-keyring poppler tiff enca libgsf libunistring giflib taglib bzip2 upower gtk+3 libgee networkmanager"
+
+RDEPENDS_${PN} += " gvfs gsettings-desktop-schemas"
+HOMEPAGE = "http://projects.gnome.org/tracker/"
+
+PR = "r7"
+
+inherit autotools pkgconfig gnomebase gettext gsettings systemd
+
+VER_DIR = "${@gnome_verdir("${PV}")}"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \
+           file://0005-Fix-missing-gobject-introspection-checks.patch \
+           file://enable-sqlite-crosscompile.patch \
+           file://fix-removable-media-detection.patch \
+           file://90tracker \
+           file://tracker-store.service \
+           file://tracker-miner-fs.service \
+           file://tracker-dbus.service \
+           "
+
+SYSTEMD_SERVICE_${PN} = " tracker-store.service tracker-miner-fs.service tracker-dbus.service "
+SYSTEMD_AUTO_ENABLE = "disable"
+
+EXTRA_OECONF += " tracker_cv_have_ioprio=yes"
+
+PACKAGECONFIG ?= "nautilus"
+PACKAGECONFIG[nautilus] = "--enable-nautilus-extension,--disable-nautilus-extension,nautilus"
+
+# Disable the desktop-centric miners
+EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \
+                 --disable-miner-evolution --disable-miner-flickr"
+
+LEAD_SONAME = "libtrackerclient.so.0"
+
+do_install_append() {
+    cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true
+#   install -d ${D}/${sysconfdir}/X11/Xsession.d/
+#   install -m 0755 ${WORKDIR}/90tracker  ${D}/${sysconfdir}/X11/Xsession.d/
+
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system
+    sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \
+           -e 's,@BASE_BINDIR@,${base_bindir},g' \
+               ${D}${systemd_unitdir}/system/*.service
+}
+
+PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension"
+
+FILES_${PN} += "${datadir}/dbus-1/ \
+                ${libdir}/tracker-${VER_DIR}/*.so.* \
+                ${libdir}/tracker-${VER_DIR}/extract-modules/*.so \
+                ${datadir}/icons/hicolor/*/apps/tracker.* \
+                ${libdir}/nautilus/extensions-2.0/*.la \
+                ${datadir}/glib-2.0/schemas/* \
+                ${systemd_unitdir}/system/tracker-store.service \
+                ${systemd_unitdir}/system/tracker-miner-fs.service \
+                ${systemd_unitdir}/system/tracker-dbus.service \
+"
+
+FILES_${PN}-dev += "${libdir}/tracker-${VER_DIR}/*.la \
+                    ${libdir}/tracker-${VER_DIR}/*.so \
+                    ${libdir}/tracker-${VER_DIR}/*/*.so \
+                    ${libdir}/tracker-${VER_DIR}/*/*.la \
+                    ${libdir}/tracker-${VER_DIR}/extract-modules/*.la"
+
+FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug \
+                    ${libdir}/*/.debug"
+FILES_${PN}-tests = "${datadir}/tracker-tests/"
+FILES_${PN}-vala = "${datadir}/vala/"
+FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
+
+SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac"
+SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1"