Tue Apr 23 01:16:16 PDT 2013

314 files changed, 15074 insertions, 15381 deletions

diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD
index 1d860b203..6b7fbaddb 100644
--- a/community/activity-log-manager/PKGBUILD
+++ b/community/activity-log-manager/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 79218 2012-11-01 09:45:30Z bgyorgy $
+# $Id: PKGBUILD 88673 2013-04-21 22:16:39Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Ner0
 
 pkgname=activity-log-manager
 pkgver=0.9.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/activity-log-manager"
 license=('GPL2')
-depends=('gtk3' 'libgee' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
+depends=('gtk3' 'libgee06' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('vala' 'intltool')
 install=$pkgname.install
 source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
@@ -27,10 +27,10 @@ build() {
   # Fix docdir location
   sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in}
 
-  # Update language files
-  echo 'af ar ast be bg bn bs ca ca@valencia cs da de el eo es et eu fi fr gd gl he hi hr hu id it ja km ko ku lt lv mi ms my nb nl oc pl pt ro ru se si sk sl sr sv ta te ug uk uz vi zh_CN zh_HK zh_TW' >po/LINGUAS
+  # Install updated language files
   rename $pkgname- '' ../po/$pkgname-*.po
   mv -f -t po ../po/*
+  printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS
 
   # Fix crash with GTK+ 3.6
   # https://bugs.launchpad.net/activity-log-manager/+bug/1058037
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD
index 9bf7cba30..905ac9983 100644
--- a/community/almanah/PKGBUILD
+++ b/community/almanah/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87238 2013-03-28 21:27:02Z bgyorgy $
+# $Id: PKGBUILD 88674 2013-04-21 22:16:40Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=almanah
 pkgver=0.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Almanah_Diary"
@@ -12,13 +12,18 @@ depends=('evolution-data-server' 'gtkspell3' 'libcryptui' 'xdg-utils')
 makedepends=('intltool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        eds-3.8.patch
         update-gtkspell3-support.patch)
 sha256sums=('122789c1baea1713102b200c0401d25395ec177a66ae22635d3ae2fecc1f08bd'
+            '2407cb2cc11e61b7863bf20fc13d4614a3384e8cb7c5b534f1e3ce7a3afb2d2d'
             '60fedd6be05ef2619c3b50539b9fdc717480e4f03a2920d8b68b09e63dc7e7db')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Port to evolution-data-server 3.8
+  patch -Np1 -i "$srcdir/eds-3.8.patch"
+
   # Port to the new gtkspell3
   patch -Np1 -i "$srcdir/update-gtkspell3-support.patch"
 
diff --git a/community/almanah/eds-3.8.patch b/community/almanah/eds-3.8.patch
new file mode 100644
index 000000000..dea51eb74
--- /dev/null
+++ b/community/almanah/eds-3.8.patch
@@ -0,0 +1,2609 @@
+From e481f5abdb46d41ac00ee3393332e92f605b55e7 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Thu, 13 Dec 2012 14:16:58 +0000
+Subject: Bug 687229 - Embed ESourceSelector widget from libedataserverui
+
+Evolution developers are merging libedataserverui back into Evolution.
+Drop the libedataserverui dependency and embed the ECellRendererColor
+and ESourceSelector widgets from libedataserverui in event-factories.
+
+See also:
+https://mail.gnome.org/archives/distributor-list/2012-December/msg00000.html
+---
+diff --git a/configure.ac b/configure.ac
+index a529568..b89ba74 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,7 +83,7 @@ AC_SUBST(STANDARD_CFLAGS)
+ AC_SUBST(STANDARD_LIBS)
+ 
+ dnl Evolution
+-PKG_CHECK_MODULES(EVO, libecal-1.2 libedataserver-1.2 libedataserverui-3.0, have_evo=yes, have_evo=no)
++PKG_CHECK_MODULES(EVO, libecal-1.2 >= 3.5.91 libedataserver-1.2, have_evo=yes, have_evo=no)
+ if test "x$have_evo" = "xyes"; then
+ 	AC_DEFINE(HAVE_EVO, 1, [Defined if libecal-1.2 is installed])
+ fi
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0de37e3..740c9f2 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,6 +52,10 @@ almanah_SOURCES += \
+ 	event-factories/calendar-debug.h	\
+ 	event-factories/calendar-sources.c	\
+ 	event-factories/calendar-sources.h	\
++	event-factories/e-cell-renderer-color.c	\
++	event-factories/e-cell-renderer-color.h	\
++	event-factories/e-source-selector.c	\
++	event-factories/e-source-selector.h	\
+ 	events/calendar-appointment.c		\
+ 	events/calendar-appointment.h		\
+ 	events/calendar-task.c			\
+diff --git a/src/event-factories/calendar-sources.c b/src/event-factories/calendar-sources.c
+index 217327d..9451a0d 100644
+--- a/src/event-factories/calendar-sources.c
++++ b/src/event-factories/calendar-sources.c
+@@ -32,7 +32,8 @@
+ #define HANDLE_LIBICAL_MEMORY
+ #include <libecal/libecal.h>
+ #include <libedataserver/libedataserver.h>
+-#include <libedataserverui/libedataserverui.h>
++
++#include "e-source-selector.h"
+ 
+ #undef CALENDAR_ENABLE_DEBUG
+ #include "calendar-debug.h"
+diff --git a/src/event-factories/e-cell-renderer-color.c b/src/event-factories/e-cell-renderer-color.c
+new file mode 100644
+index 0000000..748bea5
+--- /dev/null
++++ b/src/event-factories/e-cell-renderer-color.c
+@@ -0,0 +1,237 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* e-cell-renderer-color.c
++ *
++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of version 2 of the GNU Lesser General Public
++ * License as published by the Free Software Foundation.
++ *
++ * 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 Lesser 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.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "e-cell-renderer-color.h"
++
++#include <string.h>
++#include <glib/gi18n-lib.h>
++
++#define E_CELL_RENDERER_COLOR_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorPrivate))
++
++enum {
++	PROP_0,
++	PROP_COLOR
++};
++
++struct _ECellRendererColorPrivate {
++	GdkColor *color;
++};
++
++G_DEFINE_TYPE (
++	ECellRendererColor,
++	e_cell_renderer_color,
++	GTK_TYPE_CELL_RENDERER)
++
++static void
++cell_renderer_color_get_size (GtkCellRenderer *cell,
++                              GtkWidget *widget,
++                              const GdkRectangle *cell_area,
++                              gint *x_offset,
++                              gint *y_offset,
++                              gint *width,
++                              gint *height)
++{
++	gint color_width  = 16;
++	gint color_height = 16;
++	gint calc_width;
++	gint calc_height;
++	gfloat xalign;
++	gfloat yalign;
++	guint xpad;
++	guint ypad;
++
++	g_object_get (
++		cell, "xalign", &xalign, "yalign", &yalign,
++		"xpad", &xpad, "ypad", &ypad, NULL);
++
++	calc_width  = (gint) xpad * 2 + color_width;
++	calc_height = (gint) ypad * 2 + color_height;
++
++	if (cell_area && color_width > 0 && color_height > 0) {
++		if (x_offset) {
++			*x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
++					(1.0 - xalign) : xalign) *
++					(cell_area->width - calc_width));
++			*x_offset = MAX (*x_offset, 0);
++		}
++
++		if (y_offset) {
++			*y_offset =(yalign *
++				(cell_area->height - calc_height));
++			*y_offset = MAX (*y_offset, 0);
++		}
++	} else {
++		if (x_offset) *x_offset = 0;
++		if (y_offset) *y_offset = 0;
++	}
++
++	if (width)
++		*width = calc_width;
++
++	if (height)
++		*height = calc_height;
++}
++
++static void
++cell_renderer_color_render (GtkCellRenderer *cell,
++                            cairo_t *cr,
++                            GtkWidget *widget,
++                            const GdkRectangle *background_area,
++                            const GdkRectangle *cell_area,
++                            GtkCellRendererState flags)
++{
++	ECellRendererColorPrivate *priv;
++	GdkRectangle pix_rect;
++	GdkRectangle draw_rect;
++	guint xpad;
++	guint ypad;
++
++	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cell);
++
++	if (priv->color == NULL)
++		return;
++
++	cell_renderer_color_get_size (
++		cell, widget, cell_area,
++		&pix_rect.x, &pix_rect.y,
++		&pix_rect.width, &pix_rect.height);
++
++	g_object_get (cell, "xpad", &xpad, "ypad", &ypad, NULL);
++
++	pix_rect.x += cell_area->x + xpad;
++	pix_rect.y += cell_area->y + ypad;
++	pix_rect.width  -= xpad * 2;
++	pix_rect.height -= ypad * 2;
++
++	if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
++		return;
++
++	gdk_cairo_set_source_color (cr, priv->color);
++	cairo_rectangle (cr, pix_rect.x, pix_rect.y, draw_rect.width, draw_rect.height);
++
++	cairo_fill (cr);
++}
++
++static void
++cell_renderer_color_set_property (GObject *object,
++                                  guint property_id,
++                                  const GValue *value,
++                                  GParamSpec *pspec)
++{
++	ECellRendererColorPrivate *priv;
++
++	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object);
++
++	switch (property_id) {
++		case PROP_COLOR:
++			if (priv->color != NULL)
++				gdk_color_free (priv->color);
++			priv->color = g_value_dup_boxed (value);
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++cell_renderer_color_get_property (GObject *object,
++                                  guint property_id,
++                                  GValue *value,
++                                  GParamSpec *pspec)
++{
++	ECellRendererColorPrivate *priv;
++
++	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object);
++
++	switch (property_id) {
++		case PROP_COLOR:
++			g_value_set_boxed (value, priv->color);
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++cell_renderer_color_finalize (GObject *object)
++{
++	ECellRendererColorPrivate *priv;
++
++	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object);
++
++	if (priv->color != NULL)
++		gdk_color_free (priv->color);
++
++	/* Chain up to parent's finalize() method. */
++	G_OBJECT_CLASS (e_cell_renderer_color_parent_class)->finalize (object);
++}
++
++static void
++e_cell_renderer_color_class_init (ECellRendererColorClass *class)
++{
++	GObjectClass *object_class;
++	GtkCellRendererClass *cell_class;
++
++	g_type_class_add_private (class, sizeof (ECellRendererColorPrivate));
++
++	object_class = G_OBJECT_CLASS (class);
++	object_class->set_property = cell_renderer_color_set_property;
++	object_class->get_property = cell_renderer_color_get_property;
++	object_class->finalize = cell_renderer_color_finalize;
++
++	cell_class = GTK_CELL_RENDERER_CLASS (class);
++	cell_class->get_size = cell_renderer_color_get_size;
++	cell_class->render = cell_renderer_color_render;
++
++	g_object_class_install_property (
++		object_class,
++		PROP_COLOR,
++		g_param_spec_boxed (
++			"color",
++			"Color Info",
++			"The color to render",
++			GDK_TYPE_COLOR,
++			G_PARAM_READWRITE));
++}
++
++static void
++e_cell_renderer_color_init (ECellRendererColor *cellcolor)
++{
++	cellcolor->priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cellcolor);
++
++	g_object_set (cellcolor, "xpad", 4, NULL);
++}
++
++/**
++ * e_cell_renderer_color_new:
++ *
++ * Since: 2.22
++ **/
++GtkCellRenderer *
++e_cell_renderer_color_new (void)
++{
++	return g_object_new (E_TYPE_CELL_RENDERER_COLOR, NULL);
++}
+diff --git a/src/event-factories/e-cell-renderer-color.h b/src/event-factories/e-cell-renderer-color.h
+new file mode 100644
+index 0000000..0e0da70
+--- /dev/null
++++ b/src/event-factories/e-cell-renderer-color.h
+@@ -0,0 +1,75 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* e-cell-renderer-color.h
++ *
++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of version 2 of the GNU Lesser General Public
++ * License as published by the Free Software Foundation.
++ *
++ * 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 Lesser 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 _E_CELL_RENDERER_COLOR_H_
++#define _E_CELL_RENDERER_COLOR_H_
++
++#include <gtk/gtk.h>
++
++/* Standard GObject macros */
++#define E_TYPE_CELL_RENDERER_COLOR \
++	(e_cell_renderer_color_get_type ())
++#define E_CELL_RENDERER_COLOR(obj) \
++	(G_TYPE_CHECK_INSTANCE_CAST \
++	((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColor))
++#define E_CELL_RENDERER_COLOR_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_CAST \
++	((cls), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorClass))
++#define E_IS_CELL_RENDERER_COLOR(obj) \
++	(G_TYPE_CHECK_INSTANCE_TYPE \
++	((obj), E_TYPE_CELL_RENDERER_COLOR))
++#define E_IS_CELL_RENDERER_COLOR_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_TYPE ((cls), E_TYPE_CELL_RENDERER_COLOR))
++#define E_CELL_RENDERER_COLOR_GET_CLASS(obj) \
++	(G_TYPE_INSTANCE_GET_CLASS \
++	((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorClass))
++
++G_BEGIN_DECLS
++
++typedef struct _ECellRendererColor ECellRendererColor;
++typedef struct _ECellRendererColorClass ECellRendererColorClass;
++typedef struct _ECellRendererColorPrivate ECellRendererColorPrivate;
++
++/**
++ * ECellRendererColor:
++ *
++ * Since: 2.22
++ **/
++struct _ECellRendererColor {
++	GtkCellRenderer parent;
++	ECellRendererColorPrivate *priv;
++};
++
++struct _ECellRendererColorClass {
++	GtkCellRendererClass parent_class;
++
++	/* Padding for future expansion */
++	void (*_gtk_reserved1) (void);
++	void (*_gtk_reserved2) (void);
++	void (*_gtk_reserved3) (void);
++	void (*_gtk_reserved4) (void);
++};
++
++GType            e_cell_renderer_color_get_type	(void);
++GtkCellRenderer *e_cell_renderer_color_new	(void);
++
++G_END_DECLS
++
++#endif /* _E_CELL_RENDERER_COLOR_H_ */
+diff --git a/src/event-factories/e-source-selector.c b/src/event-factories/e-source-selector.c
+new file mode 100644
+index 0000000..925d9cd
+--- /dev/null
++++ b/src/event-factories/e-source-selector.c
+@@ -0,0 +1,2080 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* e-source-selector.c
++ *
++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public License as
++ * published by the Free Software Foundation; either version 2 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 Lesser 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.
++ *
++ * Author: Ettore Perazzoli <ettore@ximian.com>
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <string.h>
++
++#include "e-cell-renderer-color.h"
++#include "e-source-selector.h"
++
++#define E_SOURCE_SELECTOR_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelectorPrivate))
++
++typedef struct _AsyncContext AsyncContext;
++
++struct _ESourceSelectorPrivate {
++	ESourceRegistry *registry;
++	GHashTable *source_index;
++	gchar *extension_name;
++
++	GtkTreeRowReference *saved_primary_selection;
++
++	/* ESource -> GSource */
++	GHashTable *pending_writes;
++	GMainContext *main_context;
++
++	gboolean toggled_last;
++	gboolean select_new;
++	gboolean show_colors;
++	gboolean show_toggles;
++};
++
++struct _AsyncContext {
++	ESourceSelector *selector;
++	ESource *source;
++};
++
++enum {
++	PROP_0,
++	PROP_EXTENSION_NAME,
++	PROP_PRIMARY_SELECTION,
++	PROP_REGISTRY,
++	PROP_SHOW_COLORS,
++	PROP_SHOW_TOGGLES
++};
++
++enum {
++	SELECTION_CHANGED,
++	PRIMARY_SELECTION_CHANGED,
++	POPUP_EVENT,
++	DATA_DROPPED,
++	NUM_SIGNALS
++};
++
++enum {
++	COLUMN_NAME,
++	COLUMN_COLOR,
++	COLUMN_ACTIVE,
++	COLUMN_SHOW_COLOR,
++	COLUMN_SHOW_TOGGLE,
++	COLUMN_WEIGHT,
++	COLUMN_SOURCE,
++	NUM_COLUMNS
++};
++
++static guint signals[NUM_SIGNALS];
++
++G_DEFINE_TYPE (ESourceSelector, e_source_selector, GTK_TYPE_TREE_VIEW)
++
++/* ESafeToggleRenderer does not emit 'toggled' signal
++ * on 'activate' when mouse is not over the toggle. */
++
++typedef GtkCellRendererToggle ECellRendererSafeToggle;
++typedef GtkCellRendererToggleClass ECellRendererSafeToggleClass;
++
++/* Forward Declarations */
++GType e_cell_renderer_safe_toggle_get_type (void);
++
++G_DEFINE_TYPE (
++	ECellRendererSafeToggle,
++	e_cell_renderer_safe_toggle,
++	GTK_TYPE_CELL_RENDERER_TOGGLE)
++
++static gboolean
++safe_toggle_activate (GtkCellRenderer *cell,
++                      GdkEvent *event,
++                      GtkWidget *widget,
++                      const gchar *path,
++                      const GdkRectangle *background_area,
++                      const GdkRectangle *cell_area,
++                      GtkCellRendererState flags)
++{
++	gboolean point_in_cell_area = TRUE;
++
++	if (event->type == GDK_BUTTON_PRESS && cell_area != NULL) {
++		cairo_region_t *region;
++
++		region = cairo_region_create_rectangle (cell_area);
++		point_in_cell_area = cairo_region_contains_point (
++			region, event->button.x, event->button.y);
++		cairo_region_destroy (region);
++	}
++
++	if (!point_in_cell_area)
++		return FALSE;
++
++	return GTK_CELL_RENDERER_CLASS (
++		e_cell_renderer_safe_toggle_parent_class)->activate (
++		cell, event, widget, path, background_area, cell_area, flags);
++}
++
++static void
++e_cell_renderer_safe_toggle_class_init (ECellRendererSafeToggleClass *class)
++{
++	GtkCellRendererClass *cell_renderer_class;
++
++	cell_renderer_class = GTK_CELL_RENDERER_CLASS (class);
++	cell_renderer_class->activate = safe_toggle_activate;
++}
++
++static void
++e_cell_renderer_safe_toggle_init (ECellRendererSafeToggle *obj)
++{
++}
++
++static GtkCellRenderer *
++e_cell_renderer_safe_toggle_new (void)
++{
++	return g_object_new (e_cell_renderer_safe_toggle_get_type (), NULL);
++}
++
++static void
++clear_saved_primary_selection (ESourceSelector *selector)
++{
++	gtk_tree_row_reference_free (selector->priv->saved_primary_selection);
++	selector->priv->saved_primary_selection = NULL;
++}
++
++static void
++async_context_free (AsyncContext *async_context)
++{
++	if (async_context->selector != NULL)
++		g_object_unref (async_context->selector);
++
++	if (async_context->source != NULL)
++		g_object_unref (async_context->source);
++
++	g_slice_free (AsyncContext, async_context);
++}
++
++static void
++pending_writes_destroy_source (GSource *source)
++{
++	g_source_destroy (source);
++	g_source_unref (source);
++}
++
++static void
++source_selector_write_done_cb (GObject *source_object,
++                               GAsyncResult *result,
++                               gpointer user_data)
++{
++	ESource *source;
++	ESourceSelector *selector;
++	GError *error = NULL;
++
++	source = E_SOURCE (source_object);
++	selector = E_SOURCE_SELECTOR (user_data);
++
++	e_source_write_finish (source, result, &error);
++
++	/* FIXME Display the error in the selector somehow? */
++	if (error != NULL) {
++		g_warning ("%s: %s", G_STRFUNC, error->message);
++		g_error_free (error);
++	}
++
++	g_object_unref (selector);
++}
++
++static gboolean
++source_selector_write_idle_cb (gpointer user_data)
++{
++	AsyncContext *async_context = user_data;
++	GHashTable *pending_writes;
++
++	/* XXX This operation is not cancellable. */
++	e_source_write (
++		async_context->source, NULL,
++		source_selector_write_done_cb,
++		g_object_ref (async_context->selector));
++
++	pending_writes = async_context->selector->priv->pending_writes;
++	g_hash_table_remove (pending_writes, async_context->source);
++
++	return FALSE;
++}
++
++static void
++source_selector_cancel_write (ESourceSelector *selector,
++                              ESource *source)
++{
++	GHashTable *pending_writes;
++
++	/* Cancel any pending writes for this ESource so as not
++	 * to overwrite whatever change we're being notified of. */
++	pending_writes = selector->priv->pending_writes;
++	g_hash_table_remove (pending_writes, source);
++}
++
++static void
++source_selector_update_row (ESourceSelector *selector,
++                            ESource *source)
++{
++	GHashTable *source_index;
++	ESourceExtension *extension = NULL;
++	GtkTreeRowReference *reference;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++	const gchar *extension_name;
++	const gchar *display_name;
++	gboolean selected;
++
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++
++	/* This function runs when ANY ESource in the registry changes.
++	 * If the ESource is not in our tree model then return silently. */
++	if (reference == NULL)
++		return;
++
++	/* If we do have a row reference, it should be valid. */
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
++
++	model = gtk_tree_row_reference_get_model (reference);
++	path = gtk_tree_row_reference_get_path (reference);
++	gtk_tree_model_get_iter (model, &iter, path);
++	gtk_tree_path_free (path);
++
++	display_name = e_source_get_display_name (source);
++
++	extension_name = e_source_selector_get_extension_name (selector);
++	selected = e_source_selector_source_is_selected (selector, source);
++
++	if (e_source_has_extension (source, extension_name))
++		extension = e_source_get_extension (source, extension_name);
++
++	if (extension != NULL) {
++		GdkColor color;
++		const gchar *color_spec = NULL;
++		gboolean show_color = FALSE;
++		gboolean show_toggle;
++
++		show_color =
++			E_IS_SOURCE_SELECTABLE (extension) &&
++			e_source_selector_get_show_colors (selector);
++
++		if (show_color)
++			color_spec = e_source_selectable_get_color (
++				E_SOURCE_SELECTABLE (extension));
++
++		if (color_spec != NULL && *color_spec != '\0')
++			show_color = gdk_color_parse (color_spec, &color);
++
++		show_toggle = e_source_selector_get_show_toggles (selector);
++
++		gtk_tree_store_set (
++			GTK_TREE_STORE (model), &iter,
++			COLUMN_NAME, display_name,
++			COLUMN_COLOR, show_color ? &color : NULL,
++			COLUMN_ACTIVE, selected,
++			COLUMN_SHOW_COLOR, show_color,
++			COLUMN_SHOW_TOGGLE, show_toggle,
++			COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL,
++			COLUMN_SOURCE, source,
++			-1);
++	} else {
++		gtk_tree_store_set (
++			GTK_TREE_STORE (model), &iter,
++			COLUMN_NAME, display_name,
++			COLUMN_COLOR, NULL,
++			COLUMN_ACTIVE, FALSE,
++			COLUMN_SHOW_COLOR, FALSE,
++			COLUMN_SHOW_TOGGLE, FALSE,
++			COLUMN_WEIGHT, PANGO_WEIGHT_BOLD,
++			COLUMN_SOURCE, source,
++			-1);
++	}
++}
++
++static gboolean
++source_selector_traverse (GNode *node,
++                          ESourceSelector *selector)
++{
++	ESource *source;
++	GHashTable *source_index;
++	GtkTreeRowReference *reference = NULL;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++
++	/* Skip the root node. */
++	if (G_NODE_IS_ROOT (node))
++		return FALSE;
++
++	source_index = selector->priv->source_index;
++
++	model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
++
++	if (node->parent != NULL && node->parent->data != NULL)
++		reference = g_hash_table_lookup (
++			source_index, node->parent->data);
++
++	if (gtk_tree_row_reference_valid (reference)) {
++		GtkTreeIter parent;
++
++		path = gtk_tree_row_reference_get_path (reference);
++		gtk_tree_model_get_iter (model, &parent, path);
++		gtk_tree_path_free (path);
++
++		gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent);
++	} else
++		gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
++
++	source = E_SOURCE (node->data);
++
++	path = gtk_tree_model_get_path (model, &iter);
++	reference = gtk_tree_row_reference_new (model, path);
++	g_hash_table_insert (source_index, g_object_ref (source), reference);
++	gtk_tree_path_free (path);
++
++	source_selector_update_row (selector, source);
++
++	return FALSE;
++}
++
++static void
++source_selector_save_expanded (GtkTreeView *tree_view,
++                               GtkTreePath *path,
++                               GQueue *queue)
++{
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++	ESource *source;
++
++	model = gtk_tree_view_get_model (tree_view);
++	gtk_tree_model_get_iter (model, &iter, path);
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++	g_queue_push_tail (queue, source);
++}
++
++static void
++source_selector_build_model (ESourceSelector *selector)
++{
++	ESourceRegistry *registry;
++	GQueue queue = G_QUEUE_INIT;
++	GHashTable *source_index;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	ESource *selected;
++	const gchar *extension_name;
++	GNode *root;
++
++	tree_view = GTK_TREE_VIEW (selector);
++
++	registry = e_source_selector_get_registry (selector);
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	/* Make sure we have what we need to build the model, since
++	 * this can get called early in the initialization phase. */
++	if (registry == NULL || extension_name == NULL)
++		return;
++
++	source_index = selector->priv->source_index;
++	selected = e_source_selector_ref_primary_selection (selector);
++
++	/* Save expanded sources to restore later. */
++	gtk_tree_view_map_expanded_rows (
++		tree_view, (GtkTreeViewMappingFunc)
++		source_selector_save_expanded, &queue);
++
++	model = gtk_tree_view_get_model (tree_view);
++	gtk_tree_store_clear (GTK_TREE_STORE (model));
++
++	g_hash_table_remove_all (source_index);
++
++	root = e_source_registry_build_display_tree (registry, extension_name);
++
++	g_node_traverse (
++		root, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
++		(GNodeTraverseFunc) source_selector_traverse,
++		selector);
++
++	e_source_registry_free_display_tree (root);
++
++	/* Restore previously expanded sources. */
++	while (!g_queue_is_empty (&queue)) {
++		GtkTreeRowReference *reference;
++		ESource *source;
++
++		source = g_queue_pop_head (&queue);
++		reference = g_hash_table_lookup (source_index, source);
++
++		if (gtk_tree_row_reference_valid (reference)) {
++			GtkTreePath *path;
++
++			path = gtk_tree_row_reference_get_path (reference);
++			gtk_tree_view_expand_to_path (tree_view, path);
++			gtk_tree_path_free (path);
++		}
++
++		g_object_unref (source);
++	}
++
++	/* Restore the primary selection. */
++	if (selected != NULL) {
++		e_source_selector_set_primary_selection (selector, selected);
++		g_object_unref (selected);
++	}
++
++	/* Make sure we have a primary selection.  If not, pick one. */
++	selected = e_source_selector_ref_primary_selection (selector);
++	if (selected == NULL) {
++		selected = e_source_registry_ref_default_for_extension_name (
++			registry, extension_name);
++		e_source_selector_set_primary_selection (selector, selected);
++	}
++	g_object_unref (selected);
++}
++
++static void
++source_selector_expand_to_source (ESourceSelector *selector,
++                                  ESource *source)
++{
++	GHashTable *source_index;
++	GtkTreeRowReference *reference;
++	GtkTreePath *path;
++
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++
++	/* If the ESource is not in our tree model then return silently. */
++	if (reference == NULL)
++		return;
++
++	/* If we do have a row reference, it should be valid. */
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
++
++	/* Expand the tree view to the path containing the ESource */
++	path = gtk_tree_row_reference_get_path (reference);
++	gtk_tree_view_expand_to_path (GTK_TREE_VIEW (selector), path);
++	gtk_tree_path_free (path);
++}
++
++static void
++source_selector_source_added_cb (ESourceRegistry *registry,
++                                 ESource *source,
++                                 ESourceSelector *selector)
++{
++	source_selector_build_model (selector);
++
++	source_selector_expand_to_source (selector, source);
++}
++
++static void
++source_selector_source_changed_cb (ESourceRegistry *registry,
++                                   ESource *source,
++                                   ESourceSelector *selector)
++{
++	source_selector_cancel_write (selector, source);
++
++	source_selector_update_row (selector, source);
++}
++
++static void
++source_selector_source_removed_cb (ESourceRegistry *registry,
++                                   ESource *source,
++                                   ESourceSelector *selector)
++{
++	source_selector_build_model (selector);
++}
++
++static void
++source_selector_source_enabled_cb (ESourceRegistry *registry,
++                                   ESource *source,
++                                   ESourceSelector *selector)
++{
++	source_selector_build_model (selector);
++
++	source_selector_expand_to_source (selector, source);
++}
++
++static void
++source_selector_source_disabled_cb (ESourceRegistry *registry,
++                                    ESource *source,
++                                    ESourceSelector *selector)
++{
++	source_selector_build_model (selector);
++}
++
++static gboolean
++same_source_name_exists (ESourceSelector *selector,
++                         const gchar *display_name)
++{
++	GHashTable *source_index;
++	GHashTableIter iter;
++	gpointer key;
++
++	source_index = selector->priv->source_index;
++	g_hash_table_iter_init (&iter, source_index);
++
++	while (g_hash_table_iter_next (&iter, &key, NULL)) {
++		ESource *source = E_SOURCE (key);
++		const gchar *source_name;
++
++		source_name = e_source_get_display_name (source);
++		if (g_strcmp0 (display_name, source_name) == 0)
++			return TRUE;
++	}
++
++	return FALSE;
++}
++
++static gboolean
++selection_func (GtkTreeSelection *selection,
++                GtkTreeModel *model,
++                GtkTreePath *path,
++                gboolean path_currently_selected,
++                ESourceSelector *selector)
++{
++	ESource *source;
++	GtkTreeIter iter;
++	const gchar *extension_name;
++
++	if (selector->priv->toggled_last) {
++		selector->priv->toggled_last = FALSE;
++		return FALSE;
++	}
++
++	if (path_currently_selected)
++		return TRUE;
++
++	if (!gtk_tree_model_get_iter (model, &iter, path))
++		return FALSE;
++
++	extension_name = e_source_selector_get_extension_name (selector);
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	if (!e_source_has_extension (source, extension_name)) {
++		g_object_unref (source);
++		return FALSE;
++	}
++
++	clear_saved_primary_selection (selector);
++
++	g_object_unref (source);
++
++	return TRUE;
++}
++
++static void
++text_cell_edited_cb (ESourceSelector *selector,
++                     const gchar *path_string,
++                     const gchar *new_name)
++{
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++	ESource *source;
++
++	tree_view = GTK_TREE_VIEW (selector);
++	model = gtk_tree_view_get_model (tree_view);
++	path = gtk_tree_path_new_from_string (path_string);
++
++	gtk_tree_model_get_iter (model, &iter, path);
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++	gtk_tree_path_free (path);
++
++	if (new_name == NULL || *new_name == '\0')
++		return;
++
++	if (same_source_name_exists (selector, new_name))
++		return;
++
++	e_source_set_display_name (source, new_name);
++
++	e_source_selector_queue_write (selector, source);
++}
++
++static void
++cell_toggled_callback (GtkCellRendererToggle *renderer,
++                       const gchar *path_string,
++                       ESourceSelector *selector)
++{
++	ESource *source;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++
++	model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
++	path = gtk_tree_path_new_from_string (path_string);
++
++	if (!gtk_tree_model_get_iter (model, &iter, path)) {
++		gtk_tree_path_free (path);
++		return;
++	}
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	if (e_source_selector_source_is_selected (selector, source))
++		e_source_selector_unselect_source (selector, source);
++	else
++		e_source_selector_select_source (selector, source);
++
++	selector->priv->toggled_last = TRUE;
++
++	gtk_tree_path_free (path);
++
++	g_object_unref (source);
++}
++
++static void
++selection_changed_callback (GtkTreeSelection *selection,
++                            ESourceSelector *selector)
++{
++	g_signal_emit (selector, signals[PRIMARY_SELECTION_CHANGED], 0);
++	g_object_notify (G_OBJECT (selector), "primary-selection");
++}
++
++static void
++source_selector_set_extension_name (ESourceSelector *selector,
++                                    const gchar *extension_name)
++{
++	g_return_if_fail (extension_name != NULL);
++	g_return_if_fail (selector->priv->extension_name == NULL);
++
++	selector->priv->extension_name = g_strdup (extension_name);
++}
++
++static void
++source_selector_set_registry (ESourceSelector *selector,
++                              ESourceRegistry *registry)
++{
++	g_return_if_fail (E_IS_SOURCE_REGISTRY (registry));
++	g_return_if_fail (selector->priv->registry == NULL);
++
++	selector->priv->registry = g_object_ref (registry);
++}
++
++static void
++source_selector_set_property (GObject *object,
++                              guint property_id,
++                              const GValue *value,
++                              GParamSpec *pspec)
++{
++	switch (property_id) {
++		case PROP_EXTENSION_NAME:
++			source_selector_set_extension_name (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_string (value));
++			return;
++
++		case PROP_PRIMARY_SELECTION:
++			e_source_selector_set_primary_selection (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_object (value));
++			return;
++
++		case PROP_REGISTRY:
++			source_selector_set_registry (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_object (value));
++			return;
++
++		case PROP_SHOW_COLORS:
++			e_source_selector_set_show_colors (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_boolean (value));
++			return;
++
++		case PROP_SHOW_TOGGLES:
++			e_source_selector_set_show_toggles (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_boolean (value));
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++source_selector_get_property (GObject *object,
++                              guint property_id,
++                              GValue *value,
++                              GParamSpec *pspec)
++{
++	switch (property_id) {
++		case PROP_EXTENSION_NAME:
++			g_value_set_string (
++				value,
++				e_source_selector_get_extension_name (
++				E_SOURCE_SELECTOR (object)));
++			return;
++
++		case PROP_PRIMARY_SELECTION:
++			g_value_take_object (
++				value,
++				e_source_selector_ref_primary_selection (
++				E_SOURCE_SELECTOR (object)));
++			return;
++
++		case PROP_REGISTRY:
++			g_value_set_object (
++				value,
++				e_source_selector_get_registry (
++				E_SOURCE_SELECTOR (object)));
++			return;
++
++		case PROP_SHOW_COLORS:
++			g_value_set_boolean (
++				value,
++				e_source_selector_get_show_colors (
++				E_SOURCE_SELECTOR (object)));
++			return;
++
++		case PROP_SHOW_TOGGLES:
++			g_value_set_boolean (
++				value,
++				e_source_selector_get_show_toggles (
++				E_SOURCE_SELECTOR (object)));
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++source_selector_dispose (GObject *object)
++{
++	ESourceSelectorPrivate *priv;
++
++	priv = E_SOURCE_SELECTOR_GET_PRIVATE (object);
++
++	if (priv->registry != NULL) {
++		g_signal_handlers_disconnect_matched (
++			priv->registry,
++			G_SIGNAL_MATCH_DATA,
++			0, 0, NULL, NULL, object);
++		g_object_unref (priv->registry);
++		priv->registry = NULL;
++	}
++
++	g_hash_table_remove_all (priv->source_index);
++	g_hash_table_remove_all (priv->pending_writes);
++
++	clear_saved_primary_selection (E_SOURCE_SELECTOR (object));
++
++	/* Chain up to parent's dispose() method. */
++	G_OBJECT_CLASS (e_source_selector_parent_class)->dispose (object);
++}
++
++static void
++source_selector_finalize (GObject *object)
++{
++	ESourceSelectorPrivate *priv;
++
++	priv = E_SOURCE_SELECTOR_GET_PRIVATE (object);
++
++	g_hash_table_destroy (priv->source_index);
++	g_hash_table_destroy (priv->pending_writes);
++
++	g_free (priv->extension_name);
++
++	if (priv->main_context != NULL)
++		g_main_context_unref (priv->main_context);
++
++	/* Chain up to parent's finalize() method. */
++	G_OBJECT_CLASS (e_source_selector_parent_class)->finalize (object);
++}
++
++static void
++source_selector_constructed (GObject *object)
++{
++	ESourceRegistry *registry;
++	ESourceSelector *selector;
++
++	selector = E_SOURCE_SELECTOR (object);
++	registry = e_source_selector_get_registry (selector);
++
++	g_signal_connect (
++		registry, "source-added",
++		G_CALLBACK (source_selector_source_added_cb), selector);
++
++	g_signal_connect (
++		registry, "source-changed",
++		G_CALLBACK (source_selector_source_changed_cb), selector);
++
++	g_signal_connect (
++		registry, "source-removed",
++		G_CALLBACK (source_selector_source_removed_cb), selector);
++
++	g_signal_connect (
++		registry, "source-enabled",
++		G_CALLBACK (source_selector_source_enabled_cb), selector);
++
++	g_signal_connect (
++		registry, "source-disabled",
++		G_CALLBACK (source_selector_source_disabled_cb), selector);
++
++	source_selector_build_model (selector);
++
++	gtk_tree_view_expand_all (GTK_TREE_VIEW (selector));
++}
++
++static gboolean
++source_selector_button_press_event (GtkWidget *widget,
++                                    GdkEventButton *event)
++{
++	ESourceSelector *selector;
++	GtkWidgetClass *widget_class;
++	GtkTreePath *path;
++	ESource *source = NULL;
++	ESource *primary;
++	gboolean right_click = FALSE;
++	gboolean triple_click = FALSE;
++	gboolean row_exists;
++	gboolean res = FALSE;
++
++	selector = E_SOURCE_SELECTOR (widget);
++
++	selector->priv->toggled_last = FALSE;
++
++	/* Triple-clicking a source selects it exclusively. */
++
++	if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
++		right_click = TRUE;
++	else if (event->button == 1 && event->type == GDK_3BUTTON_PRESS)
++		triple_click = TRUE;
++	else
++		goto chainup;
++
++	row_exists = gtk_tree_view_get_path_at_pos (
++		GTK_TREE_VIEW (widget), event->x, event->y,
++		&path, NULL, NULL, NULL);
++
++	/* Get the source/group */
++	if (row_exists) {
++		GtkTreeModel *model;
++		GtkTreeIter iter;
++
++		model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
++
++		gtk_tree_model_get_iter (model, &iter, path);
++		gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++	}
++
++	if (source == NULL)
++		goto chainup;
++
++	primary = e_source_selector_ref_primary_selection (selector);
++	if (source != primary)
++		e_source_selector_set_primary_selection (selector, source);
++	if (primary != NULL)
++		g_object_unref (primary);
++
++	if (right_click)
++		g_signal_emit (
++			widget, signals[POPUP_EVENT], 0, source, event, &res);
++
++	if (triple_click) {
++		e_source_selector_select_exclusive (selector, source);
++		res = TRUE;
++	}
++
++	g_object_unref (source);
++
++	return res;
++
++chainup:
++
++	/* Chain up to parent's button_press_event() method. */
++	widget_class = GTK_WIDGET_CLASS (e_source_selector_parent_class);
++	return widget_class->button_press_event (widget, event);
++}
++
++static void
++source_selector_drag_leave (GtkWidget *widget,
++                            GdkDragContext *context,
++                            guint time_)
++{
++	GtkTreeView *tree_view;
++	GtkTreeViewDropPosition pos;
++
++	tree_view = GTK_TREE_VIEW (widget);
++	pos = GTK_TREE_VIEW_DROP_BEFORE;
++
++	gtk_tree_view_set_drag_dest_row (tree_view, NULL, pos);
++}
++
++static gboolean
++source_selector_drag_motion (GtkWidget *widget,
++                             GdkDragContext *context,
++                             gint x,
++                             gint y,
++                             guint time_)
++{
++	ESource *source = NULL;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path = NULL;
++	GtkTreeIter iter;
++	GtkTreeViewDropPosition pos;
++	GdkDragAction action = 0;
++
++	tree_view = GTK_TREE_VIEW (widget);
++	model = gtk_tree_view_get_model (tree_view);
++
++	if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL))
++		goto exit;
++
++	if (!gtk_tree_model_get_iter (model, &iter, path))
++		goto exit;
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	if (!e_source_get_writable (source))
++		goto exit;
++
++	pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
++	gtk_tree_view_set_drag_dest_row (tree_view, path, pos);
++
++	if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE)
++		action = GDK_ACTION_MOVE;
++	else
++		action = gdk_drag_context_get_suggested_action (context);
++
++exit:
++	if (path != NULL)
++		gtk_tree_path_free (path);
++
++	if (source != NULL)
++		g_object_unref (source);
++
++	gdk_drag_status (context, action, time_);
++
++	return TRUE;
++}
++
++static gboolean
++source_selector_drag_drop (GtkWidget *widget,
++                           GdkDragContext *context,
++                           gint x,
++                           gint y,
++                           guint time_)
++{
++	ESource *source;
++	ESourceSelector *selector;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++	const gchar *extension_name;
++	gboolean drop_zone;
++	gboolean valid;
++
++	tree_view = GTK_TREE_VIEW (widget);
++	model = gtk_tree_view_get_model (tree_view);
++
++	if (!gtk_tree_view_get_path_at_pos (
++		tree_view, x, y, &path, NULL, NULL, NULL))
++		return FALSE;
++
++	valid = gtk_tree_model_get_iter (model, &iter, path);
++	gtk_tree_path_free (path);
++	g_return_val_if_fail (valid, FALSE);
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	selector = E_SOURCE_SELECTOR (widget);
++	extension_name = e_source_selector_get_extension_name (selector);
++	drop_zone = e_source_has_extension (source, extension_name);
++
++	g_object_unref (source);
++
++	return drop_zone;
++}
++
++static void
++source_selector_drag_data_received (GtkWidget *widget,
++                                    GdkDragContext *context,
++                                    gint x,
++                                    gint y,
++                                    GtkSelectionData *selection_data,
++                                    guint info,
++                                    guint time_)
++{
++	ESource *source = NULL;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path = NULL;
++	GtkTreeIter iter;
++	GdkDragAction action;
++	gboolean delete;
++	gboolean success = FALSE;
++
++	tree_view = GTK_TREE_VIEW (widget);
++	model = gtk_tree_view_get_model (tree_view);
++
++	action = gdk_drag_context_get_selected_action (context);
++	delete = (action == GDK_ACTION_MOVE);
++
++	if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL))
++		goto exit;
++
++	if (!gtk_tree_model_get_iter (model, &iter, path))
++		goto exit;
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	if (!e_source_get_writable (source))
++		goto exit;
++
++	g_signal_emit (
++		widget, signals[DATA_DROPPED], 0, selection_data,
++		source, gdk_drag_context_get_selected_action (context),
++		info, &success);
++
++exit:
++	if (path != NULL)
++		gtk_tree_path_free (path);
++
++	if (source != NULL)
++		g_object_unref (source);
++
++	gtk_drag_finish (context, success, delete, time_);
++}
++
++static gboolean
++source_selector_popup_menu (GtkWidget *widget)
++{
++	ESourceSelector *selector;
++	ESource *source;
++	gboolean res = FALSE;
++
++	selector = E_SOURCE_SELECTOR (widget);
++	source = e_source_selector_ref_primary_selection (selector);
++	g_signal_emit (selector, signals[POPUP_EVENT], 0, source, NULL, &res);
++
++	if (source != NULL)
++		g_object_unref (source);
++
++	return res;
++}
++
++static gboolean
++source_selector_test_collapse_row (GtkTreeView *tree_view,
++                                   GtkTreeIter *iter,
++                                   GtkTreePath *path)
++{
++	ESourceSelectorPrivate *priv;
++	GtkTreeSelection *selection;
++	GtkTreeModel *model;
++	GtkTreeIter child_iter;
++
++	priv = E_SOURCE_SELECTOR_GET_PRIVATE (tree_view);
++
++	/* Clear this because something else has been clicked on now */
++	priv->toggled_last = FALSE;
++
++	if (priv->saved_primary_selection)
++		return FALSE;
++
++	selection = gtk_tree_view_get_selection (tree_view);
++
++	if (!gtk_tree_selection_get_selected (selection, &model, &child_iter))
++		return FALSE;
++
++	if (gtk_tree_store_is_ancestor (GTK_TREE_STORE (model), iter, &child_iter)) {
++		GtkTreeRowReference *reference;
++		GtkTreePath *child_path;
++
++		child_path = gtk_tree_model_get_path (model, &child_iter);
++		reference = gtk_tree_row_reference_new (model, child_path);
++		priv->saved_primary_selection = reference;
++		gtk_tree_path_free (child_path);
++	}
++
++	return FALSE;
++}
++
++static void
++source_selector_row_expanded (GtkTreeView *tree_view,
++                              GtkTreeIter *iter,
++                              GtkTreePath *path)
++{
++	ESourceSelectorPrivate *priv;
++	GtkTreeModel *model;
++	GtkTreePath *child_path;
++	GtkTreeIter child_iter;
++
++	priv = E_SOURCE_SELECTOR_GET_PRIVATE (tree_view);
++
++	if (!priv->saved_primary_selection)
++		return;
++
++	model = gtk_tree_view_get_model (tree_view);
++
++	child_path = gtk_tree_row_reference_get_path (
++		priv->saved_primary_selection);
++	gtk_tree_model_get_iter (model, &child_iter, child_path);
++
++	if (gtk_tree_store_is_ancestor (GTK_TREE_STORE (model), iter, &child_iter)) {
++		GtkTreeSelection *selection;
++
++		selection = gtk_tree_view_get_selection (tree_view);
++		gtk_tree_selection_select_iter (selection, &child_iter);
++
++		clear_saved_primary_selection (E_SOURCE_SELECTOR (tree_view));
++	}
++
++	gtk_tree_path_free (child_path);
++}
++
++static gboolean
++source_selector_get_source_selected (ESourceSelector *selector,
++                                     ESource *source)
++{
++	ESourceSelectable *extension;
++	const gchar *extension_name;
++	gboolean selected = TRUE;
++
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	if (!e_source_has_extension (source, extension_name))
++		return FALSE;
++
++	extension = e_source_get_extension (source, extension_name);
++
++	if (E_IS_SOURCE_SELECTABLE (extension))
++		selected = e_source_selectable_get_selected (extension);
++
++	return selected;
++}
++
++static void
++source_selector_set_source_selected (ESourceSelector *selector,
++                                     ESource *source,
++                                     gboolean selected)
++{
++	ESourceSelectable *extension;
++	const gchar *extension_name;
++
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	if (!e_source_has_extension (source, extension_name))
++		return;
++
++	extension = e_source_get_extension (source, extension_name);
++
++	if (!E_IS_SOURCE_SELECTABLE (extension))
++		return;
++
++	if (selected != e_source_selectable_get_selected (extension)) {
++		e_source_selectable_set_selected (extension, selected);
++		e_source_selector_queue_write (selector, source);
++	}
++}
++
++static gboolean
++ess_bool_accumulator (GSignalInvocationHint *ihint,
++                      GValue *out,
++                      const GValue *in,
++                      gpointer data)
++{
++	gboolean v_boolean;
++
++	v_boolean = g_value_get_boolean (in);
++	g_value_set_boolean (out, v_boolean);
++
++	return !v_boolean;
++}
++
++static void
++e_source_selector_class_init (ESourceSelectorClass *class)
++{
++	GObjectClass *object_class;
++	GtkWidgetClass *widget_class;
++	GtkTreeViewClass *tree_view_class;
++
++	g_type_class_add_private (class, sizeof (ESourceSelectorPrivate));
++
++	object_class = G_OBJECT_CLASS (class);
++	object_class->set_property = source_selector_set_property;
++	object_class->get_property = source_selector_get_property;
++	object_class->dispose  = source_selector_dispose;
++	object_class->finalize = source_selector_finalize;
++	object_class->constructed = source_selector_constructed;
++
++	widget_class = GTK_WIDGET_CLASS (class);
++	widget_class->button_press_event = source_selector_button_press_event;
++	widget_class->drag_leave = source_selector_drag_leave;
++	widget_class->drag_motion = source_selector_drag_motion;
++	widget_class->drag_drop = source_selector_drag_drop;
++	widget_class->drag_data_received = source_selector_drag_data_received;
++	widget_class->popup_menu = source_selector_popup_menu;
++
++	tree_view_class = GTK_TREE_VIEW_CLASS (class);
++	tree_view_class->test_collapse_row = source_selector_test_collapse_row;
++	tree_view_class->row_expanded = source_selector_row_expanded;
++
++	class->get_source_selected = source_selector_get_source_selected;
++	class->set_source_selected = source_selector_set_source_selected;
++
++	g_object_class_install_property (
++		object_class,
++		PROP_EXTENSION_NAME,
++		g_param_spec_string (
++			"extension-name",
++			NULL,
++			NULL,
++			NULL,
++			G_PARAM_READWRITE |
++			G_PARAM_CONSTRUCT_ONLY |
++			G_PARAM_STATIC_STRINGS));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_PRIMARY_SELECTION,
++		g_param_spec_object (
++			"primary-selection",
++			NULL,
++			NULL,
++			E_TYPE_SOURCE,
++			G_PARAM_READWRITE |
++			G_PARAM_STATIC_STRINGS));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_REGISTRY,
++		g_param_spec_object (
++			"registry",
++			NULL,
++			NULL,
++			E_TYPE_SOURCE_REGISTRY,
++			G_PARAM_READWRITE |
++			G_PARAM_CONSTRUCT_ONLY |
++			G_PARAM_STATIC_STRINGS));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_SHOW_COLORS,
++		g_param_spec_boolean (
++			"show-colors",
++			NULL,
++			NULL,
++			TRUE,
++			G_PARAM_READWRITE |
++			G_PARAM_STATIC_STRINGS));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_SHOW_TOGGLES,
++		g_param_spec_boolean (
++			"show-toggles",
++			NULL,
++			NULL,
++			TRUE,
++			G_PARAM_READWRITE |
++			G_PARAM_STATIC_STRINGS));
++
++	signals[SELECTION_CHANGED] = g_signal_new (
++		"selection-changed",
++		G_OBJECT_CLASS_TYPE (object_class),
++		G_SIGNAL_RUN_LAST,
++		G_STRUCT_OFFSET (ESourceSelectorClass, selection_changed),
++		NULL, NULL, NULL,
++		G_TYPE_NONE, 0);
++
++	/* XXX Consider this signal deprecated.  Connect
++	 *     to "notify::primary-selection" instead. */
++	signals[PRIMARY_SELECTION_CHANGED] = g_signal_new (
++		"primary-selection-changed",
++		G_OBJECT_CLASS_TYPE (object_class),
++		G_SIGNAL_RUN_LAST,
++		G_STRUCT_OFFSET (ESourceSelectorClass, primary_selection_changed),
++		NULL, NULL, NULL,
++		G_TYPE_NONE, 0);
++
++	signals[POPUP_EVENT] = g_signal_new (
++		"popup-event",
++		G_OBJECT_CLASS_TYPE (object_class),
++		G_SIGNAL_RUN_LAST,
++		G_STRUCT_OFFSET (ESourceSelectorClass, popup_event),
++		ess_bool_accumulator, NULL, NULL,
++		G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT,
++		GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
++
++	signals[DATA_DROPPED] = g_signal_new (
++		"data-dropped",
++		G_OBJECT_CLASS_TYPE (object_class),
++		G_SIGNAL_RUN_LAST,
++		G_STRUCT_OFFSET (ESourceSelectorClass, data_dropped),
++		NULL, NULL, NULL,
++		G_TYPE_BOOLEAN, 4,
++		GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
++		E_TYPE_SOURCE,
++		GDK_TYPE_DRAG_ACTION,
++		G_TYPE_UINT);
++}
++
++static void
++e_source_selector_init (ESourceSelector *selector)
++{
++	GHashTable *pending_writes;
++	GtkTreeViewColumn *column;
++	GtkTreeSelection *selection;
++	GtkCellRenderer *renderer;
++	GtkTreeStore *tree_store;
++	GtkTreeView *tree_view;
++
++	pending_writes = g_hash_table_new_full (
++		(GHashFunc) g_direct_hash,
++		(GEqualFunc) g_direct_equal,
++		(GDestroyNotify) g_object_unref,
++		(GDestroyNotify) pending_writes_destroy_source);
++
++	selector->priv = E_SOURCE_SELECTOR_GET_PRIVATE (selector);
++
++	selector->priv->pending_writes = pending_writes;
++
++	selector->priv->main_context = g_main_context_get_thread_default ();
++	if (selector->priv->main_context != NULL)
++		g_main_context_ref (selector->priv->main_context);
++
++	tree_view = GTK_TREE_VIEW (selector);
++
++	gtk_tree_view_set_search_column (tree_view, COLUMN_SOURCE);
++	gtk_tree_view_set_enable_search (tree_view, TRUE);
++
++	selector->priv->toggled_last = FALSE;
++	selector->priv->select_new = FALSE;
++	selector->priv->show_colors = TRUE;
++	selector->priv->show_toggles = TRUE;
++
++	selector->priv->source_index = g_hash_table_new_full (
++		(GHashFunc) e_source_hash,
++		(GEqualFunc) e_source_equal,
++		(GDestroyNotify) g_object_unref,
++		(GDestroyNotify) gtk_tree_row_reference_free);
++
++	tree_store = gtk_tree_store_new (
++		NUM_COLUMNS,
++		G_TYPE_STRING,		/* COLUMN_NAME */
++		GDK_TYPE_COLOR,		/* COLUMN_COLOR */
++		G_TYPE_BOOLEAN,		/* COLUMN_ACTIVE */
++		G_TYPE_BOOLEAN,		/* COLUMN_SHOW_COLOR */
++		G_TYPE_BOOLEAN,		/* COLUMN_SHOW_TOGGLE */
++		G_TYPE_INT,		/* COLUMN_WEIGHT */
++		E_TYPE_SOURCE);		/* COLUMN_SOURCE */
++
++	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (tree_store));
++
++	column = gtk_tree_view_column_new ();
++	gtk_tree_view_append_column (tree_view, column);
++
++	renderer = e_cell_renderer_color_new ();
++	g_object_set (
++		G_OBJECT (renderer), "mode",
++		GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
++	gtk_tree_view_column_pack_start (column, renderer, FALSE);
++	gtk_tree_view_column_add_attribute (
++		column, renderer, "color", COLUMN_COLOR);
++	gtk_tree_view_column_add_attribute (
++		column, renderer, "visible", COLUMN_SHOW_COLOR);
++
++	renderer = e_cell_renderer_safe_toggle_new ();
++	gtk_tree_view_column_pack_start (column, renderer, FALSE);
++	gtk_tree_view_column_add_attribute (
++		column, renderer, "active", COLUMN_ACTIVE);
++	gtk_tree_view_column_add_attribute (
++		column, renderer, "visible", COLUMN_SHOW_TOGGLE);
++	g_signal_connect (
++		renderer, "toggled",
++		G_CALLBACK (cell_toggled_callback), selector);
++
++	renderer = gtk_cell_renderer_text_new ();
++	g_object_set (
++		G_OBJECT (renderer),
++		"ellipsize", PANGO_ELLIPSIZE_END, NULL);
++	g_signal_connect_swapped (
++		renderer, "edited",
++		G_CALLBACK (text_cell_edited_cb), selector);
++	gtk_tree_view_column_pack_start (column, renderer, TRUE);
++	gtk_tree_view_column_set_attributes (
++		column, renderer,
++		"text", COLUMN_NAME,
++		"weight", COLUMN_WEIGHT,
++		NULL);
++
++	selection = gtk_tree_view_get_selection (tree_view);
++	gtk_tree_selection_set_select_function (
++		selection, (GtkTreeSelectionFunc)
++		selection_func, selector, NULL);
++	g_signal_connect_object (
++		selection, "changed",
++		G_CALLBACK (selection_changed_callback),
++		G_OBJECT (selector), 0);
++
++	gtk_tree_view_set_headers_visible (tree_view, FALSE);
++}
++
++/**
++ * e_source_selector_new:
++ * @registry: an #ESourceRegistry
++ * @extension_name: the name of an #ESource extension
++ *
++ * Displays a list of sources from @registry having an extension named
++ * @extension_name.  The sources are grouped by backend or groupware
++ * account, which are described by the parent source.
++ *
++ * Returns: a new #ESourceSelector
++ **/
++GtkWidget *
++e_source_selector_new (ESourceRegistry *registry,
++                       const gchar *extension_name)
++{
++	g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL);
++	g_return_val_if_fail (extension_name != NULL, NULL);
++
++	return g_object_new (
++		E_TYPE_SOURCE_SELECTOR, "registry", registry,
++		"extension-name", extension_name, NULL);
++}
++
++/**
++ * e_source_selector_get_registry:
++ * @selector: an #ESourceSelector
++ *
++ * Returns the #ESourceRegistry that @selector is getting sources from.
++ *
++ * Returns: an #ESourceRegistry
++ *
++ * Since: 3.6
++ **/
++ESourceRegistry *
++e_source_selector_get_registry (ESourceSelector *selector)
++{
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++
++	return selector->priv->registry;
++}
++
++/**
++ * e_source_selector_get_extension_name:
++ * @selector: an #ESourceSelector
++ *
++ * Returns the extension name used to filter which sources are displayed.
++ *
++ * Returns: the #ESource extension name
++ *
++ * Since: 3.6
++ **/
++const gchar *
++e_source_selector_get_extension_name (ESourceSelector *selector)
++{
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++
++	return selector->priv->extension_name;
++}
++
++/**
++ * e_source_selector_get_show_colors:
++ * @selector: an #ESourceSelector
++ *
++ * Returns whether colors are shown next to data sources.
++ *
++ * Returns: %TRUE if colors are being shown
++ *
++ * Since: 3.6
++ **/
++gboolean
++e_source_selector_get_show_colors (ESourceSelector *selector)
++{
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE);
++
++	return selector->priv->show_colors;
++}
++
++/**
++ * e_source_selector_set_show_colors:
++ * @selector: an #ESourceSelector
++ * @show_colors: whether to show colors
++ *
++ * Sets whether to show colors next to data sources.
++ *
++ * Since: 3.6
++ **/
++void
++e_source_selector_set_show_colors (ESourceSelector *selector,
++                                   gboolean show_colors)
++{
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++
++	if ((show_colors ? 1 : 0) == (selector->priv->show_colors ? 1 : 0))
++		return;
++
++	selector->priv->show_colors = show_colors;
++
++	g_object_notify (G_OBJECT (selector), "show-colors");
++
++	source_selector_build_model (selector);
++}
++
++/**
++ * e_source_selector_get_show_toggles:
++ * @selector: an #ESourceSelector
++ *
++ * Returns whether toggles are shown next to data sources.
++ *
++ * Returns: %TRUE if toggles are being shown
++ *
++ * Since: 3.6
++ **/
++gboolean
++e_source_selector_get_show_toggles (ESourceSelector *selector)
++{
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE);
++
++	return selector->priv->show_toggles;
++}
++
++/**
++ * e_source_selector_set_show_toggles:
++ * @selector: an #ESourceSelector
++ * @show_toggles: whether to show toggles
++ *
++ * Sets whether to show toggles next to data sources.
++ *
++ * Since: 3.6
++ **/
++void
++e_source_selector_set_show_toggles (ESourceSelector *selector,
++                                   gboolean show_toggles)
++{
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++
++	if ((show_toggles ? 1 : 0) == (selector->priv->show_toggles ? 1 : 0))
++		return;
++
++	selector->priv->show_toggles = show_toggles;
++
++	g_object_notify (G_OBJECT (selector), "show-toggles");
++
++	source_selector_build_model (selector);
++}
++
++/* Helper for e_source_selector_get_selection() */
++static gboolean
++source_selector_check_selected (GtkTreeModel *model,
++                                GtkTreePath *path,
++                                GtkTreeIter *iter,
++                                gpointer user_data)
++{
++	ESource *source;
++
++	struct {
++		ESourceSelector *selector;
++		GSList *list;
++	} *closure = user_data;
++
++	gtk_tree_model_get (model, iter, COLUMN_SOURCE, &source, -1);
++
++	if (e_source_selector_source_is_selected (closure->selector, source))
++		closure->list = g_slist_prepend (closure->list, source);
++	else
++		g_object_unref (source);
++
++	return FALSE;
++}
++
++/**
++ * e_source_selector_get_selection:
++ * @selector: an #ESourceSelector
++ *
++ * Get the list of selected sources, i.e. those that were enabled through the
++ * corresponding checkboxes in the tree.
++ *
++ * Returns: A list of the ESources currently selected.  The sources will
++ * be in the same order as they appear on the screen, and the list should be
++ * freed using e_source_selector_free_selection().
++ **/
++GSList *
++e_source_selector_get_selection (ESourceSelector *selector)
++{
++	struct {
++		ESourceSelector *selector;
++		GSList *list;
++	} closure;
++
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++
++	closure.selector = selector;
++	closure.list = NULL;
++
++	gtk_tree_model_foreach (
++		gtk_tree_view_get_model (GTK_TREE_VIEW (selector)),
++		(GtkTreeModelForeachFunc) source_selector_check_selected,
++		&closure);
++
++	return g_slist_reverse (closure.list);
++}
++
++/**
++ * e_source_list_free_selection:
++ * @list: A selection list returned by e_source_selector_get_selection().
++ *
++ * Free the selection list.
++ **/
++void
++e_source_selector_free_selection (GSList *list)
++{
++	g_slist_foreach (list, (GFunc) g_object_unref, NULL);
++	g_slist_free (list);
++}
++
++/**
++ * e_source_selector_set_select_new:
++ * @selector: An #ESourceSelector widget
++ * @state: A gboolean
++ *
++ * Set whether or not to select new sources added to @selector.
++ **/
++void
++e_source_selector_set_select_new (ESourceSelector *selector,
++                                  gboolean state)
++{
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++
++	selector->priv->select_new = state;
++}
++
++/**
++ * e_source_selector_select_source:
++ * @selector: An #ESourceSelector widget
++ * @source: An #ESource.
++ *
++ * Select @source in @selector.
++ **/
++void
++e_source_selector_select_source (ESourceSelector *selector,
++                                 ESource *source)
++{
++	ESourceSelectorClass *class;
++	GtkTreeRowReference *reference;
++	GHashTable *source_index;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	/* Make sure the ESource is in our tree model. */
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
++
++	class = E_SOURCE_SELECTOR_GET_CLASS (selector);
++	g_return_if_fail (class->set_source_selected != NULL);
++
++	class->set_source_selected (selector, source, TRUE);
++
++	g_signal_emit (selector, signals[SELECTION_CHANGED], 0);
++}
++
++/**
++ * e_source_selector_unselect_source:
++ * @selector: An #ESourceSelector widget
++ * @source: An #ESource.
++ *
++ * Unselect @source in @selector.
++ **/
++void
++e_source_selector_unselect_source (ESourceSelector *selector,
++                                   ESource *source)
++{
++	ESourceSelectorClass *class;
++	GtkTreeRowReference *reference;
++	GHashTable *source_index;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	/* Make sure the ESource is in our tree model. */
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
++
++	class = E_SOURCE_SELECTOR_GET_CLASS (selector);
++	g_return_if_fail (class->set_source_selected != NULL);
++
++	class->set_source_selected (selector, source, FALSE);
++
++	g_signal_emit (selector, signals[SELECTION_CHANGED], 0);
++}
++
++/**
++ * e_source_selector_select_exclusive:
++ * @selector: An #ESourceSelector widget
++ * @source: An #ESource.
++ *
++ * Select @source in @selector and unselect all others.
++ *
++ * Since: 2.30
++ **/
++void
++e_source_selector_select_exclusive (ESourceSelector *selector,
++                                    ESource *source)
++{
++	ESourceSelectorClass *class;
++	GHashTable *source_index;
++	GHashTableIter iter;
++	gpointer key;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	class = E_SOURCE_SELECTOR_GET_CLASS (selector);
++	g_return_if_fail (class->set_source_selected != NULL);
++
++	source_index = selector->priv->source_index;
++	g_hash_table_iter_init (&iter, source_index);
++
++	while (g_hash_table_iter_next (&iter, &key, NULL)) {
++		gboolean selected = e_source_equal (key, source);
++		class->set_source_selected (selector, key, selected);
++	}
++
++	g_signal_emit (selector, signals[SELECTION_CHANGED], 0);
++}
++
++/**
++ * e_source_selector_source_is_selected:
++ * @selector: An #ESourceSelector widget
++ * @source: An #ESource.
++ *
++ * Check whether @source is selected in @selector.
++ *
++ * Returns: %TRUE if @source is currently selected, %FALSE otherwise.
++ **/
++gboolean
++e_source_selector_source_is_selected (ESourceSelector *selector,
++                                      ESource *source)
++{
++	ESourceSelectorClass *class;
++	GtkTreeRowReference *reference;
++	GHashTable *source_index;
++
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE);
++	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
++
++	/* Make sure the ESource is in our tree model. */
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++	g_return_val_if_fail (gtk_tree_row_reference_valid (reference), FALSE);
++
++	class = E_SOURCE_SELECTOR_GET_CLASS (selector);
++	g_return_val_if_fail (class->get_source_selected != NULL, FALSE);
++
++	return class->get_source_selected (selector, source);
++}
++
++/**
++ * e_source_selector_edit_primary_selection:
++ * @selector: An #ESourceSelector widget
++ *
++ * Allows the user to rename the primary selected source by opening an
++ * entry box directly in @selector.
++ *
++ * Since: 2.26
++ **/
++void
++e_source_selector_edit_primary_selection (ESourceSelector *selector)
++{
++	GtkTreeRowReference *reference;
++	GtkTreeSelection *selection;
++	GtkTreeViewColumn *column;
++	GtkCellRenderer *renderer;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path = NULL;
++	GtkTreeIter iter;
++	GList *list;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++
++	tree_view = GTK_TREE_VIEW (selector);
++	column = gtk_tree_view_get_column (tree_view, 0);
++	reference = selector->priv->saved_primary_selection;
++	selection = gtk_tree_view_get_selection (tree_view);
++
++	if (reference != NULL)
++		path = gtk_tree_row_reference_get_path (reference);
++	else if (gtk_tree_selection_get_selected (selection, &model, &iter))
++		path = gtk_tree_model_get_path (model, &iter);
++
++	if (path == NULL)
++		return;
++
++	/* XXX Because we stuff three renderers in a single column,
++	 *     we have to manually hunt for the text renderer. */
++	renderer = NULL;
++	list = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
++	while (list != NULL) {
++		renderer = list->data;
++		if (GTK_IS_CELL_RENDERER_TEXT (renderer))
++			break;
++		list = g_list_delete_link (list, list);
++	}
++	g_list_free (list);
++
++	/* Make the text cell renderer editable, but only temporarily.
++	 * We don't want editing to be activated by simply clicking on
++	 * the source name.  Too easy for accidental edits to occur. */
++	g_object_set (renderer, "editable", TRUE, NULL);
++	gtk_tree_view_expand_to_path (tree_view, path);
++	gtk_tree_view_set_cursor_on_cell (
++		tree_view, path, column, renderer, TRUE);
++	g_object_set (renderer, "editable", FALSE, NULL);
++
++	gtk_tree_path_free (path);
++}
++
++/**
++ * e_source_selector_ref_primary_selection:
++ * @selector: An #ESourceSelector widget
++ *
++ * Get the primary selected source.  The primary selection is the one that is
++ * highlighted through the normal #GtkTreeView selection mechanism (as opposed
++ * to the "normal" selection, which is the set of source whose checkboxes are
++ * checked).
++ *
++ * The returned #ESource is referenced for thread-safety and must be
++ * unreferenced with g_object_unref() when finished with it.
++ *
++ * Returns: The selected source.
++ *
++ * Since: 3.6
++ **/
++ESource *
++e_source_selector_ref_primary_selection (ESourceSelector *selector)
++{
++	ESource *source;
++	GtkTreeRowReference *reference;
++	GtkTreeSelection *selection;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++	const gchar *extension_name;
++	gboolean have_iter = FALSE;
++
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++
++	tree_view = GTK_TREE_VIEW (selector);
++	model = gtk_tree_view_get_model (tree_view);
++	selection = gtk_tree_view_get_selection (tree_view);
++
++	reference = selector->priv->saved_primary_selection;
++
++	if (gtk_tree_row_reference_valid (reference)) {
++		GtkTreePath *path;
++
++		path = gtk_tree_row_reference_get_path (reference);
++		have_iter = gtk_tree_model_get_iter (model, &iter, path);
++		gtk_tree_path_free (path);
++	}
++
++	if (!have_iter)
++		have_iter = gtk_tree_selection_get_selected (
++			selection, NULL, &iter);
++
++	if (!have_iter)
++		return NULL;
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	if (!e_source_has_extension (source, extension_name)) {
++		g_object_unref (source);
++		return NULL;
++	}
++
++	return source;
++}
++
++/**
++ * e_source_selector_set_primary_selection:
++ * @selector: an #ESourceSelector widget
++ * @source: an #ESource to select
++ *
++ * Highlights @source in @selector.  The highlighted #ESource is called
++ * the primary selection.
++ *
++ * Do not confuse this function with e_source_selector_select_source(),
++ * which activates the check box next to an #ESource's display name in
++ * @selector.  This function does not alter the check box.
++ **/
++void
++e_source_selector_set_primary_selection (ESourceSelector *selector,
++                                         ESource *source)
++{
++	GHashTable *source_index;
++	GtkTreeRowReference *reference;
++	GtkTreeSelection *selection;
++	GtkTreeView *tree_view;
++	GtkTreePath *child_path;
++	GtkTreePath *parent_path;
++	const gchar *extension_name;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	tree_view = GTK_TREE_VIEW (selector);
++	selection = gtk_tree_view_get_selection (tree_view);
++
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++
++	/* XXX Maybe we should return a success/fail boolean? */
++	if (!gtk_tree_row_reference_valid (reference))
++		return;
++
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	/* Return silently if attempting to select a parent node
++	 * lacking the expected extension (e.g. On This Computer). */
++	if (!e_source_has_extension (source, extension_name))
++		return;
++
++	/* We block the signal because this all needs to be atomic */
++	g_signal_handlers_block_matched (
++		selection, G_SIGNAL_MATCH_FUNC,
++		0, 0, NULL, selection_changed_callback, NULL);
++	gtk_tree_selection_unselect_all (selection);
++	g_signal_handlers_unblock_matched (
++		selection, G_SIGNAL_MATCH_FUNC,
++		0, 0, NULL, selection_changed_callback, NULL);
++
++	clear_saved_primary_selection (selector);
++
++	child_path = gtk_tree_row_reference_get_path (reference);
++
++	parent_path = gtk_tree_path_copy (child_path);
++	gtk_tree_path_up (parent_path);
++
++	if (gtk_tree_view_row_expanded (tree_view, parent_path)) {
++		gtk_tree_selection_select_path (selection, child_path);
++	} else {
++		selector->priv->saved_primary_selection =
++			gtk_tree_row_reference_copy (reference);
++		g_signal_emit (selector, signals[PRIMARY_SELECTION_CHANGED], 0);
++		g_object_notify (G_OBJECT (selector), "primary-selection");
++	}
++
++	gtk_tree_path_free (child_path);
++	gtk_tree_path_free (parent_path);
++}
++
++/**
++ * e_source_selector_ref_source_by_path:
++ * @selector: an #ESourceSelector
++ * @path: a #GtkTreePath
++ *
++ * Returns the #ESource object at @path, or %NULL if @path is invalid.
++ *
++ * The returned #ESource is referenced for thread-safety and must be
++ * unreferenced with g_object_unref() when finished with it.
++ *
++ * Returns: the #ESource object at @path, or %NULL
++ *
++ * Since: 3.6
++ **/
++ESource *
++e_source_selector_ref_source_by_path (ESourceSelector *selector,
++                                      GtkTreePath *path)
++{
++	ESource *source = NULL;
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++	g_return_val_if_fail (path != NULL, NULL);
++
++	model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
++
++	if (gtk_tree_model_get_iter (model, &iter, path))
++		gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	return source;
++}
++
++/**
++ * e_source_selector_queue_write:
++ * @selector: an #ESourceSelecetor
++ * @source: an #ESource with changes to be written
++ *
++ * Queues a main loop idle callback to write changes to @source back to
++ * the D-Bus registry service.
++ *
++ * Since: 3.6
++ **/
++void
++e_source_selector_queue_write (ESourceSelector *selector,
++                               ESource *source)
++{
++	GSource *idle_source;
++	GHashTable *pending_writes;
++	GMainContext *main_context;
++	AsyncContext *async_context;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	main_context = selector->priv->main_context;
++	pending_writes = selector->priv->pending_writes;
++
++	idle_source = g_hash_table_lookup (pending_writes, source);
++	if (idle_source != NULL && !g_source_is_destroyed (idle_source))
++		return;
++
++	async_context = g_slice_new0 (AsyncContext);
++	async_context->selector = g_object_ref (selector);
++	async_context->source = g_object_ref (source);
++
++	/* Set a higher priority so this idle source runs before our
++	 * source_selector_cancel_write() signal handler, which will
++	 * cancel this idle source.  Cancellation is the right thing
++	 * to do when receiving changes from OTHER registry clients,
++	 * but we don't want to cancel our own changes.
++	 *
++	 * XXX This might be an argument for using etags.
++	 */
++	idle_source = g_idle_source_new ();
++	g_hash_table_insert (
++		pending_writes,
++		g_object_ref (source),
++		g_source_ref (idle_source));
++	g_source_set_callback (
++		idle_source,
++		source_selector_write_idle_cb,
++		async_context,
++		(GDestroyNotify) async_context_free);
++	g_source_set_priority (idle_source, G_PRIORITY_HIGH_IDLE);
++	g_source_attach (idle_source, main_context);
++	g_source_unref (idle_source);
++}
++
+diff --git a/src/event-factories/e-source-selector.h b/src/event-factories/e-source-selector.h
+new file mode 100644
+index 0000000..b6d3770
+--- /dev/null
++++ b/src/event-factories/e-source-selector.h
+@@ -0,0 +1,137 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* e-source-selector.h
++ *
++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public License as
++ * published by the Free Software Foundation; either version 2 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 Lesser 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.
++ *
++ * Author: Ettore Perazzoli <ettore@ximian.com>
++ */
++
++#ifndef E_SOURCE_SELECTOR_H
++#define E_SOURCE_SELECTOR_H
++
++#include <gtk/gtk.h>
++#include <libedataserver/libedataserver.h>
++
++/* Standard GObject macros */
++#define E_TYPE_SOURCE_SELECTOR \
++	(e_source_selector_get_type ())
++#define E_SOURCE_SELECTOR(obj) \
++	(G_TYPE_CHECK_INSTANCE_CAST \
++	((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelector))
++#define E_SOURCE_SELECTOR_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_CAST \
++	((cls), E_TYPE_SOURCE_SELECTOR, ESourceSelectorClass))
++#define E_IS_SOURCE_SELECTOR(obj) \
++	(G_TYPE_CHECK_INSTANCE_TYPE \
++	((obj), E_TYPE_SOURCE_SELECTOR))
++#define E_IS_SOURCE_SELECTOR_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_TYPE \
++	((cls), E_TYPE_SOURCE_SELECTOR))
++#define E_SOURCE_SELECTOR_GET_CLASS(obj) \
++	(G_TYPE_INSTANCE_GET_CLASS \
++	((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelectorClass))
++
++G_BEGIN_DECLS
++
++typedef struct _ESourceSelector ESourceSelector;
++typedef struct _ESourceSelectorClass ESourceSelectorClass;
++typedef struct _ESourceSelectorPrivate ESourceSelectorPrivate;
++
++struct _ESourceSelector {
++	GtkTreeView parent;
++	ESourceSelectorPrivate *priv;
++};
++
++struct _ESourceSelectorClass {
++	GtkTreeViewClass parent_class;
++
++	/* Methods */
++	gboolean	(*get_source_selected)	(ESourceSelector *selector,
++						 ESource *source);
++	void		(*set_source_selected)	(ESourceSelector *selector,
++						 ESource *source,
++						 gboolean selected);
++
++	/* Signals */
++	void		(*selection_changed)	(ESourceSelector *selector);
++	void		(*primary_selection_changed)
++						(ESourceSelector *selector);
++	gboolean	(*popup_event)		(ESourceSelector *selector,
++						 ESource *primary,
++						 GdkEventButton *event);
++	gboolean	(*data_dropped)		(ESourceSelector *selector,
++						 GtkSelectionData *data,
++						 ESource *destination,
++						 GdkDragAction action,
++						 guint target_info);
++
++	gpointer padding1;
++	gpointer padding2;
++	gpointer padding3;
++};
++
++GType		e_source_selector_get_type	(void);
++GtkWidget *	e_source_selector_new		(ESourceRegistry *registry,
++						 const gchar *extension_name);
++ESourceRegistry *
++		e_source_selector_get_registry	(ESourceSelector *selector);
++const gchar *	e_source_selector_get_extension_name
++						(ESourceSelector *selector);
++gboolean	e_source_selector_get_show_colors
++						(ESourceSelector *selector);
++void		e_source_selector_set_show_colors
++						(ESourceSelector *selector,
++						 gboolean show_colors);
++gboolean	e_source_selector_get_show_toggles
++						(ESourceSelector *selector);
++void		e_source_selector_set_show_toggles
++						(ESourceSelector *selector,
++						 gboolean show_toggles);
++void		e_source_selector_select_source	(ESourceSelector *selector,
++						 ESource *source);
++void		e_source_selector_unselect_source
++						(ESourceSelector *selector,
++						 ESource *source);
++void		e_source_selector_select_exclusive
++						(ESourceSelector *selector,
++						 ESource *source);
++gboolean	e_source_selector_source_is_selected
++						(ESourceSelector *selector,
++						 ESource *source);
++GSList *	e_source_selector_get_selection	(ESourceSelector *selector);
++void		e_source_selector_free_selection
++						(GSList *list);
++void		e_source_selector_set_select_new
++						(ESourceSelector *selector,
++						 gboolean state);
++void		e_source_selector_edit_primary_selection
++						(ESourceSelector *selector);
++ESource *	e_source_selector_ref_primary_selection
++						(ESourceSelector *selector);
++void		e_source_selector_set_primary_selection
++						(ESourceSelector *selector,
++						 ESource *source);
++ESource *	e_source_selector_ref_source_by_path
++						(ESourceSelector *selector,
++						 GtkTreePath *path);
++void		e_source_selector_queue_write	(ESourceSelector *selector,
++						 ESource *source);
++
++G_END_DECLS
++
++#endif /* E_SOURCE_SELECTOR_H */
+--
+cgit v0.9.1
diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD
index a0bca90b3..065bf30fa 100644
--- a/community/apvlv/PKGBUILD
+++ b/community/apvlv/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 79519 2012-11-06 16:27:50Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 88809 2013-04-22 20:09:44Z jsteel $
+# Maintainer:  Jonathan Steel <jsteel@aur.archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: tocer.deng <tocer.deng@gmail.com>
 
 pkgname=apvlv
 pkgver=0.1.4.20121023
-pkgrel=1
-pkgdesc='A PDF Viewer which behaves like Vim'
+pkgrel=3
+pkgdesc='A PDF Viewer, which behaves like Vim'
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/"
 license=('GPL')
-depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre')
+depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre' 'desktop-file-utils')
 makedepends=('cmake' 'libwebkit')
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('f222fc4b09b15358eb4e7f996ba810d6')
+install=$pkgname.install
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
+        $pkgname.desktop)
+backup=(etc/apvlvrc)
+md5sums=('f222fc4b09b15358eb4e7f996ba810d6'
+         '54478fecb54f36d1c44d8fdc233ddbac')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
 
   mkdir -p build
   cd build
@@ -25,11 +30,15 @@ build() {
   cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DAPVLV_WITH_UMD=no  ..
+
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/build
+  cd "$srcdir"/$pkgname-$pkgver/build
+
+  make DESTDIR="$pkgdir"/ install
 
-  make DESTDIR=$pkgdir/ install
+  install -Dm644 "$srcdir"/$pkgname.desktop \
+    "$pkgdir"/usr/share/applications/$pkgname.desktop
 }
diff --git a/community/apvlv/apvlv.desktop b/community/apvlv/apvlv.desktop
new file mode 100644
index 000000000..2f6ebd398
--- /dev/null
+++ b/community/apvlv/apvlv.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=apvlv
+Comment=A minimalistic document viewer
+Comment[de]=Ein minimalistischer Dokumenten-Betrachter
+Comment[fr]=Un visionneur de document minimaliste
+Comment[ru]=Минималистичный просмотрщик документов
+Comment[tr]=Minimalist bir belge görüntüleyicisi
+Comment[es_CL]=Un visor de documentos minimalista
+Comment[uk_UA]=Легкий переглядач документів
+Comment[it]=Un visualizzatore di documenti minimalista
+Comment[pl]=Minimalistyczna przeglądarka dokumentów
+Exec=apvlv %f
+Terminal=false
+Categories=Office;Viewer;
+MimeType=application/pdf;application/postscript;application/eps;application/x-eps;image/eps;image/x-eps;image/vnd.djvu;
diff --git a/community/apvlv/apvlv.install b/community/apvlv/apvlv.install
new file mode 100644
index 000000000..5384f9c85
--- /dev/null
+++ b/community/apvlv/apvlv.install
@@ -0,0 +1,7 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index 11d84fd02..b2160ddb0 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82354 2013-01-16 08:38:43Z mtorromeo $
+# $Id: PKGBUILD 88732 2013-04-22 07:51:09Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url=http://people.redhat.com/sgrubb/$pkgname
@@ -59,7 +59,7 @@ package() {
 	sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf
 }
 
-sha256sums=('8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b'
+sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02'
             '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5'
             '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007'
             '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4')
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index d187b373f..c303de52b 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88411 2013-04-17 07:47:53Z faidoc $
+# $Id: PKGBUILD 88800 2013-04-22 12:29:37Z bgyorgy $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
 # Based on gnome-control-center:
 # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
@@ -6,23 +6,33 @@
 
 pkgname=cinnamon-control-center
 pkgver=1.7.3
-pkgrel=1
+pkgrel=3
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
-depends=('cinnamon' 'cheese' 'libgtop' 'network-manager-applet')
+depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet')
 optdepends=('mesa-demos: provides glxinfo for graphics information'
             'gnome-color-manager: for color management tasks')
-makedepends=('intltool' 'gnome-common' 'libgnomekbd')
+makedepends=('intltool' 'gnome-common')
 url="https://github.com/linuxmint/cinnamon-control-center"
 install=cinnamon-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
-sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
+        "gnomerrlabeler.patch"
+        "idle-delay.patch")
+sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be'
+            '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6'
+            '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67')
 
 build() {
   cd $pkgname-$pkgver
 
+  # Build fix for GNOME 3.8
+  patch -Np1 -i "$srcdir/gnomerrlabeler.patch"
+
+  # Runtime fix for GNOME 3.8
+  patch -Np1 -i "$srcdir/idle-delay.patch"
+
   autoreconf -fi
 
   ./configure --prefix=/usr --sysconfdir=/etc \
@@ -48,9 +58,6 @@ package() {
   make -C shell DESTDIR="$pkgdir" uninstall
   make -C shell DESTDIR="$pkgdir" install-libLTLIBRARIES
 
-  # Remove Region panel, because it's not compatible with gnome-settings-daemon 3.6
-  make -C panels/region DESTDIR="$pkgdir" uninstall
-
   # Remove broken desktop files
   rm -R "$pkgdir/usr/share/applications"
   rm -R "$pkgdir/etc"
diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch
new file mode 100644
index 000000000..b763078ba
--- /dev/null
+++ b/community/cinnamon-control-center/gnomerrlabeler.patch
@@ -0,0 +1,766 @@
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c
+--- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c	2013-04-22 03:46:53.499944701 +0200
+@@ -31,12 +31,13 @@
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libgnome-desktop/gnome-rr.h>
+ #include <libgnome-desktop/gnome-rr-config.h>
+-#include <libgnome-desktop/gnome-rr-labeler.h>
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ #include <glib/gi18n.h>
+ #include <gdesktop-enums.h>
+ 
++#include "cc-rr-labeler.h"
++
+ CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
+ 
+ #define DISPLAY_PANEL_PRIVATE(o) \
+@@ -75,7 +76,7 @@
+ {
+   GnomeRRScreen       *screen;
+   GnomeRRConfig  *current_configuration;
+-  GnomeRRLabeler *labeler;
++  CcRRLabeler *labeler;
+   GnomeRROutputInfo         *current_output;
+ 
+   GSettings      *clock_settings;
+@@ -200,7 +201,7 @@
+         g_signal_handler_disconnect (GTK_WIDGET (self), self->priv->focus_id_hide);
+     }
+ 
+-  gnome_rr_labeler_hide (self->priv->labeler);
++  cc_rr_labeler_hide (self->priv->labeler);
+   g_object_unref (self->priv->labeler);
+ 
+   G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object);
+@@ -293,16 +294,16 @@
+   self->priv->current_output = NULL;
+ 
+   if (self->priv->labeler) {
+-    gnome_rr_labeler_hide (self->priv->labeler);
++    cc_rr_labeler_hide (self->priv->labeler);
+     g_object_unref (self->priv->labeler);
+   }
+ 
+-  self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
++  self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration);
+ 
+   if (cc_panel_get_shell (CC_PANEL (self)) == NULL)
+-    gnome_rr_labeler_hide (self->priv->labeler);
++    cc_rr_labeler_hide (self->priv->labeler);
+   else
+-    gnome_rr_labeler_show (self->priv->labeler);
++    cc_rr_labeler_show (self->priv->labeler);
+ 
+   select_current_output_from_dialog_position (self);
+ 
+@@ -2594,9 +2595,9 @@
+   if (self->priv->labeler == NULL)
+     return;
+   if (gtk_window_has_toplevel_focus (window))
+-    gnome_rr_labeler_show (self->priv->labeler);
++    cc_rr_labeler_show (self->priv->labeler);
+   else
+-    gnome_rr_labeler_hide (self->priv->labeler);
++    cc_rr_labeler_hide (self->priv->labeler);
+ }
+ 
+ static void
+@@ -2606,9 +2607,9 @@
+     if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL)
+         return;
+     if (gtk_widget_get_visible (widget)) {
+-        gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
++        cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
+     } else {
+-        gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
++        cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
+     }
+ }
+ 
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c
+--- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c	1970-01-01 01:00:00.000000000 +0100
++++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c	2013-04-22 03:42:12.379900127 +0200
+@@ -0,0 +1,601 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * cc-rr-labeler.c - Utility to label monitors to identify them
++ * while they are being configured.
++ *
++ * Copyright 2008, Novell, Inc.
++ *
++ * This file is part of the Gnome Library.
++ *
++ * The Gnome Library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * The Gnome Library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
++ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ * Author: Federico Mena-Quintero <federico@novell.com>
++ */
++
++#include <config.h>
++#include <glib/gi18n-lib.h>
++#include <gtk/gtk.h>
++
++#include <X11/Xproto.h>
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
++#include <X11/Xatom.h>
++#include <gdk/gdkx.h>
++
++#include "cc-rr-labeler.h"
++
++struct _CcRRLabelerPrivate {
++	GnomeRRConfig *config;
++
++	int num_outputs;
++
++	GdkRGBA *palette;
++	GtkWidget **windows;
++
++	GdkScreen  *screen;
++	Atom        workarea_atom;
++};
++
++enum {
++	PROP_0,
++	PROP_CONFIG,
++	PROP_LAST
++};
++
++G_DEFINE_TYPE (CcRRLabeler, cc_rr_labeler, G_TYPE_OBJECT);
++
++static void cc_rr_labeler_finalize (GObject *object);
++static void setup_from_config (CcRRLabeler *labeler);
++
++static GdkFilterReturn
++screen_xevent_filter (GdkXEvent      *xevent,
++		      GdkEvent       *event,
++		      CcRRLabeler *labeler)
++{
++	XEvent *xev;
++
++	xev = (XEvent *) xevent;
++
++	if (xev->type == PropertyNotify &&
++	    xev->xproperty.atom == labeler->priv->workarea_atom) {
++		/* update label positions */
++		if (labeler->priv->windows != NULL) {
++			cc_rr_labeler_hide (labeler);
++			cc_rr_labeler_show (labeler);
++		}
++	}
++
++	return GDK_FILTER_CONTINUE;
++}
++
++static void
++cc_rr_labeler_init (CcRRLabeler *labeler)
++{
++	GdkWindow *gdkwindow;
++
++	labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler, GNOME_TYPE_RR_LABELER, CcRRLabelerPrivate);
++
++	labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
++						    "_NET_WORKAREA",
++						    True);
++
++	labeler->priv->screen = gdk_screen_get_default ();
++	/* code is not really designed to handle multiple screens so *shrug* */
++	gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
++	gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler);
++	gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK);
++}
++
++static void
++cc_rr_labeler_set_property (GObject *gobject, guint property_id, const GValue *value, GParamSpec *param_spec)
++{
++	CcRRLabeler *self = CC_RR_LABELER (gobject);
++
++	switch (property_id) {
++	case PROP_CONFIG:
++		self->priv->config = GNOME_RR_CONFIG (g_value_dup_object (value));
++		return;
++	default:
++		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, param_spec);
++	}
++}
++
++static GObject *
++cc_rr_labeler_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
++{
++	CcRRLabeler *self = (CcRRLabeler*) G_OBJECT_CLASS (cc_rr_labeler_parent_class)->constructor (type, n_construct_properties, construct_properties);
++
++	setup_from_config (self);
++
++	return (GObject*) self;
++}
++
++static void
++cc_rr_labeler_class_init (CcRRLabelerClass *klass)
++{
++	GObjectClass *object_class;
++
++	g_type_class_add_private (klass, sizeof (CcRRLabelerPrivate));
++
++	object_class = (GObjectClass *) klass;
++
++	object_class->set_property = cc_rr_labeler_set_property;
++	object_class->finalize = cc_rr_labeler_finalize;
++	object_class->constructor = cc_rr_labeler_constructor;
++
++	g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_object ("config",
++											 "Configuration",
++											 "RandR configuration to label",
++											 GNOME_TYPE_RR_CONFIG,
++											 G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
++											 G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
++}
++
++static void
++cc_rr_labeler_finalize (GObject *object)
++{
++	CcRRLabeler *labeler;
++	GdkWindow      *gdkwindow;
++
++	labeler = CC_RR_LABELER (object);
++
++	gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
++	gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler);
++
++	if (labeler->priv->config != NULL) {
++		g_object_unref (labeler->priv->config);
++	}
++
++	if (labeler->priv->windows != NULL) {
++		cc_rr_labeler_hide (labeler);
++		g_free (labeler->priv->windows);
++	}
++
++	g_free (labeler->priv->palette);
++
++	G_OBJECT_CLASS (cc_rr_labeler_parent_class)->finalize (object);
++}
++
++static int
++count_outputs (GnomeRRConfig *config)
++{
++	int i;
++	GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config);
++
++	for (i = 0; outputs[i] != NULL; i++)
++		;
++
++	return i;
++}
++
++static void
++make_palette (CcRRLabeler *labeler)
++{
++	/* The idea is that we go around an hue color wheel.  We want to start
++	 * at red, go around to green/etc. and stop at blue --- because magenta
++	 * is evil.  Eeeeek, no magenta, please!
++	 *
++	 * Purple would be nice, though.  Remember that we are watered down
++	 * (i.e. low saturation), so that would be like Like berries with cream.
++	 * Mmmmm, berries.
++	 */
++	double start_hue;
++	double end_hue;
++	int i;
++
++	g_assert (labeler->priv->num_outputs > 0);
++
++	labeler->priv->palette = g_new (GdkRGBA, labeler->priv->num_outputs);
++
++	start_hue = 0.0; /* red */
++	end_hue   = 2.0/3; /* blue */
++
++	for (i = 0; i < labeler->priv->num_outputs; i++) {
++		double h, s, v;
++		double r, g, b;
++
++		h = start_hue + (end_hue - start_hue) / labeler->priv->num_outputs * i;
++		s = 1.0 / 3;
++		v = 1.0;
++
++		gtk_hsv_to_rgb (h, s, v, &r, &g, &b);
++
++		labeler->priv->palette[i].red   = r;
++		labeler->priv->palette[i].green = g;
++		labeler->priv->palette[i].blue  = b;
++		labeler->priv->palette[i].alpha  = 1.0;
++	}
++}
++
++static void
++rounded_rectangle (cairo_t *cr,
++                   gint     x,
++                   gint     y,
++                   gint     width,
++                   gint     height,
++                   gint     x_radius,
++                   gint     y_radius)
++{
++	gint x1, x2;
++	gint y1, y2;
++	gint xr1, xr2;
++	gint yr1, yr2;
++
++	x1 = x;
++	x2 = x1 + width;
++	y1 = y;
++	y2 = y1 + height;
++
++	x_radius = MIN (x_radius, width / 2.0);
++	y_radius = MIN (y_radius, width / 2.0);
++
++	xr1 = x_radius;
++	xr2 = x_radius / 2.0;
++	yr1 = y_radius;
++	yr2 = y_radius / 2.0;
++
++	cairo_move_to    (cr, x1 + xr1, y1);
++	cairo_line_to    (cr, x2 - xr1, y1);
++	cairo_curve_to   (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1);
++	cairo_line_to    (cr, x2, y2 - yr1);
++	cairo_curve_to   (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2);
++	cairo_line_to    (cr, x1 + xr1, y2);
++	cairo_curve_to   (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1);
++	cairo_line_to    (cr, x1, y1 + yr1);
++	cairo_curve_to   (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1);
++	cairo_close_path (cr);
++}
++
++#define LABEL_WINDOW_EDGE_THICKNESS 2
++#define LABEL_WINDOW_PADDING 12
++/* Look for panel-corner in:
++ * http://git.gnome.org/browse/gnome-shell/tree/data/theme/gnome-shell.css
++ * to match the corner radius */
++#define LABEL_CORNER_RADIUS 6 + LABEL_WINDOW_EDGE_THICKNESS
++
++static void
++label_draw_background_and_frame (GtkWidget *widget, cairo_t *cr, gboolean for_shape)
++{
++	GdkRGBA shape_color = { 0, 0, 0, 1 };
++	GdkRGBA *rgba;
++	GtkAllocation allocation;
++
++	rgba = g_object_get_data (G_OBJECT (widget), "rgba");
++	gtk_widget_get_allocation (widget, &allocation);
++
++	cairo_save (cr);
++	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
++
++	/* edge outline */
++	if (for_shape)
++		gdk_cairo_set_source_rgba (cr, &shape_color);
++	else
++		cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
++
++	rounded_rectangle (cr,
++	                   LABEL_WINDOW_EDGE_THICKNESS / 2.0,
++	                   LABEL_WINDOW_EDGE_THICKNESS / 2.0,
++	                   allocation.width - LABEL_WINDOW_EDGE_THICKNESS,
++	                   allocation.height - LABEL_WINDOW_EDGE_THICKNESS,
++	                   LABEL_CORNER_RADIUS, LABEL_CORNER_RADIUS);
++	cairo_set_line_width (cr, LABEL_WINDOW_EDGE_THICKNESS);
++	cairo_stroke (cr);
++
++	/* fill */
++	if (for_shape) {
++		gdk_cairo_set_source_rgba (cr, &shape_color);
++	} else {
++		rgba->alpha = 0.75;
++		gdk_cairo_set_source_rgba (cr, rgba);
++	}
++
++	rounded_rectangle (cr,
++	                   LABEL_WINDOW_EDGE_THICKNESS,
++	                   LABEL_WINDOW_EDGE_THICKNESS,
++	                   allocation.width - LABEL_WINDOW_EDGE_THICKNESS * 2,
++	                   allocation.height - LABEL_WINDOW_EDGE_THICKNESS * 2,
++	                   LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0,
++			   LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0);
++	cairo_fill (cr);
++
++	cairo_restore (cr);
++}
++
++static void
++maybe_update_shape (GtkWidget *widget)
++{
++	cairo_t *cr;
++	cairo_surface_t *surface;
++	cairo_region_t *region;
++
++	/* fallback to XShape only for non-composited clients */
++	if (gtk_widget_is_composited (widget)) {
++		gtk_widget_shape_combine_region (widget, NULL);
++		return;
++	}
++
++	surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
++						     CAIRO_CONTENT_COLOR_ALPHA,
++						     gtk_widget_get_allocated_width (widget),
++						     gtk_widget_get_allocated_height (widget));
++
++	cr = cairo_create (surface);
++	label_draw_background_and_frame (widget, cr, TRUE);
++	cairo_destroy (cr);
++
++	region = gdk_cairo_region_create_from_surface (surface);
++	gtk_widget_shape_combine_region (widget, region);
++
++	cairo_surface_destroy (surface);
++	cairo_region_destroy (region);
++}
++
++static gboolean
++label_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
++{
++	if (gtk_widget_is_composited (widget)) {
++		/* clear any content */
++		cairo_save (cr);
++		cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
++		cairo_set_source_rgba (cr, 0, 0, 0, 0);
++		cairo_paint (cr);
++		cairo_restore (cr);
++	}
++
++	maybe_update_shape (widget);
++	label_draw_background_and_frame (widget, cr, FALSE);
++
++	return FALSE;
++}
++
++static void
++position_window (CcRRLabeler  *labeler,
++		 GtkWidget       *window,
++		 int              x,
++		 int              y)
++{
++	GdkRectangle    workarea;
++	GdkRectangle    monitor;
++	int             monitor_num;
++
++	monitor_num = gdk_screen_get_monitor_at_point (labeler->priv->screen, x, y);
++	gdk_screen_get_monitor_workarea (labeler->priv->screen, monitor_num, &workarea);
++	gdk_screen_get_monitor_geometry (labeler->priv->screen,
++                                         monitor_num,
++                                         &monitor);
++	gdk_rectangle_intersect (&monitor, &workarea, &workarea);
++
++	gtk_window_move (GTK_WINDOW (window), workarea.x, workarea.y);
++}
++
++static void
++label_window_realize_cb (GtkWidget *widget)
++{
++	cairo_region_t *region;
++
++	/* make the whole window ignore events */
++	region = cairo_region_create ();
++	gtk_widget_input_shape_combine_region (widget, region);
++	cairo_region_destroy (region);
++
++	maybe_update_shape (widget);
++}
++
++static void
++label_window_composited_changed_cb (GtkWidget *widget, CcRRLabeler *labeler)
++{
++	if (gtk_widget_get_realized (widget))
++		maybe_update_shape (widget);
++}
++
++static GtkWidget *
++create_label_window (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba)
++{
++	GtkWidget *window;
++	GtkWidget *widget;
++	char *str;
++	const char *display_name;
++	GdkRGBA black = { 0, 0, 0, 1.0 };
++	int x, y;
++	GdkScreen *screen;
++	GdkVisual *visual;
++
++	window = gtk_window_new (GTK_WINDOW_POPUP);
++	gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_TOOLTIP);
++	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
++	gtk_widget_set_app_paintable (window, TRUE);
++	screen = gtk_widget_get_screen (window);
++	visual = gdk_screen_get_rgba_visual (screen);
++
++	if (visual != NULL)
++		gtk_widget_set_visual (window, visual);
++
++	gtk_container_set_border_width (GTK_CONTAINER (window), LABEL_WINDOW_PADDING + LABEL_WINDOW_EDGE_THICKNESS);
++
++	/* This is semi-dangerous.  The color is part of the labeler->palette
++	 * array.  Note that in cc_rr_labeler_finalize(), we are careful to
++	 * free the palette only after we free the windows.
++	 */
++	g_object_set_data (G_OBJECT (window), "rgba", rgba);
++
++	g_signal_connect (window, "draw",
++			  G_CALLBACK (label_window_draw_event_cb), labeler);
++	g_signal_connect (window, "realize",
++			  G_CALLBACK (label_window_realize_cb), labeler);
++	g_signal_connect (window, "composited-changed",
++			  G_CALLBACK (label_window_composited_changed_cb), labeler);
++
++	if (gnome_rr_config_get_clone (labeler->priv->config)) {
++		/* Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() */
++
++		/* Translators:  this is the feature where what you see on your
++		 * laptop's screen is the same as your external projector.
++		 * Here, "Mirrored" is being used as an adjective.  For example,
++		 * the Spanish translation could be "Pantallas en Espejo".
++		 */
++		display_name = _("Mirrored Displays");
++	} else
++		display_name = gnome_rr_output_info_get_display_name (output);
++
++	str = g_strdup_printf ("<b>%s</b>", display_name);
++	widget = gtk_label_new (NULL);
++	gtk_label_set_markup (GTK_LABEL (widget), str);
++	g_free (str);
++
++	/* Make the label explicitly black.  We don't want it to follow the
++	 * theme's colors, since the label is always shown against a light
++	 * pastel background.  See bgo#556050
++	 */
++	gtk_widget_override_color (widget,
++				   gtk_widget_get_state_flags (widget),
++				   &black);
++
++	gtk_container_add (GTK_CONTAINER (window), widget);
++
++	/* Should we center this at the top edge of the monitor, instead of using the upper-left corner? */
++	gnome_rr_output_info_get_geometry (output, &x, &y, NULL, NULL);
++	position_window (labeler, window, x, y);
++
++	gtk_widget_show_all (window);
++
++	return window;
++}
++
++static void
++setup_from_config (CcRRLabeler *labeler)
++{
++	labeler->priv->num_outputs = count_outputs (labeler->priv->config);
++
++	make_palette (labeler);
++
++	cc_rr_labeler_show (labeler);
++}
++
++/**
++ * cc_rr_labeler_new:
++ * @config: Configuration of the screens to label
++ *
++ * Create a GUI element that will display colored labels on each connected monitor.
++ * This is useful when users are required to identify which monitor is which, e.g. for
++ * for configuring multiple monitors.
++ * The labels will be shown by default, use cc_rr_labeler_hide to hide them.
++ *
++ * Returns: A new #CcRRLabeler
++ */
++CcRRLabeler *
++cc_rr_labeler_new (GnomeRRConfig *config)
++{
++	g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), NULL);
++
++	return g_object_new (GNOME_TYPE_RR_LABELER, "config", config, NULL);
++}
++
++/**
++ * cc_rr_labeler_show:
++ * @labeler: A #CcRRLabeler
++ *
++ * Show the labels.
++ */
++void
++cc_rr_labeler_show (CcRRLabeler *labeler)
++{
++	int i;
++	gboolean created_window_for_clone;
++	GnomeRROutputInfo **outputs;
++
++	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
++
++	if (labeler->priv->windows != NULL)
++		return;
++
++	labeler->priv->windows = g_new (GtkWidget *, labeler->priv->num_outputs);
++
++	created_window_for_clone = FALSE;
++
++	outputs = gnome_rr_config_get_outputs (labeler->priv->config);
++
++	for (i = 0; i < labeler->priv->num_outputs; i++) {
++		if (!created_window_for_clone && gnome_rr_output_info_is_active (outputs[i])) {
++			labeler->priv->windows[i] = create_label_window (labeler, outputs[i], labeler->priv->palette + i);
++
++			if (gnome_rr_config_get_clone (labeler->priv->config))
++				created_window_for_clone = TRUE;
++		} else
++			labeler->priv->windows[i] = NULL;
++	}
++}
++
++/**
++ * cc_rr_labeler_hide:
++ * @labeler: A #CcRRLabeler
++ *
++ * Hide ouput labels.
++ */
++void
++cc_rr_labeler_hide (CcRRLabeler *labeler)
++{
++	int i;
++	CcRRLabelerPrivate *priv;
++
++	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
++
++	priv = labeler->priv;
++
++	if (priv->windows == NULL)
++		return;
++
++	for (i = 0; i < priv->num_outputs; i++)
++		if (priv->windows[i] != NULL) {
++			gtk_widget_destroy (priv->windows[i]);
++			priv->windows[i] = NULL;
++	}
++	g_free (priv->windows);
++	priv->windows = NULL;
++}
++
++/**
++ * cc_rr_labeler_get_rgba_for_output:
++ * @labeler: A #CcRRLabeler
++ * @output: Output device (i.e. monitor) to query
++ * @rgba_out: (out): Color of selected monitor.
++ *
++ * Get the color used for the label on a given output (monitor).
++ */
++void
++cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out)
++{
++	int i;
++	GnomeRROutputInfo **outputs;
++
++	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
++	g_return_if_fail (GNOME_IS_RR_OUTPUT_INFO (output));
++	g_return_if_fail (rgba_out != NULL);
++
++	outputs = gnome_rr_config_get_outputs (labeler->priv->config);
++
++	for (i = 0; i < labeler->priv->num_outputs; i++)
++		if (outputs[i] == output) {
++			*rgba_out = labeler->priv->palette[i];
++			return;
++		}
++
++	g_warning ("trying to get the color for unknown GnomeOutputInfo %p; returning magenta!", output);
++
++	rgba_out->red   = 1.0;
++	rgba_out->green = 0;
++	rgba_out->blue  = 1.0;
++	rgba_out->alpha  = 1.0;
++}
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h
+--- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h	1970-01-01 01:00:00.000000000 +0100
++++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h	2013-04-22 03:42:12.383233540 +0200
+@@ -0,0 +1,64 @@
++/* gnome-rr-labeler.h - Utility to label monitors to identify them
++ * while they are being configured.
++ *
++ * Copyright 2008, Novell, Inc.
++ *
++ * This file is part of the Gnome Library.
++ *
++ * The Gnome Library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * The Gnome Library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
++ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ * Author: Federico Mena-Quintero <federico@novell.com>
++ */
++
++#ifndef CC_RR_LABELER_H
++#define CC_RR_LABELER_H
++
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++#include <libgnome-desktop/gnome-rr-config.h>
++
++#define GNOME_TYPE_RR_LABELER            (cc_rr_labeler_get_type ())
++#define CC_RR_LABELER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, CcRRLabeler))
++#define CC_RR_LABELER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GNOME_TYPE_RR_LABELER, CcRRLabelerClass))
++#define GNOME_IS_RR_LABELER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_RR_LABELER))
++#define GNOME_IS_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GNOME_TYPE_RR_LABELER))
++#define CC_RR_LABELER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GNOME_TYPE_RR_LABELER, CcRRLabelerClass))
++
++typedef struct _CcRRLabeler CcRRLabeler;
++typedef struct _CcRRLabelerClass CcRRLabelerClass;
++typedef struct _CcRRLabelerPrivate CcRRLabelerPrivate;
++
++struct _CcRRLabeler {
++	GObject parent;
++
++	/*< private >*/
++	CcRRLabelerPrivate *priv;
++};
++
++struct _CcRRLabelerClass {
++	GObjectClass parent_class;
++};
++
++GType cc_rr_labeler_get_type (void);
++
++CcRRLabeler *cc_rr_labeler_new (GnomeRRConfig *config);
++
++void cc_rr_labeler_show (CcRRLabeler *labeler);
++
++void cc_rr_labeler_hide (CcRRLabeler *labeler);
++
++void cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out);
++
++#endif
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am cinnamon-control-center-1.7.3/panels/display/Makefile.am
+--- cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/display/Makefile.am	2013-04-22 03:42:12.376566715 +0200
+@@ -19,6 +19,8 @@
+ 	display-module.c	\
+ 	cc-display-panel.c	\
+ 	cc-display-panel.h	\
++	cc-rr-labeler.c		\
++	cc-rr-labeler.h		\
+ 	scrollarea.c		\
+ 	scrollarea.h		\
+ 	$(MARSHALFILES)
diff --git a/community/cinnamon-control-center/idle-delay.patch b/community/cinnamon-control-center/idle-delay.patch
new file mode 100644
index 000000000..7434018f5
--- /dev/null
+++ b/community/cinnamon-control-center/idle-delay.patch
@@ -0,0 +1,71 @@
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c
+--- cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c	2013-04-22 05:04:26.466092668 +0200
+@@ -1068,26 +1068,6 @@
+                     G_CALLBACK (combo_enum_changed_cb),
+                     self);
+ 
+-  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action");
+-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+-                                               "combobox_lid_ac"));
+-  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
+-  set_value_for_combo (GTK_COMBO_BOX (widget), value);
+-  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action");
+-  g_signal_connect (widget, "changed",
+-                    G_CALLBACK (combo_enum_changed_cb),
+-                    self);
+-
+-  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action");
+-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+-                                               "combobox_lid_battery"));
+-  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
+-  set_value_for_combo (GTK_COMBO_BOX (widget), value);
+-  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action");
+-  g_signal_connect (widget, "changed",
+-                    G_CALLBACK (combo_enum_changed_cb),
+-                    self);
+-
+   widget = WID (self->priv->builder, "vbox_power");
+   gtk_widget_reparent (widget, (GtkWidget *) self);
+ 
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c
+--- cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c	2013-04-22 14:15:28.440488342 +0200
+@@ -351,10 +351,6 @@
+                       1, &value,
+                       -1);
+ 
+-  /* set both battery and ac keys */
+-  g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value);
+-  g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value);
+-
+   set_idle_delay_from_dpms (self, value);
+ }
+ 
+@@ -384,7 +380,7 @@
+ {
+   GtkTreeIter iter;
+   GtkTreeModel *model;
+-  gint value;
++  guint value;
+   gint value_tmp, value_prev;
+   gboolean ret;
+   guint i;
+@@ -399,7 +395,7 @@
+   i = 0;
+ 
+   /* try to make the UI match the AC setting */
+-  value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac");
++  g_settings_get (self->priv->session_settings, "idle-delay", "u", &value);
+   do
+     {
+       gtk_tree_model_get (model, &iter,
+@@ -510,7 +506,7 @@
+   /* bind the auto dim checkbox */
+   widget = WID ("screen_auto_reduce_checkbutton");
+   g_settings_bind (self->priv->gsd_settings,
+-                   "idle-dim-battery",
++                   "idle-dim",
+                    widget, "active",
+                    G_SETTINGS_BIND_DEFAULT);
+ 
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index ae1e35a1e..6b80d2ca0 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=cinnamon-screensaver
 pkgver=1.7.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,26 +18,19 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensav
        cinnamon-screensaver.desktop
        cinnamon2d-screensaver.desktop
        cinnamon-screensaver.pam
-       gnome-autogen.sh
        configure.patch
        fix-dbus-compatibility.patch)
-
 sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1'
             '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa'
             '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a'
-            '99457b683c2e766a8c09a75ca906e3e00db6d294bb204a2e7a2a05c2e6b1d77e'
-            '827276b01e658afb8045fb0dcbebb54f679ef47dac482f4399e1839369277ccc'
+            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
             'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a'
-            '9013004395a401e99ce6685abb8319eb1e9ddd888c4fa6a7e45729fb93d285d1')
+            '50fa77bafc666f1aa32945a6d06d4e7c5e50bce1d98738de74075fb634cf6197')
 
 build() {
   cd $pkgname-$pkgver
 
-  cp ${srcdir}/gnome-autogen.sh .
-  sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am
-  sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh
-  chmod +x gnome-autogen.sh
-
+  # Fix build with automake 1.13
   patch -uNp2 -r- -i ${srcdir}/configure.patch
 
   # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes
@@ -47,7 +40,6 @@ build() {
                --libexecdir=/usr/lib/cinnamon-screensaver \
                --localstatedir=/var \
                --with-mit-ext --with-systemd
-
   make
 }
 
diff --git a/community/cinnamon-screensaver/cinnamon-screensaver.pam b/community/cinnamon-screensaver/cinnamon-screensaver.pam
index fd8d42d03..8d3baf085 100644
--- a/community/cinnamon-screensaver/cinnamon-screensaver.pam
+++ b/community/cinnamon-screensaver/cinnamon-screensaver.pam
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth        required     pam_unix_auth.so nullok
+auth        substack     system-login
 -auth        optional     pam_gnome_keyring.so
diff --git a/community/cinnamon-screensaver/fix-dbus-compatibility.patch b/community/cinnamon-screensaver/fix-dbus-compatibility.patch
index fa53f6fac..d4c27a0b1 100644
--- a/community/cinnamon-screensaver/fix-dbus-compatibility.patch
+++ b/community/cinnamon-screensaver/fix-dbus-compatibility.patch
@@ -1,8 +1,20 @@
+From e43385126cf6f5187f98f940b8c04c3e99202b0b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Thu, 28 Feb 2013 05:45:12 +0100
+Subject: [PATCH 1/4] Fix crashing and compatibility with gnome-screensaver's
+ D-Bus interface
+
+---
+ src/cinnamon-screensaver-command.c |  4 ++--
+ src/gs-listener-dbus.c             | 10 ++++++++--
+ src/gs-manager.c                   | 14 +++++++++++---
+ 3 files changed, 21 insertions(+), 7 deletions(-)
+
 diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c
 index 4267bd0..5c90916 100644
 --- a/src/cinnamon-screensaver-command.c
 +++ b/src/cinnamon-screensaver-command.c
-@@ -311,11 +311,11 @@ do_command (GDBusConnection *connection)
+@@ -311,11 +311,11 @@
  
          if (do_lock) {
  				if (g_strcmp0 (away_message, "DEFAULT") == 0) {
@@ -20,7 +32,7 @@ diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
 index 2a98aee..6dbf12d 100644
 --- a/src/gs-listener-dbus.c
 +++ b/src/gs-listener-dbus.c
-@@ -653,6 +653,8 @@ do_introspect (DBusConnection *connection,
+@@ -653,6 +653,8 @@ enum {
          xml = g_string_append (xml,
                                 "  <interface name=\""GS_INTERFACE"\">\n"
                                 "    <method name=\"Lock\">\n"
@@ -29,7 +41,7 @@ index 2a98aee..6dbf12d 100644
                                 "      <arg name=\"body\" direction=\"in\" type=\"s\"/>\n"
                                 "    </method>\n"
                                 "    <method name=\"SimulateUserActivity\">\n"
-@@ -744,6 +746,10 @@ listener_dbus_handle_session_message (DBusConnection *connection,
+@@ -744,6 +746,10 @@ enum {
          g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
  
          if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) {
@@ -40,7 +52,7 @@ index 2a98aee..6dbf12d 100644
                  return listener_lock (listener, connection, message);
          }
          if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) {
-@@ -906,7 +912,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+@@ -906,7 +912,7 @@ enum {
                  } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
                          if (_listener_message_path_is_our_session (listener, message)) {
                                  gs_debug ("systemd requested session lock");
@@ -49,7 +61,7 @@ index 2a98aee..6dbf12d 100644
                          }
  
                          return DBUS_HANDLER_RESULT_HANDLED;
-@@ -948,7 +954,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+@@ -948,7 +954,7 @@ enum {
          } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) {
                  if (_listener_message_path_is_our_session (listener, message)) {
                          gs_debug ("ConsoleKit requested session lock");
@@ -62,7 +74,7 @@ diff --git a/src/gs-manager.c b/src/gs-manager.c
 index 1544921..bc09cb9 100644
 --- a/src/gs-manager.c
 +++ b/src/gs-manager.c
-@@ -1275,10 +1275,18 @@ void
+@@ -1275,10 +1275,18 @@ enum {
  gs_manager_set_away_message (GSManager   *manager,
                               const char  *message)
  {
@@ -84,3 +96,224 @@ index 1544921..bc09cb9 100644
          for (l = manager->priv->windows; l; l = l->next) {
                  gs_window_set_away_message (l->data, manager->priv->away_message);
          }
+-- 
+1.8.1.6
+
+
+From 4db01451afbb246213f483805f81a77c4c7371a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Fri, 1 Mar 2013 05:17:46 +0100
+Subject: [PATCH 2/4] Update dbus document with the new LockMessage method
+
+---
+ doc/dbus-interface.html | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/doc/dbus-interface.html b/doc/dbus-interface.html
+index faff26c..c9f95ba 100644
+--- a/doc/dbus-interface.html
++++ b/doc/dbus-interface.html
+@@ -2,6 +2,8 @@
+ ������������<code class="email">&lt;<a class="email" href="mailto:mccann@jhu.edu">mccann@jhu.edu</a>&gt;</code><br>
+ ����������</p></div></div></div></div></div><div><p class="releaseinfo">Version 1.7.1</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#dbus-interface">1. DBUS Interface</a></span></dt><dd><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">
+         <code class="literal">Lock</code>
++      </a></span></dt><dt><span class="sect2"><a href="#gs-method-LockMessage">
++        <code class="literal">LockMessage</code>
+       </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
+         <code class="literal">Cycle</code>
+       </a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">
+@@ -30,6 +32,8 @@
+         <code class="literal">AuthenticationRequestEnd</code>
+       </a></span></dt></dl></dd><dt><span class="sect1"><a href="#gs-examples">Examples</a></span></dt></dl></dd></dl></div><div class="chapter" title="Chapter�1.�DBUS Interface"><div class="titlepage"><div><div><h2 class="title"><a name="dbus-interface"></a>Chapter�1.�DBUS Interface</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">
+         <code class="literal">Lock</code>
++      </a></span></dt><dt><span class="sect2"><a href="#gs-method-LockMessage">
++        <code class="literal">LockMessage</code>
+       </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
+         <code class="literal">Cycle</code>
+       </a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">
+@@ -70,7 +74,11 @@
+         <code class="literal">Lock</code>
+       </h3></div></div></div><p>
+         Request that the screen be locked.
+-      </p></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
++      </p></div><div class="sect2" title="LockMessage"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-LockMessage"></a>
++        <code class="literal">LockMessage</code>
++      </h3></div></div></div><p>
++        Request that the screen be locked, and set an away message.
++      </p><div class="informaltable"><table border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the away message</td></tr></tbody></table></div></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
+         <code class="literal">Cycle</code>
+       </h3></div></div></div><p>
+         Request that the screen saver theme be restarted and, if applicable,
+-- 
+1.8.1.6
+
+
+From 7141e8ce04921ab6d46648cba20c691b8d8f8e0b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Sat, 2 Mar 2013 08:11:45 +0100
+Subject: [PATCH 3/4] Revert "Fixed away_message shown as "(null)" (using a
+ prefix to explicitly mark custom away messages)"
+
+This reverts commit bf1f42b9f9a673091b0f7bf1118781b2d95c88fd.
+---
+ src/cinnamon-screensaver-command.c |  9 +-------
+ src/gs-window-x11.c                | 43 ++++++++++++--------------------------
+ 2 files changed, 14 insertions(+), 38 deletions(-)
+
+diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c
+index 5c90916..dbcac8a 100644
+--- a/src/cinnamon-screensaver-command.c
++++ b/src/cinnamon-screensaver-command.c
+@@ -310,14 +310,7 @@
+         }
+ 
+         if (do_lock) {
+-				if (g_strcmp0 (away_message, "DEFAULT") == 0) {
+-					reply = screensaver_send_message_string (connection, "LockMessage", away_message);
+-				}
+-				else {
+-					gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);
+-					reply = screensaver_send_message_string (connection, "LockMessage", custom_message);
+-					g_free (custom_message);
+-				}
++                reply = screensaver_send_message_string (connection, "LockMessage", away_message);
+                 if (reply == NULL) {
+                         g_message ("Did not receive a reply from the screensaver.");
+                         goto done;
+diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
+index 6858509..0e3bb6f 100644
+--- a/src/gs-window-x11.c
++++ b/src/gs-window-x11.c
+@@ -2132,38 +2132,21 @@ enum {
+         return utf8_name;
+ }
+ 
+-static gchar * 
+-str_replace(const char *string, const char *delimiter, const char *replacement)
+-{
+-	gchar **split;
+-	gchar *ret;
+-	g_return_val_if_fail(string      != NULL, NULL);
+-	g_return_val_if_fail(delimiter   != NULL, NULL);
+-	g_return_val_if_fail(replacement != NULL, NULL);
+-	split = g_strsplit(string, delimiter, 0);
+-	ret = g_strjoinv(replacement, split);
+-	g_strfreev(split);
+-	return ret;
+-}
+-
+ static void
+ update_clock (GSWindow *window)
+-{	
+-	char *markup;
+-	char *away_message;
+-			
+-	if (window->priv->away_message != NULL && g_str_has_prefix (window->priv->away_message, "CUSTOM###") && g_strcmp0(window->priv->away_message, "") != 0) {		
+-		away_message = str_replace(window->priv->away_message, "CUSTOM###", "");		
+-		away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), away_message);
+-	}
+-	else {
+-		away_message = g_strdup_printf (_("%s"), window->priv->default_message);
+-	}
+-		
+-	markup = g_strdup_printf ("%s\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#FFFFFF\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
+-	gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
+-	g_free (markup);
+-	g_free (away_message);
++{
++        char *markup;
++        char *away_message;
++        if (g_strcmp0(window->priv->away_message, "DEFAULT") == 0 || g_strcmp0(window->priv->away_message, "") == 0) {
++            away_message = g_strdup_printf (_("%s"), window->priv->default_message);
++        }
++        else {
++            away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), window->priv->away_message);
++        }
++        markup = g_strdup_printf ("%s\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#FFFFFF\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
++        gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
++        g_free (markup);
++        g_free (away_message);
+ }
+ 
+ static void
+-- 
+1.8.1.6
+
+
+From 1ed6a959746e115a7f33de2134921c6572185ebd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Sat, 2 Mar 2013 08:13:04 +0100
+Subject: [PATCH 4/4] Simplify away message handling
+
+---
+ src/cinnamon-screensaver-command.c | 19 ++++++++++++-------
+ src/gs-window-x11.c                |  7 +++----
+ 2 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c
+index dbcac8a..4836f81 100644
+--- a/src/cinnamon-screensaver-command.c
++++ b/src/cinnamon-screensaver-command.c
+@@ -41,7 +41,7 @@
+ static gboolean do_query      = FALSE;
+ static gboolean do_time       = FALSE;
+ 
+-static gchar   *away_message  = "DEFAULT";
++static gchar   *away_message;
+ 
+ static GOptionEntry entries [] = {
+         { "exit", 0, 0, G_OPTION_ARG_NONE, &do_quit,
+@@ -114,7 +114,7 @@
+ static GDBusMessage *
+ screensaver_send_message_string (GDBusConnection *connection,
+                                  const char      *name,
+-                                 gboolean         value)
++                                 gchar           *value)
+ {
+         GDBusMessage *message, *reply;
+         GError       *error;
+@@ -310,12 +310,17 @@
+         }
+ 
+         if (do_lock) {
+-                reply = screensaver_send_message_string (connection, "LockMessage", away_message);
+-                if (reply == NULL) {
+-                        g_message ("Did not receive a reply from the screensaver.");
+-                        goto done;
++                if (away_message) {
++                        reply = screensaver_send_message_string (connection, "LockMessage", away_message);
++                        if (reply == NULL) {
++                                g_message ("Did not receive a reply from the screensaver.");
++                                goto done;
++                        }
++                        g_object_unref (reply);
++                } else {
++                        reply = screensaver_send_message_void (connection, "Lock", FALSE);
++                        g_assert (reply == NULL);
+                 }
+-                g_object_unref (reply);
+         }
+ 
+         if (do_activate) {
+diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
+index 0e3bb6f..22f5471 100644
+--- a/src/gs-window-x11.c
++++ b/src/gs-window-x11.c
+@@ -2137,11 +2137,10 @@ enum {
+ {
+         char *markup;
+         char *away_message;
+-        if (g_strcmp0(window->priv->away_message, "DEFAULT") == 0 || g_strcmp0(window->priv->away_message, "") == 0) {
+-            away_message = g_strdup_printf (_("%s"), window->priv->default_message);
+-        }
+-        else {
++        if (window->priv->away_message && g_strcmp0(window->priv->away_message, "") != 0) {
+             away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), window->priv->away_message);
++        } else {
++            away_message = g_strdup_printf (_("%s"), window->priv->default_message);
+         }
+         markup = g_strdup_printf ("%s\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#FFFFFF\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
+         gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
+-- 
+1.8.1.6
+
diff --git a/community/cinnamon-screensaver/gnome-autogen.sh b/community/cinnamon-screensaver/gnome-autogen.sh
deleted file mode 100644
index 2467a1de2..000000000
--- a/community/cinnamon-screensaver/gnome-autogen.sh
+++ /dev/null
@@ -1,538 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-#name of package
-test "$PKG_NAME" || PKG_NAME=Package
-test "$srcdir" || srcdir=.
-
-# default version requirements ...
-test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53
-test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9
-test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3
-test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40
-test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0
-test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25
-test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0
-test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0
-test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0
-test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2
-
-# a list of required m4 macros.  Package can set an initial value
-test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS=
-test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS=
-
-# Not all echo versions allow -n, so we check what is possible. This test is
-# based on the one in autoconf.
-ECHO_C=
-ECHO_N=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ;;
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# some terminal codes ...
-if tty < /dev/null 1>/dev/null 2>&1; then
-    boldface="`tput bold 2>/dev/null`"
-    normal="`tput sgr0 2>/dev/null`"
-else
-    boldface=
-    normal=
-fi
-printbold() {
-    echo $ECHO_N "$boldface" $ECHO_C
-    echo "$@"
-    echo $ECHO_N "$normal" $ECHO_C
-}    
-printerr() {
-    echo "$@" >&2
-}
-
-# Usage:
-#     compare_versions MIN_VERSION ACTUAL_VERSION
-# returns true if ACTUAL_VERSION >= MIN_VERSION
-compare_versions() {
-    ch_min_version=$1
-    ch_actual_version=$2
-    ch_status=0
-    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
-    set $ch_actual_version
-    for ch_min in $ch_min_version; do
-        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-        if [ -z "$ch_min" ]; then break; fi
-        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-        if [ $ch_cur -gt $ch_min ]; then break; fi
-        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-    done
-    IFS="$ch_save_IFS"
-    return $ch_status
-}
-
-# Usage:
-#     version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE
-# checks to see if the package is available
-version_check() {
-    vc_package=$1
-    vc_variable=$2
-    vc_checkprogs=$3
-    vc_min_version=$4
-    vc_source=$5
-    vc_status=1
-
-    vc_checkprog=`eval echo "\\$$vc_variable"`
-    if [ -n "$vc_checkprog" ]; then
-	printbold "using $vc_checkprog for $vc_package"
-	return 0
-    fi
-
-    if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then
-	vc_comparator="="
-    else
-	vc_comparator=">="
-    fi
-    printbold "checking for $vc_package $vc_comparator $vc_min_version..."
-    for vc_checkprog in $vc_checkprogs; do
-	echo $ECHO_N "  testing $vc_checkprog... " $ECHO_C
-	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
-	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
-                               sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
-	    if compare_versions $vc_min_version $vc_actual_version; then
-		echo "found $vc_actual_version"
-		# set variables
-		eval "$vc_variable=$vc_checkprog; \
-			${vc_variable}_VERSION=$vc_actual_version"
-		vc_status=0
-		break
-	    else
-		echo "too old (found version $vc_actual_version)"
-	    fi
-	else
-	    echo "not found."
-	fi
-    done
-    if [ "$vc_status" != 0 ]; then
-	printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed"
-	printerr "  to build $PKG_NAME.  Download the appropriate package for"
-	printerr "  from your distribution or get the source tarball at"
-        printerr "    $vc_source"
-	printerr
-	exit $vc_status
-    fi
-    return $vc_status
-}
-
-# Usage:
-#     require_m4macro filename.m4
-# adds filename.m4 to the list of required macros
-require_m4macro() {
-    case "$REQUIRED_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;;
-    esac
-}
-
-forbid_m4macro() {
-    case "$FORBIDDEN_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;;
-    esac
-}
-
-# Usage:
-#     add_to_cm_macrodirs dirname
-# Adds the dir to $cm_macrodirs, if it's not there yet.
-add_to_cm_macrodirs() {
-    case $cm_macrodirs in
-    "$1 "* | *" $1 "* | *" $1") ;;
-    *) cm_macrodirs="$cm_macrodirs $1";;
-    esac
-}
-
-# Usage:
-#     print_m4macros_error
-# Prints an error message saying that autoconf macros were misused
-print_m4macros_error() {
-    printerr "***Error***: some autoconf macros required to build $PKG_NAME"
-    printerr "  were not found in your aclocal path, or some forbidden"
-    printerr "  macros were found.  Perhaps you need to adjust your"
-    printerr "  ACLOCAL_FLAGS?"
-    printerr
-}
-
-# Usage:
-#     check_m4macros
-# Checks that all the requested macro files are in the aclocal macro path
-# Uses REQUIRED_M4MACROS and ACLOCAL variables.
-check_m4macros() {
-    # construct list of macro directories
-    cm_macrodirs=`$ACLOCAL --print-ac-dir`
-    # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9
-    # but it contains only Automake's own macros, so we can ignore it.
-
-    # Read the dirlist file, supported by Automake >= 1.7.
-    # If AUTOMAKE was defined, no version was detected.
-    if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then
-	cm_dirlist=`sed 's/[ 	]*#.*//;/^$/d' $cm_macrodirs/dirlist`
-	if [ -n "$cm_dirlist" ] ; then
-	    for cm_dir in $cm_dirlist; do
-		if [ -d $cm_dir ]; then
-		    add_to_cm_macrodirs $cm_dir
-		fi
-	    done
-	fi
-    fi
-
-    # Parse $ACLOCAL_FLAGS
-    set - $ACLOCAL_FLAGS
-    while [ $# -gt 0 ]; do
-	if [ "$1" = "-I" ]; then
-	    add_to_cm_macrodirs "$2"
-	    shift
-	fi
-	shift
-    done
-
-    cm_status=0
-    if [ -n "$REQUIRED_M4MACROS" ]; then
-	printbold "Checking for required M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $REQUIRED_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-		# The macro dir in Cygwin environments may contain a file
-		# called dirlist containing other directories to look in.
-		if [ -f "$cm_dir/dirlist" ]; then
-		    for cm_otherdir in `cat $cm_dir/dirlist`; do
-			if [ -f "$cm_otherdir/$cm_macro" ]; then
-			    cm_macrofound=true
-		            break
-			fi
-		    done
-		fi
-	    done
-	    if $cm_macrofound; then
-		:
-	    else
-		printerr "  $cm_macro not found"
-		cm_status=1
-	    fi
-	done
-    fi
-    if [ "$cm_status" != 0 ]; then
-        print_m4macros_error
-        exit $cm_status
-    fi
-    if [ -n "$FORBIDDEN_M4MACROS" ]; then
-	printbold "Checking for forbidden M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $FORBIDDEN_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-	    done
-	    if $cm_macrofound; then
-		printerr "  $cm_macro found (should be cleared from macros dir)"
-		cm_status=1
-	    fi
-	done
-    fi
-    if [ "$cm_status" != 0 ]; then
-        print_m4macros_error
-	exit $cm_status
-    fi
-}
-
-# try to catch the case where the macros2/ directory hasn't been cleared out.
-forbid_m4macro gnome-cxx-check.m4
-
-want_libtool=false
-want_gettext=false
-want_glib_gettext=false
-want_intltool=false
-want_pkg_config=false
-want_gtk_doc=false
-want_gnome_doc_utils=false
-want_maintainer_mode=false
-
-find_configure_files() {
-    configure_ac=
-    if test -f "$1/configure.ac"; then
-	configure_ac="$1/configure.ac"
-    elif test -f "$1/configure.in"; then
-	configure_ac="$1/configure.in"
-    fi
-    if test "x$configure_ac" != x; then
-	echo "$configure_ac"
-	# TODO We have not detected the right autoconf yet!
-	autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do
-	    find_configure_files "$1/$dir"
-	done
-    fi
-}
-
-configure_files="`find_configure_files $srcdir`"
-
-for configure_ac in $configure_files; do
-    dirname=`dirname $configure_ac`
-    if [ -f $dirname/NO-AUTO-GEN ]; then
-	echo skipping $dirname -- flagged as no auto-gen
-	continue
-    fi
-    if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null ||
-       grep "^LT_INIT" $configure_ac >/dev/null; then
-	want_libtool=true
-    fi
-    if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then
-	want_gettext=true
-    fi
-    if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then
-	want_glib_gettext=true
-    fi
-    if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null ||
-       grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then
-	want_intltool=true
-    fi
-    if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then
-	want_pkg_config=true
-    fi
-    if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then
-	want_gtk_doc=true
-    fi
-    if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then
-        want_gnome_doc_utils=true
-    fi
-
-    # check that AM_MAINTAINER_MODE is used
-    if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then
-	want_maintainer_mode=true
-    fi
-
-    if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then
-        require_m4macro yelp.m4
-    fi
-
-    # check to make sure gnome-common macros can be found ...
-    if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null ||
-       grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null ||
-       grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then
-        require_m4macro gnome-common.m4
-    fi
-    if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null ||
-       grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then
-        require_m4macro gnome-compiler-flags.m4
-    fi
-    if grep "^GNOME_CODE_COVERAGE" $configure_ac >/dev/null; then
-        require_m4macro gnome-code-coverage.m4
-    fi
-done
-
-#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13
-WANT_AUTOCONF_2_5=1
-export WANT_AUTOCONF_2_5
-version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \
-    "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"
-AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
-
-case $REQUIRED_AUTOMAKE_VERSION in
-    1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
-    1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;;
-    1.12*) automake_progs="automake-1.13 automake-1.12" ;;
-    1.13*) automake_progs="automake-1.13" ;;
-esac
-version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
-    "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
-
-if $want_libtool; then
-    version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \
-        "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz"
-    require_m4macro libtool.m4
-fi
-
-if $want_gettext; then
-    version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \
-        "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz"
-    require_m4macro gettext.m4
-fi
-
-if $want_glib_gettext; then
-    version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \
-        "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz"
-    require_m4macro glib-gettext.m4
-fi
-
-if $want_intltool; then
-    version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \
-        "http://ftp.gnome.org/pub/GNOME/sources/intltool/"
-    require_m4macro intltool.m4
-fi
-
-if $want_pkg_config; then
-    version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \
-        "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz"
-    require_m4macro pkg.m4
-fi
-
-if $want_gtk_doc; then
-    version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \
-        "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-    require_m4macro gtk-doc.m4
-fi
-
-if $want_gnome_doc_utils; then
-    version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \
-        "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/"
-fi
-
-if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
-    version_check gnome-common DOC_COMMON gnome-doc-common \
-        $REQUIRED_DOC_COMMON_VERSION " "
-fi
-
-check_m4macros
-
-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
-  printerr "**Warning**: I am going to run \`configure' with no arguments."
-  printerr "If you wish to pass any to it, please specify them on the"
-  printerr \`$0\'" command line."
-  printerr
-fi
-
-topdir=`pwd`
-for configure_ac in $configure_files; do 
-    dirname=`dirname $configure_ac`
-    basename=`basename $configure_ac`
-    if [ -f $dirname/NO-AUTO-GEN ]; then
-	echo skipping $dirname -- flagged as no auto-gen
-    elif [ ! -w $dirname ]; then
-        echo skipping $dirname -- directory is read only
-    else
-	printbold "Processing $configure_ac"
-	cd $dirname
-
-        # Note that the order these tools are called should match what
-        # autoconf's "autoupdate" package does.  See bug 138584 for
-        # details.
-
-        # programs that might install new macros get run before aclocal
-	if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null ||
-	   grep "^LT_INIT" $basename >/dev/null; then
-	    printbold "Running $LIBTOOLIZE..."
-	    $LIBTOOLIZE --force --copy || exit 1
-	fi
-
-	if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then
-	    printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages."
-	    echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1
-	elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then
-	   if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then
-	   	printbold "Running autopoint..."
-		autopoint --force || exit 1
-	   else
-	    	printbold "Running $GETTEXTIZE... Ignore non-fatal messages."
-	    	echo "no" | $GETTEXTIZE --force --copy || exit 1
-	   fi
-	fi
-
-	if grep "^AC_PROG_INTLTOOL" $basename >/dev/null ||
-           grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then
-	    printbold "Running $INTLTOOLIZE..."
-	    $INTLTOOLIZE --force --copy --automake || exit 1
-	fi
-	if grep "^GTK_DOC_CHECK" $basename >/dev/null; then
-	    printbold "Running $GTKDOCIZE..."
-	    $GTKDOCIZE --copy || exit 1
-	fi
-
-	if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
-	    printbold "Running gnome-doc-common..."
-	    gnome-doc-common --copy || exit 1
-	fi
-	if grep "^GNOME_DOC_INIT" $basename >/dev/null; then
-	    printbold "Running $GNOME_DOC_PREPARE..."
-	    $GNOME_DOC_PREPARE --force --copy || exit 1
-	fi
-
-        # Now run aclocal to pull in any additional macros needed
-
-	# if the AC_CONFIG_MACRO_DIR() macro is used, pass that
-	# directory to aclocal.
-	m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-	if [ -n "$m4dir" ]; then
-	    m4dir="-I $m4dir"
-	fi
-	printbold "Running $ACLOCAL..."
-	$ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1
-
-	if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then
-	    printerr "*** obsolete gnome macros were used in $configure_ac"
-	fi
-
-	# Now that all the macros are sorted, run autoconf and autoheader ...
-	printbold "Running $AUTOCONF..."
-	$AUTOCONF || exit 1
-	if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then
-	    printbold "Running $AUTOHEADER..."
-	    $AUTOHEADER || exit 1
-	    # this prevents automake from thinking config.h.in is out of
-	    # date, since autoheader doesn't touch the file if it doesn't
-	    # change.
-	    test -f config.h.in && touch config.h.in
-	fi
-
-	# Finally, run automake to create the makefiles ...
-	printbold "Running $AUTOMAKE..."
-        if [ -f COPYING ]; then
-          cp -pf COPYING COPYING.autogen_bak
-        fi
-        if [ -f INSTALL ]; then
-          cp -pf INSTALL INSTALL.autogen_bak
-        fi
-	if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then
-	    $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1
-	else
-	    $AUTOMAKE --gnu --add-missing --copy || exit 1
-	fi
-        if [ -f COPYING.autogen_bak ]; then
-          cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING
-          rm -f COPYING.autogen_bak
-        fi
-        if [ -f INSTALL.autogen_bak ]; then
-          cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL
-          rm -f INSTALL.autogen_bak
-        fi
-
-	cd "$topdir"
-    fi
-done
-
-conf_flags=""
-
-if $want_maintainer_mode; then
-    conf_flags="--enable-maintainer-mode"
-fi
-
-if test x$NOCONFIGURE = x; then
-    printbold Running $srcdir/configure $conf_flags "$@" ...
-    $srcdir/configure $conf_flags "$@" \
-	&& echo Now type \`make\' to compile $PKG_NAME || exit 1
-else
-    echo Skipping configure process.
-fi
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index f4fecd1a7..a16839508 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87446 2013-03-31 19:54:32Z faidoc $
+# $Id: PKGBUILD 88709 2013-04-22 00:29:56Z bgyorgy $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=2
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
@@ -13,8 +13,9 @@ url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
 depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth'
          'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session'
-         'gnome-themes-standard' 'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus'
-         'python2-gconf' 'python2-imaging' 'python2-pyinotify' 'python2-lxml' 'webkitgtk3')
+         'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
+         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging'
+         'python2-pyinotify' 'python2-lxml' 'webkitgtk3')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
             'cinnamon-screensaver: lock screen'
@@ -26,15 +27,21 @@ install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
         "keyboard_applet.patch"
         "fix-control-center-check.patch"
-        "fix-keyboard-settings.patch")
-md5sums=('c733e2a2280508aecf3ee010587e6743'
+        "gnome-3.8.patch")
+md5sums=('95260dc968ca9be32c265b35df2dd49d'
          '2b1ece84416c3e4de030be15f1774d82'
          'c3f25b06d345d9d36c197cd96e08f496'
-         'c36138eddde544b5c27b66d19451e7a5')
+         'cf2efbe1a5c48e1be53a0e8e4b7c3181')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
 
+  # Python2 fix
+  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \
+    files/usr/bin/$pkgname-menu-editor \
+    files/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
   # Fix Keyboard applet
   # https://github.com/linuxmint/Cinnamon/issues/1337
   patch -Np1 -i ${srcdir}/keyboard_applet.patch
@@ -42,9 +49,8 @@ build() {
   # Check for the cc-panel path, not for the unneeded binary
   patch -Np1 -i ${srcdir}/fix-control-center-check.patch
 
-  # Fix Keyboard settings (https://bugs.archlinux.org/task/34472)
-  patch -Np1 -i ${srcdir}/fix-keyboard-settings.patch
-
+  # https://github.com/linuxmint/Cinnamon/pull/1888
+  patch -Np1 -i ${srcdir}/gnome-3.8.patch
 
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
@@ -54,31 +60,10 @@ build() {
                --disable-schemas-compile \
                --enable-compile-warnings=yes \
                --with-session-tracking=systemd
- 
   make
 }
 
 package() {
   cd ${srcdir}/linuxmint-Cinnamon*
   make DESTDIR="${pkgdir}" install
-
-  # Install autostart files for gnome-fallback-mount-helper
-  install -Dm644 /etc/xdg/autostart/gnome-fallback-mount-helper.desktop \
-    "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon.desktop"
-  sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon/' \
-    "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon.desktop"
-
-  install -Dm644 /etc/xdg/autostart/gnome-fallback-mount-helper.desktop \
-    "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon2d.desktop"
-  sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon2d/' \
-    "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon2d.desktop"
-
-  # Python2 fix
-  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \
-    "${pkgdir}/usr/bin/$pkgname-menu-editor" \
-    "${pkgdir}/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py"
-
-  find "${pkgdir}" -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 }
-
-
diff --git a/community/cinnamon/cinnamon.install b/community/cinnamon/cinnamon.install
index 901fd95c9..326aa98a2 100644
--- a/community/cinnamon/cinnamon.install
+++ b/community/cinnamon/cinnamon.install
@@ -2,28 +2,10 @@ post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/cinnamon.schemas ]; then
-    gconfpkg --uninstall cinnamon
-  fi
-
-  if [ "$(vercmp 1.6.7-6 "$2")" -eq 1 ]; then
-    if [[ -h '/usr/lib/libgnome-desktop-3.so.2' ]]; then
-      if [[ $(uname -m) == 'i686' ]]; then
-        unlink /usr/lib/libgnome-desktop-3.so.2
-      fi
-    fi
-  fi
-}
-
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  pre_upgrade
-}
-
 post_remove() {
   post_install
 }
diff --git a/community/cinnamon/fix-keyboard-settings.patch b/community/cinnamon/fix-keyboard-settings.patch
deleted file mode 100644
index b606939c9..000000000
--- a/community/cinnamon/fix-keyboard-settings.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 034f9c886a4b08e214193576b11fb97ba3d62922 Mon Sep 17 00:00:00 2001
-From: Lusito <core@roughael.net>
-Date: Sun, 10 Mar 2013 21:01:07 +0100
-Subject: [PATCH] fix for broken keyboard settings
-
----
- files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py |  2 +-
- files/usr/lib/cinnamon-settings/modules/cs_keyboard.py | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py b/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py
-index b8842fe..cdccf46 100644
---- a/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py
-+++ b/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py
-@@ -9,7 +9,7 @@
-     import gettext
-     from gi.repository import Gio, Gtk, GObject, Gdk
-     from gi.repository import GdkPixbuf 
--#    import gconf
-+    from gi.repository import GConf
-     import json
-     import dbus
-     import time
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
-index 27a75ae..1ea8fd9 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
-@@ -8,7 +8,7 @@
- gettext.install("cinnamon", "/usr/share/cinnamon/locale")
- 
- # Keybindings page - check if we need to store custom
--# keybindings to gsettings key as well as gconf (In Mint 14 this is changed)
-+# keybindings to gsettings key as well as GConf (In Mint 14 this is changed)
- CUSTOM_KEYS_BASENAME = "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"
- CUSTOM_KEYS_SCHEMA = "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"
- CUSTOM_KEYBINDINGS_GSETTINGS = False
-@@ -160,7 +160,7 @@ def __init__(self, content_box):
-         first_run_completed = schema.get_boolean("custom-keybindings-to-3-6")
- 
-         if CUSTOM_KEYBINDINGS_GSETTINGS and not first_run_completed:
--            gclient = gconf.client_get_default()
-+            gclient = GConf.Client.get_default()
-             path = "/desktop/gnome/keybindings"
-             subdirs = gclient.all_dirs(path)
-             for subdir in subdirs:
-@@ -251,7 +251,7 @@ def setBinding(self, index, val):
-         self.writeSettings()
- 
-     def writeSettings(self):
--        gclient = gconf.client_get_default()
-+        gclient = GConf.Client.get_default()
-         gclient.set_string(self.path + "/name", self.label)
-         gclient.set_string(self.path + "/action", self.action)
-         gclient.set_string(self.path + "/binding", self.entries[0])
-@@ -537,7 +537,7 @@ def loadCustoms(self):
-         for category in self.main_store:
-             if category.int_name is "custom":
-                 category.clear()
--        gclient = gconf.client_get_default()
-+        gclient = GConf.Client.get_default()
-         path = "/desktop/gnome/keybindings"
-         subdirs = gclient.all_dirs(path)
-         for subdir in subdirs:
-@@ -645,7 +645,7 @@ def onAddCustomButtonClicked(self, button):
-             dialog.destroy()
-             return
- 
--        gclient = gconf.client_get_default()
-+        gclient = GConf.Client.get_default()
-         path = "/desktop/gnome/keybindings/custom"
-         i = 0
-         while gclient.dir_exists(path + str(i)):
-@@ -670,7 +670,7 @@ def onRemoveCustomButtonClicked(self, button):
-         keybindings, iter = self.kb_tree.get_selection().get_selected()
-         if iter:
-             keybinding = keybindings[iter][1]
--            gclient = gconf.client_get_default()
-+            gclient = GConf.Client.get_default()
-             if gclient.dir_exists(keybinding.path):
-                 gclient.unset(keybinding.path + "/name")
-                 gclient.unset(keybinding.path + "/action")
--- 
-1.8.1.5
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
new file mode 100644
index 000000000..61cd9180f
--- /dev/null
+++ b/community/cinnamon/gnome-3.8.patch
@@ -0,0 +1,3669 @@
+From f4020d3960fa96a101bdb1c3ac1e1a452dbbf48c Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Apr 2013 13:19:50 -0400
+Subject: [PATCH 01/15] Disable XInput on cinnamon startup (for 3.8 compat)
+ This has no effect on < 1.14 clutter
+
+---
+ src/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/main.c b/src/main.c
+index 418fb60..ac90d91 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -260,6 +260,7 @@
+   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
+ 
+   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
++  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
+   g_setenv ("NO_GAIL", "1", TRUE);
+   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
+   meta_init ();
+-- 
+1.8.1.6
+
+
+From cc68659ecdd9e43128ec2b4555479f930c0d1ccd Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Apr 2013 13:21:40 -0400
+Subject: [PATCH 02/15] Explain change
+
+---
+ src/main.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index ac90d91..9d37975 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -257,10 +257,12 @@
+ 
+   g_option_context_free (ctx);
+ 
++  /* Disable XInput extension - required for 3.8 compatibility */
++  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
++
+   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
+ 
+   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
+-  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
+   g_setenv ("NO_GAIL", "1", TRUE);
+   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
+   meta_init ();
+-- 
+1.8.1.6
+
+
+From f3777b3b2733b965bd348c7175ee67ee268aee06 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 16 Apr 2013 17:01:30 -0400
+Subject: [PATCH 03/15] Add backgroundManager - this is needed for gnome 3.8
+ compatibility, as gnome-settings-daemon no longer handles the desktop
+ background.
+
+---
+ configure.ac                                       |   7 +-
+ data/org.cinnamon.gschema.xml.in                   |  71 +++-
+ .../cinnamon-settings/modules/cs_backgrounds.py    |  31 +-
+ js/ui/main.js                                      |   3 +-
+ src/Makefile.am                                    |   2 +
+ src/cinnamon-background-manager.c                  | 411 +++++++++++++++++++++
+ src/cinnamon-background-manager.h                  |  57 +++
+ 7 files changed, 562 insertions(+), 20 deletions(-)
+ create mode 100644 src/cinnamon-background-manager.c
+ create mode 100644 src/cinnamon-background-manager.h
+
+diff --git a/configure.ac b/configure.ac
+index 0aa47c5..a2a9479 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,6 +68,7 @@ GTK_MIN_VERSION=3.0.0
+ GIO_MIN_VERSION=2.29.10
+ POLKIT_MIN_VERSION=0.100
+ STARTUP_NOTIFICATION_MIN_VERSION=0.11
++GNOME_DESKTOP_MIN_VERSION=3.0.0
+ 
+ # Collect more than 20 libraries for a prize!
+ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+@@ -82,7 +83,8 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+ 			       libcanberra
+                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+-                               libnm-glib libnm-util gnome-keyring-1)
++                               libnm-glib libnm-util gnome-keyring-1
++                               gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION)
+ 
+ PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
+ 
+@@ -106,7 +108,8 @@ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
+ CFLAGS=$saved_CFLAGS
+ LIBS=$saved_LIBS
+ 
+-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
++PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 
++                      gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION x11)
+ PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
+ PKG_CHECK_MODULES(TRAY, gtk+-3.0)
+ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
+index ffbad92..6f55477 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -720,6 +720,23 @@
+     </key>
+   </schema>
+ 
++
++  <enum id="bg_style">
++    <value nick="none" value="0"/>
++    <value nick="wallpaper" value="1"/>
++    <value nick="centered" value="2"/>
++    <value nick="scaled" value="3"/>
++    <value nick="stretched" value="4"/>
++    <value nick="zoom" value="5"/>
++    <value nick="spanned" value="6"/>
++  </enum>
++
++  <enum id="bg_shading">
++    <value nick="solid" value="0"/>
++    <value nick="vertical" value="1"/>
++    <value nick="horizontal" value="2"/>
++  </enum>
++
+   <schema id="org.cinnamon.background" path="/org/cinnamon/background/">
+     <key name="mode" type="s">
+       <default>"wallpaper"</default>
+@@ -750,8 +767,60 @@
+         This key defines the delay for the slideshow.
+       </description>
+     </key>
++    <key name="draw-background" type="b">
++      <default>true</default>
++      <_summary>Draw Desktop Background</_summary>
++      <_description>Have GNOME draw the desktop background.</_description>
++    </key>
++    <key name="picture-options" enum="bg_style">
++      <default>'zoom'</default>
++      <_summary>Picture Options</_summary>
++      <_description>
++        Determines how the image set by wallpaper_filename is rendered.
++        Possible values are "none", "wallpaper", "centered", "scaled",
++        "stretched", "zoom", "spanned".
++      </_description>
++    </key>
++    <key name="picture-uri" type="s">
++      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
++      <_summary>Picture URI</_summary>
++      <_description>
++        URI to use for the background image. Not that the backend only supports
++        local (file://) URIs.
++      </_description>
++    </key>
++    <key name="picture-opacity" type="i">
++      <range min="0" max="100"/>
++      <default>100</default>
++      <_summary>Picture Opacity</_summary>
++      <_description>
++        Opacity with which to draw the background picture.
++      </_description>
++    </key>
++    <key name="primary-color" type="s">
++      <default>'#023c88'</default>
++      <_summary>Primary Color</_summary>
++      <_description>
++        Left or Top color when drawing gradients, or the solid color.
++      </_description>
++    </key>
++    <key name="secondary-color" type="s">
++      <default>'#5789ca'</default>
++      <_summary>Secondary Color</_summary>
++      <_description>
++        Right or Bottom color when drawing gradients, not used for solid color.
++      </_description>
++    </key>
++    <key name="color-shading-type" enum="bg_shading">
++      <default>'solid'</default>
++      <_summary>Color Shading Type</_summary>
++      <_description>
++        How to shade the background color. Possible values are "horizontal",
++        "vertical", and "solid".
++      </_description>
++    </key>
+   </schema>
+-  
++
+   <schema id="org.cinnamon.screensaver" path="/org/cinnamon/screensaver/">
+     <key name="default-message" type="s">
+       <default>""</default>
+diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+index f964aed..4a38c84 100644
+--- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+@@ -232,11 +232,11 @@ def getFirstFileFromBackgroundXml(self, filename):
+     
+ 
+ class BackgroundWallpaperPane (Gtk.VBox):
+-    def __init__(self, sidepage, gnome_background_schema):
++    def __init__(self, sidepage, cinnamon_background_schema):
+         Gtk.VBox.__init__(self)
+         self.set_spacing(5)
+         
+-        self._gnome_background_schema = gnome_background_schema
++        self._cinnamon_background_schema = cinnamon_background_schema
+         self._sidepage = sidepage
+         
+         scw = Gtk.ScrolledWindow()
+@@ -263,15 +263,15 @@ def _on_selection_changed(self, iconview):
+         if wallpaper:
+             for key in wallpaper:
+                 if key == "filename":
+-                    self._gnome_background_schema.set_string("picture-uri", "file://" + wallpaper[key])
++                    self._cinnamon_background_schema.set_string("picture-uri", "file://" + wallpaper[key])
+                 elif key == "pcolor":
+-                    self._gnome_background_schema.set_string("primary-color", wallpaper[key])
++                    self._cinnamon_background_schema.set_string("primary-color", wallpaper[key])
+                 elif key == "scolor":
+-                    self._gnome_background_schema.set_string("secondary-color", wallpaper[key])
++                    self._cinnamon_background_schema.set_string("secondary-color", wallpaper[key])
+                 elif key == "shade_type":
+-                    self._gnome_background_schema.set_string("color-shading-type", wallpaper[key])
++                    self._cinnamon_background_schema.set_string("color-shading-type", wallpaper[key])
+                 elif key == "options":
+-                    self._gnome_background_schema.set_string("picture-options", wallpaper[key])
++                    self._cinnamon_background_schema.set_string("picture-options", wallpaper[key])
+             if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""):
+                 self._sidepage.remove_wallpaper_button.set_sensitive(True)
+     
+@@ -364,7 +364,7 @@ def run(self):
+         return res
+ 
+ class BackgroundSlideshowPane(Gtk.Table):
+-    def __init__(self, sidepage, gnome_background_schema, cinnamon_background_schema):
++    def __init__(self, sidepage, cinnamon_background_schema):
+         Gtk.Table.__init__(self)
+         self.set_col_spacings(5)
+         self.set_row_spacings(5)
+@@ -445,12 +445,11 @@ def _do_update_list(self, folder, recursive, delay, transition_duration = 0):
+             f = open(filename, "w")
+             f.write(xml_data)
+             f.close()
+-            Gio.Settings("org.gnome.desktop.background").set_string("picture-uri", "file://" + filename)
++            Gio.Settings("org.cinnamon.background").set_string("picture-uri", "file://" + filename)
+ 
+ class BackgroundSidePage (SidePage):
+     def __init__(self, name, icon, keywords, advanced, content_box):
+         SidePage.__init__(self, name, icon, keywords, advanced, content_box)
+-        self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background")
+         self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background")
+         self._add_wallpapers_dialog = AddWallpapersDialog()
+         
+@@ -515,8 +514,8 @@ def build(self, advanced):
+         self.mainbox.set_visible_window(False)
+         self.content_box.pack_start(self.mainbox, True, True, 3)
+         
+-        self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema)
+-        self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema)
++        self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema)
++        self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema)
+         if self._cinnamon_background_schema["mode"] == "slideshow":
+             self.mainbox.add(self.slideshow_pane)
+         else:
+@@ -536,21 +535,21 @@ def build(self, advanced):
+         l = Gtk.Label(_("Picture aspect"))
+         l.set_alignment(0, 0.5)
+         advanced_options_box.pack_start(l, False, False, 0)
+-        self.picture_options = GSettingsComboBox("", "org.gnome.desktop.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS)
++        self.picture_options = GSettingsComboBox("", "org.cinnamon.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS)
+         advanced_options_box.pack_start(self.picture_options, False, False, 0)
+         
+         l = Gtk.Label(_("Gradient"))
+         l.set_alignment(0, 0.5)
+         advanced_options_box.pack_start(l, False, False, 0)
+-        self.color_shading_type = GSettingsComboBox("", "org.gnome.desktop.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES)
++        self.color_shading_type = GSettingsComboBox("", "org.cinnamon.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES)
+         advanced_options_box.pack_start(self.color_shading_type, False, False, 0)
+         
+         hbox = Gtk.HBox()
+         l = Gtk.Label(_("Colors"))
+         hbox.pack_start(l, False, False, 2)
+-        self.primary_color = GSettingsColorChooser("org.gnome.desktop.background", "primary-color", None)
++        self.primary_color = GSettingsColorChooser("org.cinnamon.background", "primary-color", None)
+         hbox.pack_start(self.primary_color, False, False, 2)
+-        self.secondary_color = GSettingsColorChooser("org.gnome.desktop.background", "secondary-color", None)
++        self.secondary_color = GSettingsColorChooser("org.cinnamon.background", "secondary-color", None)
+         hbox.pack_start(self.secondary_color, False, False, 2)
+         advanced_options_box.pack_start(hbox, False, False, 0)
+         self.content_box.show_all()
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 11920a4..5cae372 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -86,6 +86,7 @@ let _cssStylesheet = null;
+ let dynamicWorkspaces = null;
+ let nWorks = null;
+ let tracker = null;
++let backgroundManager = null;
+ let desktopShown;
+ 
+ let workspace_names = [];
+@@ -214,7 +215,7 @@ function start() {
+     // be predictable anyways.
+     tracker = Cinnamon.WindowTracker.get_default();
+     Cinnamon.AppUsage.get_default();
+-
++    backgroundManager = Cinnamon.BackgroundManager.get_default();
+     // The stage is always covered so Clutter doesn't need to clear it; however
+     // the color is used as the default contents for the Muffin root background
+     // actor so set it anyways.
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 51413aa..6efce18 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -105,6 +105,7 @@ cinnamon_public_headers_h =		\
+ 	cinnamon-app-system.h		\
+ 	cinnamon-app-usage.h		\
+ 	cinnamon-arrow.h			\
++	cinnamon-background-manager.h	\
+ 	cinnamon-doc-system.h		\
+ 	cinnamon-embedded-window.h		\
+ 	cinnamon-generic-container.h	\
+@@ -142,6 +143,7 @@ libcinnamon_la_SOURCES =		\
+ 	cinnamon-app-system.c		\
+ 	cinnamon-app-usage.c		\
+ 	cinnamon-arrow.c			\
++	cinnamon-background-manager.c	\
+ 	cinnamon-doc-system.c		\
+ 	cinnamon-embedded-window.c		\
+ 	cinnamon-generic-container.c	\
+diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c
+new file mode 100644
+index 0000000..9d95250
+--- /dev/null
++++ b/src/cinnamon-background-manager.c
+@@ -0,0 +1,411 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright © 2001 Ximian, Inc.
++ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
++ * Copyright 2007 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 <sys/types.h>
++#include <sys/wait.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
++#include <errno.h>
++
++#include <locale.h>
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <gio/gio.h>
++#include <gdk/gdk.h>
++#include <gdk/gdkx.h>
++
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++#include <libgnome-desktop/gnome-bg.h>
++#include <X11/Xatom.h>
++
++#include "cinnamon-background-manager.h"
++
++#define CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerPrivate))
++
++struct CinnamonBackgroundManagerPrivate
++{
++        GSettings   *settings;
++        GnomeBG     *bg;
++
++        GnomeBGCrossfade *fade;
++
++        GDBusProxy  *proxy;
++        guint        proxy_signal_id;
++};
++
++static void     cinnamon_background_manager_class_init  (CinnamonBackgroundManagerClass *klass);
++static void     cinnamon_background_manager_init        (CinnamonBackgroundManager      *background_manager);
++static void     cinnamon_background_manager_finalize    (GObject             *object);
++
++static void setup_bg (CinnamonBackgroundManager *manager);
++static void connect_screen_signals (CinnamonBackgroundManager *manager);
++
++G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT)
++
++static gpointer manager_object = NULL;
++
++static gboolean
++dont_draw_background (CinnamonBackgroundManager *manager)
++{
++        return !g_settings_get_boolean (manager->priv->settings,
++                                        "draw-background");
++}
++
++static void
++on_crossfade_finished (CinnamonBackgroundManager *manager)
++{
++        g_object_unref (manager->priv->fade);
++        manager->priv->fade = NULL;
++}
++
++static void
++draw_background (CinnamonBackgroundManager *manager,
++                 gboolean              use_crossfade)
++{
++        GdkDisplay *display;
++        int         n_screens;
++        int         i;
++
++        display = gdk_display_get_default ();
++        n_screens = gdk_display_get_n_screens (display);
++
++        for (i = 0; i < n_screens; ++i) {
++                GdkScreen *screen;
++                GdkWindow *root_window;
++                cairo_surface_t *surface;
++
++                screen = gdk_display_get_screen (display, i);
++
++                root_window = gdk_screen_get_root_window (screen);
++
++                surface = gnome_bg_create_surface (manager->priv->bg,
++                                                   root_window,
++                                                   gdk_screen_get_width (screen),
++                                                   gdk_screen_get_height (screen),
++                                                   TRUE);
++
++                if (use_crossfade) {
++
++                        if (manager->priv->fade != NULL) {
++                                g_object_unref (manager->priv->fade);
++                        }
++
++                        manager->priv->fade = gnome_bg_set_surface_as_root_with_crossfade (screen, surface);
++                        g_signal_connect_swapped (manager->priv->fade, "finished",
++                                                  G_CALLBACK (on_crossfade_finished),
++                                                  manager);
++                } else {
++                        gnome_bg_set_surface_as_root (screen, surface);
++                }
++
++                cairo_surface_destroy (surface);
++        }
++}
++
++static void
++on_bg_transitioned (GnomeBG              *bg,
++                    CinnamonBackgroundManager *manager)
++{
++        draw_background (manager, FALSE);
++}
++
++static gboolean
++settings_change_event_cb (GSettings            *settings,
++                          gpointer              keys,
++                          gint                  n_keys,
++                          CinnamonBackgroundManager *manager)
++{
++        gnome_bg_load_from_preferences (manager->priv->bg,
++                                        manager->priv->settings);
++        return FALSE;
++}
++
++static void
++on_screen_size_changed (GdkScreen            *screen,
++                        CinnamonBackgroundManager *manager)
++{
++        draw_background (manager, FALSE);
++}
++
++static void
++watch_bg_preferences (CinnamonBackgroundManager *manager)
++{
++        g_signal_connect (manager->priv->settings,
++                          "change-event",
++                          G_CALLBACK (settings_change_event_cb),
++                          manager);
++}
++
++static void
++on_bg_changed (GnomeBG              *bg,
++               CinnamonBackgroundManager *manager)
++{
++        draw_background (manager, TRUE);
++}
++
++static void
++setup_bg (CinnamonBackgroundManager *manager)
++{
++        g_return_if_fail (manager->priv->bg == NULL);
++
++        manager->priv->bg = gnome_bg_new ();
++
++        g_signal_connect (manager->priv->bg,
++                          "changed",
++                          G_CALLBACK (on_bg_changed),
++                          manager);
++
++        g_signal_connect (manager->priv->bg,
++                          "transitioned",
++                          G_CALLBACK (on_bg_transitioned),
++                          manager);
++
++        connect_screen_signals (manager);
++        watch_bg_preferences (manager);
++        gnome_bg_load_from_preferences (manager->priv->bg,
++                                        manager->priv->settings);
++}
++
++static void
++setup_bg_and_draw_background (CinnamonBackgroundManager *manager)
++{
++        setup_bg (manager);
++        draw_background (manager, FALSE);
++}
++
++static void
++disconnect_session_manager_listener (CinnamonBackgroundManager *manager)
++{
++        if (manager->priv->proxy && manager->priv->proxy_signal_id) {
++                g_signal_handler_disconnect (manager->priv->proxy,
++                                             manager->priv->proxy_signal_id);
++                manager->priv->proxy_signal_id = 0;
++        }
++}
++
++static void
++on_session_manager_signal (GDBusProxy   *proxy,
++                           const gchar  *sender_name,
++                           const gchar  *signal_name,
++                           GVariant     *parameters,
++                           gpointer      user_data)
++{
++        CinnamonBackgroundManager *manager = CINNAMON_BACKGROUND_MANAGER (user_data);
++
++        if (g_strcmp0 (signal_name, "SessionRunning") == 0) {
++                setup_bg_and_draw_background (manager);
++                disconnect_session_manager_listener (manager);
++        }
++}
++
++static void
++draw_background_after_session_loads (CinnamonBackgroundManager *manager)
++{
++        GError *error = NULL;
++        GDBusProxyFlags flags;
++
++        flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
++                G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
++        manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
++                                                              flags,
++                                                              NULL, /* GDBusInterfaceInfo */
++                                                              "org.gnome.SessionManager",
++                                                              "/org/gnome/SessionManager",
++                                                              "org.gnome.SessionManager",
++                                                              NULL, /* GCancellable */
++                                                              &error);
++        if (manager->priv->proxy == NULL) {
++                g_warning ("Could not listen to session manager: %s",
++                           error->message);
++                g_error_free (error);
++                return;
++        }
++
++        manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
++                                                           "g-signal",
++                                                           G_CALLBACK (on_session_manager_signal),
++                                                           manager);
++}
++
++
++static void
++disconnect_screen_signals (CinnamonBackgroundManager *manager)
++{
++        GdkDisplay *display;
++        int         i;
++        int         n_screens;
++
++        display = gdk_display_get_default ();
++        n_screens = gdk_display_get_n_screens (display);
++
++        for (i = 0; i < n_screens; ++i) {
++                GdkScreen *screen;
++                screen = gdk_display_get_screen (display, i);
++                g_signal_handlers_disconnect_by_func (screen,
++                                                      G_CALLBACK (on_screen_size_changed),
++                                                      manager);
++        }
++}
++
++static void
++connect_screen_signals (CinnamonBackgroundManager *manager)
++{
++        GdkDisplay *display;
++        int         i;
++        int         n_screens;
++
++        display = gdk_display_get_default ();
++        n_screens = gdk_display_get_n_screens (display);
++
++        for (i = 0; i < n_screens; ++i) {
++                GdkScreen *screen;
++                screen = gdk_display_get_screen (display, i);
++                g_signal_connect (screen,
++                                  "monitors-changed",
++                                  G_CALLBACK (on_screen_size_changed),
++                                  manager);
++                g_signal_connect (screen,
++                                  "size-changed",
++                                  G_CALLBACK (on_screen_size_changed),
++                                  manager);
++        }
++}
++
++static void
++draw_background_changed (GSettings            *settings,
++                         const char           *key,
++                         CinnamonBackgroundManager *manager)
++{
++        if (dont_draw_background (manager) == FALSE)
++                setup_bg_and_draw_background (manager);
++}
++
++gboolean
++cinnamon_background_manager_start (CinnamonBackgroundManager *manager)
++{
++        manager->priv->settings = g_settings_new ("org.cinnamon.background");
++        g_signal_connect (manager->priv->settings, "changed::draw-background",
++                          G_CALLBACK (draw_background_changed), manager);
++
++        setup_bg_and_draw_background (manager);
++            //draw_background_after_session_loads (manager);
++
++
++        return TRUE;
++}
++
++void
++cinnamon_background_manager_stop (CinnamonBackgroundManager *manager)
++{
++        CinnamonBackgroundManagerPrivate *p = manager->priv;
++
++        g_debug ("Stopping background manager");
++
++        disconnect_screen_signals (manager);
++
++        if (manager->priv->proxy) {
++                disconnect_session_manager_listener (manager);
++                g_object_unref (manager->priv->proxy);
++        }
++
++        g_signal_handlers_disconnect_by_func (manager->priv->settings,
++                                              settings_change_event_cb,
++                                              manager);
++
++        if (p->settings != NULL) {
++                g_object_unref (p->settings);
++                p->settings = NULL;
++        }
++
++        if (p->bg != NULL) {
++                g_object_unref (p->bg);
++                p->bg = NULL;
++        }
++}
++
++/**
++ * cinnamon_background_manager_get_default:
++ *
++ * Return Value: (transfer none): The global #CinnamonBackgroundManager singleton
++ */
++CinnamonBackgroundManager *
++cinnamon_background_manager_get_default ()
++{
++  static CinnamonBackgroundManager *instance = NULL;
++
++  if (instance == NULL)
++    instance = g_object_new (CINNAMON_TYPE_BACKGROUND_MANAGER, NULL);
++
++  return instance;
++}
++
++static GObject *
++cinnamon_background_manager_constructor (GType                  type,
++                                    guint                  n_construct_properties,
++                                    GObjectConstructParam *construct_properties)
++{
++        CinnamonBackgroundManager      *background_manager;
++
++        background_manager = CINNAMON_BACKGROUND_MANAGER (G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->constructor (type,
++                                                                                                                        n_construct_properties,
++                                                                                                                        construct_properties));
++
++        return G_OBJECT (background_manager);
++}
++
++static void
++cinnamon_background_manager_class_init (CinnamonBackgroundManagerClass *klass)
++{
++        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
++
++        object_class->constructor = cinnamon_background_manager_constructor;
++        object_class->finalize = cinnamon_background_manager_finalize;
++
++        g_type_class_add_private (klass, sizeof (CinnamonBackgroundManagerPrivate));
++}
++
++static void
++cinnamon_background_manager_init (CinnamonBackgroundManager *manager)
++{
++        manager->priv = CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE (manager);
++        cinnamon_background_manager_start (manager);
++}
++
++static void
++cinnamon_background_manager_finalize (GObject *object)
++{
++        CinnamonBackgroundManager *background_manager;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (CINNAMON_IS_BACKGROUND_MANAGER (object));
++
++        background_manager = CINNAMON_BACKGROUND_MANAGER (object);
++
++        g_return_if_fail (background_manager->priv != NULL);
++
++        G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->finalize (object);
++}
+diff --git a/src/cinnamon-background-manager.h b/src/cinnamon-background-manager.h
+new file mode 100644
+index 0000000..9a56e32
+--- /dev/null
++++ b/src/cinnamon-background-manager.h
+@@ -0,0 +1,57 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
++ *
++ * 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 __CINNAMON_BACKGROUND_MANAGER_H
++#define __CINNAMON_BACKGROUND_MANAGER_H
++
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define CINNAMON_TYPE_BACKGROUND_MANAGER         (cinnamon_background_manager_get_type ())
++#define CINNAMON_BACKGROUND_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManager))
++#define CINNAMON_BACKGROUND_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass))
++#define CINNAMON_IS_BACKGROUND_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER))
++#define CINNAMON_IS_BACKGROUND_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CINNAMON_TYPE_BACKGROUND_MANAGER))
++#define CINNAMON_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass))
++
++typedef struct CinnamonBackgroundManagerPrivate CinnamonBackgroundManagerPrivate;
++
++typedef struct
++{
++        GObject                     parent;
++        CinnamonBackgroundManagerPrivate *priv;
++} CinnamonBackgroundManager;
++
++typedef struct
++{
++        GObjectClass   parent_class;
++} CinnamonBackgroundManagerClass;
++
++GType                   cinnamon_background_manager_get_type            (void);
++
++CinnamonBackgroundManager *cinnamon_background_manager_get_default (void);
++
++gboolean                cinnamon_background_manager_start               (CinnamonBackgroundManager *manager);
++void                    cinnamon_background_manager_stop                (CinnamonBackgroundManager *manager);
++
++G_END_DECLS
++
++#endif /* __CINNAMON_BACKGROUND_MANAGER_H */
+-- 
+1.8.1.6
+
+
+From 590a48961f2c7a1b18fb914a1d7212ffcdf03017 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 16 Apr 2013 18:28:16 -0400
+Subject: [PATCH 04/15] Change default background
+
+---
+ data/org.cinnamon.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
+index 6f55477..35b0972 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -782,7 +782,7 @@
+       </_description>
+     </key>
+     <key name="picture-uri" type="s">
+-      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
++      <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default>
+       <_summary>Picture URI</_summary>
+       <_description>
+         URI to use for the background image. Not that the backend only supports
+-- 
+1.8.1.6
+
+
+From ac8b0954c7506ae88059e488539f88d55329f070 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 16 Apr 2013 18:41:16 -0400
+Subject: [PATCH 05/15] Use distro-agnostic background..
+
+---
+ data/org.cinnamon.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
+index 35b0972..0d01089 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -782,7 +782,7 @@
+       </_description>
+     </key>
+     <key name="picture-uri" type="s">
+-      <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default>
++      <default>'file:///usr/share/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
+       <_summary>Picture URI</_summary>
+       <_description>
+         URI to use for the background image. Not that the backend only supports
+-- 
+1.8.1.6
+
+
+From 81dbccb60231744999463a5b84c7c36358570929 Mon Sep 17 00:00:00 2001
+From: dalcde <dalcde@yahoo.com.hk>
+Date: Mon, 15 Apr 2013 18:34:48 +0800
+Subject: [PATCH 06/15] [GDbus] Port DBus to GDBus (AltLinux patch)
+
+---
+ .../applets/brightness@cinnamon.org/applet.js      |  39 ++--
+ .../cinnamon/applets/power@cinnamon.org/applet.js  | 102 +++++----
+ .../cinnamon/applets/sound@cinnamon.org/applet.js  | 244 +++++----------------
+ .../cinnamon/applets/xrandr@cinnamon.org/applet.js |  19 +-
+ js/misc/gnomeSession.js                            | 147 ++++---------
+ js/misc/modemManager.js                            |  79 ++++---
+ js/misc/screenSaver.js                             |  89 ++++----
+ js/ui/appletManager.js                             |   1 -
+ js/ui/automountManager.js                          | 106 +++++----
+ js/ui/autorunManager.js                            |  27 +--
+ js/ui/calendar.js                                  |  71 +++---
+ js/ui/cinnamonDBus.js                              |  96 ++++----
+ js/ui/endSessionDialog.js                          |  79 ++++---
+ js/ui/keyboard.js                                  |  48 ++--
+ js/ui/layout.js                                    |  14 +-
+ js/ui/magnifierDBus.js                             | 134 +++++++----
+ js/ui/main.js                                      |   6 -
+ js/ui/messageTray.js                               |  13 +-
+ js/ui/notificationDaemon.js                        | 193 ++++++++--------
+ js/ui/scripting.js                                 |  34 ++-
+ 20 files changed, 688 insertions(+), 853 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
+index 9cbda80..9087b25 100644
+--- a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
+@@ -5,7 +5,6 @@ const St = imports.gi.St;
+ const PopupMenu = imports.ui.popupMenu;
+ const GLib = imports.gi.GLib;
+ const Gio = imports.gi.Gio;
+-const DBus = imports.dbus;
+ 
+ /* constants */
+ const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
+@@ -14,24 +13,25 @@ const DimSettingsBattery = "idle-dim-battery";
+ const PowerBusName = 'org.gnome.SettingsDaemon';
+ const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
+ 
+-/* DBus interface */
+-const PowerManagerInterface = {
+-    name: 'org.gnome.SettingsDaemon.Power.Screen',
+-    methods:
+-        [
+-            { name: 'GetPercentage', inSignature: '', outSignature: 'u' },
+-            { name: 'SetPercentage', inSignature: 'u', outSignature: 'u' },
+-            { name: 'StepUp', inSignature: '', outSignature: 'u' },
+-            { name: 'StepDown', inSignature: '', outSignature: 'u' },
+-        ],
+-    signals:
+-        [
+-            { name: 'Changed', inSignature: '', outSignature: '' },
+-        ]
+-};
++const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power.Screen">
++<method name="GetPercentage">
++    <arg type="u" direction="out"/>
++</method>
++<method name="SetPercentage">
++    <arg type="u" direction="in"/>
++    <arg type="u" direction="out"/>
++</method>
++<method name="StepUp">
++    <arg type="u" direction="out"/>
++</method>
++<method name="StepDown">
++    <arg type="u" direction="out"/>
++</method>
++<signal name="Changed" />
++</interface>;
+ 
+ /* DBus magic */
+-let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
++const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
+ 
+ /* TextImageMenuItem taken from sound@cinnamon.org applet */
+ let icon_path = "/usr/share/cinnamon/theme/";
+@@ -100,7 +100,7 @@ MyApplet.prototype = {
+         Applet.IconApplet.prototype._init.call(this, orientation, panel_height);
+         
+         try {
+-            this._proxy = new PowerManagerProxy(DBus.session, PowerBusName, PowerObjectPath);
++            this._proxy = new PowerManagerProxy(Gio.DBus.session, PowerBusName, PowerObjectPath);
+             
+             this.menuManager = new PopupMenu.PopupMenuManager(this);
+             this.menu = new Applet.AppletPopupMenu(this, orientation);
+@@ -137,7 +137,8 @@ MyApplet.prototype = {
+                     this.menu.addMenuItem(this._settingsMenu);
+                 
+                     //get notified
+-                    this._proxy.connect('Changed', Lang.bind(this, this._getBrightness));
++                    this._proxy.connectSignal('Changed', Lang.bind(this, this._getBrightness));
++                    
+                     this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+                 } else {
+                     this.set_applet_tooltip(_("Brightness"));
+diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+index c342fe7..b6b2bcd 100644
+--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+@@ -1,6 +1,5 @@
+ const Applet = imports.ui.applet;
+ const Gio = imports.gi.Gio;
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
+ const St = imports.gi.St;
+ const PopupMenu = imports.ui.popupMenu;
+@@ -42,34 +41,46 @@ const LabelDisplay = {
+     TIME: 'time'
+ };
+ 
+-const PowerManagerInterface = {
+-    name: 'org.gnome.SettingsDaemon.Power',
+-    methods: [
+-        { name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' },
+-        { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' },
+-        ],
+-    signals: [
+-        { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' },
+-        ],
+-    properties: [
+-        { name: 'Icon', signature: 's', access: 'read' },
+-        ]
+-};
+-let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
+-
+-const SettingsManagerInterface = {
+-	name: 'org.freedesktop.DBus.Properties',
+-	methods: [
+-		{ name: 'Get', inSignature: 's,s', outSignature: 'v' },
+-		{ name: 'GetAll', inSignature: 's', outSignature: 'a{sv}' },
+-		{ name: 'Set', inSignature: 's,s,v', outSignature: '' }
+-	],
+-	signals: [
+-	{name: 'PropertiesChanged', inSignature:'s,a{sv},a[s]', outSignature:''}
+-	]
+-};
+-
+-let SettingsManagerProxy = DBus.makeProxyClass(SettingsManagerInterface);
++const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
++<method name="GetDevices">
++    <arg type="a(susdut)" direction="out"/>
++</method>
++<method name="GetPrimaryDevice">
++    <arg type="(susdut)" direction="out"/>
++</method>
++<signal name="PropertiesChanged">
++    <arg type="s"/>
++    <arg type="a{sv}"/>
++    <arg type="a[s]"/>
++</signal>
++<property name="Icon" type="s" access="read" />
++</interface>;
++
++const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
++
++const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties">
++<method name="Get">
++    <arg type="s" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="v" direction="out"/>
++</method>
++<method name="GetAll">
++    <arg type="s" direction="in"/>
++    <arg type="a{sv}" direction="out"/>
++</method>
++<method name="Set">
++    <arg type="s" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="v" direction="in"/>
++</method>
++<signal name="PropertiesChanged">
++    <arg type="s"/>
++    <arg type="a{sv}"/>
++    <arg type="a[s]"/>
++</signal>
++</interface>;
++
++const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface);
+ 
+ function DeviceItem() {
+     this._init.apply(this, arguments);
+@@ -143,11 +154,11 @@ MyApplet.prototype = {
+             this.menuManager = new PopupMenu.PopupMenuManager(this);
+             this.menu = new Applet.AppletPopupMenu(this, orientation);
+             this.menuManager.addMenu(this.menu);            
+-            
+-            this.set_applet_icon_symbolic_name('battery-missing');            
+-            this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
+-            this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
+-            
++
++            //this.set_applet_icon_symbolic_name('battery-missing');            
++            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
++            this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
++
+             let icon = this.actor.get_children()[0];
+             this.actor.remove_actor(icon);
+             let box = new St.BoxLayout({ name: 'batteryBox' });
+@@ -306,18 +317,19 @@ MyApplet.prototype = {
+         this._devicesChanged();
+     },
+ 
+-    _devicesChanged: function() {
+-        this.set_applet_icon_symbolic_name('battery-missing');
+-        this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) {
+-            if (icon) {    
+-                let gicon = Gio.icon_new_for_string(icon);
+-                this._applet_icon.gicon = gicon;
+-                this.actor.show();
+-            } else {
+-                this.menu.close();
+-                this.actor.hide();
+-            }
+-        }));
++
++    _devicesChanged: function() {
++        this.set_applet_icon_symbolic_name('battery-missing');
++        let icon = this._proxy.Icon;
++        if (icon) {
++            let gicon = Gio.icon_new_for_string(icon);
++            this.setGIcon(gicon);
++            this.actor.show();
++        } else {
++            this.menu.close();
++            this.actor.hide();
++        }
++
+         this._readPrimaryDevice();
+         this._readOtherDevices();
+         this._updateLabel();
+diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+index 1113b1e..5bfaf26 100644
+--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+@@ -1,7 +1,6 @@
+ const Applet = imports.ui.applet;
+ const Mainloop = imports.mainloop;
+ const Gio = imports.gi.Gio;
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
+ const Cinnamon = imports.gi.Cinnamon;
+ const Clutter = imports.gi.Clutter;
+@@ -12,90 +11,45 @@ const Gvc = imports.gi.Gvc;
+ const Pango = imports.gi.Pango;
+ const Tooltips = imports.ui.tooltips;
+ 
+-const PropIFace = {
+-    name: 'org.freedesktop.DBus.Properties',
+-    signals: [{ name: 'PropertiesChanged',
+-                inSignature: 'a{sv}'}]
+-};
+-
+-const MediaServer2IFace = {
+-    name: 'org.mpris.MediaPlayer2',
+-    methods: [{ name: 'Raise',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Quit',
+-                inSignature: '',
+-                outSignature: '' }],
+-    properties: [{ name: 'CanRaise',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanQuit',
+-                   signature: 'b',
+-                   access: 'read'}],
+-};
+-
+-const MediaServer2PlayerIFace = {
+-    name: 'org.mpris.MediaPlayer2.Player',
+-    methods: [{ name: 'PlayPause',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Pause',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Play',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Stop',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Next',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Previous',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'SetPosition',
+-                inSignature: 'a{ov}',
+-                outSignature: '' }],
+-    properties: [{ name: 'Metadata',
+-                   signature: 'a{sv}',
+-                   access: 'read'},
+-                 { name: 'Shuffle',
+-                   signature: 'b',
+-                   access: 'readwrite'},
+-                 { name: 'Rate',
+-                   signature: 'd',
+-                   access: 'readwrite'},
+-                 { name: 'LoopStatus',
+-                   signature: 'b',
+-                   access: 'readwrite'},
+-                 { name: 'Volume',
+-                   signature: 'd',
+-                   access: 'readwrite'},
+-                 { name: 'PlaybackStatus',
+-                   signature: 's',
+-                   access: 'read'},
+-                 { name: 'Position',
+-                   signature: 'x',
+-                   access: 'read'},
+-                 { name: 'CanGoNext',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanGoPrevious',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanPlay',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanPause',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanSeek',
+-                   signature: 'b',
+-                   access: 'read'}],
+-    signals: [{ name: 'Seeked',
+-                inSignature: 'x' }]
+-};
++const PropIFace = <interface name="org.freedesktop.DBus.Properties">
++<signal name="PropertiesChanged">
++    <arg type="a{sv}"/>
++</signal>
++</interface>;
++
++const MediaServer2IFace = <interface name="org.mpris.MediaPlayer2">
++<method name="Raise" />
++<method name="Quit" />
++<property name="CanRaise" type="b" access="read" />
++<property name="CanQuit" type="b" access="read" />
++</interface>;
++
++const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
++<method name="PlayPause" />
++<method name="Pause" />
++<method name="Play" />
++<method name="Stop" />
++<method name="Next" />
++<method name="Previous" />
++<method name="SetPosition">
++    <arg type="a{ov}" direction="in"/>
++</method>
++<property name='Metadata' access='read' type='a{sv}' />
++<property name='Shuffle' access='readwrite' type='b' />
++<property name='Rate' access='readwrite' type='d' />
++<property name='LoopStatus' access='readwrite' type='b' />
++<property name='Volume' access='readwrite' type='d' />
++<property name='PlaybackStatus' access='read' type='s' />
++<property name='Position' access='read' type='x' />
++<property name="CanGoNext" type="b" access="read" />
++<property name="CanGoPrevious" type="b" access="read" />
++<property name="CanPlay" type="b" access="read" />
++<property name="CanPause" type="b" access="read" />
++<property name="CanSeek" type="b" access="read" />
++<signal name="Seeked">
++    <arg type="x"/>
++</signal>
++</interface>;
+ 
+ /* global values */
+ let icon_path = "/usr/share/cinnamon/theme/";
+@@ -112,120 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */
+ const ICON_SIZE = 28;
+ 
+ 
+-function Prop() {
+-    this._init.apply(this, arguments);
++var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace);
++function Prop(owner, initCallback, cancellable) {
++    return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
+ }
+ 
+-Prop.prototype = {
+-    _init: function(owner) {
+-        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
+-    }
++var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace);
++function MediaServer2(owner, initCallback, cancellable) {
++    return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
+ }
+-DBus.proxifyPrototype(Prop.prototype, PropIFace)
+ 
+-function MediaServer2() {
+-    this._init.apply(this, arguments);
+-}
+-
+-MediaServer2.prototype = {
+-    _init: function(owner) {
+-        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
+-    },
+-    getRaise: function(callback) {
+-        this.GetRemote('CanRaise', Lang.bind(this,
+-            function(raise, ex) {
+-                if (!ex)
+-                    callback(this, raise);
+-            }));
+-    },
+-    getQuit: function(callback) {
+-        this.GetRemote('CanQuit', Lang.bind(this,
+-            function(quit, ex) {
+-                if (!ex)
+-                    callback(this, quit);
+-            }));
+-    }
+-}
+-DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace)
+-
+-function MediaServer2Player() {
+-    this._init.apply(this, arguments);
+-}
+-
+-MediaServer2Player.prototype = {
+-    _init: function(owner) {
+-        this._owner = owner;
+-        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
+-    },
+-    getMetadata: function(callback) {
+-        this.GetRemote('Metadata', Lang.bind(this,
+-            function(metadata, ex) {
+-                if (!ex)
+-                    callback(this, metadata);
+-            }));
+-    },
+-    getPlaybackStatus: function(callback) {
+-        this.GetRemote('PlaybackStatus', Lang.bind(this,
+-            function(status, ex) {
+-                if (!ex)
+-                    callback(this, status);
+-            }));
+-    },
+-    getRate: function(callback) {
+-        this.GetRemote('Rate', Lang.bind(this,
+-            function(rate, ex) {
+-                if (!ex)
+-                    callback(this, rate);
+-            }));
+-    },
+-    getPosition: function(callback) {
+-        this.GetRemote('Position', Lang.bind(this,
+-            function(position, ex) {
+-                if (!ex)
+-                    callback(this, position);
+-            }));
+-    },
+-    getShuffle: function(callback) {
+-        this.GetRemote('Shuffle', Lang.bind(this,
+-            function(shuffle, ex) {
+-                if (!ex)
+-                    callback(this, shuffle);
+-            }));
+-    },
+-    setShuffle: function(value) {
+-        this.SetRemote('Shuffle', value);
+-    },
+-    getVolume: function(callback) {
+-        this.GetRemote('Volume', Lang.bind(this,
+-            function(volume, ex) {
+-                if (!ex)
+-                    callback(this, volume);
+-            }));
+-    },
+-    setVolume: function(value) {
+-        this.SetRemote('Volume', parseFloat(value));
+-    },
+-    getRepeat: function(callback) {
+-        this.GetRemote('LoopStatus', Lang.bind(this,
+-            function(repeat, ex) {
+-                if (!ex) {
+-                    if (repeat == "None")
+-                        repeat = false
+-                    else
+-                        repeat = true
+-                    callback(this, repeat);
+-                }
+-            }));
+-    },
+-    setRepeat: function(value) {
+-        if (value)
+-            value = "Playlist"
+-        else
+-            value = "None"
+-        this.SetRemote('LoopStatus', value);
+-    }
++var MediaServer2PlayerProxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2PlayerIFace);
++function MediaServer2Player(owner, initCallback, cancellable) {
++    return new MediaServer2PlayerProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
+ }
+-DBus.proxifyPrototype(MediaServer2Player.prototype, MediaServer2PlayerIFace)
+ 
+ function TrackInfo() {
+     this._init.apply(this, arguments);
+@@ -715,7 +569,7 @@ MyApplet.prototype = {
+             this._players = {};
+             // watch players
+             for (var p=0; p<compatible_players.length; p++) {
+-                DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
++                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
+                     Lang.bind(this, this._addPlayer),
+                     Lang.bind(this, this._removePlayer)
+                 );
+diff --git a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
+index 0dcf74d..c2d152a 100644
+--- a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
+@@ -1,6 +1,6 @@
+ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+ 
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const Gdk = imports.gi.Gdk;
+ const GLib = imports.gi.GLib;
+ const GnomeDesktop = imports.gi.GnomeDesktop;
+@@ -22,13 +22,14 @@ let rotations = [ [ GnomeDesktop.RRRotation.ROTATION_0, N_("Normal") ],
+ 		  [ GnomeDesktop.RRRotation.ROTATION_180, N_("Upside-down") ]
+ 		];
+ 
+-const XRandr2Iface = {
+-    name: 'org.gnome.SettingsDaemon.XRANDR_2',
+-    methods: [
+-	{ name: 'ApplyConfiguration', inSignature: 'xx', outSignature: '' },
+-    ]
+-};
+-let XRandr2 = DBus.makeProxyClass(XRandr2Iface);
++const XRandr2Iface = <interface name="org.gnome.SettingsDaemon.XRANDR_2">
++<method name="ApplyConfiguration">
++    <arg type="x" direction="in"/>
++    <arg type="x" direction="in"/>
++</method>
++</interface>;
++
++const XRandr2 = Gio.DBusProxy.makeProxyWrapper(XRandr2Iface);
+ 
+ function MyApplet(orientation, panel_height) {
+     this._init(orientation, panel_height);
+@@ -48,7 +49,7 @@ MyApplet.prototype = {
+             this.menu = new Applet.AppletPopupMenu(this, orientation);
+             this.menuManager.addMenu(this.menu);            
+                                 
+-            this._proxy = new XRandr2(DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
++            this._proxy = new XRandr2(Gio.DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
+ 
+             try {
+                 this._screen = new GnomeDesktop.RRScreen({ gdk_screen: Gdk.Screen.get_default() });
+diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
+index a2b61fd..e21d3a8 100644
+--- a/js/misc/gnomeSession.js
++++ b/js/misc/gnomeSession.js
+@@ -1,20 +1,18 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+ const Signals = imports.signals;
+ 
+-const PresenceIface = {
+-    name: 'org.gnome.SessionManager.Presence',
+-    methods: [{ name: 'SetStatus',
+-                inSignature: 'u',
+-                outSignature: '' }],
+-    properties: [{ name: 'status',
+-                   signature: 'u',
+-                   access: 'readwrite' }],
+-    signals: [{ name: 'StatusChanged',
+-                inSignature: 'u' }]
+-};
++const PresenceIface = <interface name="org.gnome.SessionManager.Presence">
++<method name="SetStatus">
++    <arg type="u" direction="in"/>
++</method>
++<property name="status" type="u" access="readwrite"/>
++<signal name="StatusChanged">
++    <arg type="u" direction="out"/>
++</signal>
++</interface>;
+ 
+ const PresenceStatus = {
+     AVAILABLE: 0,
+@@ -23,104 +21,37 @@ const PresenceStatus = {
+     IDLE: 3
+ };
+ 
+-function Presence() {
+-    this._init();
++var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface);
++function Presence(initCallback, cancellable) {
++    return new PresenceProxy(Gio.DBus.session, 'org.gnome.SessionManager',
++                             '/org/gnome/SessionManager/Presence', initCallback, cancellable);
+ }
+ 
+-Presence.prototype = {
+-    _init: function() {
+-        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
+-    },
+-
+-    getStatus: function(callback) {
+-        this.GetRemote('status', Lang.bind(this,
+-            function(status, ex) {
+-                if (!ex)
+-                    callback(this, status);
+-            }));
+-    },
+-
+-    setStatus: function(status) {
+-        this.SetStatusRemote(status);
+-    }
+-};
+-DBus.proxifyPrototype(Presence.prototype, PresenceIface);
+-
+-// Note inhibitors are immutable objects, so they don't
+-// change at runtime (changes always come in the form
+-// of new inhibitors)
+-const InhibitorIface = {
+-    name: 'org.gnome.SessionManager.Inhibitor',
+-    properties: [{ name: 'app_id',
+-                   signature: 's',
+-                   access: 'readonly' },
+-                 { name: 'client_id',
+-                   signature: 's',
+-                   access: 'readonly' },
+-                 { name: 'reason',
+-                   signature: 's',
+-                   access: 'readonly' },
+-                 { name: 'flags',
+-                   signature: 'u',
+-                   access: 'readonly' },
+-                 { name: 'toplevel_xid',
+-                   signature: 'u',
+-                   access: 'readonly' },
+-                 { name: 'cookie',
+-                   signature: 'u',
+-                   access: 'readonly' }],
+-};
+-
+-function Inhibitor(objectPath) {
+-    this._init(objectPath);
++const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor">
++<property name="app_id" type="s" access="read" />
++<property name="client_id" type="s" access="read" />
++<property name="reason" type="s" access="read" />
++<property name="flags" type="u" access="read" />
++<property name="toplevel_xid" type="u" access="read" />
++<property name="cookie" type="u" access="read" />
++</interface>;
++
++var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
++function Inhibitor(objectPath, initCallback, cancellable) {
++    return new InhibitorProxy(Gio.DBus.session, 'org.gnome.SessionManager', objectPath, initCallback, cancellable);
+ }
+ 
+-Inhibitor.prototype = {
+-    _init: function(objectPath) {
+-        DBus.session.proxifyObject(this,
+-                                   'org.gnome.SessionManager',
+-                                   objectPath);
+-        this.isLoaded = false;
+-        this._loadingPropertiesCount = InhibitorIface.properties.length;
+-        for (let i = 0; i < InhibitorIface.properties.length; i++) {
+-            let propertyName = InhibitorIface.properties[i].name;
+-            this.GetRemote(propertyName, Lang.bind(this,
+-                function(value, exception) {
+-                    if (exception)
+-                        return;
+-
+-                    this[propertyName] = value;
+-                    this._loadingPropertiesCount--;
+-
+-                    if (this._loadingPropertiesCount == 0) {
+-                        this.isLoaded = true;
+-                        this.emit('is-loaded');
+-                    }
+-                }));
+-        }
+-    },
+-};
+-DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface);
+-Signals.addSignalMethods(Inhibitor.prototype);
+-
+-
+-// Not the full interface, only the methods we use
+-const SessionManagerIface = {
+-    name: 'org.gnome.SessionManager',
+-    methods: [
+-        { name: 'Logout', inSignature: 'u', outSignature: '' },
+-        { name: 'Shutdown', inSignature: '', outSignature: '' },
+-        { name: 'CanShutdown', inSignature: '', outSignature: 'b' }
+-    ]
+-};
+-
+-function SessionManager() {
+-    this._init();
++const SessionManagerIface = <interface name="org.gnome.SessionManager">
++<method name="Logout">
++    <arg type="u" direction="in" />
++</method>
++<method name="Shutdown" />
++<method name="CanShutdown">
++    <arg type="b" direction="out" />
++</method>
++</interface>;
++
++var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
++function SessionManager(initCallback, cancellable) {
++    return new SessionManagerProxy(Gio.DBus.session, 'org.gnome.SessionManager', '/org/gnome/SessionManager', initCallback, cancellable);
+ }
+-
+-SessionManager.prototype = {
+-    _init: function() {
+-        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager');
+-    }
+-};
+-DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface);
+\ No newline at end of file
+diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
+index befd142..f35f925 100644
+--- a/js/misc/modemManager.js
++++ b/js/misc/modemManager.js
+@@ -1,6 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+ const Cinnamon = imports.gi.Cinnamon;
+ const Signals = imports.signals;
+@@ -8,33 +8,43 @@ const Signals = imports.signals;
+ // The following are not the complete interfaces, just the methods we need
+ // (or may need in the future)
+ 
+-const ModemGsmNetworkInterface = {
+-    name: 'org.freedesktop.ModemManager.Modem.Gsm.Network',
+-    methods: [
+-        { name: 'GetRegistrationInfo', inSignature: '', outSignature: 'uss' },
+-        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' }
+-    ],
+-    properties: [
+-        { name: 'AccessTechnology', signature: 'u', access: 'read' }
+-    ],
+-    signals: [
+-        { name: 'SignalQuality', inSignature: 'u' },
+-        { name: 'RegistrationInfo', inSignature: 'uss' }
+-    ]
+-};
+-const ModemGsmNetworkProxy = DBus.makeProxyClass(ModemGsmNetworkInterface);
+-
+-const ModemCdmaInterface = {
+-    name: 'org.freedesktop.ModemManager.Modem.Cdma',
+-    methods: [
+-        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' },
+-        { name: 'GetServingSystem', inSignature: '', outSignature: 'usu' }
+-    ],
+-    signals: [
+-        { name: 'SignalQuality', inSignature: 'u' }
+-    ]
+-};
+-const ModemCdmaProxy = DBus.makeProxyClass(ModemCdmaInterface);
++const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
++<method name="GetRegistrationInfo">
++    <arg type="u" direction="out" />
++    <arg type="s" direction="out" />
++    <arg type="s" direction="out" />
++</method>
++<method name="GetSignalQuality">
++    <arg type="u" direction="out" />
++</method>
++<property name="AccessTechnology" type="u" access="read" />
++<signal name="SignalQuality">
++    <arg type="u" direction="out" />
++</signal>
++<signal name="RegistrationInfo">
++    <arg type="u" direction="out" />
++    <arg type="s" direction="out" />
++    <arg type="s" direction="out" />
++</signal>
++</interface>;
++
++const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);
++
++const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.Cdma">
++<method name="GetSignalQuality">
++    <arg type="u" direction="out" />
++</method>
++<method name="GetServingSystem">
++    <arg type="u" direction="out" />
++    <arg type="s" direction="out" />
++    <arg type="u" direction="out" />
++</method>
++<signal name="SignalQuality">
++    <arg type="u" direction="out" />
++</signal>
++</interface>;
++
++const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
+ 
+ let _providersTable;
+ function _getProvidersTable() {
+@@ -50,17 +60,17 @@ function ModemGsm() {
+ 
+ ModemGsm.prototype = {
+     _init: function(path) {
+-        this._proxy = new ModemGsmNetworkProxy(DBus.system, 'org.freedesktop.ModemManager', path);
++        this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
+ 
+         this.signal_quality = 0;
+         this.operator_name = null;
+ 
+         // Code is duplicated because the function have different signatures
+-        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
++        this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, [quality]) {
+             this.signal_quality = quality;
+             this.emit('notify::signal-quality');
+         }));
+-        this._proxy.connect('RegistrationInfo', Lang.bind(this, function(proxy, status, code, name) {
++        this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) {
+             this.operator_name = this._findOperatorName(name, code);
+             this.emit('notify::operator-name');
+         }));
+@@ -154,12 +164,13 @@ function ModemCdma() {
+ }
+ 
+ ModemCdma.prototype = {
+-    _init: function(path) {
+-        this._proxy = new ModemCdmaProxy(DBus.system, 'org.freedesktop.ModemManager', path);
++    _init: function(path) {        
++        this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
+ 
+         this.signal_quality = 0;
+         this.operator_name = null;
+-        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
++        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
++            this.signal_quality = params[0];
+             this.signal_quality = quality;
+             this.emit('notify::signal-quality');
+ 
+diff --git a/js/misc/screenSaver.js b/js/misc/screenSaver.js
+index c471856..aec883f 100644
+--- a/js/misc/screenSaver.js
++++ b/js/misc/screenSaver.js
+@@ -1,53 +1,48 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
+-
+-const ScreenSaverIface = {
+-    name: 'org.gnome.ScreenSaver',
+-    methods: [{ name: 'GetActive',
+-                inSignature: '',
+-                outSignature: 'b' },
+-              { name: 'Lock',
+-                inSignature: '' },
+-              { name: 'SetActive',
+-                inSignature: 'b' }],
+-    signals: [{ name: 'ActiveChanged',
+-                inSignature: 'b' }]
+-};
++const Gio = imports.gi.Gio;
++
++const ScreenSaverIface = <interface name="org.gnome.ScreenSaver">
++<method name="GetActive">
++    <arg type="b" direction="out" />
++</method>
++<method name="Lock" />
++<method name="SetActive">
++    <arg type="b" direction="in" />
++</method>
++<signal name="ActiveChanged">
++    <arg type="b" direction="out" />
++</signal>
++</interface>;
++
++const ScreenSaverInfo = Gio.DBusInterfaceInfo.new_for_xml(ScreenSaverIface);
+ 
+ function ScreenSaverProxy() {
+-    this._init();
++    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
++                                  g_interface_name: ScreenSaverInfo.name,
++                                  g_interface_info: ScreenSaverInfo,
++                                  g_name: 'org.gnome.ScreenSaver',
++                                  g_object_path: '/org/gnome/ScreenSaver',
++                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
++                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
++    self.init(null);
++    self.screenSaverActive = false;
++
++    self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) {
++        self.screenSaverActive = isActive;
++    });
++    self.connect('notify::g-name-owner', function() {
++        if (self.g_name_owner) {
++            self.GetActiveRemote(function(result, excp) {
++                if (result) {
++                    let [isActive] = result;
++                    self.screenSaverActive = isActive;
++                }
++            });
++        } else
++            self.screenSaverActive = false;
++    });
++
++    return self;
+ }
+-
+-ScreenSaverProxy.prototype = {
+-    _init: function() {
+-        DBus.session.proxifyObject(this,
+-                                   'org.gnome.ScreenSaver',
+-                                   '/org/gnome/ScreenSaver');
+-
+-        DBus.session.watch_name('org.gnome.ScreenSaver',
+-                                false, // do not launch a name-owner if none exists
+-                                Lang.bind(this, this._onSSAppeared),
+-                                Lang.bind(this, this._onSSVanished));
+-
+-        this.screenSaverActive = false;
+-        this.connect('ActiveChanged',
+-                     Lang.bind(this, this._onActiveChanged));
+-    },
+-
+-    _onSSAppeared: function(owner) {
+-        this.GetActiveRemote(Lang.bind(this, function(isActive) {
+-            this.screenSaverActive = isActive;
+-        }))
+-    },
+-
+-    _onSSVanished: function(oldOwner) {
+-        this.screenSaverActive = false;
+-    },
+-
+-    _onActiveChanged: function(object, isActive) {
+-        this.screenSaverActive = isActive;
+-    }
+-};
+-DBus.proxifyPrototype(ScreenSaverProxy.prototype, ScreenSaverIface);
+diff --git a/js/ui/appletManager.js b/js/ui/appletManager.js
+index abf8136..830d80d 100644
+--- a/js/ui/appletManager.js
++++ b/js/ui/appletManager.js
+@@ -7,7 +7,6 @@ const Cinnamon = imports.gi.Cinnamon;
+ const Main = imports.ui.main;
+ const Applet = imports.ui.applet;
+ const Extension = imports.ui.extension;
+-const DBus = imports.dbus;
+ 
+ // Maps uuid -> metadata object
+ var appletMeta;
+diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js
+index fa73bfe..f29f9f3 100644
+--- a/js/ui/automountManager.js
++++ b/js/ui/automountManager.js
+@@ -1,7 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+ const Lang = imports.lang;
+-const DBus = imports.dbus;
+ const Mainloop = imports.mainloop;
+ const Gio = imports.gi.Gio;
+ const Params = imports.misc.params;
+@@ -15,63 +14,57 @@ const SETTING_ENABLE_AUTOMOUNT = 'automount';
+ 
+ const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
+ 
+-const ConsoleKitSessionIface = {
+-    name: 'org.freedesktop.ConsoleKit.Session',
+-    methods: [{ name: 'IsActive',
+-                inSignature: '',
+-                outSignature: 'b' }],
+-    signals: [{ name: 'ActiveChanged',
+-                inSignature: 'b' }]
+-};
++const ConsoleKitSessionIface = <interface name="org.freedesktop.ConsoleKit.Session">
++<method name="isActive">
++    <arg type="b" direction="out" />
++</method>
++<method name="ActiveChanged">
++    <arg type="b" direction="in" />
++</method>
++</interface>;
+ 
+-const ConsoleKitSessionProxy = DBus.makeProxyClass(ConsoleKitSessionIface);
++const ConsoleKitSessionProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
+ 
+-const ConsoleKitManagerIface = {
+-    name: 'org.freedesktop.ConsoleKit.Manager',
+-    methods: [{ name: 'GetCurrentSession',
+-                inSignature: '',
+-                outSignature: 'o' }]
+-};
++const ConsoleKitManagerIface = <interface name="org.freedesktop.ConsoleKit.Manager">
++<method name="GetCurrentSession">
++    <arg type="o" direction="out" />
++</method>
++</interface>;
+ 
+-function ConsoleKitManager() {
+-    this._init();
+-};
+-
+-ConsoleKitManager.prototype = {
+-    _init: function() {
+-        this.sessionActive = true;
+-
+-        DBus.system.proxifyObject(this,
+-                                  'org.freedesktop.ConsoleKit',
+-                                  '/org/freedesktop/ConsoleKit/Manager');
++const ConsoleKitManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ConsoleKitManagerIface);
+ 
+-        DBus.system.watch_name('org.freedesktop.ConsoleKit',
+-                               false, // do not launch a name-owner if none exists
+-                               Lang.bind(this, this._onManagerAppeared),
+-                               Lang.bind(this, this._onManagerVanished));
+-    },
+-
+-    _onManagerAppeared: function(owner) {
+-        this.GetCurrentSessionRemote(Lang.bind(this, this._onCurrentSession));
+-    },
+-
+-    _onManagerVanished: function(oldOwner) {
+-        this.sessionActive = true;
+-    },
+-
+-    _onCurrentSession: function(session) {
+-        this._ckSession = new ConsoleKitSessionProxy(DBus.system, 'org.freedesktop.ConsoleKit', session);
+-
+-        this._ckSession.connect
+-            ('ActiveChanged', Lang.bind(this, function(object, isActive) {
+-                this.sessionActive = isActive;            
+-            }));
+-        this._ckSession.IsActiveRemote(Lang.bind(this, function(isActive) {
+-            this.sessionActive = isActive;            
+-        }));
++function ConsoleKitManager() {
++    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
++                                  g_interface_name: ConsoleKitManagerInfo.name,
++                                  g_interface_info: ConsoleKitManagerInfo,
++                                  g_name: 'org.freedesktop.ConsoleKit',
++                                  g_object_path: '/org/freedesktop/ConsoleKit/Manager',
++                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
++                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
++    
++    self._updateSessionActive = function() {
++        if (self.g_name_owner) {
++            self.GetCurrentSessionRemote(function([session]) {
++                self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session);
++
++                self._ckSession.connectSignal('ActiveChanged', function(object, senderName, [isActive]) {
++                    self.sessionActive = isActive;
++                });
++                self._ckSession.IsActiveRemote(function([isActive]) {
++                    self.sessionActive = isActive;
++                });
++            });
++        } else {
++            self.sessionActive = true;
++        }
+     }
+-};
+-DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface);
++    self.connect('notify::g-name-owner',
++                 Lang.bind(self, self._updateSessionActive));
++ 
++    self._updateSessionActive();
++    self.init(null);
++    return self;
++}
+ 
+ function AutomountManager() {
+     this._init();
+@@ -85,9 +78,8 @@ AutomountManager.prototype = {
+         this.ckListener = new ConsoleKitManager();
+ 
+         this._ssProxy = new ScreenSaver.ScreenSaverProxy();
+-        this._ssProxy.connect('ActiveChanged',
+-                              Lang.bind(this,
+-                                        this._screenSaverActiveChanged));
++        this._ssProxy.connectSignal('ActiveChanged',
++                                    Lang.bind(this, this._screenSaverActiveChanged));
+ 
+         this._volumeMonitor = Gio.VolumeMonitor.get();
+ 
+@@ -110,7 +102,7 @@ AutomountManager.prototype = {
+         Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
+     },
+ 
+-    _screenSaverActiveChanged: function(object, isActive) {
++    _screenSaverActiveChanged: function(object, senderName, [isActive]) {
+         if (!isActive) {
+             this._volumeQueue.forEach(Lang.bind(this, function(volume) {
+                 this._checkAndMountVolume(volume);
+diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
+index 02cd4da..99b6fbe 100644
+--- a/js/ui/autorunManager.js
++++ b/js/ui/autorunManager.js
+@@ -1,7 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+ const Lang = imports.lang;
+-const DBus = imports.dbus;
+ const Gio = imports.gi.Gio;
+ const St = imports.gi.St;
+ 
+@@ -61,25 +60,19 @@ function startAppForMount(app, mount) {
+ 
+ /******************************************/
+ 
+-const HotplugSnifferIface = {
+-    name: 'org.Cinnamon.HotplugSniffer',
+-    methods: [{ name: 'SniffURI',
+-                inSignature: 's',
+-                outSignature: 'as' }]
+-};
+-
+-const HotplugSniffer = function() {
+-    this._init();
+-};
++const HotplugSnifferIface = <interface name="org.Cinnamon.HotplugSniffer">
++<method name="SniffURI">
++    <arg type="s" direction="in" />
++    <arg type="as" direction="out" />
++</method>
++</interface>;
+ 
+-HotplugSniffer.prototype = {
+-    _init: function() {
+-        DBus.session.proxifyObject(this,
++const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
++function HotplugSniffer() {
++    return new HotplugSnifferProxy(Gio.DBus.session,
+                                    'org.Cinnamon.HotplugSniffer',
+                                    '/org/Cinnamon/HotplugSniffer');
+-    },
+-};
+-DBus.proxifyPrototype(HotplugSniffer.prototype, HotplugSnifferIface);
++}
+ 
+ function ContentTypeDiscoverer(callback) {
+     this._init(callback);
+diff --git a/js/ui/calendar.js b/js/ui/calendar.js
+index ff4777a..a97e2a9 100644
+--- a/js/ui/calendar.js
++++ b/js/ui/calendar.js
+@@ -1,6 +1,5 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
+ const Clutter = imports.gi.Clutter;
+ const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+@@ -194,30 +193,34 @@ EmptyEventSource.prototype = {
+ };
+ Signals.addSignalMethods(EmptyEventSource.prototype);
+ 
+-const CalendarServerIface = {
+-    name: 'org.Cinnamon.CalendarServer',
+-    methods: [{ name: 'GetEvents',
+-                inSignature: 'xxb',
+-                outSignature: 'a(sssbxxa{sv})' }],
+-    signals: [{ name: 'Changed',
+-                inSignature: '' }]
+-};
+-
+-const CalendarServer = function () {
+-    this._init();
+-};
+-
+-CalendarServer.prototype = {
+-     _init: function() {
+-         DBus.session.proxifyObject(this, 'org.Cinnamon.CalendarServer', '/org/Cinnamon/CalendarServer');
+-     }
+-};
+-
+-DBus.proxifyPrototype(CalendarServer.prototype, CalendarServerIface);
++const CalendarServerIface = <interface name="org.Cinnamon.CalendarServer">
++<method name="GetEvents">
++    <arg type="x" direction="in" />
++    <arg type="x" direction="in" />
++    <arg type="b" direction="in" />
++    <arg type="a(sssbxxa{sv})" direction="out" />
++</method>
++<signal name="Changed" />
++</interface>;
++
++const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
++
++function CalendarServer() {
++    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
++				   g_interface_name: CalendarServerInfo.name,
++				   g_interface_info: CalendarServerInfo,
++				   g_name: 'org.Cinnamon.CalendarServer',
++				   g_object_path: '/org/Cinnamon/CalendarServer',
++                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
++                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
++
++    self.init(null);
++    return self;
++}
+ 
+ // an implementation that reads data from a session bus service
+-function DBusEventSource(owner) {
+-    this._init(owner);
++function DBusEventSource() {
++    this._init();
+ }
+ 
+ function _datesEqual(a, b) {
+@@ -240,16 +243,18 @@ function _dateIntervalsOverlap(a0, a1, b0, b1)
+ 
+ 
+ DBusEventSource.prototype = {
+-    _init: function(owner) {
++    _init: function() {
+         this._resetCache();
+ 
+-        this._dbusProxy = new CalendarServer(owner);
+-        this._dbusProxy.connect('Changed', Lang.bind(this, this._onChanged));
++        this._dbusProxy = new CalendarServer();
++        this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
+ 
+-        DBus.session.watch_name('org.Cinnamon.CalendarServer',
+-                                false, // do not launch a name-owner if none exists
+-                                Lang.bind(this, this._onNameAppeared),
+-                                Lang.bind(this, this._onNameVanished));
++        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
++            if (this._dbusProxy.g_name_owner)
++                this._onNameAppeared();
++            else
++                this._onNameVanished();
++        }));
+     },
+ 
+     _resetCache: function() {
+@@ -272,7 +277,7 @@ DBusEventSource.prototype = {
+         this._loadEvents(false);
+     },
+ 
+-    _onEventsReceived: function(appointments) {
++    _onEventsReceived: function([appointments]) {
+         let newEvents = [];
+         if (appointments != null) {
+             for (let n = 0; n < appointments.length; n++) {
+@@ -295,9 +300,9 @@ DBusEventSource.prototype = {
+ 
+     _loadEvents: function(forceReload) {
+         if (this._curRequestBegin && this._curRequestEnd){
+-            let callFlags = 0;
++            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
+             if (forceReload)
+-                callFlags |= DBus.CALL_FLAG_START;
++                callFlags = Gio.DBusCallFlags.NONE;
+             this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
+                                             this._curRequestEnd.getTime() / 1000,
+                                             forceReload,
+diff --git a/js/ui/cinnamonDBus.js b/js/ui/cinnamonDBus.js
+index 600e92f..5d4eb1c 100644
+--- a/js/ui/cinnamonDBus.js
++++ b/js/ui/cinnamonDBus.js
+@@ -1,7 +1,7 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
++const Gio = imports.gi.Gio;
+ 
+ const Config = imports.misc.config;
+ const Flashspot = imports.ui.flashspot;
+@@ -9,48 +9,53 @@ const Main = imports.ui.main;
+ const AppletManager = imports.ui.appletManager;
+ const DeskletManager = imports.ui.deskletManager;
+ 
+-const CinnamonIface = {
+-    name: 'org.Cinnamon',
+-    methods: [{ name: 'Eval',
+-                inSignature: 's',
+-                outSignature: 'bs'
+-              },
+-              { name: 'ScreenshotArea',
+-                inSignature: 'biiiibs',
+-                outSignature: ''
+-              },
+-              { name: 'ScreenshotWindow',
+-                inSignature: 'bbbs',
+-                outSignature: ''
+-              },
+-              { name: 'Screenshot',
+-                inSignature: 'bbs',
+-                outSignature: ''
+-              },
+-              {
+-                name: 'FlashArea',
+-                inSignature: 'iiii',
+-                outSignature: ''
+-              },
+-              {
+-                name: 'highlightApplet',
+-                inSignature: 'sb',
+-                outSignature: ''
+-              },
+-              {
+-                name: 'activateCallback',
+-                inSignature: 'ssb',
+-                outSignature: ''
+-              }
+-             ],
+-    signals: [],
+-    properties: [{ name: 'OverviewActive',
+-                   signature: 'b',
+-                   access: 'readwrite' },
+-                 { name: 'CinnamonVersion',
+-                   signature: 's',
+-                   access: 'read' }]
+-};
++
++const CinnamonIface = <interface name="org.Cinnamon">
++<method name="Eval">
++    <arg type="s" direction="in" name="script" />
++    <arg type="b" direction="out" name="success" />
++    <arg type="s" direction="out" name="result" />
++</method>
++<method name="ScreenshotArea">
++include_cursor
++    <arg type="b" direction="in" name="include_cursor"/>
++    <arg type="i" direction="in" name="x"/>
++    <arg type="i" direction="in" name="y"/>
++    <arg type="i" direction="in" name="width"/>
++    <arg type="i" direction="in" name="height"/>
++    <arg type="b" direction="in" name="flash"/>
++    <arg type="s" direction="in" name="filename"/>
++</method>
++<method name="ScreenshotWindow">
++    <arg type="b" direction="in" name="include_frame"/>
++    <arg type="b" direction="in" name="include_cursor"/>
++    <arg type="b" direction="in" name="flash"/>
++    <arg type="s" direction="in" name="filename"/>
++</method>
++<method name="Screenshot">
++    <arg type="b" direction="in" name="include_frame"/>
++    <arg type="b" direction="in" name="flash"/>
++    <arg type="s" direction="in" name="filename"/>
++</method>
++<method name="FlashArea">
++include_cursor
++    <arg type="i" direction="in" name="x"/>
++    <arg type="i" direction="in" name="y"/>
++    <arg type="i" direction="in" name="width"/>
++    <arg type="i" direction="in" name="height"/>
++</method>
++<method name="highlightApplet">
++    <arg type="s" direction="in" />
++    <arg type="b" direction="in" />
++</method>
++<method name="activateCallback">
++    <arg type="s" direction="in" />
++    <arg type="s" direction="in" />
++    <arg type="b" direction="in" />
++</method>
++<property name="OverviewActive" type="b" access="readwrite" />
++<property name="CinnamonVersion" type="s" access="read" />
++</interface>;
+ 
+ function Cinnamon() {
+     this._init();
+@@ -58,7 +63,8 @@ function Cinnamon() {
+ 
+ Cinnamon.prototype = {
+     _init: function() {
+-        DBus.session.exportObject('/org/Cinnamon', this);
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(CinnamonIface, this);
++        this._dbusImpl.export(Gio.DBus.session, '/org/Cinnamon');
+     },
+ 
+     /**
+@@ -215,5 +221,3 @@ Cinnamon.prototype = {
+     CinnamonVersion: Config.PACKAGE_VERSION
+ };
+ 
+-DBus.conformExport(Cinnamon.prototype, CinnamonIface);
+-
+diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
+index e909f5f..4f1f7d0 100644
+--- a/js/ui/endSessionDialog.js
++++ b/js/ui/endSessionDialog.js
+@@ -18,19 +18,19 @@
+  * 02110-1335, USA.
+  */
+ 
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
+ const Signals = imports.signals;
+ 
+ const AccountsService = imports.gi.AccountsService;
+ const Clutter = imports.gi.Clutter;
++const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+ const Gtk = imports.gi.Gtk;
+ const Pango = imports.gi.Pango;
+ const St = imports.gi.St;
+ const Cinnamon = imports.gi.Cinnamon;
+ 
+-const GnomeSession = imports.misc.gnomeSession
++const GnomeSession = imports.misc.gnomeSession;
+ const ModalDialog = imports.ui.modalDialog;
+ const Tweener = imports.ui.tweener;
+ 
+@@ -40,20 +40,20 @@ const _ITEM_ICON_SIZE = 48;
+ const _DIALOG_ICON_SIZE = 32;
+ 
+ const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
+-
+-const EndSessionDialogIface = {
+-    name: 'org.gnome.SessionManager.EndSessionDialog',
+-    methods: [{ name: 'Open',
+-                inSignature: 'uuuao',
+-                outSignature: ''
+-              }
+-             ],
+-    signals: [{ name: 'Canceled',
+-                inSignature: '',
+-              }],
+-    properties: []
+-};
+-
++const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessionDialog">
++<method name="Open">
++    <arg type="u" direction="in" />
++    <arg type="u" direction="in" />
++    <arg type="u" direction="in" />
++    <arg type="ao" direction="in" />
++</method>
++<signal name="ConfirmedLogout" />
++<signal name="ConfirmedReboot" />
++<signal name="ConfirmedShutdown" />
++<signal name="Canceled" />
++<signal name="Closed" />
++</interface>;
++ 
+ const logoutDialogContent = {
+     subjectWithUser: _("Log Out %s"),
+     subject: _("Log Out"),
+@@ -230,8 +230,6 @@ function _setLabelText(label, text) {
+ function EndSessionDialog() {
+     if (_endSessionDialog == null) {
+         this._init();
+-        DBus.session.exportObject('/org/gnome/SessionManager/EndSessionDialog',
+-                                  this);
+         _endSessionDialog = this;
+     }
+ 
+@@ -328,6 +326,9 @@ EndSessionDialog.prototype = {
+                                           if (this._applicationList.get_children().length == 0)
+                                               scrollView.hide();
+                                       }));
++
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
++        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
+     },
+ 
+     _onDestroy: function() {
+@@ -442,25 +443,19 @@ EndSessionDialog.prototype = {
+ 
+     close: function() {
+         ModalDialog.ModalDialog.prototype.close.call(this);
+-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+-                                 'org.gnome.SessionManager.EndSessionDialog',
+-                                 'Closed', '', []);
++        this._dbusImpl.emit_signal('Closed', null);
+     },
+ 
+     cancel: function() {
+         this._stopTimer();
+-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+-                                 'org.gnome.SessionManager.EndSessionDialog',
+-                                 'Canceled', '', []);
++        this._dbusImpl.emit_signal('Canceled', null);
+         this.close(global.get_current_time());
+     },
+ 
+     _confirm: function(signal) {
+         this._fadeOutDialog();
+         this._stopTimer();
+-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+-                                 'org.gnome.SessionManager.EndSessionDialog',
+-                                 signal, '', []);
++        this._dbusImpl.emit_signal(signal, null);
+     },
+ 
+     _onOpened: function() {
+@@ -512,39 +507,41 @@ EndSessionDialog.prototype = {
+         this._updateContent();
+     },
+ 
+-    OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) {
++    OpenAsync: function(parameters, invocation) {
++        let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
+         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
+         this._inhibitors = [];
+         this._applicationList.destroy_children();
+         this._type = type;
+ 
+-        if (!(this._type in DialogContent))
+-            throw new DBus.DBusError('org.Cinnamon.ModalDialog.TypeError',
+-                                     "Unknown dialog type requested");
++        if (!(this._type in DialogContent)) {
++            invocation.report_dbus_error('org.Cinnamon.ModalDialog.TypeError',
++                                         "Unknown dialog type requested");
++            return;
++        }
+ 
+         for (let i = 0; i < inhibitorObjectPaths.length; i++) {
+-            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]);
++            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) {
++                this._onInhibitorLoaded(proxy);
++            }));
+ 
+-            inhibitor.connect('is-loaded',
+-                              Lang.bind(this, function() {
+-                                  this._onInhibitorLoaded(inhibitor);
+-                              }));
+             this._inhibitors.push(inhibitor);
+         }
+ 
+         this._updateButtons();
+ 
+-        if (!this.open(timestamp))
+-            throw new DBus.DBusError('org.Cinnamon.ModalDialog.GrabError',
+-                                     "Cannot grab pointer and keyboard");
++        if (!this.open(timestamp)) {
++            invocation.report_dbus_error('org.Cinnamon.ModalDialog.GrabError',
++                                         "Cannot grab pointer and keyboard");
++            return;
++        }
+ 
+         this._updateContent();
+ 
+         let signalId = this.connect('opened',
+                                     Lang.bind(this, function() {
+-                                        callback();
++                                        invocation.return_value(null);
+                                         this.disconnect(signalId);
+                                     }));
+     }
+ };
+-DBus.conformExport(EndSessionDialog.prototype, EndSessionDialogIface);
+diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
+index f55cf93..69edb51 100644
+--- a/js/ui/keyboard.js
++++ b/js/ui/keyboard.js
+@@ -2,7 +2,6 @@
+ 
+ const Caribou = imports.gi.Caribou;
+ const Clutter = imports.gi.Clutter;
+-const DBus = imports.dbus;
+ const Gdk = imports.gi.Gdk;
+ const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+@@ -38,28 +37,27 @@ const PRETTY_KEYS = {
+     'Alt_L': 'Alt'
+ };
+ 
+-const CaribouKeyboardIface = {
+-    name: 'org.gnome.Caribou.Keyboard',
+-    methods:    [ { name: 'Show',
+-                    inSignature: 'u',
+-                    outSignature: ''
+-                  },
+-                  { name: 'Hide',
+-                    inSignature: 'u',
+-                    outSignature: ''
+-                  },
+-                  { name: 'SetCursorLocation',
+-                    inSignature: 'iiii',
+-                    outSignature: ''
+-                  },
+-                  { name: 'SetEntryLocation',
+-                    inSignature: 'iiii',
+-                    outSignature: ''
+-                  } ],
+-    properties: [ { name: 'Name',
+-                    signature: 's',
+-                    access: 'read' } ]
+-};
++const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
++<method name='Show'>
++    <arg type='u' direction='in' />
++</method>
++<method name='Hide'>
++    <arg type='u' direction='in' />
++</method>
++<method name='SetCursorLocation'>
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++</method>
++<method name='SetEntryLocation'>
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++</method>
++<property name='Name' access='read' type='s' />
++</interface>;
+ 
+ function Key() {
+     this._init.apply(this, arguments);
+@@ -199,7 +197,8 @@ function Keyboard() {
+ 
+ Keyboard.prototype = {
+     _init: function () {
+-        DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this);
++        this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this);
++        this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard');
+ 
+         this.actor = null;
+ 
+@@ -541,7 +540,6 @@ Keyboard.prototype = {
+         return 'cinnamon';
+     }
+ };
+-DBus.conformExport(Keyboard.prototype, CaribouKeyboardIface);
+ 
+ function KeyboardSource() {
+     this._init.apply(this, arguments);
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index 76303b9..b97459e 100644
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -488,12 +488,14 @@ Chrome.prototype = {
+ 
+         this._screenSaverActive = false;
+         this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
+-        this._screenSaverProxy.connect('ActiveChanged', Lang.bind(this, this._onScreenSaverActiveChanged));
+-        this._screenSaverProxy.GetActiveRemote(Lang.bind(this,
+-            function(result, err) {
+-                if (!err)
+-                    this._onScreenSaverActiveChanged(this._screenSaverProxy, result);
+-            }));
++        this._screenSaverProxy.connectSignal('ActiveChanged', Lang.bind(this, function(proxy, senderName, [isActive]) {
++            this._onScreenSaverActiveChanged(isActive);
++        }));
++        this._screenSaverProxy.GetActiveRemote(Lang.bind(this, function(result, err) {
++            if (!err)
++                this._onScreenSaverActiveChanged(result[0]);
++        }));
++
+ 
+         this._relayout();
+     },
+diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js
+index 72bba26..4d21797 100644
+--- a/js/ui/magnifierDBus.js
++++ b/js/ui/magnifierDBus.js
+@@ -1,6 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const Main = imports.ui.main;
+ 
+ const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
+@@ -10,47 +10,85 @@ const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
+ 
+ // Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
+ // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
+-const MagnifierIface = {
+-    name: MAG_SERVICE_NAME,
+-    methods: [
+-                { name: 'setActive', inSignature: 'b', outSignature: '' },
+-                { name: 'isActive', inSignature: '', outSignature: 'b' },
+-                { name: 'showCursor', inSignature: '', outSignature: '' },
+-                { name: 'hideCursor', inSignature: '', outSignature: ''  },
+-                { name: 'createZoomRegion', inSignature: 'ddaiai', outSignature: 'o' },
+-                { name: 'addZoomRegion', inSignature: 'o', outSignature: 'b' },
+-                { name: 'getZoomRegions', inSignature: '', outSignature: 'ao' },
+-                { name: 'clearAllZoomRegions', inSignature: '', outSignature: '' },
+-                { name: 'fullScreenCapable', inSignature: '', outSignature: 'b' },
+-
+-                { name: 'setCrosswireSize', inSignature: 'i', outSignature: '' },
+-                { name: 'getCrosswireSize', inSignature: '', outSignature: 'i' },
+-                { name: 'setCrosswireLength', inSignature: 'i', outSignature: '' },
+-                { name: 'getCrosswireLength', inSignature: '', outSignature: 'i' },
+-                { name: 'setCrosswireClip', inSignature: 'b', outSignature: '' },
+-                { name: 'getCrosswireClip', inSignature: '', outSignature: 'b' },
+-                { name: 'setCrosswireColor', inSignature: 'u', outSignature: '' },
+-                { name: 'getCrosswireColor', inSignature: '', outSignature: 'u' }
+-             ],
+-    signals: [],
+-    properties: []
+-};
++const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
++<method name="setActive">
++    <arg type="b" direction="in" />
++</method>
++<method name="isActive">
++    <arg type="b" direction="out" />
++</method>
++<method name="showCursor" />
++<method name="hideCursor" />
++<method name="createZoomRegion">
++    <arg type="d" direction="in" />
++    <arg type="d" direction="in" />
++    <arg type="ai" direction="in" />
++    <arg type="ai" direction="in" />
++    <arg type="o" direction="out" />
++</method>
++<method name="addZoomRegion">
++    <arg type="o" direction="in" />
++    <arg type="b" direction="out" />
++</method>
++<method name="getZoomRegions">
++    <arg type="ao" direction="out" />
++</method>
++<method name="clearAllZoomRegions" />
++<method name="fullScreenCapable">
++    <arg type="b" direction="out" />
++</method>
++<method name="setCrosswireSize">
++    <arg type="i" direction="in" />
++</method>
++<method name="getCrosswireSize">
++    <arg type="i" direction="out" />
++</method>
++<method name="setCrosswireLength">
++    <arg type="i" direction="in" />
++</method>
++<method name="getCrosswireLength">
++    <arg type="i" direction="out" />
++</method>
++<method name="setCrosswireClip">
++    <arg type="b" direction="in" />
++</method>
++<method name="getCrosswireClip">
++    <arg type="b" direction="out" />
++</method>
++<method name="setCrosswireColor">
++    <arg type="u" direction="in" />
++</method>
++<method name="getCrosswireColor">
++    <arg type="u" direction="out" />
++</method>
++</interface>;
+ 
+ // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
+ // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
+-const ZoomRegionIface = {
+-    name: ZOOM_SERVICE_NAME,
+-    methods: [
+-                { name: 'setMagFactor', inSignature: 'dd', outSignature: ''},
+-                { name: 'getMagFactor', inSignature: '', outSignature: 'dd' },
+-                { name: 'setRoi', inSignature: 'ai', outSignature: '' },
+-                { name: 'getRoi', inSignature: '', outSignature: 'ai' },
+-                { name: 'shiftContentsTo', inSignature: 'ii', outSignature: 'b' },
+-                { name: 'moveResize', inSignature: 'ai', outSignature: '' }
+-             ],
+-    signals: [],
+-    properties: []
+-};
++const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
++<method name="setMagFactor">
++    <arg type="d" direction="in" />
++    <arg type="d" direction="in" />
++</method>
++<method name="getMagFactor">
++    <arg type="d" direction="out" />
++    <arg type="d" direction="out" />
++</method>
++<method name="setRoi">
++    <arg type="ai" direction="in" />
++</method>
++<method name="getRoi">
++    <arg type="ai" direction="out" />
++</method>
++<method name="shiftContentsTo">
++    <arg type="i" direction="in" />
++    <arg type="i" direction="in" />
++    <arg type="b" direction="out" />
++</method>
++<method name="moveResize">
++    <arg type="ai" direction="in" />
++</method>
++</interface>;
+ 
+ // For making unique ZoomRegion DBus proxy object paths of the form:
+ // '/org/gnome/Magnifier/ZoomRegion/zoomer0',
+@@ -64,7 +102,9 @@ function CinnamonMagnifier() {
+ CinnamonMagnifier.prototype = {
+     _init: function() {
+         this._zoomers = {};
+-        DBus.session.exportObject(MAG_SERVICE_PATH, this);
++
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(MagnifierIface, this);
++        this._dbusImpl.export(Gio.DBus.session, MAG_SERVICE_PATH);
+     },
+ 
+     /**
+@@ -195,10 +235,10 @@ CinnamonMagnifier.prototype = {
+         Main.magnifier.clearAllZoomRegions();
+         for (let objectPath in this._zoomers) {
+             let proxyAndZoomer = this._zoomers[objectPath];
++            proxyAndZoomer.proxy.destroy();
+             proxyAndZoomer.proxy = null;
+             proxyAndZoomer.zoomRegion = null;
+             delete this._zoomers[objectPath];
+-            DBus.session.unexportObject(proxyAndZoomer);
+         }
+         this._zoomers = {};
+     },
+@@ -300,8 +340,9 @@ function CinnamonMagnifierZoomRegion(zoomerObjectPath, zoomRegion) {
+ CinnamonMagnifierZoomRegion.prototype = {
+     _init: function(zoomerObjectPath, zoomRegion) {
+         this._zoomRegion = zoomRegion;
+-        DBus.session.proxifyObject(this, ZOOM_SERVICE_NAME, zoomerObjectPath);
+-        DBus.session.exportObject(zoomerObjectPath, this);
++
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ZoomRegionIface, this);
++        this._dbusImpl.export(Gio.DBus.session, zoomerObjectPath);
+     },
+ 
+     /**
+@@ -376,8 +417,9 @@ CinnamonMagnifierZoomRegion.prototype = {
+     moveResize: function(viewPort) {
+         let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
+         this._zoomRegion.setViewPort(viewRect);
++    },
++
++    destroy: function() {
++        this._dbusImpl.unexport();
+     }
+ };
+-
+-DBus.conformExport(CinnamonMagnifier.prototype, MagnifierIface);
+-DBus.conformExport(CinnamonMagnifierZoomRegion.prototype, ZoomRegionIface);
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 5cae372..180db5c 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -1,7 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+ const Clutter = imports.gi.Clutter;
+-const DBus = imports.dbus;
+ const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+ const Gtk = imports.gi.Gtk;
+@@ -199,11 +198,6 @@ function start() {
+ 
+     cinnamonDBusService = new CinnamonDBus.Cinnamon();
+     lookingGlassDBusService = new LookingGlassDBus.CinnamonLookingGlass();
+-    // Force a connection now; dbus.js will do this internally
+-    // if we use its name acquisition stuff but we aren't right
+-    // now; to do so we'd need to convert from its async calls
+-    // back into sync ones.
+-    DBus.session.flush();
+ 
+     // Ensure CinnamonWindowTracker and CinnamonAppUsage are initialized; this will
+     // also initialize CinnamonAppSystem first.  CinnamonAppSystem
+diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
+index 18d6615..8bed028 100644
+--- a/js/ui/messageTray.js
++++ b/js/ui/messageTray.js
+@@ -1388,12 +1388,17 @@ function MessageTray() {
+ 
+ MessageTray.prototype = {
+     _init: function() {
+-        this._presence = new GnomeSession.Presence();
++        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
++            this._onStatusChanged(proxy.status);
++        }));
++
+         this._userStatus = GnomeSession.PresenceStatus.AVAILABLE;
+         this._busy = false;
+         this._backFromAway = false;
+-        this._presence.connect('StatusChanged', Lang.bind(this, this._onStatusChanged));
+-        this._presence.getStatus(Lang.bind(this, this._onStatusChanged));
++        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
++            this._onStatusChanged(status);
++        }));
++
+ 
+         this._notificationBin = new St.Bin();
+         this._notificationBin.hide();
+@@ -1548,7 +1553,7 @@ MessageTray.prototype = {
+         this._updateState();
+     },
+ 
+-    _onStatusChanged: function(presence, status) {
++    _onStatusChanged: function(status) {
+         this._backFromAway = (this._userStatus == GnomeSession.PresenceStatus.IDLE && this._userStatus != status);
+         this._userStatus = status;
+ 
+diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
+index bee8ffd..b037e07 100644
+--- a/js/ui/notificationDaemon.js
++++ b/js/ui/notificationDaemon.js
+@@ -1,7 +1,7 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+ const Clutter = imports.gi.Clutter;
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+ const Lang = imports.lang;
+ const Cinnamon = imports.gi.Cinnamon;
+@@ -14,49 +14,52 @@ const Params = imports.misc.params;
+ 
+ let nextNotificationId = 1;
+ 
+-// Should really be defined in dbus.js
+-const BusIface = {
+-    name: 'org.freedesktop.DBus',
+-    methods: [{ name: 'GetConnectionUnixProcessID',
+-                inSignature: 's',
+-                outSignature: 'i' }]
+-};
+-
+-const Bus = function () {
+-    this._init();
+-};
+-
+-Bus.prototype = {
+-     _init: function() {
+-         DBus.session.proxifyObject(this, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
+-     }
+-};
++// Should really be defined in Gio.js
++const BusIface = <interface name="org.freedesktop.DBus">
++<method name="GetConnectionUnixProcessID">
++    <arg type="s" direction="in" />
++    <arg type="u" direction="out" />
++</method>
++</interface>;
++
++var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
++function Bus() {
++    return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
++}
+ 
+-DBus.proxifyPrototype(Bus.prototype, BusIface);
+-
+-const NotificationDaemonIface = {
+-    name: 'org.freedesktop.Notifications',
+-    methods: [{ name: 'Notify',
+-                inSignature: 'susssasa{sv}i',
+-                outSignature: 'u'
+-              },
+-              { name: 'CloseNotification',
+-                inSignature: 'u',
+-                outSignature: ''
+-              },
+-              { name: 'GetCapabilities',
+-                inSignature: '',
+-                outSignature: 'as'
+-              },
+-              { name: 'GetServerInformation',
+-                inSignature: '',
+-                outSignature: 'ssss'
+-              }],
+-    signals: [{ name: 'NotificationClosed',
+-                inSignature: 'uu' },
+-              { name: 'ActionInvoked',
+-                inSignature: 'us' }]
+-};
++const NotificationDaemonIface = <interface name="org.freedesktop.Notifications">
++<method name="Notify">
++    <arg type="s" direction="in"/>
++    <arg type="u" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="as" direction="in"/>
++    <arg type="a{sv}" direction="in"/>
++    <arg type="i" direction="in"/>
++    <arg type="u" direction="out"/>
++</method>
++<method name="CloseNotification">
++    <arg type="u" direction="in"/>
++</method>
++<method name="GetCapabilities">
++    <arg type="as" direction="out"/>
++</method>
++<method name="GetServerInformation">
++    <arg type="s" direction="out"/>
++    <arg type="s" direction="out"/>
++    <arg type="s" direction="out"/>
++    <arg type="s" direction="out"/>
++</method>
++<signal name="NotificationClosed">
++    <arg type="u"/>
++    <arg type="u"/>
++</signal>
++<signal name="ActionInvoked">
++    <arg type="u"/>
++    <arg type="s"/>
++</signal>
++</interface>;
+ 
+ const NotificationClosedReason = {
+     EXPIRED: 1,
+@@ -88,7 +91,8 @@ function NotificationDaemon() {
+ 
+ NotificationDaemon.prototype = {
+     _init: function() {
+-        DBus.session.exportObject('/org/freedesktop/Notifications', this);
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this);
++        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');
+ 
+         this._sources = [];
+         this._senderToPid = {};
+@@ -213,8 +217,8 @@ NotificationDaemon.prototype = {
+         return source;
+     },
+ 
+-    Notify: function(appName, replacesId, icon, summary, body,
+-                     actions, hints, timeout) {
++    NotifyAsync: function(params, invocation) {
++        let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
+         let id;
+         
+         let rewrites = rewriteRules[appName];
+@@ -257,51 +261,55 @@ NotificationDaemon.prototype = {
+         }
+         this._notifications[id] = ndata;
+ 
+-        let sender = DBus.getCurrentMessageContext().sender;
++        let sender = invocation.get_sender();
+         let pid = this._senderToPid[sender];
+ 
+         let source = this._getSource(appName, pid, ndata, sender, null);
+ 
+         if (source) {
+             this._notifyForSource(source, ndata);
+-            return id;
++            return invocation.return_value(GLib.Variant.new('(u)', [id]));
+         }
+ 
+         if (replacesId) {
+             // There's already a pending call to GetConnectionUnixProcessID,
+             // which will see the new notification data when it finishes,
+             // so we don't have to do anything.
+-            return id;
++            return invocation.return_value(GLib.Variant.new('(u)', [id]));
+         }
+ 
+-        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this,
+-            function (pid, ex) {
+-                // The app may have updated or removed the notification
+-                ndata = this._notifications[id];
+-                if (!ndata)
+-                    return;
+-
+-                source = this._getSource(appName, pid, ndata, sender, null);
+-
+-                // We only store sender-pid entries for persistent sources.
+-                // Removing the entries once the source is destroyed
+-                // would result in the entries associated with transient
+-                // sources removed once the notification is shown anyway.
+-                // However, keeping these pairs would mean that we would
+-                // possibly remove an entry associated with a persistent
+-                // source when a transient source for the same sender is
+-                // distroyed.
+-                if (!source.isTransient) {
+-                    this._senderToPid[sender] = pid;
+-                    source.connect('destroy', Lang.bind(this,
+-                        function() {
+-                            delete this._senderToPid[sender];
+-                        }));
+-                }
+-                this._notifyForSource(source, ndata);
+-            }));
++        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, function (result, excp) {
++            // The app may have updated or removed the notification
++            ndata = this._notifications[id];
++            if (!ndata)
++                return;
+ 
+-        return id;
++            if (excp) {
++                logError(excp, 'Call to GetConnectionUnixProcessID failed');
++                return;
++            }
++
++            let [pid] = result;
++            source = this._getSource(appName, pid, ndata, sender);
++
++            // We only store sender-pid entries for persistent sources.
++            // Removing the entries once the source is destroyed
++            // would result in the entries associated with transient
++            // sources removed once the notification is shown anyway.
++            // However, keeping these pairs would mean that we would
++            // possibly remove an entry associated with a persistent
++            // source when a transient source for the same sender is
++            // distroyed.
++            if (!source.isTransient) {
++                this._senderToPid[sender] = pid;
++                source.connect('destroy', Lang.bind(this, function() {
++                    delete this._senderToPid[sender];
++                }));
++            }
++            this._notifyForSource(source, ndata);
++        }));
++
++        return invocation.return_value(GLib.Variant.new('(u)', [id]));
+     },
+ 
+     _notifyForSource: function(source, ndata) {
+@@ -441,17 +449,13 @@ NotificationDaemon.prototype = {
+     },
+ 
+     _emitNotificationClosed: function(id, reason) {
+-        DBus.session.emit_signal('/org/freedesktop/Notifications',
+-                                 'org.freedesktop.Notifications',
+-                                 'NotificationClosed', 'uu',
+-                                 [id, reason]);
++        this._dbusImpl.emit_signal('NotificationClosed',
++                                   GLib.Variant.new('(uu)', [id, reason]));
+     },
+ 
+     _emitActionInvoked: function(id, action) {
+-        DBus.session.emit_signal('/org/freedesktop/Notifications',
+-                                 'org.freedesktop.Notifications',
+-                                 'ActionInvoked', 'us',
+-                                 [id, action]);
++        this._dbusImpl.emit_signal('ActionInvoked',
++                                   GLib.Variant.new('(us)', [id, action]));
+     },
+ 
+     _onTrayIconAdded: function(o, icon) {
+@@ -465,8 +469,6 @@ NotificationDaemon.prototype = {
+     }
+ };
+ 
+-DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
+-
+ function Source(title, pid, sender, trayIcon) {
+     this._init(title, pid, sender, trayIcon);
+ }
+@@ -481,15 +483,12 @@ Source.prototype = {
+ 
+         this.pid = pid;
+         if (sender)
+-            // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for
+-            // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation,
+-            // we should save the id here and call unwatch_name() with it in destroy().
+-            // Moving to GDBus is the work in progress: https://bugzilla.gnome.org/show_bug.cgi?id=648651
+-            // and https://bugzilla.gnome.org/show_bug.cgi?id=622921 .
+-            DBus.session.watch_name(sender,
+-                                    false,
+-                                    null,
+-                                    Lang.bind(this, this._onNameVanished));
++            this._nameWatcherId = Gio.DBus.session.watch_name(sender,
++                                                              Gio.BusNameWatcherFlags.NONE,
++                                                              null,
++                                                              Lang.bind(this, this._onNameVanished));
++        else
++            this._nameWatcherId = 0;
+ 
+         this._setApp();
+         if (this.app)
+@@ -596,6 +595,10 @@ Source.prototype = {
+     },
+ 
+     destroy: function() {
++        if (this._nameWatcherId) {
++            Gio.DBus.session.unwatch_name(this._nameWatcherId);
++            this._nameWatcherId = 0;
++        }
+         MessageTray.Source.prototype.destroy.call(this);
+     }
+ };
+diff --git a/js/ui/scripting.js b/js/ui/scripting.js
+index 42c4f6d..9163d29 100644
+--- a/js/ui/scripting.js
++++ b/js/ui/scripting.js
+@@ -1,6 +1,5 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
+ const Gio = imports.gi.Gio;
+ const Mainloop = imports.mainloop;
+ const Meta = imports.gi.Meta;
+@@ -70,24 +69,21 @@ function waitLeisure() {
+     };
+ }
+ 
+-const PerfHelperIface = {
+-    name: 'org.Cinnamon.PerfHelper',
+-    methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' },
+-              { name: 'WaitWindows', inSignature: '', outSignature: '' },
+-              { name: 'DestroyWindows', inSignature: '', outSignature: ''}]
+-};
+-
+-const PerfHelper = function () {
+-    this._init();
+-};
+-
+-PerfHelper.prototype = {
+-     _init: function() {
+-         DBus.session.proxifyObject(this, 'org.Cinnamon.PerfHelper', '/org/Cinnamon/PerfHelper');
+-     }
+-};
+-
+-DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface);
++const PerfHelperIface = <interface name="org.gnome.Shell.PerfHelper">
++<method name="CreateWindow">
++    <arg type="i" direction="in" />
++    <arg type="i" direction="in" />
++    <arg type="b" direction="in" />
++    <arg type="b" direction="in" />
++</method>
++<method name="WaitWindows" />
++<method name="DestroyWindows" />
++</interface>;
++
++var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface);
++function PerfHelper() {
++    return new PerfHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper');
++}
+ 
+ let _perfHelper = null;
+ function _getPerfHelper() {
+-- 
+1.8.1.6
+
+
+From d85e078c0ed09a8b9f8d3ea2ebec1043b6d150c1 Mon Sep 17 00:00:00 2001
+From: dalcde <dalcde@yahoo.com.hk>
+Date: Tue, 16 Apr 2013 16:58:30 +0800
+Subject: [PATCH 07/15] [GDBus][Sound/Power Applet] Fix dbus port issues
+
+---
+ .../cinnamon/applets/power@cinnamon.org/applet.js  |  2 +-
+ .../cinnamon/applets/sound@cinnamon.org/applet.js  | 83 ++++++++++------------
+ 2 files changed, 37 insertions(+), 48 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+index b6b2bcd..fad39ab 100644
+--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+@@ -212,7 +212,7 @@ MyApplet.prototype = {
+             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+             this.menu.addSettingsAction(_("Power Settings"), 'power');
+ 
+-            this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged));
++            this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged));
+             this._devicesChanged();            
+         }
+         catch (e) {
+diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+index 5bfaf26..52b8cde 100644
+--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+@@ -37,7 +37,7 @@ const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
+ <property name='Metadata' access='read' type='a{sv}' />
+ <property name='Shuffle' access='readwrite' type='b' />
+ <property name='Rate' access='readwrite' type='d' />
+-<property name='LoopStatus' access='readwrite' type='b' />
++<property name='LoopStatus' access='readwrite' type='s' />
+ <property name='Volume' access='readwrite' type='d' />
+ <property name='PlaybackStatus' access='read' type='s' />
+ <property name='Position' access='read' type='x' />
+@@ -256,23 +256,20 @@ Player.prototype = {
+         this._trackControls.set_child(this.controls);
+         this.addActor(this._trackControls);
+ 
+-        this._mediaServer.getRaise(Lang.bind(this, function(sender, raise) {
+-            if (raise) {
+-                this._raiseButton = new ControlButton('go-up',
+-                    Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); }));
+-                this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player"));
+-                this.controls.add_actor(this._raiseButton.getActor());
+-            }
+-        }));
+-
+-        this._mediaServer.getQuit(Lang.bind(this, function(sender, quit) {
+-            if (quit) {
+-                this._quitButton = new ControlButton('window-close',
+-                    Lang.bind(this, function () { this._mediaServer.QuitRemote(); }));
+-                this.controls.add_actor(this._quitButton.getActor());
+-                this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player"));
+-            }
+-        }));
++	let CanRaise = this._mediaServer.CanRaise;
++	let CanQuit = this._mediaServer.CanQuit;
++	if (CanRaise) {
++            this._raiseButton = new ControlButton('go-up',
++						  Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); }));
++            this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player"));
++            this.controls.add_actor(this._raiseButton.getActor());
++	}
++	if (CanQuit) {
++            this._quitButton = new ControlButton('window-close',
++						 Lang.bind(this, function () { this._mediaServer.QuitRemote(); }));
++            this.controls.add_actor(this._quitButton.getActor());
++            this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player"));
++	}
+ 
+         /* this players don't support seek */
+         if (support_seek.indexOf(this._name) == -1)
+@@ -283,14 +280,14 @@ Player.prototype = {
+         this._currentTime = 0;
+         this._getPosition();
+ 
+-        this._prop.connect('PropertiesChanged', Lang.bind(this, function(sender, iface, value) {
++        this._prop.connectSignal('PropertiesChanged', Lang.bind(this, function(sender, iface, value) {
+             if (value["PlaybackStatus"])
+-                this._setStatus(iface, value["PlaybackStatus"]);
++                this._setStatus(value["PlaybackStatus"]);
+             if (value["Metadata"])
+-                this._setMetadata(iface, value["Metadata"]);
++                this._setMetadata(value["Metadata"]);
+         }));
+ 
+-        this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) {
++        this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
+             this._setPosition(sender, value);
+         }));
+ 
+@@ -315,19 +312,17 @@ Player.prototype = {
+     },
+ 
+     _getPosition: function() {
+-        this._mediaServerPlayer.getPosition(Lang.bind(this,
+-            this._setPosition
+-        ));
++	this._setPosition(this._mediaServerPlayer.Position);
+         Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
+     },
+ 
+-    _setMetadata: function(sender, metadata) {
++    _setMetadata: function(metadata) {
+         if (metadata["mpris:length"]) {
+             // song length in secs
+-            this._songLength = metadata["mpris:length"] / 1000000;
++            this._songLength = metadata["mpris:length"].unpack() / 1000000;
+             // FIXME upstream
+             if (this._name == "quodlibet")
+-                this._songLength = metadata["mpris:length"] / 1000;
++                this._songLength = metadata["mpris:length"].unpack() / 1000;
+             // reset timer
+             this._stopTimer();
+             if (this._playerStatus == "Playing")
+@@ -338,15 +333,15 @@ Player.prototype = {
+             this._stopTimer();
+         }
+         if (metadata["xesam:artist"])
+-            this._artist.setLabel(metadata["xesam:artist"].toString());
++            this._artist.setLabel(metadata["xesam:artist"].unpack());
+         else
+             this._artist.setLabel(_("Unknown Artist"));
+         if (metadata["xesam:album"])
+-            this._album.setLabel(metadata["xesam:album"].toString());
++            this._album.setLabel(metadata["xesam:album"].unpack());
+         else
+             this._album.setLabel(_("Unknown Album"));
+         if (metadata["xesam:title"])
+-            this._title.setLabel(metadata["xesam:title"].toString());
++            this._title.setLabel(metadata["xesam:title"].unpack());
+         else
+             this._title.setLabel(_("Unknown Title"));
+         /*if (metadata["mpris:trackid"]) {
+@@ -359,8 +354,8 @@ Player.prototype = {
+ 
+         let change = false;
+         if (metadata["mpris:artUrl"]) {
+-            if (this._trackCoverFile != metadata["mpris:artUrl"].toString()) {
+-                this._trackCoverFile = metadata["mpris:artUrl"].toString();
++            if (this._trackCoverFile != metadata["mpris:artUrl"].unpack()) {
++                this._trackCoverFile = metadata["mpris:artUrl"].unpack();
+                 change = true;
+             }
+         }
+@@ -392,12 +387,10 @@ Player.prototype = {
+     },
+ 
+     _getMetadata: function() {
+-        this._mediaServerPlayer.getMetadata(Lang.bind(this,
+-            this._setMetadata
+-        ));
++	this._setMetadata(this._mediaServerPlayer.Metadata);
+     },
+ 
+-    _setStatus: function(sender, status) {
++    _setStatus: function(status) {
+         this._playerStatus = status;
+         if (status == "Playing") {
+             this._playButton.setIcon("media-playback-pause");
+@@ -416,15 +409,11 @@ Player.prototype = {
+     },
+ 
+     _getStatus: function() {
+-        this._mediaServerPlayer.getPlaybackStatus(Lang.bind(this,
+-            this._setStatus
+-        ));
++	this._setStatus(this._mediaServerPlayer.PlaybackStatus);
+     },
+ 
+     _updateRate: function() {
+-        this._mediaServerPlayer.getRate(Lang.bind(this, function(sender, rate) {
+-            this._rate = rate;
+-        }));
++	this._rate = this._mediaServerPlayer.Rate;
+     },
+ 
+     _updateTimer: function() {
+@@ -569,7 +558,7 @@ MyApplet.prototype = {
+             this._players = {};
+             // watch players
+             for (var p=0; p<compatible_players.length; p++) {
+-                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
++                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
+                     Lang.bind(this, this._addPlayer),
+                     Lang.bind(this, this._removePlayer)
+                 );
+@@ -700,7 +689,7 @@ MyApplet.prototype = {
+         return Object.keys(this._players).length;
+     },
+ 
+-    _addPlayer: function(owner) {
++    _addPlayer: function(connection, owner) {
+         // ensure menu is empty
+         this._cleanup();
+         this._volumeControlShown = false;
+@@ -715,12 +704,12 @@ MyApplet.prototype = {
+         this._readOutput();
+     },
+ 
+-    _removePlayer: function(owner) {
++    _removePlayer: function(connection, owner) {
+         delete this._players[owner];
+         this._cleanup();
+         this._volumeControlShown = false;
+         for (owner in this._players) {
+-            this._addPlayer(owner);
++            this._addPlayer(connection, owner);
+         }
+         this.menu.emit('players-loaded', true);
+ 
+-- 
+1.8.1.6
+
+
+From 02da490ff9d33b050e7a10171b5795aee67d1645 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Apr 2013 19:09:18 -0400
+Subject: [PATCH 08/15] Fix gicon error - power applet
+
+---
+ files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+index fad39ab..3a13eab 100644
+--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+@@ -323,7 +323,7 @@ MyApplet.prototype = {
+         let icon = this._proxy.Icon;
+         if (icon) {
+             let gicon = Gio.icon_new_for_string(icon);
+-            this.setGIcon(gicon);
++            this._applet_icon.gicon = gicon
+             this.actor.show();
+         } else {
+             this.menu.close();
+-- 
+1.8.1.6
+
+
+From 3d78b5c929e7e3b0ee24d4b537492740e7bebf2f Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Apr 2013 19:44:33 -0400
+Subject: [PATCH 09/15] Remove unused
+
+---
+ src/cinnamon-background-manager.c | 34 ----------------------------------
+ 1 file changed, 34 deletions(-)
+
+diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c
+index 9d95250..67427ed 100644
+--- a/src/cinnamon-background-manager.c
++++ b/src/cinnamon-background-manager.c
+@@ -66,8 +66,6 @@ struct CinnamonBackgroundManagerPrivate
+ 
+ G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT)
+ 
+-static gpointer manager_object = NULL;
+-
+ static gboolean
+ dont_draw_background (CinnamonBackgroundManager *manager)
+ {
+@@ -223,36 +221,6 @@ struct CinnamonBackgroundManagerPrivate
+ }
+ 
+ static void
+-draw_background_after_session_loads (CinnamonBackgroundManager *manager)
+-{
+-        GError *error = NULL;
+-        GDBusProxyFlags flags;
+-
+-        flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+-                G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
+-        manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+-                                                              flags,
+-                                                              NULL, /* GDBusInterfaceInfo */
+-                                                              "org.gnome.SessionManager",
+-                                                              "/org/gnome/SessionManager",
+-                                                              "org.gnome.SessionManager",
+-                                                              NULL, /* GCancellable */
+-                                                              &error);
+-        if (manager->priv->proxy == NULL) {
+-                g_warning ("Could not listen to session manager: %s",
+-                           error->message);
+-                g_error_free (error);
+-                return;
+-        }
+-
+-        manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
+-                                                           "g-signal",
+-                                                           G_CALLBACK (on_session_manager_signal),
+-                                                           manager);
+-}
+-
+-
+-static void
+ disconnect_screen_signals (CinnamonBackgroundManager *manager)
+ {
+         GdkDisplay *display;
+@@ -312,8 +280,6 @@ struct CinnamonBackgroundManagerPrivate
+                           G_CALLBACK (draw_background_changed), manager);
+ 
+         setup_bg_and_draw_background (manager);
+-            //draw_background_after_session_loads (manager);
+-
+ 
+         return TRUE;
+ }
+-- 
+1.8.1.6
+
+
+From d08b882470b135591fb99bd9ff7c63619fcaea82 Mon Sep 17 00:00:00 2001
+From: dalcde <dalcde@yahoo.com.hk>
+Date: Sat, 20 Apr 2013 15:42:13 +0800
+Subject: [PATCH 10/15] [GDBus][Power applet] Some fixes and cleanup
+
+---
+ .../cinnamon/applets/power@cinnamon.org/applet.js  | 52 ++++++----------------
+ 1 file changed, 14 insertions(+), 38 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+index 3a13eab..5f81d91 100644
+--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+@@ -48,40 +48,11 @@ const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
+ <method name="GetPrimaryDevice">
+     <arg type="(susdut)" direction="out"/>
+ </method>
+-<signal name="PropertiesChanged">
+-    <arg type="s"/>
+-    <arg type="a{sv}"/>
+-    <arg type="a[s]"/>
+-</signal>
+ <property name="Icon" type="s" access="read" />
+ </interface>;
+ 
+ const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
+ 
+-const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties">
+-<method name="Get">
+-    <arg type="s" direction="in"/>
+-    <arg type="s" direction="in"/>
+-    <arg type="v" direction="out"/>
+-</method>
+-<method name="GetAll">
+-    <arg type="s" direction="in"/>
+-    <arg type="a{sv}" direction="out"/>
+-</method>
+-<method name="Set">
+-    <arg type="s" direction="in"/>
+-    <arg type="s" direction="in"/>
+-    <arg type="v" direction="in"/>
+-</method>
+-<signal name="PropertiesChanged">
+-    <arg type="s"/>
+-    <arg type="a{sv}"/>
+-    <arg type="a[s]"/>
+-</signal>
+-</interface>;
+-
+-const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface);
+-
+ function DeviceItem() {
+     this._init.apply(this, arguments);
+ }
+@@ -156,8 +127,16 @@ MyApplet.prototype = {
+             this.menuManager.addMenu(this.menu);            
+ 
+             //this.set_applet_icon_symbolic_name('battery-missing');            
+-            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
+-            this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
++            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
++                                               Lang.bind(this, function(proxy, error) {
++                                                             if (error) {
++                                                                 global.log(error.message);
++
++                                                                 return;
++                                                             }
++                                                             this._proxy.connect('g-properties-changed', Lang.bind(this, this._devicesChanged));
++                                                             this._devicesChanged();
++                                               }));
+ 
+             let icon = this.actor.get_children()[0];
+             this.actor.remove_actor(icon);
+@@ -211,9 +190,6 @@ MyApplet.prototype = {
+ 
+             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+             this.menu.addSettingsAction(_("Power Settings"), 'power');
+-
+-            this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged));
+-            this._devicesChanged();            
+         }
+         catch (e) {
+             global.logError(e);
+@@ -245,14 +221,14 @@ MyApplet.prototype = {
+     },
+     
+     _readPrimaryDevice: function() {
+-        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) {
++        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
+             if (error) {
+                 this._hasPrimary = false;
+                 this._primaryDeviceId = null;
+                 this._batteryItem.actor.hide();                
+                 return;
+             }
+-            let [device_id, device_type, icon, percentage, state, seconds] = device;
++            let [[device_id, device_type, icon, percentage, state, seconds]] = result;
+             if (device_type == UPDeviceType.BATTERY) {
+                 this._hasPrimary = true;
+                 let time = Math.round(seconds / 60);
+@@ -290,7 +266,7 @@ MyApplet.prototype = {
+     },
+ 
+     _readOtherDevices: function() {
+-        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
++        this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) {
+             this._deviceItems.forEach(function(i) { i.destroy(); });
+             this._deviceItems = [];
+ 
+@@ -336,7 +312,7 @@ MyApplet.prototype = {
+     },
+     
+     _updateLabel: function() {
+-        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
++        this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) {
+             if (error) {
+                 this._mainLabel.set_text("");
+                 return;
+-- 
+1.8.1.6
+
+
+From c93e9746b321ad6d0aa38ec28c15fe7b3f18f8f7 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 10:59:54 -0400
+Subject: [PATCH 11/15] Move CLUTTER_DISABLE_XINPUT to session startup file
+
+---
+ files/usr/bin/gnome-session-cinnamon | 2 +-
+ src/main.c                           | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
+index 315f135..56c37f5 100755
+--- a/files/usr/bin/gnome-session-cinnamon
++++ b/files/usr/bin/gnome-session-cinnamon
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+-exec gnome-session --session cinnamon "$@"
++exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@"
+ 
+diff --git a/src/main.c b/src/main.c
+index 9d37975..418fb60 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -257,9 +257,6 @@
+ 
+   g_option_context_free (ctx);
+ 
+-  /* Disable XInput extension - required for 3.8 compatibility */
+-  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
+-
+   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
+ 
+   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
+-- 
+1.8.1.6
+
+
+From de1719e63518884cad6c9d63d508f737eab35d49 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 12:23:29 -0400
+Subject: [PATCH 12/15] Add Xinput disable to cinnamon2d
+
+---
+ files/usr/bin/cinnamon2d | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/bin/cinnamon2d b/files/usr/bin/cinnamon2d
+index 1eced99..7f42517 100755
+--- a/files/usr/bin/cinnamon2d
++++ b/files/usr/bin/cinnamon2d
+@@ -1,2 +1,2 @@
+ #!/bin/bash
+-CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
++CLUTTER_DISABLE_XINPUT=1 CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
+-- 
+1.8.1.6
+
+
+From 15d57d1c15f34d44b23f74b21929d996d4465afb Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 12:29:43 -0400
+Subject: [PATCH 13/15] Fix session file
+
+---
+ files/usr/bin/gnome-session-cinnamon | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
+index 56c37f5..31c9eff 100755
+--- a/files/usr/bin/gnome-session-cinnamon
++++ b/files/usr/bin/gnome-session-cinnamon
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+-exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@"
++CLUTTER_DISABLE_XINPUT=1 exec gnome-session --session cinnamon "$@"
+ 
+-- 
+1.8.1.6
+
+
+From 03436393c322fd97d8216c3481d28cd34833c656 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 12:36:45 -0400
+Subject: [PATCH 14/15] Add cinnamon3d command
+
+---
+ files/usr/bin/cinnamon3d | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 files/usr/bin/cinnamon3d
+
+diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d
+new file mode 100644
+index 0000000..4891783
+--- /dev/null
++++ b/files/usr/bin/cinnamon3d
+@@ -0,0 +1,2 @@
++#!/bin/bash
++CLUTTER_DISABLE_XINPUT=1 cinnamon $@
+-- 
+1.8.1.6
+
+
+From 850da270967622b95be9e0c5edd8e230eb4be5a1 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 12:37:26 -0400
+Subject: [PATCH 15/15] Fix perms
+
+---
+ files/usr/bin/cinnamon3d | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 files/usr/bin/cinnamon3d
+
+diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d
+old mode 100644
+new mode 100755
+-- 
+1.8.1.6
+
diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD
index 54794584f..e7ec9d64e 100644
--- a/community/clinica/PKGBUILD
+++ b/community/clinica/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 78165 2012-10-16 15:57:54Z bgyorgy $
+# $Id: PKGBUILD 88675 2013-04-21 22:16:41Z heftig $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gianmarco Brocchi <gianmarcobrocchi@gmail.com>
 
 pkgname=clinica
 pkgver=0.2.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Simple medical records manager"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/clinica-project"
 license=('GPL3')
-depends=('libgee' 'libpeas' 'dconf')
+depends=('libgee06' 'libpeas' 'dconf')
 makedepends=('vala' 'intltool' 'python')
 optdepends=('python2-gobject: for Agenzia del Farmaco plugin')
 install=clinica.install
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index c6dd92e95..d60f4c930 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87877 2013-04-08 12:24:37Z spupykin $
+# $Id: PKGBUILD 88676 2013-04-21 22:16:43Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=couchdb
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=('i686' 'x86_64')
 url="http://couchdb.apache.org"
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index d90482aa5..52bea4ed9 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83887 2013-02-06 11:39:48Z spupykin $
+# $Id: PKGBUILD 88776 2013-04-22 10:14:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Igor Scabini <furester @ gmail.com>
 
 pkgname=('cython' 'cython2')
 pkgbase=cython
-pkgver=0.18
+pkgver=0.19
 pkgrel=1
 pkgdesc="C-Extensions for Python "
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-distribute' 'python2-distribute')
 source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('6a72d14e72f3df597b34ac326152f8d2')
+md5sums=('76989337dee4cf7afdcb5cde514423f8')
 
 build() {
   true
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index d48e7169f..bd1162ece 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87840 2013-04-08 09:20:17Z spupykin $
+# $Id: PKGBUILD 88689 2013-04-21 22:17:06Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
@@ -6,7 +6,7 @@
 
 pkgname=denemo
 pkgver=1.0.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A music score editor"
 arch=('i686' 'x86_64')
 url="http://www.denemo.org"
diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 6b6f6cd7a..2b9d1139c 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81104 2012-12-12 00:47:30Z eric $
+# $Id: PKGBUILD 88677 2013-04-21 22:16:44Z heftig $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -8,39 +8,19 @@
 pkgname=elinks
 pkgver=0.13
 _commit="9313aae9062e1d9ff084858fa6844259cd8237d6"
-pkgrel=11
+pkgrel=12
 pkgdesc="An advanced and well-established feature-rich text mode web browser."
 arch=("i686" "x86_64")
 url="http://elinks.or.cz"
 license=('GPL')
-depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js'
+depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js185'
 	 'gc' 'tre')
 makedepends=('git')
-source=()
-md5sums=()
-
-__gitroot="http://elinks.cz/elinks.git"
-__gitname="elinks"
+source=("git+http://elinks.cz/elinks.git#commit=$_commit")
+md5sums=('SKIP')
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
- 
-  if [ -d $__gitname ] ; then
-    cd $__gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $__gitroot
-  fi
- 
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
- 
-  rm -rf "$srcdir/$__gitname-build"
-  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
-  cd "$srcdir/$__gitname-build"
-  git checkout "$_commit"
-
+  cd elinks
   [ -x configure ] || sh autogen.sh
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --sysconfdir=/etc \
@@ -51,7 +31,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$__gitname-build"
+  cd elinks
   make DESTDIR="$pkgdir" install
   rm -f "$pkgdir/usr/share/locale/locale.alias"
 
diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD
index ec562da65..a5eddbbe9 100644
--- a/community/freewrl/PKGBUILD
+++ b/community/freewrl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78928 2012-10-27 23:44:21Z ebelanger $
+# $Id: PKGBUILD 88678 2013-04-21 22:16:45Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=freewrl
 pkgver=1.22.13.1
 _pkgver=1.22.13
-pkgrel=3
+pkgrel=4
 pkgdesc="VRML viewer"
 arch=('i686' 'x86_64')
 url="http://freewrl.sourceforge.net/"
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 9db934a71..161682e5a 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79119 2012-10-30 23:06:21Z heftig $
+# $Id: PKGBUILD 88687 2013-04-21 22:17:03Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,20 +6,20 @@
 # Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Plugins for gedit"
-arch=('x86_64' 'i686')
-license=('GPL')
+arch=(x86_64 i686)
+license=(GPL)
 url="http://live.gnome.org/GeditPlugins"
-depends=('gedit' 'dbus-python')
+depends=(gedit python-dbus)
+makedepends=(intltool gnome-doc-utils vte3)
 optdepends=('gucharmap: for charmap plugin'
             'vte3: for embedded terminal')
-makedepends=('intltool' 'gnome-doc-utils' 'vte3')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
-sha256sums=('c5e92830e6029110bf1117bd9f31b23a9ad907210b8cb37039772f5bfcf6d174')
+sha256sums=('659d379f9edfbba2db37522991c734c5d50e03eb1f70985e978d93a718273141')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD
index dc22aa950..13b652f78 100644
--- a/community/giggle/PKGBUILD
+++ b/community/giggle/PKGBUILD
@@ -1,31 +1,40 @@
-# $Id: PKGBUILD 79629 2012-11-09 09:55:35Z ibiru $
+# $Id: PKGBUILD 88688 2013-04-21 22:17:05Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: neodreams <yanbrodeur@gmail.com>
 
 pkgname=giggle
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Git repository viewer"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://live.gnome.org/giggle"
-license=('GPL')
-depends=('git' 'gtksourceview3' 'vte3')
-makedepends=('intltool' 'itstool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz)
+license=(GPL)
+depends=(git gtksourceview3 vte3 desktop-file-utils hicolor-icon-theme)
+makedepends=(intltool itstool)
 options=(!libtool)
 install=giggle.install
-sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59')
+source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz
+        gtksourceview3.7.patch)
+sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59'
+            'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../gtksourceview3.7.patch
+}
 
-  ./configure \
-    --prefix=/usr
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
   make
 }
 
-package() {
+check() {
   cd $pkgname-$pkgver
+  make check
+}
 
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/giggle/gtksourceview3.7.patch b/community/giggle/gtksourceview3.7.patch
new file mode 100644
index 000000000..eb86cdeef
--- /dev/null
+++ b/community/giggle/gtksourceview3.7.patch
@@ -0,0 +1,36 @@
+From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Wed, 03 Apr 2013 20:26:17 +0000
+Subject: Directly include gtksourcebuffer.h
+
+Until gtksourceview 3.7, it was included indirectly by gtksourceview.h.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697220
+---
+diff --git a/src/giggle-diff-view.c b/src/giggle-diff-view.c
+index 3ded28d..ff6bbe3 100644
+--- a/src/giggle-diff-view.c
++++ b/src/giggle-diff-view.c
+@@ -29,6 +29,8 @@
+ #include <glib/gi18n.h>
+ #include <string.h>
+ 
++#include <gtksourceview/gtksourcebuffer.h>
++
+ typedef struct GiggleDiffViewPriv GiggleDiffViewPriv;
+ typedef struct GiggleDiffViewFile GiggleDiffViewFile;
+ typedef struct GiggleDiffViewHunk GiggleDiffViewHunk;
+diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
+index 130af4a..517858d 100644
+--- a/src/giggle-view-file.c
++++ b/src/giggle-view-file.c
+@@ -40,6 +40,7 @@
+ 
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourceview.h>
++#include <gtksourceview/gtksourcebuffer.h>
+ 
+ #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT            (giggle_view_file_snapshot_get_type ())
+ #define GIGGLE_VIEW_FILE_SNAPSHOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot))
+--
+cgit v0.9.1
diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD
index 1bb606e4e..68d902e4f 100644
--- a/community/gitg/PKGBUILD
+++ b/community/gitg/PKGBUILD
@@ -1,36 +1,28 @@
-# $Id: PKGBUILD 57270 2011-10-25 06:09:22Z ebelanger $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Blaž Tomžič <blaz.tomazic@gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-# Contributor: M Rawash <mrawash@gmail.com>
-# Contributor: DonVla <donvla@users.sourceforge.net>
+# $Id: PKGBUILD 88690 2013-04-21 22:17:07Z heftig $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gitg
-pkgver=0.2.5
+pkgver=0.2.7
 pkgrel=1
 pkgdesc='A GIT repository viewer based on GTK+'
 arch=('i686' 'x86_64')
-url='http://trac.novowork.com/gitg/'
+url='https://git.gnome.org/browse/gitg/'
 license=('GPL')
-depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \
+depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \
          'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
-install="${pkgname}.install"
-source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('d3dfff65834d8371d43b2e91926af1421f8ec2128580dfeceb6925b6b1ce6d8c')
+install=gitg.install
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a')
 
 build() {
-  	cd "${srcdir}/${pkgname}-${pkgver}"
-
-  	./configure \
-    		--prefix=/usr
-  	make
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-  	cd "${srcdir}/${pkgname}-${pkgver}"
-
-  	make DESTDIR="${pkgdir}" install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/gitg/gitg.install b/community/gitg/gitg.install
index 7b356a632..4b90c879e 100644
--- a/community/gitg/gitg.install
+++ b/community/gitg/gitg.install
@@ -1,19 +1,13 @@
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: DonVla <donvla@users.sourceforge.net>
-# gitg install file
-
 post_install() {
-	usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  	post_install $1
+  post_install $1
 }
 
 post_remove() {
-	usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install $1
 }
diff --git a/community/gnome-applets/01_battstat_upower.patch b/community/gnome-applets/01_battstat_upower.patch
new file mode 100644
index 000000000..fa31e720b
--- /dev/null
+++ b/community/gnome-applets/01_battstat_upower.patch
@@ -0,0 +1,622 @@
+From 18a2f4aa3ba2c8c9fc3718b15a9ab366fdd35f05 Mon Sep 17 00:00:00 2001
+From: Joachim Breitner <mail@joachim-breitner.de>
+Date: Mon, 5 Jul 2010 12:20:04 +0200
+Subject: [PATCH] [battstat applet] upower support
+
+As HAL is being deprecated, the battstat applet is adjusted to talk to
+upower, using libupower-glib. (Bug #607254)
+---
+ battstat/Makefile.am          |    6 +-
+ battstat/battstat-upower.c    |  330 +++++++++++++++++++++++++++++++++++++++++
+ battstat/battstat-upower.h    |   33 ++++
+ battstat/battstat_applet.c    |    7 +-
+ battstat/docs/C/battstat.xml  |   18 ++-
+ battstat/docs/de/battstat.xml |   22 +++-
+ battstat/docs/eu/battstat.xml |   20 ++-
+ battstat/power-management.c   |   66 +++++++--
+ configure.in                  |   22 +++
+ 9 files changed, 493 insertions(+), 31 deletions(-)
+ create mode 100644 battstat/battstat-upower.c
+ create mode 100644 battstat/battstat-upower.h
+
+Index: gnome-applets-3.4.1/battstat/Makefile.am
+===================================================================
+--- gnome-applets-3.4.1.orig/battstat/Makefile.am	2012-04-13 19:02:29.000000000 +0200
++++ gnome-applets-3.4.1/battstat/Makefile.am	2012-04-19 00:28:17.246029051 +0200
+@@ -27,6 +27,7 @@
+ 	$(GNOME_APPLETS_CFLAGS)			\
+ 	$(LIBNOTIFY_CFLAGS)			\
+ 	$(HAL_CFLAGS)				\
++	$(UPOWER_CFLAGS)			\
+ 	$(APMINC)				\
+ 	$(ACPIINC)				\
+ 	$(WARN_CFLAGS)				\
+@@ -48,13 +49,17 @@
+ 	acpi-freebsd.c \
+ 	acpi-freebsd.h \
+ 	battstat-hal.c \
+-	battstat-hal.h
++	battstat-hal.h \
++	battstat-upower.c \
++	battstat-upower.h
+ 
+ 
+ battstat_applet_2_LDADD = \
+ 		     $(GNOME_APPLETS_LIBS) \
+ 		     $(LIBNOTIFY_LIBS) \
+ 		     $(HAL_LIBS) \
++		     $(UPOWER_LIBS) \
++		     $(LIBM) \
+ 		     $(APMLIB)
+ 
+ schemasdir   = @GCONF_SCHEMA_FILE_DIR@
+Index: gnome-applets-3.4.1/battstat/battstat-upower.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-3.4.1/battstat/battstat-upower.c	2012-04-19 00:28:17.246029051 +0200
+@@ -0,0 +1,301 @@
++/*
++ *  Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de>
++ *
++ * Based on battstat-hal.c:
++ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca>
++ *
++ *  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 Street #330, Boston, MA 02111-1307, USA.
++ *
++ * $Id$
++ */
++
++#include <config.h>
++
++#ifdef HAVE_UPOWER
++
++#include <upower.h>
++#include <math.h>
++
++#include "battstat-upower.h"
++
++static UpClient *upc;
++static void (*status_updated_callback) (void);
++
++
++/* status_updated_callback() can not be called directly because at the time of
++ * the device-remove signal, the device is not actually removed from the list
++ * of devices known to the up_client object (see libupower-glib/up-client.c in
++ * upower). Waiting for the next idle timer works around this issue and has has
++ * the additionaly benefit of possibly running status_updated_callback only
++ * once when several events happen very soon after each other.
++ */
++static gboolean status_update_scheduled;
++
++static gboolean
++update_status_idle (gpointer junk)
++{
++  if (status_updated_callback)
++    status_updated_callback ();
++
++  return status_update_scheduled = FALSE;
++}
++
++static void
++schedule_status_callback (void)
++{
++  if (status_update_scheduled)
++    return;
++
++  status_update_scheduled = TRUE;
++  g_idle_add (update_status_idle, NULL);
++}
++
++static void
++device_cb (UpClient *client, UpDevice *device, gpointer user_data) {
++  schedule_status_callback();
++}
++
++/* ---- public functions ---- */
++
++char *
++battstat_upower_initialise (void (*callback) (void))
++{
++  status_updated_callback = callback;
++
++  if( upc != NULL )
++    return g_strdup( "Already initialised!" );
++
++  if( (upc = up_client_new() ) == NULL )
++    goto error_out;
++
++  if (! up_client_enumerate_devices_sync( upc, NULL, NULL ) ) {
++    goto error_shutdownclient;
++  }
++
++  g_signal_connect_after( upc, "device-changed", device_cb, NULL );
++  g_signal_connect_after( upc, "device-added", device_cb, NULL );
++  g_signal_connect_after( upc, "device-removed", device_cb, NULL );
++
++  return NULL;
++
++error_shutdownclient:
++  g_object_unref( upc );
++  upc = NULL;
++
++error_out:
++  return "Can not initialize upower";
++}
++
++void
++battstat_upower_cleanup( void )
++{
++  if( upc == NULL )
++    return;
++  
++  g_object_unref( upc );
++  upc = NULL;
++}
++
++#include "battstat.h"
++
++/* This function currently exists to allow the multiple batteries supported
++ * by the upower backend to appear as a single composite battery device (since
++ * at the current time this is all that battstat supports).
++ *
++ * This entire function is filled with logic to make multiple batteries
++ * appear as one "composite" battery.  Comments included as appropriate.
++ *
++ * For more information about some of the assumptions made in the following
++ * code please see the following mailing list post and the resulting thread:
++ *
++ *   http://lists.freedesktop.org/archives/hal/2005-July/002841.html
++ */
++void
++battstat_upower_get_battery_info( BatteryStatus *status )
++{
++
++  GPtrArray *devices = up_client_get_devices( upc );
++
++  /* The calculation to get overall percentage power remaining is as follows:
++   *
++   *    Sum( Current charges ) / Sum( Full Capacities )
++   *
++   * We can't just take an average of all of the percentages since this
++   * doesn't deal with the case that one battery might have a larger
++   * capacity than the other.
++   *
++   * In order to do this calculation, we need to keep a running total of
++   * current charge and full capacities.
++   */
++  double current_charge_total = 0, full_capacity_total = 0;
++
++  /* Record the time remaining as reported by upower.  This is used in the event
++   * that the system has exactly one battery (since, then, upower is capable
++   * of providing an accurate time remaining report and we should trust it.)
++   */
++  gint64 remaining_time = 0;
++
++  /* The total (dis)charge rate of the system is the sum of the rates of
++   * the individual batteries.
++   */
++  double rate_total = 0;
++
++  /* We need to know if we should report the composite battery as present
++   * at all.  The logic is that if at least one actual battery is installed
++   * then the composite battery will be reported to exist.
++   */
++  int present = 0;
++
++  /* We need to know if we are on AC power or not.  Eventually, we can look
++   * at the AC adaptor upower devices to determine that.  For now, we assume that
++   * if any battery is discharging then we must not be on AC power.  Else, by
++   * default, we must be on AC.
++   */
++  int on_ac_power = 1;
++
++  /* Finally, we consider the composite battery to be "charging" if at least
++   * one of the actual batteries in the system is charging.
++   */
++  int charging = 0;
++
++  /* For each physical battery bay... */
++  int i;
++  for( i = 0; i < devices->len; i++ )
++  {
++    UpDevice *upd = g_ptr_array_index( devices, i );
++
++    int type, state;
++    double current_charge, full_capacity, rate;
++    gint64 time_to_full, time_to_empty;
++    
++    g_object_get( upd,
++      "kind", &type,
++      "state", &state,
++      "energy", &current_charge,
++      "energy-full", &full_capacity,
++      "energy-rate", &rate,
++      "time-to-full", &time_to_full,
++      "time-to-empty", &time_to_empty,
++      NULL );
++
++    /* Only count batteries here */
++
++    if (type != UP_DEVICE_KIND_BATTERY)
++      continue;
++
++    /* At least one battery present -> composite battery is present. */
++    present++;
++
++    /* At least one battery charging -> composite battery is charging. */
++    if( state == UP_DEVICE_STATE_CHARGING )
++      charging = 1;
++
++    /* At least one battery is discharging -> we're not on AC. */
++    if( state == UP_DEVICE_STATE_DISCHARGING )
++      on_ac_power = 0;
++
++    /* Sum the totals for current charge, design capacity, (dis)charge rate. */
++    current_charge_total += current_charge;
++    full_capacity_total += full_capacity;
++    rate_total += rate;
++
++    /* Record remaining time too, incase this is the only battery. */
++    remaining_time = (state == UP_DEVICE_STATE_DISCHARGING ? time_to_empty : time_to_full);
++  }
++
++  if( !present || full_capacity_total <= 0 || (charging && !on_ac_power) )
++  {
++    /* Either no battery is present or something has gone horribly wrong.
++     * In either case we must return that the composite battery is not
++     * present.
++     */
++    status->present = FALSE;
++    status->percent = 0;
++    status->minutes = -1;
++    status->on_ac_power = TRUE;
++    status->charging = FALSE;
++
++    g_ptr_array_unref( devices );
++    return;
++  }
++
++  /* Else, our composite battery is present. */
++  status->present = TRUE;
++
++  /* As per above, overall charge is:
++   *
++   *    Sum( Current charges ) / Sum( Full Capacities )
++   */
++  status->percent = ( current_charge_total / full_capacity_total ) * 100.0 + 0.5;
++
++  if( present == 1 )
++  {
++    /* In the case of exactly one battery, report the time remaining figure
++     * from upower directly since it might have come from an authorative source
++     * (ie: the PMU or APM subsystem).
++     *
++     * upower gives remaining time in seconds with a 0 to mean that the
++     * remaining time is unknown.  Battstat uses minutes and -1 for 
++     * unknown time remaining.
++     */
++
++    if( remaining_time == 0 )
++      status->minutes = -1;
++    else
++      status->minutes = (remaining_time + 30) / 60;
++  }
++  /* Rest of cases to deal with multiple battery systems... */
++  else if( !on_ac_power && rate_total != 0 )
++  {
++    /* Then we're discharging.  Calculate time remaining until at zero. */
++
++    double remaining;
++
++    remaining = current_charge_total;
++    remaining /= rate_total;
++    status->minutes = (int) floor( remaining * 60.0 + 0.5 );
++  }
++  else if( charging && rate_total != 0 )
++  {
++    /* Calculate time remaining until charged.  For systems with more than
++     * one battery, this code is very approximate.  The assumption is that if
++     * one battery reaches full charge before the other that the other will
++     * start charging faster due to the increase in available power (similar
++     * to how a laptop will charge faster if you're not using it).
++     */
++
++    double remaining;
++
++    remaining = full_capacity_total - current_charge_total;
++    if( remaining < 0 )
++      remaining = 0;
++    remaining /= rate_total;
++
++    status->minutes = (int) floor( remaining * 60.0 + 0.5 );
++  }
++  else
++  {
++    /* On AC power and not charging -or- rate is unknown. */
++    status->minutes = -1;
++  }
++
++  /* These are simple and well-explained above. */
++  status->charging = charging;
++  status->on_ac_power = on_ac_power;
++  
++  g_ptr_array_unref( devices );
++}
++
++#endif /* HAVE_UPOWER */
+Index: gnome-applets-3.4.1/battstat/battstat-upower.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-3.4.1/battstat/battstat-upower.h	2012-04-19 00:28:17.254029051 +0200
+@@ -0,0 +1,33 @@
++/*
++ * Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de>
++ *
++ * Based on battstat-hal.h:
++ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca>
++ *
++ *  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 Street #330, Boston, MA 02111-1307, USA.
++ *
++ * $Id$
++ */
++
++#ifndef _battstat_upower_h_
++#define _battstat_upower_h_
++
++char *battstat_upower_initialise (void (*) (void));
++void battstat_upower_cleanup (void);
++
++#include "battstat.h"
++void battstat_upower_get_battery_info (BatteryStatus *status);
++
++#endif /* _battstat_upower_h_ */
+Index: gnome-applets-3.4.1/battstat/battstat_applet.c
+===================================================================
+--- gnome-applets-3.4.1.orig/battstat/battstat_applet.c	2012-04-13 19:02:29.000000000 +0200
++++ gnome-applets-3.4.1/battstat/battstat_applet.c	2012-04-19 00:28:17.254029051 +0200
+@@ -1188,9 +1188,12 @@
+ 
+   char *comments = g_strdup_printf ("%s\n\n%s",
+ 		  _("This utility shows the status of your laptop battery."),
+-		  power_management_using_hal () ?
++		  power_management_using_upower () ?
++		  	/* true */ _("upower backend enabled.") :
++		  (power_management_using_hal () ?
+ 		  	/* true */ _("HAL backend enabled.") :
+-			/* false */ _("Legacy (non-HAL) backend enabled."));
++			/* false */ _("Legacy (non-HAL) backend enabled.")
++		  ));
+ 
+   gtk_show_about_dialog( NULL,
+     "version",             VERSION,
+Index: gnome-applets-3.4.1/battstat/docs/C/battstat.xml
+===================================================================
+--- gnome-applets-3.4.1.orig/battstat/docs/C/battstat.xml	2012-04-15 15:49:58.000000000 +0200
++++ gnome-applets-3.4.1/battstat/docs/C/battstat.xml	2012-04-19 00:28:17.254029051 +0200
+@@ -226,10 +226,13 @@
+      <title>Power Management Backends</title>
+ 
+      <para>
+-      The battery monitor supports a number of power management backends. If it
+-      is available, the monitor will attempt to use the freedesktop.org
+-      <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware Abstraction
+-      Layer)</ulink>. If it is unavailable or unsupported on your platform, the
++      The battery monitor supports a number of power management backends.
++      If it is available, the monitor will attempt to use the freedesktop.org
++      <ulink url="http://upower.freedesktop.org/">upower</ulink> interface.
++      If it is unavailable or unsupported on your platform, it will fall back
++      to the freedesktop.org
++      <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware
++      Abstraction Layer)</ulink>. If that is also not availble, the
+       battery monitor will attempt direct access to the power management system.
+      </para>
+      <para>
+@@ -410,10 +413,10 @@
+     <sect2 id="battstat-troubleshooting-backends">
+      <title>Determining the backend</title>
+      <para>
+-       If you are using the Hardware Abstraction Layer
+-       (see <xref linkend="battstat-power-backends"/>) then that will be
+-       indicated in the about dialog by placing a star next to the author of the
+-       HAL backend.
++       If you are using the upower interface, or the the Hardware
++       Abstraction Layer (see <xref linkend="battstat-power-backends"/>) then
++       that will be indicated in the about dialog by placing a star next to the
++       author of the HAL backend.
+     <figure id="battstat-credits-hal"> 
+       <title>Check you're using the HAL backend</title> 
+       <screenshot> 
+Index: gnome-applets-3.4.1/battstat/power-management.c
+===================================================================
+--- gnome-applets-3.4.1.orig/battstat/power-management.c	2012-04-13 19:02:29.000000000 +0200
++++ gnome-applets-3.4.1/battstat/power-management.c	2012-04-19 00:28:17.254029051 +0200
+@@ -41,6 +41,7 @@
+ 
+ #include "battstat.h"
+ #include "battstat-hal.h"
++#include "battstat-upower.h"
+ 
+ #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! "    \
+                     "Make sure the ACPI subsystem is working and "           \
+@@ -66,6 +67,9 @@
+ #ifdef HAVE_HAL
+ static int using_hal;
+ #endif
++#ifdef HAVE_UPOWER
++static int using_upower;
++#endif
+ 
+ /*
+  * What follows is a series of platform-specific apm_readinfo functions
+@@ -390,6 +394,14 @@
+     return NULL;
+   }
+ 
++#ifdef HAVE_UPOWER
++  if( using_upower )
++  {
++    battstat_upower_get_battery_info( status );
++    return NULL;
++  }
++#endif
++
+ #ifdef HAVE_HAL
+   if( using_hal )
+   {
+@@ -430,27 +442,36 @@
+ const char *
+ power_management_initialise (int no_hal, void (*callback) (void))
+ {
++  char *err;
++  err = g_strdup( ":(" );
+ #ifdef __linux__
+   struct stat statbuf;
+ #endif
+-#ifdef HAVE_HAL
+-  char *err;
++#ifdef HAVE_UPOWER
++  err = battstat_upower_initialise (callback);
+ 
+-  if( no_hal )
+-    err = g_strdup( ":(" );
+-  else
+-    err = battstat_hal_initialise (callback);
+-
+-
+-  if( err == NULL ) /* HAL is up */
++  if( err == NULL ) /* UPOWER is up */
+   {
+     pm_initialised = 1;
+-    using_hal = TRUE;
++    using_upower = TRUE;
+     return NULL;
++  } 
++#endif
++
++#ifdef HAVE_HAL
++  if(! no_hal ) {
++    err = battstat_hal_initialise (callback);
++
++    if( err == NULL ) /* HAL is up */
++    {
++      pm_initialised = 1;
++      using_hal = TRUE;
++      return NULL;
++    }
+   }
+-  else
+-    /* fallback to legacy methods */
+-    g_free( err );
++
++  /* fallback to legacy methods */
++  g_free( err );
+ #endif
+     
+ #ifdef __linux__
+@@ -498,6 +519,15 @@
+ void
+ power_management_cleanup( void )
+ {
++#ifdef HAVE_UPOWER
++  if( using_upower )
++  {
++    battstat_upower_cleanup();
++    pm_initialised = 1;
++    return;
++  }
++#endif
++
+ #ifdef HAVE_HAL
+   if( using_hal )
+   {
+@@ -525,6 +555,16 @@
+ }
+ 
+ int
++power_management_using_upower( void )
++{
++#ifdef HAVE_UPOWER
++  return using_upower;
++#else
++  return 0;
++#endif
++}
++
++int
+ power_management_using_hal( void )
+ {
+ #ifdef HAVE_HAL
+Index: gnome-applets-3.4.1/configure.in
+===================================================================
+--- gnome-applets-3.4.1.orig/configure.in	2012-04-15 15:45:36.000000000 +0200
++++ gnome-applets-3.4.1/configure.in	2012-04-19 00:28:17.254029051 +0200
+@@ -23,6 +23,7 @@
+ LIBWNCK_REQUIRED=2.91.0
+ LIBNOTIFY_REQUIRED=0.7
+ HAL_REQUIRED=0.5.3
++UPOWER_REQUIRED=0.9.4
+ DBUS_REQUIRED=1.1.2
+ DBUS_GLIB_REQUIRED=0.74
+ PYGOBJECT_REQUIRED=2.26
+@@ -223,6 +224,30 @@
+ AC_SUBST(HAL_CFLAGS)
+ AC_SUBST(HAL_LIBS)
+ 
++dnl -- check for libupower-glib (optional) --------------------------------------------
++UPOWER_CFLAGS=
++UPOWER_LIBS=
++AC_ARG_WITH(upower,[  --without-upower           build without upower support])
++
++if test "x$with_upower" != xno; then
++	PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED,
++		  HAVE_UPOWER="yes",
++		  HAVE_UPOWER="no")
++
++	LT_LIB_M
++	if test "x$HAVE_UPOWER" = "xyes"; then
++		AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available])
++	fi
++else
++	AC_MSG_WARN(["upower support disabled"])
++fi
++
++AC_SUBST(UPOWER_CFLAGS)
++AC_SUBST(UPOWER_LIBS)
++AC_SUBST(LIBM)
++
++
++
+ dnl -- check for gucharmap (optional) -----------------------------------------
+ 
+ PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
+@@ -739,5 +764,6 @@
+ 	Using DBUS:			$HAVE_DBUS
+ 	Using NetworkManager:		$HAVE_NETWORKMANAGER
+ 	Using HAL:			$HAVE_HAL
++	Using UPOWER:			$HAVE_UPOWER
+ 	Enabling IPv6:			$have_ipv6
+ " >&2
diff --git a/community/gnome-applets/PKGBUILD b/community/gnome-applets/PKGBUILD
index 59699512e..193c879af 100644
--- a/community/gnome-applets/PKGBUILD
+++ b/community/gnome-applets/PKGBUILD
@@ -1,35 +1,61 @@
-# $Id: PKGBUILD 87904 2013-04-08 14:47:20Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 88683 2013-04-21 22:16:53Z heftig $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-applets
 pkgver=3.5.92
-pkgrel=1
-pkgdesc="GNOME Applets"
-arch=(i686 x86_64)
+pkgrel=3
+pkgdesc="Small applications for the GNOME panel"
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager')
-options=(!emptydirs)
-url="http://www.gnome.org"
-install=gnome-applets.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83')
+depends=('cpupower' 'gucharmap' 'gstreamer0.10-base-plugins' 'gnome-panel' 'libgtop' 'upower')
+makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'networkmanager' 'rarian')
+url="https://live.gnome.org/GnomeApplets"
+install=$pkgname.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gnome-applets-cpupower.patch
+        disable-gweather-applet.patch
+        fix-autoconf.patch
+        01_battstat_upower.patch)
+sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83'
+            '942276d7cc18224d9f5b1b57314746ad4d713ee0dcf4aedb25fa72e92db75e65'
+            '47f6b477c0f76ebb1e8ffc6fe9bd2fac9ac7f511f059cf4bb2687f8425bfb4a8'
+            '0acd58aee458345e378d5f77256e04b13e3a4c06b166aac390a92309b864e8a4'
+            '364c9264c76721b42e85eecc48443852ead1bd730d9de937dd2ae00889db836a')
 
 build() {
   cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-schemas-install \
-      --without-hal
+
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' invest-applet/invest/*
+
+  # Use cpupower instead of cpufreq
+  patch -Np1 -i "$srcdir/gnome-applets-cpupower.patch"
+
+  # Add UPower support
+  patch -Np1 -i "$srcdir/01_battstat_upower.patch"
+
+  # Disable gweather applet, because it's not compatible with libgweather 3.8
+  patch -Np1 -i "$srcdir/disable-gweather-applet.patch"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+  # Turn off unneeded warnings
+  CFLAGS="$CFLAGS -w"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static --disable-schemas-install --disable-scrollkeeper \
+              --enable-mixer-applet \
+              PYTHON=/usr/bin/python2
   make
 }
 
 package() {
   cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-applets-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+  mkdir -m755 -p "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -r "$pkgdir"/etc/gconf
 }
diff --git a/community/gnome-applets/disable-gweather-applet.patch b/community/gnome-applets/disable-gweather-applet.patch
new file mode 100644
index 000000000..26f7e4d6b
--- /dev/null
+++ b/community/gnome-applets/disable-gweather-applet.patch
@@ -0,0 +1,12 @@
+diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
+--- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
++++ gnome-applets-3.5.92/configure.in	2013-04-09 10:39:54.214243015 +0200
+@@ -251,7 +251,7 @@
+ 
+  dnl -- check for libgweather (required for gweather applet) ------------------
+ build_libgweather_applets=false
+-PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED,
++PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED gweather-3.0 <= 3.7,
+ 	          build_libgweather_applets=true,
+ 		  AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
+ AC_SUBST(LIBGWEATHER_CFLAGS)
diff --git a/community/gnome-applets/fix-autoconf.patch b/community/gnome-applets/fix-autoconf.patch
new file mode 100644
index 000000000..fc36c743c
--- /dev/null
+++ b/community/gnome-applets/fix-autoconf.patch
@@ -0,0 +1,12 @@
+diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
+--- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
++++ gnome-applets-3.5.92/configure.in	2013-04-09 09:48:48.427334056 +0200
+@@ -4,7 +4,7 @@
+ AC_INIT(gnome-applets, 3.5.92)
+ AC_PREREQ(2.59)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
+ AC_CONFIG_MACRO_DIR(m4)
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/community/gnome-applets/gnome-applets-cpupower.patch b/community/gnome-applets/gnome-applets-cpupower.patch
new file mode 100644
index 000000000..134a617fc
--- /dev/null
+++ b/community/gnome-applets/gnome-applets-cpupower.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
+--- gnome-applets-3.1.90/configure.in.cpupower	2011-08-31 18:49:00.628945807 -0400
++++ gnome-applets-3.1.90/configure.in	2011-08-31 18:49:17.397946966 -0400
+@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
+ LIBCPUFREQ_LIBS=
+ if test "x$have_libcpufreq" = "xyes"; then
+    AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
+-   LIBCPUFREQ_LIBS=-lcpufreq
++   LIBCPUFREQ_LIBS=-lcpupower
+ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index 85972a329..cb8d4df7e 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 85932 2013-03-09 04:07:22Z jconder $
+# $Id: PKGBUILD 88703 2013-04-21 22:24:13Z heftig $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions'
 options=('!emptydirs' '!libtool')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('2db1069324cb85d8704bd1ffbbea3c29d57ba7b0d710f45f6563fd963517ef40')
+sha256sums=('fe0a6368ee5a67419c9332a3b0031ecf1e3e92aa2fe0eb30aa4273f6224d070a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
new file mode 100644
index 000000000..2c90a9fe2
--- /dev/null
+++ b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
@@ -0,0 +1,95 @@
+From a5b951654b856d899e8c6a4116b4ccc4f18aac91 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Sun, 24 Feb 2013 17:22:29 -0500
+Subject: [PATCH] Add the GNOME Flashback session
+
+This was removed from gnome-session 3.7.4 so let's it add it back here
+(under new name)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=694625
+---
+ data/Makefile.am                        |   18 +++++++++++++++++-
+ data/gnome-flashback.desktop.in         |    7 +++++++
+ data/gnome-flashback.session.desktop.in |    3 +++
+ po/POTFILES.in                          |    2 ++
+ 4 files changed, 29 insertions(+), 1 deletion(-)
+ create mode 100644 data/gnome-flashback.desktop.in
+ create mode 100644 data/gnome-flashback.session.desktop.in
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 83f82e2..84e1954 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -30,17 +30,33 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
+ 
+ @GSETTINGS_RULES@
+ 
++sessiondir = $(datadir)/gnome-session/sessions
++session_in_files = gnome-flashback.session.desktop.in
++session_DATA = $(session_in_files:.session.desktop.in=.session)
++
++xsessiondir = $(datadir)/xsessions
++xsession_in_files = gnome-flashback.desktop.in
++xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
++
++%.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
++
++@INTLTOOL_DESKTOP_RULE@
++
+ default_layoutdir   = $(datadir)/gnome-panel
+ default_layout_DATA = panel-default-layout.layout
+ 
+ EXTRA_DIST =				\
+ 	$(gsettings_schemas_in_in)	\
++	$(session_in_files)		\
++	$(xsession_in_files)		\
+ 	$(default_layout_DATA)
+ 
+ CLEANFILES =			\
+ 	$(gsettings__enum_file)	\
+ 	$(gsettings_SCHEMAS_in)	\
+ 	$(gsettings_SCHEMAS)	\
+-	*.gschema.valid
++	*.gschema.valid		\
++	$(session_DATA)		\
++	$(xsession_DATA)
+ 
+ -include $(top_srcdir)/git.mk
+diff --git a/data/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in
+new file mode 100644
+index 0000000..4856f75
+--- /dev/null
++++ b/data/gnome-flashback.desktop.in
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++_Name=GNOME Flashback
++_Comment=This session logs you into GNOME with the traditional panel
++Exec=gnome-session --session=gnome-flashback
++TryExec=gnome-session
++Icon=
++Type=Application
+diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in
+new file mode 100644
+index 0000000..c012c58
+--- /dev/null
++++ b/data/gnome-flashback.session.desktop.in
+@@ -0,0 +1,3 @@
++[GNOME Session]
++_Name=GNOME Flashback
++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;notification-daemon;
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index bc65c4c..a6aa6c7 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -23,6 +23,8 @@ applets/wncklet/window-menu.c
+ applets/wncklet/wncklet.c
+ applets/wncklet/workspace-switcher.c
+ [type: gettext/glade]applets/wncklet/workspace-switcher.ui
++data/gnome-flashback.desktop.in
++data/gnome-flashback.session.desktop.in
+ data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
+ data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
+ data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
+-- 
+1.7.10.4
+
diff --git a/community/gnome-panel/18_fix_force_quit_applet.patch b/community/gnome-panel/18_fix_force_quit_applet.patch
new file mode 100644
index 000000000..8a72c9262
--- /dev/null
+++ b/community/gnome-panel/18_fix_force_quit_applet.patch
@@ -0,0 +1,98 @@
+Description: Fix Force-Quit panel applet
+ This patch implements handling of XInput2 extension events in the applet.
+ Without this patch, the applet fails to recognize such events (either mouse
+ click for killing application, or escape key for exiting), hence freezing the
+ desktop.
+ .
+ Also fix the event mask in call of gdk_device_grab() for keyboard.
+Author: Sébastien Villemot <sebastien@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698740
+Forwarded: no
+Last-Update: 2013-01-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/gnome-panel/panel-force-quit.c
++++ b/gnome-panel/panel-force-quit.c
+@@ -32,6 +32,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/keysym.h>
+ 
++#include <X11/extensions/XInput2.h>
++
+ #include "panel-icon-names.h"
+ #include "panel-stock-icons.h"
+ 
+@@ -246,22 +248,23 @@
+ 
+ static void 
+ handle_button_press_event (GtkWidget *popup,
+-			   XKeyEvent *event)
++			   Display *display,
++			   Window subwindow)
+ {
+ 	Window window;
+ 
+ 	remove_popup (popup);
+ 
+-	if (event->subwindow == None)
++	if (subwindow == None)
+ 		return;
+ 
+ 	if (wm_state_atom == None)
+-		wm_state_atom = XInternAtom (event->display, "WM_STATE", FALSE);
++		wm_state_atom = XInternAtom (display, "WM_STATE", FALSE);
+ 
+-	window = find_managed_window (event->display, event->subwindow);
++	window = find_managed_window (display, subwindow);
+ 
+ 	if (window != None) {
+-		if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window))
++		if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (display), window))
+ 			kill_window_question ((gpointer) window);
+ 	}
+ }
+@@ -272,10 +275,12 @@
+ 	      GtkWidget *popup)
+ {
+ 	XEvent *xevent = (XEvent *) gdk_xevent;
++	XIEvent *xiev;
++	XIDeviceEvent *xidev;
+ 
+ 	switch (xevent->type) {
+ 	case ButtonPress:
+-		handle_button_press_event (popup, &xevent->xkey);
++		handle_button_press_event (popup, xevent->xbutton.display, xevent->xbutton.subwindow);
+ 		return GDK_FILTER_REMOVE;
+ 	case KeyPress:
+ 		if (xevent->xkey.keycode == XKeysymToKeycode (xevent->xany.display, XK_Escape)) {
+@@ -283,6 +288,21 @@
+ 			return GDK_FILTER_REMOVE;
+ 		}
+ 		break;
++	case GenericEvent:
++		xiev = (XIEvent *) xevent->xcookie.data;
++		xidev = (XIDeviceEvent *) xiev;
++		switch (xiev->evtype) {
++		case XI_KeyPress:
++			if (xidev->detail == XKeysymToKeycode (xevent->xany.display, XK_Escape)) {
++				remove_popup (popup);
++				return GDK_FILTER_REMOVE;
++			}
++			break;
++		case XI_ButtonPress:
++			handle_button_press_event (popup, xidev->display, xidev->child);
++			return GDK_FILTER_REMOVE;
++		}
++		break;
+ 	default:
+ 		break;
+ 	}
+@@ -331,7 +351,7 @@
+ 
+ 	status = gdk_device_grab (keyboard, root,
+ 				  GDK_OWNERSHIP_NONE, FALSE,
+-				  GDK_KEY_PRESS | GDK_KEY_RELEASE,
++				  GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
+ 				  NULL, time);
+ 	if (status != GDK_GRAB_SUCCESS) {
+ 		g_warning ("Keyboard grab failed\n");
diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
index 664bc7945..e490594e4 100644
--- a/community/gnome-panel/PKGBUILD
+++ b/community/gnome-panel/PKGBUILD
@@ -1,38 +1,84 @@
-# $Id: PKGBUILD 87902 2013-04-08 14:46:15Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 88684 2013-04-21 22:16:57Z heftig $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gnome-panel
+pkgbase=gnome-panel
+pkgname=('gnome-panel' 'gnome-flashback-session')
 pkgver=3.6.2
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf'
-         'gconf' 'telepathy-glib')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079')
+pkgdesc="Legacy GNOME panel"
+url="https://live.gnome.org/GnomePanel"
+depends=('dconf' 'evolution-data-server' 'gconf' 'gnome-desktop' 'gnome-menus' 'librsvg'
+         'libwnck3' 'telepathy-glib')
+makedepends=('gobject-introspection' 'intltool' 'yelp-tools' 'networkmanager' 'gnome-common')
+install=$pkgbase.install
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
+        gnome-desktop-3.8.patch
+        drop-gweather-xml-include.patch
+        18_fix_force_quit_applet.patch
+        logout-hang-workaround.patch
+        0001-Add-the-GNOME-Flashback-session.patch
+        fix-autoconf.patch)
+sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079'
+            '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c'
+            'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305'
+            '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775'
+            'e98391114fe618d3c9530cd5ad88e5d0d0e3b62890e4494f7db6a76ec3613a47'
+            'f313791d246749f18764ad4af13c4efe54483bc327fab371c47f9fbfc25b20a9'
+            '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71')
 
 build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-panel \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
+  cd "$pkgbase-$pkgver"
+
+  # Port to gnome-desktop 3.8
+  patch -Np1 -i "$srcdir/gnome-desktop-3.8.patch"
+
+  # Fix build with libgweather 3.8
+  patch -Np0 -i "$srcdir/drop-gweather-xml-include.patch"
+
+  # Fix force quit applet to avoid freeze
+  patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch"
+
+  # Apply a workaround to avoid hang on logout for 15-20 sec
+  patch -Np1 -i "$srcdir/logout-hang-workaround.patch"
+
+  # Add GNOME Flashback session
+  # https://bugzilla.gnome.org/show_bug.cgi?id=694625
+  patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgbase \
+              --disable-static --disable-schemas-compile \
+              PYTHON=/usr/bin/python2 
   make
 }
 
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+package_gnome-panel() {
+  cd "$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Remove unneeded script
+  rm "$pkgdir/usr/lib/gnome-panel/gnome-panel-add"
+
+  # Split out the session files
+  rm -r "$pkgdir"/usr/share/{gnome-session,xsessions}
+}
+
+package_gnome-flashback-session() {
+  pkgdesc="Shell for Gnome 3 which was initially called Gnome Fallback"
+  url="https://live.gnome.org/GnomeFlashback"
+  depends=('gnome-screensaver' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon'
+           'gnome-settings-daemon-compat' 'gnome-themes-standard' 'metacity' 'nautilus'
+           'notification-daemon' 'polkit-gnome')
+  install=
 
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+  cd "$pkgbase-$pkgver"
+  make -C data DESTDIR="$pkgdir" install-sessionDATA
+  make -C data DESTDIR="$pkgdir" install-xsessionDATA
 }
diff --git a/community/gnome-panel/drop-gweather-xml-include.patch b/community/gnome-panel/drop-gweather-xml-include.patch
new file mode 100644
index 000000000..3b3a559f0
--- /dev/null
+++ b/community/gnome-panel/drop-gweather-xml-include.patch
@@ -0,0 +1,10 @@
+--- applets/clock/clock.c.orig	2012-12-25 14:38:00.101601746 -0600
++++ applets/clock/clock.c	2012-12-25 14:38:30.331443803 -0600
+@@ -54,7 +54,6 @@
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libgnome-desktop/gnome-wall-clock.h>
+ 
+-#include <libgweather/gweather-xml.h>
+ #include <libgweather/location-entry.h>
+ #include <libgweather/timezone-menu.h>
+ #include <libgweather/gweather-enum-types.h>
diff --git a/community/gnome-panel/fix-autoconf.patch b/community/gnome-panel/fix-autoconf.patch
new file mode 100644
index 000000000..17d9e025c
--- /dev/null
+++ b/community/gnome-panel/fix-autoconf.patch
@@ -0,0 +1,11 @@
+diff -Naur gnome-panel-3.6.2.orig/configure.ac gnome-panel-3.6.2/configure.ac
+--- gnome-panel-3.6.2.orig/configure.ac	2012-11-12 18:51:14.000000000 +0100
++++ gnome-panel-3.6.2/configure.ac	2013-04-10 14:50:14.132509059 +0200
+@@ -1,6 +1,6 @@
+ AC_INIT([gnome-panel], [3.6.2],
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar -Wno-portability])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/community/gnome-panel/gnome-desktop-3.8.patch b/community/gnome-panel/gnome-desktop-3.8.patch
new file mode 100644
index 000000000..3c8823cd2
--- /dev/null
+++ b/community/gnome-panel/gnome-desktop-3.8.patch
@@ -0,0 +1,199 @@
+diff -Naur gnome-panel-3.6.2.orig/applets/clock/calendar-window.c gnome-panel-3.6.2/applets/clock/calendar-window.c
+--- gnome-panel-3.6.2.orig/applets/clock/calendar-window.c	2012-11-12 18:35:17.000000000 +0100
++++ gnome-panel-3.6.2/applets/clock/calendar-window.c	2013-04-08 23:10:30.451012763 +0200
+@@ -42,9 +42,6 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ 
+-#define GNOME_DESKTOP_USE_UNSTABLE_API
+-#include <libgnome-desktop/gnome-desktop-utils.h>
+-
+ #include "calendar-window.h"
+ 
+ #include "clock.h"
+@@ -168,6 +165,13 @@
+ 		return;
+ 	}
+ 
++	/* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */
++	if (terminal) {
++		g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. "
++		            "Please configure a different application.\n");
++		return;
++	}
++
+ 	command_line = g_find_program_in_path (program);
+ 	if (command_line == NULL) {
+ 		g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program);
+@@ -189,9 +193,6 @@
+ 	screen = gtk_widget_get_screen (calwin->priv->calendar);
+ 	error = NULL;
+ 
+-	if (terminal)
+-		gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
+-
+ 	display = gdk_screen_make_display_name (screen);
+ 
+ 	result = g_spawn_async (NULL, /* working directory */
+diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c
+--- gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c	2012-11-12 18:35:17.000000000 +0100
++++ gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c	2013-04-08 23:10:52.408175181 +0200
+@@ -25,6 +25,7 @@
+  *	Havoc Pennington <hp@pobox.com>
+  *      George Lebl <jirka@5z.com>
+  *	Mark McLoughlin <mark@skynet.ie>
++ *	Tom Tromey (Copyright (C) 1998)
+  */
+ 
+ #include <config.h>
+@@ -42,8 +43,6 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gmenu-tree.h>
+ 
+-#include <libgnome-desktop/gnome-desktop-utils.h>
+-
+ #include <libpanel-util/panel-error.h>
+ #include <libpanel-util/panel-glib.h>
+ #include <libpanel-util/panel-gtk.h>
+@@ -335,6 +334,132 @@
+ 	 */
+ }
+ 
++
++/**
++ * panel_run_dialog_prepend_terminal_to_vector:
++ * @argc: a pointer to the vector size
++ * @argv: a pointer to the vector
++ *
++ * Description:  Prepends a terminal (either the one configured as default in
++ * the user's GNOME setup, or one of the common xterm emulators) to the passed
++ * in vector, modifying it in the process.  The vector should be allocated with
++ * #g_malloc, as this will #g_free the original vector.  Also all elements must
++ * have been allocated separately.  That is the standard glib/GNOME way of
++ * doing vectors however.  If the integer that @argc points to is negative, the
++ * size will first be computed.  Also note that passing in pointers to a vector
++ * that is empty, will just create a new vector for you.
++ **/
++/* TODO: throw out this function if there ever is a proper GAppInfo port */
++static void
++panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv)
++{
++        char **real_argv;
++        int real_argc;
++        int i, j;
++	char **term_argv = NULL;
++	int term_argc = 0;
++	GSettings *settings;
++
++	gchar *terminal = NULL;
++
++	char **the_argv;
++
++        g_return_if_fail (argc != NULL);
++        g_return_if_fail (argv != NULL);
++
++	/* sanity */
++        if(*argv == NULL)
++                *argc = 0;
++
++	the_argv = *argv;
++
++	/* compute size if not given */
++	if (*argc < 0) {
++		for (i = 0; the_argv[i] != NULL; i++)
++			;
++		*argc = i;
++	}
++
++	settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
++	terminal = g_settings_get_string (settings, "exec");
++
++	if (terminal) {
++		gchar *command_line;
++		gchar *exec_flag;
++
++		exec_flag = g_settings_get_string (settings, "exec-arg");
++
++		if (exec_flag == NULL)
++			command_line = g_strdup (terminal);
++		else
++			command_line = g_strdup_printf ("%s %s", terminal,
++							exec_flag);
++
++		g_shell_parse_argv (command_line,
++				    &term_argc,
++				    &term_argv,
++				    NULL /* error */);
++
++		g_free (command_line);
++		g_free (exec_flag);
++		g_free (terminal);
++	}
++
++	g_object_unref (settings);
++
++	if (term_argv == NULL) {
++		char *check;
++
++		term_argc = 2;
++		term_argv = g_new0 (char *, 3);
++
++		check = g_find_program_in_path ("gnome-terminal");
++		if (check != NULL) {
++			term_argv[0] = check;
++			/* Note that gnome-terminal takes -x and
++			 * as -e in gnome-terminal is broken we use that. */
++			term_argv[1] = g_strdup ("-x");
++		} else {
++			if (check == NULL)
++				check = g_find_program_in_path ("nxterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("color-xterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("rxvt");
++			if (check == NULL)
++				check = g_find_program_in_path ("xterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("dtterm");
++			if (check == NULL) {
++				g_warning (_("Cannot find a terminal, using "
++					     "xterm, even if it may not work"));
++				check = g_strdup ("xterm");
++			}
++			term_argv[0] = check;
++			term_argv[1] = g_strdup ("-e");
++		}
++	}
++
++        real_argc = term_argc + *argc;
++        real_argv = g_new (char *, real_argc + 1);
++
++        for (i = 0; i < term_argc; i++)
++                real_argv[i] = term_argv[i];
++
++        for (j = 0; j < *argc; j++, i++)
++                real_argv[i] = (char *)the_argv[j];
++
++	real_argv[i] = NULL;
++
++	g_free (*argv);
++	*argv = real_argv;
++	*argc = real_argc;
++
++	/* we use g_free here as we sucked all the inner strings
++	 * out from it into real_argv */
++	g_free (term_argv);
++}
++
+ static gboolean
+ panel_run_dialog_launch_command (PanelRunDialog *dialog,
+ 				 const char     *command,
+@@ -354,7 +479,7 @@
+ 	screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
+ 
+ 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox)))
+-		gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
++		panel_run_dialog_prepend_terminal_to_vector (&argc, &argv);
+ 
+ 	display = gdk_screen_make_display_name (screen);
+ 
diff --git a/community/gnome-panel/gnome-panel.install b/community/gnome-panel/gnome-panel.install
index 0f9324937..f7e8c46ac 100644
--- a/community/gnome-panel/gnome-panel.install
+++ b/community/gnome-panel/gnome-panel.install
@@ -1,24 +1,12 @@
-pkgname=gnome-panel
-
 post_install() {
-  gconfpkg --install $pkgname
   glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
-pre_upgrade() {
-  pre_remove
-}
-
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
 post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  post_install
 }
diff --git a/community/gnome-panel/logout-hang-workaround.patch b/community/gnome-panel/logout-hang-workaround.patch
new file mode 100644
index 000000000..0b13e35b6
--- /dev/null
+++ b/community/gnome-panel/logout-hang-workaround.patch
@@ -0,0 +1,15 @@
+diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-session.c gnome-panel-3.6.2/gnome-panel/panel-session.c
+--- gnome-panel-3.6.2.orig/gnome-panel/panel-session.c	2012-09-03 17:41:42.000000000 +0200
++++ gnome-panel-3.6.2/gnome-panel/panel-session.c	2013-04-11 00:59:42.125864185 +0200
+@@ -69,11 +69,6 @@
+ 
+ 	egg_sm_client_set_mode (mode);
+ 
+-	client = egg_sm_client_get ();
+-
+-	g_signal_connect (client, "quit",
+-			  G_CALLBACK (panel_session_handle_quit), NULL);
+-
+ 	/* We don't want the WM to try and save/restore our
+ 	 * window position */
+ 	gdk_x11_set_sm_client_id (NULL);
diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD
index a84445874..9cb5ee7da 100644
--- a/community/gnome-phone-manager/PKGBUILD
+++ b/community/gnome-phone-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87900 2013-04-08 14:45:13Z heftig $
+# $Id: PKGBUILD 88702 2013-04-21 22:24:11Z heftig $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-phone-manager
-pkgver=0.68
-pkgrel=3
+pkgver=0.69
+pkgrel=1
 pkgdesc="Control your mobile phone from your GNOME desktop."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/PhoneManager"
@@ -12,10 +12,10 @@ depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' '
 makedepends=('intltool')
 options=('!emptydirs' '!libtool')
 install=gnome-phone-manager.install
-source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
         gnome-phone-manager-0.68-eds.patch)
-sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15'
-            '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66')
+sha256sums=('35e038ea3afaacdf451046e87af876096cf1520efc04fc3f5b63ea22e0297175'
+            '232a72108836ddd46d329993d166c38550e2923f161b4dc814d75af4ed5ccc79')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
index 2a36de13a..924201196 100644
--- a/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
+++ b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
@@ -1,7 +1,94 @@
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c
-index dc8e2e3..d95e5b9 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.c
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c
+diff -up gnome-phone-manager-0.68/configure.eds gnome-phone-manager-0.68/configure
+--- gnome-phone-manager-0.68/configure.eds	2012-10-30 15:03:19.515929969 -0400
++++ gnome-phone-manager-0.68/configure	2012-10-30 15:03:54.979862209 -0400
+@@ -13939,12 +13939,12 @@ if test -n "$PHONEMGR_CFLAGS"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	\$GNOME_BLUETOOTH_REQS \$evo_pc_file libedataserverui-3.0
++	\$GNOME_BLUETOOTH_REQS \$evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ ") 2>&5
+   ac_status=$?
+@@ -13952,7 +13952,7 @@ if test -n "$PHONEMGR_CFLAGS"; then
+   test $ac_status = 0; }; then
+   pkg_cv_PHONEMGR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ " 2>/dev/null`
+ else
+@@ -13967,12 +13967,12 @@ if test -n "$PHONEMGR_LIBS"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	\$GNOME_BLUETOOTH_REQS \$evo_pc_file libedataserverui-3.0
++	\$GNOME_BLUETOOTH_REQS \$evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ ") 2>&5
+   ac_status=$?
+@@ -13980,7 +13980,7 @@ if test -n "$PHONEMGR_LIBS"; then
+   test $ac_status = 0; }; then
+   pkg_cv_PHONEMGR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ " 2>/dev/null`
+ else
+@@ -14004,13 +14004,13 @@ fi
+         if test $_pkg_short_errors_supported = yes; then
+ 	        PHONEMGR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ " 2>&1`
+         else
+ 	        PHONEMGR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ " 2>&1`
+         fi
+@@ -14019,7 +14019,7 @@ fi
+ 
+ 	as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ ) were not met:
+ 
+diff -up gnome-phone-manager-0.68/configure.in.eds gnome-phone-manager-0.68/configure.in
+--- gnome-phone-manager-0.68/configure.in.eds	2012-10-30 15:03:24.151921087 -0400
++++ gnome-phone-manager-0.68/configure.in	2012-10-30 15:03:33.865897797 -0400
+@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobje
+ 
+ PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ )
+ 
+diff -up gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c.eds gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c
+--- gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c.eds	2012-07-29 22:06:12.000000000 -0400
++++ gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c	2012-10-30 15:02:47.177996584 -0400
 @@ -38,11 +38,6 @@
  #include <glib.h>
  #include <glib/gi18n.h>
@@ -32,7 +119,7 @@ index dc8e2e3..d95e5b9 100644
    /* A list of EntryLookup structs we are searching */
    GList *lookup_entries;
    /* Number of characters to start searching at */
-@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact)
+@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *
    emails = e_contact_get (contact, E_CONTACT_EMAIL);
    for (l = emails; l != NULL; l = l->next) {
      item = g_new0 (EContactEntyItem, 1);
@@ -41,7 +128,7 @@ index dc8e2e3..d95e5b9 100644
      item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
  
      items = g_list_prepend (items, item);
-@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
+@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GLi
        return;
  
      photo = e_contact_get (contact, E_CONTACT_PHOTO);
@@ -64,7 +151,7 @@ index dc8e2e3..d95e5b9 100644
          pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
  
        if (pixbuf) {
-@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
+@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GLi
   * The query on the EBookView has completed.
   */
  static void
@@ -83,7 +170,7 @@ index dc8e2e3..d95e5b9 100644
  }
  
  /**
-@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
+@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus st
    lookup->bookview = book_view;
    g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
    
@@ -94,7 +181,7 @@ index dc8e2e3..d95e5b9 100644
    
    e_book_view_start (book_view);
  }
-@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
+@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable,
        if (lookup->bookview) {
          e_book_view_stop (lookup->bookview);
          g_object_unref (lookup->bookview);
@@ -102,7 +189,7 @@ index dc8e2e3..d95e5b9 100644
        }
      }
      
-@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
+@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable,
        if (!lookup->open)
          continue;
        
@@ -111,7 +198,7 @@ index dc8e2e3..d95e5b9 100644
          g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
        }
      }
-@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
+@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus
   */
  
  void
@@ -127,7 +214,7 @@ index dc8e2e3..d95e5b9 100644
  
    g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
  
-@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry,
+@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContac
      g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
      g_list_free (entry->priv->lookup_entries);
    }
@@ -174,23 +261,24 @@ index dc8e2e3..d95e5b9 100644
 -      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
 -      e_source_set_absolute_uri (s, uri);
 -      g_free (uri);
-+  for (link = list; link != NULL; link = g_list_next (link)) {
-+    ESource *source = E_SOURCE (link->data);
-+    EntryLookup *lookup;
- 
+-
 -      /* Now add those to the lookup entries list */
 -      lookup = g_new0 (EntryLookup, 1);
 -      lookup->entry = entry;
 -      lookup->status = E_BOOK_ERROR_OK;
 -      lookup->open = FALSE;
++  for (link = list; link != NULL; link = g_list_next (link)) {
++    ESource *source = E_SOURCE (link->data);
++    EntryLookup *lookup;
+ 
+-      if ((lookup->book = e_book_new (s, &error)) == NULL) {
+-        /* TODO handle this better, fire the error signal I guess */
 +    /* Now add those to the lookup entries list */
 +    lookup = g_new0 (EntryLookup, 1);
 +    lookup->entry = entry;
 +    lookup->status = E_BOOK_ERROR_OK;
 +    lookup->open = FALSE;
- 
--      if ((lookup->book = e_book_new (s, &error)) == NULL) {
--        /* TODO handle this better, fire the error signal I guess */
++
 +    if ((lookup->book = e_book_new (source, &error)) == NULL) {
 +      /* TODO handle this better, fire the error signal I guess */
 +      if (error) {
@@ -212,7 +300,7 @@ index dc8e2e3..d95e5b9 100644
      }
    }
  
-@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry,
+@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContac
      g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
  }
  
@@ -228,7 +316,7 @@ index dc8e2e3..d95e5b9 100644
  }
  
  void
-@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue *
+@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *o
    entry = E_CONTACT_ENTRY (object);
    
    switch (property_id) {
@@ -239,7 +327,7 @@ index dc8e2e3..d95e5b9 100644
      break;
    case PROP_COMPLETE_LENGTH:
      e_contact_entry_set_complete_length (entry, g_value_get_int (value));
-@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value,
+@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *o
    entry = E_CONTACT_ENTRY (object);
    
    switch (property_id) {
@@ -250,7 +338,7 @@ index dc8e2e3..d95e5b9 100644
      break;
    case PROP_COMPLETE_LENGTH:
      g_value_set_int (value, e_contact_entry_get_complete_length (entry));
-@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object)
+@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *objec
      g_list_free (entry->priv->lookup_entries);
      g_object_unref (entry->priv->completion);
      g_object_unref (entry->priv->store);
@@ -259,7 +347,7 @@ index dc8e2e3..d95e5b9 100644
  
      if (entry->priv->display_destroy) {
        entry->priv->display_destroy (entry->priv->display_func);
-@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object)
+@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *objec
  static void
  reset_search_fields (EContactEntry *entry)
  {
@@ -268,7 +356,7 @@ index dc8e2e3..d95e5b9 100644
  
    g_free (entry->priv->search_fields);
    entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
-@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass)
+@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntr
    object_class->finalize = e_contact_entry_finalize;
  
    /* Properties */
@@ -289,10 +377,9 @@ index dc8e2e3..d95e5b9 100644
    }
    if (lookup->book) {
      g_object_unref (lookup->book);
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h
-index bf6b39b..6fedef7 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.h
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h
+diff -up gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h.eds gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h
+--- gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h.eds	2012-07-29 22:06:12.000000000 -0400
++++ gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h	2012-10-30 15:02:47.177996584 -0400
 @@ -23,10 +23,8 @@
  #ifndef CONTACT_ENTRY_H
  #define CONTACT_ENTRY_H
@@ -316,10 +403,9 @@ index bf6b39b..6fedef7 100644
  
  void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
  int e_contact_entry_get_complete_length(EContactEntry *entry);
-diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c
-index 4e62e10..baef34f 100644
---- a/libgsm/phonemgr-utils.c
-+++ b/libgsm/phonemgr-utils.c
+diff -up gnome-phone-manager-0.68/libgsm/phonemgr-utils.c.eds gnome-phone-manager-0.68/libgsm/phonemgr-utils.c
+--- gnome-phone-manager-0.68/libgsm/phonemgr-utils.c.eds	2012-07-29 22:06:12.000000000 -0400
++++ gnome-phone-manager-0.68/libgsm/phonemgr-utils.c	2012-10-30 15:02:47.177996584 -0400
 @@ -27,7 +27,7 @@
  #include <glib.h>
  #include <glib/gstdio.h>
@@ -329,21 +415,19 @@ index 4e62e10..baef34f 100644
  #include <gnokii.h>
  
  #include <bluetooth/bluetooth.h>
-diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c
-index 5d25622..38f4c2f 100644
---- a/src/e-phone-entry.c
-+++ b/src/e-phone-entry.c
-@@ -31,8 +31,7 @@
+diff -up gnome-phone-manager-0.68/src/e-phone-entry.c.eds gnome-phone-manager-0.68/src/e-phone-entry.c
+--- gnome-phone-manager-0.68/src/e-phone-entry.c.eds	2012-07-29 22:06:12.000000000 -0400
++++ gnome-phone-manager-0.68/src/e-phone-entry.c	2012-10-30 15:04:13.471829767 -0400
+@@ -31,8 +31,6 @@
  
  #include <gtk/gtk.h>
  #include <string.h>
 -#include <libedataserver/e-source-list.h>
 -#include <libedataserverui/e-client-utils.h>
-+#include <libedataserverui/libedataserverui.h>
  #include "e-phone-entry.h"
  
  #define CONTACT_FORMAT "%s (%s)"
-@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object)
+@@ -181,25 +179,25 @@ e_phone_entry_finalize (GObject *object)
  }
  
  static void
diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD
index 909802f6b..0c64c1d6d 100644
--- a/community/gnome-screensaver/PKGBUILD
+++ b/community/gnome-screensaver/PKGBUILD
@@ -1,37 +1,44 @@
-# $Id: PKGBUILD 87889 2013-04-08 14:39:56Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# $Id: PKGBUILD 88685 2013-04-21 22:16:59Z heftig $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-screensaver
 pkgver=3.6.1
-pkgrel=1
-pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
+pkgrel=3
+pkgdesc="Legacy GNOME screensaver"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd')
-makedepends=('pkgconfig' 'intltool' 'libxss')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
+depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
+makedepends=('intltool' 'gnome-common')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-       gnome-screensaver.pam)
+       gnome-screensaver.pam
+       move-desktop-file.patch
+       fix-autoconf.patch)
 sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
-            'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
+            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+            '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
+            'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb')
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext --with-systemd
+  cd "$pkgname-$pkgver"
 
+  # Upstream patch that moves gnome-screensaver desktop file out of autostart
+  patch -Np1 -i "$srcdir/move-desktop-file.patch"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --with-mit-ext
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
 }
diff --git a/community/gnome-screensaver/fix-autoconf.patch b/community/gnome-screensaver/fix-autoconf.patch
new file mode 100644
index 000000000..653b42bc8
--- /dev/null
+++ b/community/gnome-screensaver/fix-autoconf.patch
@@ -0,0 +1,12 @@
+diff -Naur gnome-screensaver-3.6.1.orig/configure.ac gnome-screensaver-3.6.1/configure.ac
+--- gnome-screensaver-3.6.1.orig/configure.ac	2012-10-16 04:28:59.000000000 +0200
++++ gnome-screensaver-3.6.1/configure.ac	2013-04-10 14:24:44.844833193 +0200
+@@ -10,7 +10,7 @@
+ AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AM_MAINTAINER_MODE([enable])
+ 
diff --git a/community/gnome-screensaver/gnome-screensaver.install b/community/gnome-screensaver/gnome-screensaver.install
deleted file mode 100644
index d1a42c6ce..000000000
--- a/community/gnome-screensaver/gnome-screensaver.install
+++ /dev/null
@@ -1,7 +0,0 @@
-pkgname=gnome-screensaver
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        gconfpkg --uninstall ${pkgname}
-    fi
-}
diff --git a/community/gnome-screensaver/gnome-screensaver.pam b/community/gnome-screensaver/gnome-screensaver.pam
index 453dae646..8d3baf085 100644
--- a/community/gnome-screensaver/gnome-screensaver.pam
+++ b/community/gnome-screensaver/gnome-screensaver.pam
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth        required     pam_unix_auth.so nullok
-auth        optional     pam_gnome_keyring.so
+auth        substack     system-login
+-auth        optional     pam_gnome_keyring.so
diff --git a/community/gnome-screensaver/move-desktop-file.patch b/community/gnome-screensaver/move-desktop-file.patch
new file mode 100644
index 000000000..d918405ad
--- /dev/null
+++ b/community/gnome-screensaver/move-desktop-file.patch
@@ -0,0 +1,34 @@
+From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim@feathertop.org>
+Date: Thu, 18 Oct 2012 23:08:56 +0000
+Subject: move gnome-screensaver desktop file out of autostart
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683060
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1dd5d46..97ffa07 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -47,7 +47,7 @@ noinst_PROGRAMS = 	\
+ 	test-window	\
+ 	$(NULL)
+ 
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(datadir)/applications
+ desktop_in_files = gnome-screensaver.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
+index fae80c4..82d6d6f 100644
+--- a/src/gnome-screensaver.desktop.in.in
++++ b/src/gnome-screensaver.desktop.in.in
+@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program
+ Icon=preferences-desktop-screensaver
+ Exec=gnome-screensaver
+ OnlyShowIn=GNOME;
+-AutostartCondition=GNOME3 if-session gnome-fallback
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+--
+cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD
new file mode 100644
index 000000000..314d38cd1
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 88700 2013-04-21 22:24:08Z heftig $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-settings-daemon-compat
+_pkgname=gnome-settings-daemon
+pkgver=3.6.4
+pkgrel=1
+pkgdesc="Compatibility package that provides background and mount helpers for the Gnome Flashback session"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gnome-desktop')
+makedepends=('docbook-xsl' 'ibus' 'intltool' 'libcanberra' 'libnotify' 'libpulse' 'libwacom' 'nss' 'upower' 'xf86-input-wacom')
+url="https://live.gnome.org/GnomeFlashback"
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
+        standalone-background-helper.patch
+        draw-background-unconditionally.patch
+        sessionisactive-port.patch
+        flashback-rename.patch
+        remove-libgsd-dependency.patch)
+sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
+            '4c2206b9654bd2b2729297870696c87906e2386b492bae1052b94148e5ea370f'
+            '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a'
+            '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915'
+            '57c66068f06599ea682325e9f5b92b751d8f0a4322b53371698f8539f709b101'
+            '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c')
+
+build() {
+  cd $_pkgname-$pkgver
+
+  # Build background helper as a stand alone binary
+  patch -Np1 -i ../standalone-background-helper.patch
+
+  # Always draw background
+  patch -Np1 -i ../draw-background-unconditionally.patch
+
+  # Port to gnome-session's SessionIsActive property
+  patch -Np1 -i ../sessionisactive-port.patch
+
+  # Remove libgsd dependency
+  patch -Np1 -i ../remove-libgsd-dependency.patch
+
+  # GNOME Fallback renamed to Flashback
+  patch -Np1 -i ../flashback-rename.patch
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \
+              --disable-static --enable-systemd
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make -C plugins/automount
+  make -C plugins/background
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make -C plugins/automount DESTDIR="$pkgdir" install
+  make -C plugins/background DESTDIR="$pkgdir" install
+}
diff --git a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
new file mode 100644
index 000000000..c279420de
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
@@ -0,0 +1,162 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c	2013-04-10 16:33:15.858860586 +0200
+@@ -69,110 +69,6 @@
+ 
+ static gpointer manager_object = NULL;
+ 
+-static gboolean
+-dont_draw_background (GsdBackgroundManager *manager)
+-{
+-        return !g_settings_get_boolean (manager->priv->settings,
+-                                        "draw-background");
+-}
+-
+-static gboolean
+-nautilus_is_drawing_background (GsdBackgroundManager *manager)
+-{
+-       Atom           window_id_atom;
+-       Window         nautilus_xid;
+-       Atom           actual_type;
+-       int            actual_format;
+-       unsigned long  nitems;
+-       unsigned long  bytes_after;
+-       unsigned char *data;
+-       Atom           wmclass_atom;
+-       gboolean       running;
+-       gint           error;
+-       gboolean       show_desktop_icons;
+-
+-       show_desktop_icons = g_settings_get_boolean (manager->priv->settings,
+-                                                     "show-desktop-icons");
+-       if (! show_desktop_icons) {
+-               return FALSE;
+-       }
+-
+-       window_id_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+-                                     "NAUTILUS_DESKTOP_WINDOW_ID", True);
+-
+-       if (window_id_atom == None) {
+-               return FALSE;
+-       }
+-
+-       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+-                           GDK_ROOT_WINDOW (),
+-                           window_id_atom,
+-                           0,
+-                           1,
+-                           False,
+-                           XA_WINDOW,
+-                           &actual_type,
+-                           &actual_format,
+-                           &nitems,
+-                           &bytes_after,
+-                           &data);
+-
+-       if (data != NULL) {
+-               nautilus_xid = *(Window *) data;
+-               XFree (data);
+-       } else {
+-               return FALSE;
+-       }
+-
+-       if (actual_type != XA_WINDOW) {
+-               return FALSE;
+-       }
+-       if (actual_format != 32) {
+-               return FALSE;
+-       }
+-
+-       wmclass_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLASS", False);
+-
+-       gdk_error_trap_push ();
+-
+-       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+-                           nautilus_xid,
+-                           wmclass_atom,
+-                           0,
+-                           24,
+-                           False,
+-                           XA_STRING,
+-                           &actual_type,
+-                           &actual_format,
+-                           &nitems,
+-                           &bytes_after,
+-                           &data);
+-
+-       error = gdk_error_trap_pop ();
+-
+-       if (error == BadWindow) {
+-               return FALSE;
+-       }
+-
+-       if (actual_type == XA_STRING &&
+-           nitems == 24 &&
+-           bytes_after == 0 &&
+-           actual_format == 8 &&
+-           data != NULL &&
+-           !strcmp ((char *)data, "desktop_window") &&
+-           !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus")) {
+-               running = TRUE;
+-       } else {
+-               running = FALSE;
+-       }
+-
+-       if (data != NULL) {
+-               XFree (data);
+-       }
+-
+-       return running;
+-}
+-
+ static void
+ on_crossfade_finished (GsdBackgroundManager *manager)
+ {
+@@ -189,11 +85,6 @@
+         int         i;
+ 
+ 
+-        if (nautilus_is_drawing_background (manager) ||
+-            dont_draw_background (manager)) {
+-                return;
+-        }
+-
+         gnome_settings_profile_start (NULL);
+ 
+         display = gdk_display_get_default ();
+@@ -408,8 +299,7 @@
+                          const char           *key,
+                          GsdBackgroundManager *manager)
+ {
+-        if (dont_draw_background (manager) == FALSE)
+-                setup_bg_and_draw_background (manager);
++        setup_bg_and_draw_background (manager);
+ }
+ 
+ gboolean
+@@ -422,24 +312,8 @@
+         gnome_settings_profile_start (NULL);
+ 
+         manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
+-        g_signal_connect (manager->priv->settings, "changed::draw-background",
+-                          G_CALLBACK (draw_background_changed), manager);
+ 
+-        /* If this is set, nautilus will draw the background and is
+-	 * almost definitely in our session.  however, it may not be
+-	 * running yet (so is_nautilus_running() will fail).  so, on
+-	 * startup, just don't do anything if this key is set so we
+-	 * don't waste time setting the background only to have
+-	 * nautilus overwrite it.
+-	 */
+-        show_desktop_icons = g_settings_get_boolean (manager->priv->settings,
+-                                                     "show-desktop-icons");
+-
+-        if (!show_desktop_icons) {
+-                setup_bg (manager);
+-        } else {
+-                draw_background_after_session_loads (manager);
+-        }
++        setup_bg (manager);
+ 
+         gnome_settings_profile_end (NULL);
+ 
diff --git a/community/gnome-settings-daemon-compat/flashback-rename.patch b/community/gnome-settings-daemon-compat/flashback-rename.patch
new file mode 100644
index 000000000..2aaa9ce22
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/flashback-rename.patch
@@ -0,0 +1,18 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-10 16:58:35.356800871 +0200
+@@ -9,4 +9,4 @@
+ NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Notify=true
+-AutostartCondition=GNOME3 if-session gnome-fallback
++AutostartCondition=GNOME3 if-session gnome-flashback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-10 15:57:02.136341000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-10 16:58:57.593982808 +0200
+@@ -9,4 +9,4 @@
+ NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Notify=true
+-AutostartCondition=GNOME3 if-session gnome-fallback
++AutostartCondition=GNOME3 if-session gnome-flashback
diff --git a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
new file mode 100644
index 000000000..b843ac2ce
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
@@ -0,0 +1,160 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c	2013-04-10 17:19:51.796298000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c	2013-04-10 17:31:27.382311947 +0200
+@@ -28,13 +28,43 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ 
+-#include "gnome-settings-profile.h"
+-#include "gnome-settings-session.h"
+ #include "gsd-automount-manager.h"
+ #include "gsd-autorun.h"
+ 
+ #define GSD_AUTOMOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_AUTOMOUNT_MANAGER, GsdAutomountManagerPrivate))
+ 
++#define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
++#define GNOME_SESSION_DBUS_OBJECT    "/org/gnome/SessionManager"
++#define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
++
++GDBusProxy *
++get_session_proxy (void)
++{
++        static GDBusProxy *session_proxy;
++        GError *error =  NULL;
++
++        if (session_proxy != NULL) {
++                g_object_ref (session_proxy);
++        } else {
++                session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
++                                                               G_DBUS_PROXY_FLAGS_NONE,
++                                                               NULL,
++                                                               GNOME_SESSION_DBUS_NAME,
++                                                               GNOME_SESSION_DBUS_OBJECT,
++                                                               GNOME_SESSION_DBUS_INTERFACE,
++                                                               NULL,
++                                                               &error);
++                if (error) {
++                        g_warning ("Failed to connect to the session manager: %s", error->message);
++                        g_error_free (error);
++                } else {
++                        g_object_add_weak_pointer (G_OBJECT (session_proxy), (gpointer*)&session_proxy);
++                }
++        }
++
++        return session_proxy;
++}
++
+ struct GsdAutomountManagerPrivate
+ {
+         GSettings   *settings;
+@@ -315,7 +345,7 @@
+ static void
+ do_initialize_session (GsdAutomountManager *manager)
+ {
+-        manager->priv->session = gnome_settings_session_get_session_proxy ();
++        manager->priv->session = get_session_proxy ();
+         g_signal_connect (manager->priv->session, "g-properties-changed",
+                           G_CALLBACK (session_props_changed), manager);
+         session_props_changed (manager->priv->session, NULL, NULL, manager);
+@@ -490,13 +520,10 @@
+                                        GError              **error)
+ {
+         g_debug ("Starting automounting manager");
+-        gnome_settings_profile_start (NULL);
+ 
+         manager->priv->settings = g_settings_new ("org.gnome.desktop.media-handling");
+         setup_automounter (manager);
+ 
+-        gnome_settings_profile_end (NULL);
+-
+         return TRUE;
+ }
+ 
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-10 17:33:09.697997021 +0200
+@@ -8,7 +8,6 @@
+ 	gsd-autorun.h
+ 
+ gnome_fallback_mount_helper_CPPFLAGS = \
+-	-I$(top_srcdir)/gnome-settings-daemon		\
+ 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	$(AM_CPPFLAGS)
+ 
+@@ -20,8 +19,7 @@
+ gnome_fallback_mount_helper_LDADD =	\
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+ 	$(SYSTEMD_LIBS)			\
+-	$(AUTOMOUNT_LIBS)		\
+-	$(top_builddir)/gnome-settings-daemon/libgsd.la
++	$(AUTOMOUNT_LIBS)
+ 
+ autostartdir = $(sysconfdir)/xdg/autostart
+ autostart_in_files = gnome-fallback-mount-helper.desktop.in
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c	2013-04-10 17:19:51.792965000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c	2013-04-10 17:22:46.930334951 +0200
+@@ -42,7 +42,6 @@
+ #include <libgnome-desktop/gnome-bg.h>
+ #include <X11/Xatom.h>
+ 
+-#include "gnome-settings-profile.h"
+ #include "gsd-background-manager.h"
+ 
+ #define GSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerPrivate))
+@@ -85,8 +84,6 @@
+         int         i;
+ 
+ 
+-        gnome_settings_profile_start (NULL);
+-
+         display = gdk_display_get_default ();
+         n_screens = gdk_display_get_n_screens (display);
+ 
+@@ -121,8 +118,6 @@
+ 
+                 cairo_surface_destroy (surface);
+         }
+-
+-        gnome_settings_profile_end (NULL);
+ }
+ 
+ static void
+@@ -309,14 +304,11 @@
+         gboolean show_desktop_icons;
+ 
+         g_debug ("Starting background manager");
+-        gnome_settings_profile_start (NULL);
+ 
+         manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
+ 
+         setup_bg (manager);
+ 
+-        gnome_settings_profile_end (NULL);
+-
+         return TRUE;
+ }
+ 
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-04-10 17:43:32.768975155 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-10 17:43:19.115328380 +0200
+@@ -6,18 +6,16 @@
+ 	gsd-background-manager.h
+ 
+ gnome_fallback_background_helper_CPPFLAGS = \
+-	-I$(top_srcdir)/gnome-settings-daemon		\
+ 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	$(AM_CPPFLAGS)
+ 
+ gnome_fallback_background_helper_CFLAGS =	\
+ 	$(SETTINGS_PLUGIN_CFLAGS)	\
+ 	$(BACKGROUND_CFLAGS)
+ 
+ gnome_fallback_background_helper_LDADD =	\
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+-	$(BACKGROUND_LIBS)		\
+-	$(top_builddir)/gnome-settings-daemon/libgsd.la
++	$(BACKGROUND_LIBS)
+ 
+ autostartdir = $(sysconfdir)/xdg/autostart
+ autostart_in_files = gnome-fallback-background-helper.desktop.in
diff --git a/community/gnome-settings-daemon-compat/sessionisactive-port.patch b/community/gnome-settings-daemon-compat/sessionisactive-port.patch
new file mode 100644
index 000000000..dc5fd260e
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/sessionisactive-port.patch
@@ -0,0 +1,73 @@
+From 32b0b2d85629ae765543df1d940a5ca3c37dcec1 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Tue, 06 Nov 2012 22:47:05 +0000
+Subject: [wip] Port to gnome-session's SessionIsActive property
+
+Rather than maintaining the systemd code here, monitor gnome-session's
+SessionIsActive property.  This allows us to drop the compile-time
+dependency on systemd.
+
+The power plugin is declared dependent on systemd at runtime, but the
+rest of the code should operate in more "basic functionality" mode.
+---
+(limited to 'plugins/automount')
+
+diff --git a/plugins/automount/gsd-automount-manager.c b/plugins/automount/gsd-automount-manager.c
+index 7912f19..d8e9e07 100644
+--- a/plugins/automount/gsd-automount-manager.c
++++ b/plugins/automount/gsd-automount-manager.c
+@@ -42,7 +42,7 @@ struct GsdAutomountManagerPrivate
+ 	GVolumeMonitor *volume_monitor;
+ 	unsigned int automount_idle_id;
+ 
+-        GnomeSettingsSession *session;
++        GDBusProxy *session;
+         gboolean session_is_active;
+         gboolean screensaver_active;
+         guint ss_watch_id;
+@@ -288,17 +288,21 @@ mount_added_callback (GVolumeMonitor *monitor,
+ 
+ 
+ static void
+-session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointer user_data)
++session_props_changed (GDBusProxy *session, GVariant *v, char **props, gpointer user_data)
+ {
+         GsdAutomountManager *manager = user_data;
+         GsdAutomountManagerPrivate *p = manager->priv;
++        GVariant *active_v = NULL;
++        gboolean is_active;
+ 
+-        if (gnome_settings_session_get_state (session) == GNOME_SETTINGS_SESSION_STATE_ACTIVE) {
+-                p->session_is_active = TRUE;
+-        }
+-        else {
+-                p->session_is_active = FALSE;
+-        }
++        active_v = g_dbus_proxy_get_cached_property (session, "SessionIsActive");
++        if (!active_v)
++                return;
++
++        g_variant_get (active_v, "b", &is_active);
++        g_variant_unref (active_v);
++        g_printerr ("AUTOMOUNT: session is active: %d -> %d\n", p->session_is_active, is_active);
++        p->session_is_active = is_active;
+ 
+         if (!p->session_is_active) {
+                 if (p->volume_queue != NULL) {
+@@ -311,10 +315,10 @@ session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointe
+ static void
+ do_initialize_session (GsdAutomountManager *manager)
+ {
+-        manager->priv->session = gnome_settings_session_new ();
+-        g_signal_connect (manager->priv->session, "notify::state",
+-                          G_CALLBACK (session_state_changed), manager);
+-        session_state_changed (manager->priv->session, NULL, manager);
++        manager->priv->session = gnome_settings_session_get_session_proxy ();
++        g_signal_connect (manager->priv->session, "g-properties-changed",
++                          G_CALLBACK (session_props_changed), manager);
++        session_props_changed (manager->priv->session, NULL, NULL, manager);
+ }
+ 
+ #define SCREENSAVER_NAME "org.gnome.ScreenSaver"
+--
+cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch
new file mode 100644
index 000000000..ccbd18f9b
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/standalone-background-helper.patch
@@ -0,0 +1,437 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+--- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-10 17:39:36.446882275 +0200
+@@ -2,7 +2,6 @@
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins" path="/org/gnome/settings-daemon/plugins/">
+     <child name="a11y-keyboard" schema="org.gnome.settings-daemon.plugins.a11y-keyboard"/>
+     <child name="a11y-settings" schema="org.gnome.settings-daemon.plugins.a11y-settings"/>
+-    <child name="background" schema="org.gnome.settings-daemon.plugins.background"/>
+     <child name="clipboard" schema="org.gnome.settings-daemon.plugins.clipboard"/>
+     <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
+     <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
+@@ -45,18 +44,6 @@
+       <_summary>Priority to use for this plugin</_summary>
+       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
+     </key>
+-  </schema>
+-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.background" path="/org/gnome/settings-daemon/plugins/background/">
+-    <key name="active" type="b">
+-      <default>true</default>
+-      <_summary>Activation of this plugin</_summary>
+-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
+-    </key>
+-    <key name="priority" type="i">
+-      <default>97</default>
+-      <_summary>Priority to use for this plugin</_summary>
+-      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
+-    </key>
+   </schema>
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.clipboard" path="/org/gnome/settings-daemon/plugins/clipboard/">
+     <key name="active" type="b">
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in	2012-04-07 15:21:20.000000000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,8 +0,0 @@
+-[GNOME Settings Plugin]
+-Module=background
+-IAge=0
+-_Name=Background
+-_Description=Background plugin
+-Authors=
+-Copyright=Copyright © 2007
+-Website=
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c	1970-01-01 01:00:00.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c	2013-04-10 17:39:36.450215685 +0200
+@@ -0,0 +1,65 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2010 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
++ *
++ * Author: Tomas Bzatek <tbzatek@redhat.com>
++ */
++
++#include "config.h"
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <unistd.h>
++#include <gtk/gtk.h>
++
++#include "gsd-background-manager.h"
++
++int
++main (int argc,
++      char **argv)
++{
++        GMainLoop *loop;
++        GsdBackgroundManager *manager;
++        GError *error = NULL;
++
++        g_type_init ();
++        gtk_init (&argc, &argv);
++
++        bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
++        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++        textdomain (GETTEXT_PACKAGE);
++
++        loop = g_main_loop_new (NULL, FALSE);
++        manager = gsd_background_manager_new ();
++
++        gsd_background_manager_start (manager, &error);
++
++        if (error != NULL) {
++                g_printerr ("Unable to start the background manager: %s",
++                            error->message);
++
++                g_error_free (error);
++                _exit (1);
++        }
++
++        g_main_loop_run (loop);
++
++        gsd_background_manager_stop (manager);
++        g_main_loop_unref (loop);
++
++        return 0;
++}
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-10 17:39:36.450215685 +0200
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++_Name=Background Helper
++_Comment=Draw desktop background
++Exec=@LIBEXECDIR@/gnome-fallback-background-helper
++Icon=desktop
++Terminal=false
++Type=Application
++Categories=
++NoDisplay=true
++OnlyShowIn=GNOME;Unity;
++X-GNOME-Autostart-Notify=true
++AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,104 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+- *
+- * 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, 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 <glib/gi18n-lib.h>
+-#include <gmodule.h>
+-
+-#include "gnome-settings-plugin.h"
+-#include "gsd-background-plugin.h"
+-#include "gsd-background-manager.h"
+-
+-struct GsdBackgroundPluginPrivate {
+-        GsdBackgroundManager *manager;
+-};
+-
+-#define GSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginPrivate))
+-
+-GNOME_SETTINGS_PLUGIN_REGISTER (GsdBackgroundPlugin, gsd_background_plugin)
+-
+-static void
+-gsd_background_plugin_init (GsdBackgroundPlugin *plugin)
+-{
+-        plugin->priv = GSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin);
+-
+-        g_debug ("GsdBackgroundPlugin initializing");
+-
+-        plugin->priv->manager = gsd_background_manager_new ();
+-}
+-
+-static void
+-gsd_background_plugin_finalize (GObject *object)
+-{
+-        GsdBackgroundPlugin *plugin;
+-
+-        g_return_if_fail (object != NULL);
+-        g_return_if_fail (GSD_IS_BACKGROUND_PLUGIN (object));
+-
+-        g_debug ("GsdBackgroundPlugin finalizing");
+-
+-        plugin = GSD_BACKGROUND_PLUGIN (object);
+-
+-        g_return_if_fail (plugin->priv != NULL);
+-
+-        if (plugin->priv->manager != NULL) {
+-                g_object_unref (plugin->priv->manager);
+-        }
+-
+-        G_OBJECT_CLASS (gsd_background_plugin_parent_class)->finalize (object);
+-}
+-
+-static void
+-impl_activate (GnomeSettingsPlugin *plugin)
+-{
+-        gboolean res;
+-        GError  *error;
+-
+-        g_debug ("Activating background plugin");
+-
+-        error = NULL;
+-        res = gsd_background_manager_start (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error);
+-        if (! res) {
+-                g_warning ("Unable to start background manager: %s", error->message);
+-                g_error_free (error);
+-        }
+-}
+-
+-static void
+-impl_deactivate (GnomeSettingsPlugin *plugin)
+-{
+-        g_debug ("Deactivating background plugin");
+-        gsd_background_manager_stop (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager);
+-}
+-
+-static void
+-gsd_background_plugin_class_init (GsdBackgroundPluginClass *klass)
+-{
+-        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
+-        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
+-
+-        object_class->finalize = gsd_background_plugin_finalize;
+-
+-        plugin_class->activate = impl_activate;
+-        plugin_class->deactivate = impl_deactivate;
+-
+-        g_type_class_add_private (klass, sizeof (GsdBackgroundPluginPrivate));
+-}
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,59 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+- *
+- * 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, 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 __GSD_BACKGROUND_PLUGIN_H__
+-#define __GSD_BACKGROUND_PLUGIN_H__
+-
+-#include <glib.h>
+-#include <glib-object.h>
+-#include <gmodule.h>
+-
+-#include "gnome-settings-plugin.h"
+-
+-G_BEGIN_DECLS
+-
+-#define GSD_TYPE_BACKGROUND_PLUGIN                (gsd_background_plugin_get_type ())
+-#define GSD_BACKGROUND_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPlugin))
+-#define GSD_BACKGROUND_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
+-#define GSD_IS_BACKGROUND_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_BACKGROUND_PLUGIN))
+-#define GSD_IS_BACKGROUND_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_BACKGROUND_PLUGIN))
+-#define GSD_BACKGROUND_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
+-
+-typedef struct GsdBackgroundPluginPrivate GsdBackgroundPluginPrivate;
+-
+-typedef struct
+-{
+-        GnomeSettingsPlugin    parent;
+-        GsdBackgroundPluginPrivate *priv;
+-} GsdBackgroundPlugin;
+-
+-typedef struct
+-{
+-        GnomeSettingsPluginClass parent_class;
+-} GsdBackgroundPluginClass;
+-
+-GType   gsd_background_plugin_get_type            (void) G_GNUC_CONST;
+-
+-/* All the plugins must implement this function */
+-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+-
+-G_END_DECLS
+-
+-#endif /* __GSD_BACKGROUND_PLUGIN_H__ */
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-10 17:40:20.117885180 +0200
+@@ -1,80 +1,34 @@
+-NULL =
++libexec_PROGRAMS = gnome-fallback-background-helper
+ 
+-plugin_name = background
++gnome_fallback_background_helper_SOURCES = \
++	gnome-fallback-background-helper.c \
++	gsd-background-manager.c \
++	gsd-background-manager.h
+ 
+-libexec_PROGRAMS = gsd-test-background
+-
+-gsd_test_background_SOURCES =		\
+-	test-background.c		\
+-	gsd-background-manager.h	\
+-	gsd-background-manager.c	\
+-	$(NULL)
+-
+-gsd_test_background_CPPFLAGS =				\
++gnome_fallback_background_helper_CPPFLAGS = \
+ 	-I$(top_srcdir)/gnome-settings-daemon		\
+-	-I$(top_srcdir)/plugins/common			\
+ 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	$(AM_CPPFLAGS)
+ 
+-gsd_test_background_CFLAGS = \
+-	$(PLUGIN_CFLAGS)		\
++gnome_fallback_background_helper_CFLAGS =	\
+ 	$(SETTINGS_PLUGIN_CFLAGS)	\
+-	$(BACKGROUND_CFLAGS)		\
+-	$(AM_CFLAGS)
+-
+-gsd_test_background_LDADD =				\
+-	$(top_builddir)/gnome-settings-daemon/libgsd.la	\
+-	$(SETTINGS_PLUGIN_LIBS)				\
+-	$(BACKGROUND_LIBS)				\
+-	$(NULL)
+-
+-plugin_LTLIBRARIES = \
+-	libbackground.la		\
+-	$(NULL)
+-
+-libbackground_la_SOURCES =		\
+-	gsd-background-plugin.h		\
+-	gsd-background-plugin.c		\
+-	gsd-background-manager.h	\
+-	gsd-background-manager.c	\
+-	$(NULL)
++	$(BACKGROUND_CFLAGS)
+ 
+-libbackground_la_CPPFLAGS = \
+-	-I$(top_srcdir)/gnome-settings-daemon		\
+-	-I$(top_srcdir)/plugins/background/libbackground   \
+-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+-	$(AM_CPPFLAGS)
+-
+-libbackground_la_CFLAGS = \
+-	$(SETTINGS_PLUGIN_CFLAGS)	\
+-	$(BACKGROUND_CFLAGS)		\
+-	$(AM_CFLAGS)
+-
+-libbackground_la_LDFLAGS =		\
+-	$(GSD_PLUGIN_LDFLAGS)		\
+-	$(NULL)
+-
+-libbackground_la_LIBADD  =		\
++gnome_fallback_background_helper_LDADD =	\
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+ 	$(BACKGROUND_LIBS)		\
+-	$(NULL)
+-
+-plugin_in_files =		\
+-	background.gnome-settings-plugin.in	\
+-	$(NULL)
++	$(top_builddir)/gnome-settings-daemon/libgsd.la
+ 
+-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
++autostartdir = $(sysconfdir)/xdg/autostart
++autostart_in_files = gnome-fallback-background-helper.desktop.in
++autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in
++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ 
+-EXTRA_DIST = 			\
+-	$(plugin_in_files)	\
+-	$(NULL)
++$(autostart_in_files): $(autostart_in_in_files)
++	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+ 
+-CLEANFILES = 			\
+-	$(plugin_DATA)		\
+-	$(NULL)
++@INTLTOOL_DESKTOP_RULE@
+ 
+-DISTCLEANFILES =		\
+-	$(plugin_DATA)		\
+-	$(NULL)
++EXTRA_DIST = $(autostart_in_in_files)
+ 
+-@GSD_INTLTOOL_PLUGIN_RULE@
++CLEANFILES = $(autostart_DATA) $(autostart_in_files)
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c gnome-settings-daemon-3.6.4/plugins/background/test-background.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c	2012-06-01 22:02:53.000000000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/test-background.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,7 +0,0 @@
+-#define NEW gsd_background_manager_new
+-#define START gsd_background_manager_start
+-#define STOP gsd_background_manager_stop
+-#define MANAGER GsdBackgroundManager
+-#include "gsd-background-manager.h"
+-
+-#include "test-plugin.h"
+diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in
+--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/po/POTFILES.in	2013-04-10 17:39:36.450215685 +0200
+@@ -21,9 +21,9 @@
+ [type: gettext/glade]plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui
+ [type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in
+ plugins/automount/gnome-fallback-mount-helper.desktop.in.in
++plugins/automount/gnome-fallback-background-helper.desktop.in.in
+ plugins/automount/gsd-automount-manager.c
+ plugins/automount/gsd-autorun.c
+-[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in
+ [type: gettext/ini]plugins/clipboard/clipboard.gnome-settings-plugin.in
+ [type: gettext/ini]plugins/color/color.gnome-settings-plugin.in
+ plugins/color/gsd-color-manager.c
+diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip
+--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip	2012-04-07 18:58:07.000000000 +0200
++++ gnome-settings-daemon-3.6.4/po/POTFILES.skip	2013-04-10 17:39:36.453549095 +0200
+@@ -20,6 +20,7 @@
+ data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
+ data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
+ data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
++plugins/automount/gnome-fallback-background-helper.desktop.in
+ plugins/automount/gnome-fallback-mount-helper.desktop.in
+ plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
+ plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
diff --git a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
deleted file mode 100644
index ceee6db82..000000000
--- a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+++ /dev/null
@@ -1,1476 +0,0 @@
-From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 21 Sep 2012 11:56:53 +0100
-Subject: [PATCH] power and media-keys: Use logind for suspending and
- rebooting the system
-
-Use the new logind features to suspend and resume but making sure we opt out
-of logind handling the sleep and power keys, and also inhibiting for lid close
-auto-suspend if there is an external monitor connected.
-
-Also use a delay inihibit for logind so that we can do actions on suspend like
-blanking the screen using the screensaver and also poking the screensaver on
-resume.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680689
-
-Conflicts:
-	plugins/power/gsd-power-manager.c
----
- plugins/common/Makefile.am                  |   4 +-
- plugins/common/gsd-power-helper.c           | 203 --------
- plugins/common/gsd-power-helper.h           |  35 --
- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
- plugins/power/gsd-power-manager.c           | 697 +++++++++++++++++++---------
- 5 files changed, 594 insertions(+), 501 deletions(-)
- delete mode 100644 plugins/common/gsd-power-helper.c
- delete mode 100644 plugins/common/gsd-power-helper.h
-
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 7e50db4..b0e907c 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
-	gsd-keygrab.c		\
-	gsd-keygrab.h		\
-	gsd-input-helper.c	\
--	gsd-input-helper.h	\
--	gsd-power-helper.c	\
--	gsd-power-helper.h
-+	gsd-input-helper.h
-
- libcommon_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
-deleted file mode 100644
-index 27d0eda..0000000
---- a/plugins/common/gsd-power-helper.c
-+++ /dev/null
-@@ -1,203 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * 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 "gsd-power-helper.h"
--
--#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
--#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
--#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
--
--#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
--#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
--#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
--
--#ifdef HAVE_SYSTEMD
--static void
--systemd_stop (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "PowerOff",
--                                g_variant_new ("(b)", FALSE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_suspend (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Suspend",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_hibernate (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Hibernate",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--#else /* HAVE_SYSTEMD */
--
--static void
--consolekit_stop_cb (GObject *source_object,
--                    GAsyncResult *res,
--                    gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't stop using ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--consolekit_stop (void)
--{
--        GError *error = NULL;
--        GDBusProxy *proxy;
--
--        /* power down the machine in a safe way */
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                               NULL,
--                                               CONSOLEKIT_DBUS_NAME,
--                                               CONSOLEKIT_DBUS_PATH_MANAGER,
--                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
--                                               NULL, &error);
--        if (proxy == NULL) {
--                g_warning ("cannot connect to ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--        g_dbus_proxy_call (proxy,
--                           "Stop",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           consolekit_stop_cb, NULL);
--        g_object_unref (proxy);
--}
--static void
--upower_sleep_cb (GObject *source_object,
--                 GAsyncResult *res,
--                 gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't sleep using UPower: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--upower_suspend (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Suspend",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--
--static void
--upower_hibernate (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Hibernate",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--#endif /* HAVE_SYSTEMD */
--
--void
--gsd_power_suspend (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_suspend ();
--#else
--	upower_suspend (upower_proxy);
--#endif
--}
--
--void
--gsd_power_poweroff (void)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_stop ();
--#else
--	consolekit_stop ();
--#endif
--}
--
--void
--gsd_power_hibernate (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_hibernate ();
--#else
--	upower_hibernate (upower_proxy);
--#endif
--}
-diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
-deleted file mode 100644
-index e3be14f..0000000
---- a/plugins/common/gsd-power-helper.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * 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 __GSD_POWER_HELPER_H
--#define __GSD_POWER_HELPER_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--#include <gio/gio.h>
--
--void gsd_power_suspend   (GDBusProxy *upower_proxy);
--void gsd_power_hibernate (GDBusProxy *upower_proxy);
--void gsd_power_poweroff  (void);
--
--G_END_DECLS
--
--#endif /* __GSD_POWER_HELPER_H */
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 9c84d7f..a2f277e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
-
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -51,7 +52,6 @@
- #include "shortcuts-list.h"
- #include "gsd-osd-window.h"
- #include "gsd-input-helper.h"
--#include "gsd-power-helper.h"
- #include "gsd-enums.h"
-
- #include <canberra.h>
-@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
- #define KEY_CURRENT_INPUT_SOURCE "current"
- #define KEY_INPUT_SOURCES        "sources"
-
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
-
- typedef struct {
-@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
-
-         /* Power stuff */
-         GSettings       *power_settings;
--        GDBusProxy      *upower_proxy;
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
-
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
- }
-
- static void
-+power_action_suspend (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
-+power_action_hibernate (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
- do_config_power_action (GsdMediaKeysManager *manager,
-                         const gchar *config_key)
- {
-@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                                            config_key);
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                power_action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown (manager);
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                power_action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
-
-+        g_clear_object (&priv->logind_proxy);
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                 priv->power_keyboard_proxy = NULL;
-         }
-
--        if (priv->upower_proxy) {
--                g_object_unref (priv->upower_proxy);
--                priv->upower_proxy = NULL;
--        }
--
-         if (priv->cancellable != NULL) {
-                 g_cancellable_cancel (priv->cancellable);
-                 g_object_unref (priv->cancellable);
-@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
- }
-
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "GNOME handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
-
- static void
-@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
-
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
-
-         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
- }
-@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
- }
-
- static void
--upower_ready_cb (GObject             *source_object,
--                 GAsyncResult        *res,
--                 GsdMediaKeysManager *manager)
--{
--        GError *error = NULL;
--
--        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
--        if (manager->priv->upower_proxy == NULL) {
--                g_warning ("Failed to get proxy for upower: %s",
--                           error->message);
--                g_error_free (error);
--        }
--}
--
--static void
- power_screen_ready_cb (GObject             *source_object,
-                        GAsyncResult        *res,
-                        GsdMediaKeysManager *manager)
-@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
-                    manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
--
--        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--                                  G_DBUS_PROXY_FLAGS_NONE,
--                                  NULL,
--                                  "org.freedesktop.UPower",
--                                  "/org/freedesktop/UPower",
--                                  "org.freedesktop.UPower",
--                                  NULL,
--                                  (GAsyncReadyCallback) upower_ready_cb,
--                                  manager);
- }
-
- GsdMediaKeysManager *
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 1c594d8..bb7224c 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
-  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -32,6 +32,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
-
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
-@@ -43,7 +44,6 @@
- #include "gnome-settings-session.h"
- #include "gsd-enums.h"
- #include "gsd-power-manager.h"
--#include "gsd-power-helper.h"
-
- #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
- #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
-@@ -78,6 +78,10 @@
- #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
- #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
-
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
-
-@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate
-         ca_context              *canberra_context;
-         ca_proplist             *critical_alert_loop_props;
-         guint32                  critical_alert_timeout_id;
--        GDBusProxy              *screensaver_proxy;
-         GDBusProxy              *session_proxy;
-         GDBusProxy              *session_presence_proxy;
-         GpmIdletime             *idletime;
-         GsdPowerIdleMode         current_idle_mode;
--        guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-         guint                    xscreensaver_watchdog_timer_id;
-         gboolean                 is_virtual_machine;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
-+        guint                    inhibit_lid_switch_timer_id;
- };
-
- enum {
-@@ -218,8 +228,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
- static gchar    *engine_get_summary (GsdPowerManager *manager);
- static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
- static void      do_lid_closed_action (GsdPowerManager *manager);
--static void      lock_screensaver (GsdPowerManager *manager);
--static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
-+static void      uninhibit_lid_switch (GsdPowerManager *manager);
-+static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
-
- G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
-
-@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void)
- }
-
- static void
-+action_poweroff (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "PowerOff",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_hibernate (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
- do_power_action_type (GsdPowerManager *manager,
-                       GsdPowerActionType action_type)
- {
-@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager,
-
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 /* this is only used on critically low battery where
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
--                gsd_power_poweroff ();
-+                action_poweroff (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
-         return ret;
- }
-
--static void
--do_lid_open_action (GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* play a sound, using sounds from the naming spec */
--        ca_context_play (manager->priv->canberra_context, 0,
--                         CA_PROP_EVENT_ID, "lid-open",
--                         /* TRANSLATORS: this is the sound description */
--                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
--                         NULL);
--
--        /* ensure we turn the panel back on after lid open */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after lid open: %s",
--                           error->message);
--                g_clear_error (&error);
--        }
--
--        /* only toggle keyboard if present and already toggled off */
--        if (manager->priv->upower_kdb_proxy != NULL &&
--            manager->priv->kbd_brightness_old != -1) {
--                ret = upower_kbd_toggle (manager, &error);
--                if (!ret) {
--                        g_warning ("failed to turn the kbd backlight on: %s",
--                                   error->message);
--                        g_error_free (error);
--                }
--        }
--
--        kill_lid_close_safety_timer (manager);
--}
--
- static gboolean
--is_on (GnomeRROutput *output)
-+inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
- {
--	GnomeRRCrtc *crtc;
--
--	crtc = gnome_rr_output_get_crtc (output);
--	if (!crtc)
--		return FALSE;
--	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
--}
--
--static gboolean
--non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
--{
--        GnomeRROutput **outputs;
--        int i;
--
--        outputs = gnome_rr_screen_list_outputs (screen);
--        for (i = 0; outputs[i] != NULL; i++) {
--                if (gnome_rr_output_is_laptop (outputs[i]))
--                        continue;
--
--                if (is_on (outputs[i]))
--                        return FALSE;
-+        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
-+            g_settings_get_boolean (manager->priv->settings,
-+                                    "lid-close-suspend-with-external-monitor")) {
-+                g_debug ("no external monitors for a while; uninhibiting lid close");
-+                uninhibit_lid_switch (manager);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                return G_SOURCE_REMOVE;
-         }
-
--        return TRUE;
--}
--
--/* Timeout callback used to check conditions when the laptop's lid is closed but
-- * the machine is not suspended yet.  We try to suspend again, so that the laptop
-- * won't overheat if placed in a backpack.
-- */
--static gboolean
--lid_close_safety_timer_cb (GsdPowerManager *manager)
--{
--        manager->priv->lid_close_safety_timer_id = 0;
--
--        g_debug ("lid has been closed for a while; trying to suspend again");
--        do_lid_closed_action (manager);
--
--        return FALSE;
-+        g_debug ("external monitor still there; trying again later");
-+        return G_SOURCE_CONTINUE;
- }
-
- /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
-  * again in the timeout handler to see if we can suspend then.
-  */
- static void
--setup_lid_close_safety_timer (GsdPowerManager *manager)
-+setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0)
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("lid close safety timer already set up");
-                 return;
-+        }
-+
-+        g_debug ("setting up lid close safety timer");
-
--        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
--                                                                          (GSourceFunc) lid_close_safety_timer_cb,
-+        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
-+                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
-                                                                           manager);
--        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
-+        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
- }
-
- static void
--kill_lid_close_safety_timer (GsdPowerManager *manager)
-+restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0) {
--                g_source_remove (manager->priv->lid_close_safety_timer_id);
--                manager->priv->lid_close_safety_timer_id = 0;
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("restarting lid close safety timer");
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                setup_inhibit_lid_switch_timer (manager);
-         }
- }
-
- static void
--suspend_with_lid_closed (GsdPowerManager *manager)
-+do_lid_open_action (GsdPowerManager *manager)
- {
-         gboolean ret;
-         GError *error = NULL;
--        GsdPowerActionType action_type;
-
--        /* maybe lock the screen if the lid is closed */
--        lock_screensaver (manager);
--
--        /* we have different settings depending on AC state */
--        if (up_client_get_on_battery (manager->priv->up_client)) {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-battery-action");
--        } else {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-ac-action");
--        }
--
--        /* check we won't melt when the lid is closed */
--        if (action_type != GSD_POWER_ACTION_SUSPEND &&
--            action_type != GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
--                        g_warning ("to prevent damage, now forcing suspend");
--                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
--                        return;
--                }
--        }
-+        /* play a sound, using sounds from the naming spec */
-+        ca_context_play (manager->priv->canberra_context, 0,
-+                         CA_PROP_EVENT_ID, "lid-open",
-+                         /* TRANSLATORS: this is the sound description */
-+                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
-+                         NULL);
-
--        /* ensure we turn the panel back on after resume */
-+        /* ensure we turn the panel back on after lid open */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_OFF,
-+                                             GNOME_RR_DPMS_ON,
-                                              &error);
-         if (!ret) {
--                g_warning ("failed to turn the panel off after lid close: %s",
-+                g_warning ("failed to turn the panel on after lid open: %s",
-                            error->message);
-                 g_clear_error (&error);
-         }
-
--        /* only toggle keyboard if present and not already toggled */
--        if (manager->priv->upower_kdb_proxy &&
--            manager->priv->kbd_brightness_old == -1) {
-+        /* only toggle keyboard if present and already toggled off */
-+        if (manager->priv->upower_kdb_proxy != NULL &&
-+            manager->priv->kbd_brightness_old != -1) {
-                 ret = upower_kbd_toggle (manager, &error);
-                 if (!ret) {
--                        g_warning ("failed to turn the kbd backlight off: %s",
-+                        g_warning ("failed to turn the kbd backlight on: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--
--        do_power_action_type (manager, action_type);
- }
-
- static void
- do_lid_closed_action (GsdPowerManager *manager)
- {
-+        gboolean ret;
-+        GError *error = NULL;
-+
-         /* play a sound, using sounds from the naming spec */
-         ca_context_play (manager->priv->canberra_context, 0,
-                          CA_PROP_EVENT_ID, "lid-close",
-@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager)
-                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
-                          NULL);
-
-+        /* turn the panel off if the lid is closed (mainly for Dells...) */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_OFF,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel off after lid close: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
-         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
-
--        /* perform policy action */
--        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
--            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
--                g_debug ("lid is closed; suspending or hibernating");
--                suspend_with_lid_closed (manager);
--        } else {
--                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
--                setup_lid_close_safety_timer (manager);
--        }
-+        restart_inhibit_lid_switch_timer (manager);
- }
-
--
- static void
- up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
- {
-@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
-         if (manager->priv->lid_is_closed == tmp)
-                 return;
-         manager->priv->lid_is_closed = tmp;
-+        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
-
-         /* fake a keypress */
-         if (tmp)
-@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
- }
-
- static void
--sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
--                            GAsyncResult *res,
--                            gpointer user_data)
--{
--        GError *error = NULL;
--        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
--
--        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
--        if (manager->priv->screensaver_proxy == NULL) {
--                g_warning ("Could not connect to gnome-screensaver: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Finish the upower_notify_sleep_cb() call by locking the screen */
--        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
--        g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                           "Lock",
--                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                           NULL, NULL, NULL);
--}
--
--static void
- idle_dbus_signal_cb (GDBusProxy *proxy,
-                      const gchar *sender_name,
-                      const gchar *signal_name,
-@@ -3477,75 +3442,38 @@ out:
- }
-
- static void
--lock_screensaver (GsdPowerManager *manager)
-+lock_screensaver (GsdPowerManager *manager,
-+                  GSourceFunc      done_cb)
- {
-         gboolean do_lock;
-
-         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
-                                           "lock-enabled");
--        if (!do_lock)
-+        if (!do_lock && done_cb) {
-+                done_cb (manager);
-                 return;
--
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_debug ("doing gnome-screensaver lock");
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "Lock",
--                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                                   NULL, NULL, NULL);
--        } else {
--                /* connect to the screensaver first */
--                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                          NULL,
--                                          GS_DBUS_NAME,
--                                          GS_DBUS_PATH,
--                                          GS_DBUS_INTERFACE,
--                                          NULL,
--                                          sleep_cb_screensaver_proxy_ready_cb,
--                                          manager);
--        }
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        GsdPowerManager *manager)
--{
--        lock_screensaver (manager);
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
-         }
-
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
--
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "Lock",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* Wait until gnome-shell shield animation is done
-+         *
-+         * FIXME: the shell should mark the lock as active
-+         * when the shield is down, then we could wait for
-+         * that. This would also fix the problem that we wait
-+         * needlessly when the shell has already locked the
-+         * screen because it is initiating the suspend.
-+         *
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
-+         */
-+        g_timeout_add (500, done_cb, manager);
- }
-
- static void
-@@ -3755,6 +3683,287 @@ out:
-         return ret;
- }
-
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                g_debug ("no lid-switch inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing lid switch system inhibitor");
-+        close (manager->priv->inhibit_lid_switch_fd);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_lid_switch_taken = FALSE;
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "GNOME needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = FALSE;
-+}
-+
-+static gboolean
-+randr_output_is_on (GnomeRROutput *output)
-+{
-+	GnomeRRCrtc *crtc;
-+
-+	crtc = gnome_rr_output_get_crtc (output);
-+	if (!crtc)
-+		return FALSE;
-+	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
-+}
-+
-+static gboolean
-+external_monitor_is_connected (GnomeRRScreen *screen)
-+{
-+        GnomeRROutput **outputs;
-+        guint i;
-+
-+        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
-+                return TRUE;
-+
-+        /* see if we have more than one screen plugged in */
-+        outputs = gnome_rr_screen_list_outputs (screen);
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (randr_output_is_on (outputs[i]) &&
-+                    !gnome_rr_output_is_laptop (outputs[i]))
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+on_randr_event (GnomeRRScreen *screen, gpointer user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+
-+        /* when a second monitor is plugged in, we take the
-+         * handle-lid-switch inhibitor lock of logind to prevent
-+         * it from suspending.
-+         *
-+         * Uninhibiting is done in the inhibit_lid_switch_timer,
-+         * since we want to give users a few seconds when unplugging
-+         * and replugging an external monitor, not suspend right away.
-+         */
-+        if (external_monitor_is_connected (screen) &&
-+            !g_settings_get_boolean (manager->priv->settings,
-+                                     "lid-close-suspend-with-external-monitor")) {
-+                inhibit_lid_switch (manager);
-+                setup_inhibit_lid_switch_timer (manager);
-+        }
-+        else {
-+                restart_inhibit_lid_switch_timer (manager);
-+        }
-+}
-+
-+static gboolean
-+screen_lock_done_cb (gpointer data)
-+{
-+        GsdPowerManager *manager = data;
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        lock_screensaver (manager, screen_lock_done_cb);
-+}
-+
-+static void
-+handle_resume_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
-
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return FALSE;
-+        }
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-         /* track the active session */
-         manager->priv->session = gnome_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
-         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-         manager->priv->up_client = up_client_new ();
--        g_signal_connect (manager->priv->up_client, "notify-sleep",
--                          G_CALLBACK (upower_notify_sleep_cb), manager);
--        g_signal_connect (manager->priv->up_client, "notify-resume",
--                          G_CALLBACK (upower_notify_resume_cb), manager);
-         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-         g_signal_connect (manager->priv->up_client, "device-added",
-                           G_CALLBACK (engine_device_added_cb), manager);
-@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (idle_idletime_reset_cb), manager);
-         g_signal_connect (manager->priv->idletime, "alarm-expired",
-                           G_CALLBACK (idle_idletime_alarm_expired_cb), manager);
-+        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
-+        /* set up initial state */
-+        on_randr_event (manager->priv->x11_screen, manager);
-
-         /* ensure the default dpms timeouts are cleared */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
-
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+        }
-+
-         if (manager->priv->bus_cancellable != NULL) {
-                 g_cancellable_cancel (manager->priv->bus_cancellable);
-                 g_object_unref (manager->priv->bus_cancellable);
-@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-                 manager->priv->introspection_data = NULL;
-         }
-
--        kill_lid_close_safety_timer (manager);
--
-         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
-
-         g_clear_object (&manager->priv->connection);
-@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-         g_clear_object (&manager->priv->settings);
-         g_clear_object (&manager->priv->settings_screensaver);
-         g_clear_object (&manager->priv->up_client);
-+
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        g_clear_object (&manager->priv->logind_proxy);
-         g_clear_object (&manager->priv->x11_screen);
-
-         g_ptr_array_unref (manager->priv->devices_array);
-@@ -3980,6 +4223,8 @@ static void
- gsd_power_manager_init (GsdPowerManager *manager)
- {
-         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
-
- static void
---
-1.8.0
-
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index e4125e240..ba4a392af 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82410 2013-01-16 23:40:08Z jconder $
+# $Id: PKGBUILD 88701 2013-04-21 22:24:09Z heftig $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.6.4
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,28 +14,20 @@ options=('!emptydirs' '!libtool')
 install=$_pkgname.install
 url="http://www.gnome.org"
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
-	'0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch'
 	'arch.patch')
-sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            'dbea64c93db308cbcae52cf0c512986c6f07a0bd5023b0641255416af863011e'
+sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee'
 	    '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  patch -Np1 -i "$srcdir/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch"
   patch -Np1 -i "$srcdir/arch.patch"
 
-  aclocal
-  autoconf
-  automake --add-missing
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
               --libexecdir=/usr/lib/gnome-settings-daemon \
-              --disable-static \
-              --enable-systemd \
-	      --disable-ibus
+              --disable-static
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD
index 761cdf404..90582160b 100644
--- a/community/gnote/PKGBUILD
+++ b/community/gnote/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 82837 2013-01-24 20:04:23Z ioni $
+# $Id: PKGBUILD 88699 2013-04-21 22:24:06Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: uastasi <uastasi@archlinux.us>
 pkgname=gnote
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A note taking application."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'boost')
 options=('!libtool')
 install=gnote.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('38f3b069874658f281445e04b8376d946580e4a5e39620f7e30fdd8216d46c1e')
+sha256sums=('603e2cc8782f910a5b4fdfd3588d955d59f0f4ddcd5685d1f2feadb955e0e9e6')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/community/gtksourceviewmm/PKGBUILD b/community/gtksourceviewmm/PKGBUILD
index 208e12cbb..1b7d00a51 100644
--- a/community/gtksourceviewmm/PKGBUILD
+++ b/community/gtksourceviewmm/PKGBUILD
@@ -1,10 +1,10 @@
-#$Id: PKGBUILD 82071 2013-01-07 09:40:20Z arodseth $
+#$Id: PKGBUILD 88691 2013-04-21 22:17:11Z heftig $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceviewmm
 pkgver=3.2.0
-pkgrel=2
+pkgrel=4
 pkgdesc='C++ bindings for the gtksourceview library'
 arch=('x86_64' 'i686')
 url='http://projects.gnome.org/gtksourceviewmm/'
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 82881fd7c..6c4e2d718 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 87242 2013-03-28 21:28:56Z bgyorgy $
+# $Id: PKGBUILD 88692 2013-04-21 22:17:13Z heftig $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
 pkgver=2.91.6
-pkgrel=3
-pkgdesc="An enhanced gettext po file editor for the GNOME"
-arch=('i686' 'x86_64')
-url="http://projects.gnome.org/gtranslator/"
+pkgrel=4
+pkgdesc='Enhanced gettext po file editor for the GNOME'
+arch=('x86_64' 'i686')
+url='http://projects.gnome.org/gtranslator/'
 license=('GPL')
 depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf')
 makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib' 'gnome-common' 'yelp-tools')
 optdepends=('gucharmap: for charmap plugin'
             'json-glib: for open-tran plugin')
 options=('!libtool')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz
-        gtkspell3-port.patch)
+install="$pkgname.install"
+source=("http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz"
+        'gtkspell3-port.patch')
 sha256sums=('a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6'
             '29afb55c692869cbd47d0181ddd93acdd53f5b236ebabd9a96a983da66d4cb9d')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
-  # Port to the new gtkspell3
+  # port to the new gtkspell3
   patch -Np1 -i "$srcdir/gtkspell3-port.patch"
 
   autoreconf -fi
@@ -34,7 +34,9 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
index 378218f5d..6bf243222 100644
--- a/community/gwibber/PKGBUILD
+++ b/community/gwibber/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 87240 2013-03-28 21:28:09Z bgyorgy $
+# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gwibber
 pkgver=3.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu"
 arch=('i686' 'x86_64')
 url="http://gwibber.com/"
 license=('GPL')
-depends=('libgee' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf')
+depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf')
 makedepends=('intltool' 'vala')
 options=('!libtool')
 install=$pkgname.install
diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD
index 22fa63751..f898512e5 100644
--- a/community/ktoblzcheck/PKGBUILD
+++ b/community/ktoblzcheck/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80490 2012-11-22 19:42:25Z spupykin $
+# $Id: PKGBUILD 88778 2013-04-22 10:14:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 
 pkgname=ktoblzcheck
-pkgver=1.40
+pkgver=1.41
 pkgrel=1
 pkgdesc="A library to check account numbers and bank codes of German banks"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('gcc-libs' 'python')
 optdepends=('perl')
 source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz
 	ktoblzcheck-python3.patch)
-md5sums=('fe29ec3ef8b48adf0302fd9d2607580b'
+md5sums=('48f6d0086d780d1c101b17b5b63706f3'
          'a81a697bb3aaeffb7fac0ad7d9166e3f')
 
 build() {
diff --git a/community/metacity/PKGBUILD b/community/metacity/PKGBUILD
index 4919a27eb..5955d5b88 100644
--- a/community/metacity/PKGBUILD
+++ b/community/metacity/PKGBUILD
@@ -1,30 +1,46 @@
-# $Id: PKGBUILD 87887 2013-04-08 14:38:04Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 88686 2013-04-21 22:17:01Z heftig $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=metacity
 pkgver=2.34.13
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
+pkgrel=4
+pkgdesc="Legacy GNOME window manager"
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra'  'libgtop' 'libsm' 'startup-notification' 'zenity')
-makedepends=('intltool' 'yelp-tools')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
+depends=('dconf' 'libcanberra' 'libgtop' 'gsettings-desktop-schemas' 'gtk2' 'startup-notification' 'zenity')
+makedepends=('intltool' 'itstool')
+url="https://live.gnome.org/Metacity"
+options=('!libtool')
 install=metacity.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix_compositing_startup.patch)
+        fix_compositing_startup.patch
+        fix_force_quit.patch
+        fix_shadows.patch
+        enable_compositing.patch)
 sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075'
-            '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2')
+            '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2'
+            '917760ac3375894ebb4052dfc7c8dff1ac556fb81033d7a7caf02123ceede50d'
+            'a0981477e9b3fd108fd03b7637bfd1f17a1f6cb13ec703d86b424b55076096f3'
+            'e53c1c20e19cd3d94d05d08045c7a9a373ce52051928ccc69bf3068081f30f9a')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/fix_compositing_startup.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/metacity \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=658036
+  patch -Np1 -i "$srcdir/fix_compositing_startup.patch"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=687938
+  patch -Np1 -i "$srcdir/fix_force_quit.patch"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=648340
+  patch -Np1 -i "$srcdir/fix_shadows.patch"
+
+  # Enable compositing by default (required for the desktop rendering feature of nautilus)
+  patch -Np1 -i "$srcdir/enable_compositing.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static --disable-schemas-compile
   make
 }
 
diff --git a/community/metacity/enable_compositing.patch b/community/metacity/enable_compositing.patch
new file mode 100644
index 000000000..3c5f09666
--- /dev/null
+++ b/community/metacity/enable_compositing.patch
@@ -0,0 +1,12 @@
+diff -Naur metacity-2.34.13.orig/src/org.gnome.metacity.gschema.xml.in metacity-2.34.13/src/org.gnome.metacity.gschema.xml.in
+--- metacity-2.34.13.orig/src/org.gnome.metacity.gschema.xml.in	2012-02-15 18:31:44.000000000 +0100
++++ metacity-2.34.13/src/org.gnome.metacity.gschema.xml.in	2013-04-10 20:14:39.837033219 +0200
+@@ -3,7 +3,7 @@
+   <schema id="org.gnome.metacity" path="/org/gnome/metacity/"
+           gettext-domain="@GETTEXT_PACKAGE@">
+     <key name="compositing-manager" type="b">
+-      <default>false</default>
++      <default>true</default>
+       <_summary>Compositing Manager</_summary>
+       <_description>
+         Determines whether Metacity is a compositing manager.
diff --git a/community/metacity/fix_force_quit.patch b/community/metacity/fix_force_quit.patch
new file mode 100644
index 000000000..020f427c4
--- /dev/null
+++ b/community/metacity/fix_force_quit.patch
@@ -0,0 +1,222 @@
+diff -Naur metacity-2.34.13.orig/src/core/delete.c metacity-2.34.13/src/core/delete.c
+--- metacity-2.34.13.orig/src/core/delete.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/core/delete.c	2012-11-08 21:36:48.373976906 +0100
+@@ -90,23 +90,41 @@
+       return;
+     }
+ 
+-  window_title = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);
++  /* This is to get a better string if the title isn't representable
++   * in the locale encoding; actual conversion to UTF-8 is done inside
++   * meta_show_dialog */
++
++  if (window->title && window->title[0])
++    {
++      tmp = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);
++      if (tmp == NULL)
++        window_title = NULL;
++      else
++        window_title = window->title;
++      g_free (tmp);
++    }
++  else
++    {
++      window_title = NULL;
++    }
+ 
+   /* Translators: %s is a window title */
+-  tmp = g_strdup_printf (_("<tt>%s</tt> is not responding."),
+-                         window_title);
++  if (window_title)
++    tmp = g_markup_printf_escaped (_("<tt>%s</tt> is not responding."),
++                                   window_title);
++  else
++    tmp = g_strdup (_("Application is not responding."));
++
+   window_content = g_strdup_printf (
+       "<big><b>%s</b></big>\n\n<i>%s</i>",
+       tmp,
+       _("You may choose to wait a short while for it to "
+         "continue or force the application to quit entirely."));
+ 
+-  g_free (window_title);
+-
+   dialog_pid =
+     meta_show_dialog ("--question",
+-                      window_content, 0,
+-                      window->screen->number,
++                      window_content, NULL,
++                      window->screen->screen_name,
+                       _("_Wait"), _("_Force Quit"), window->xwindow,
+                       NULL, NULL);
+ 
+diff -Naur metacity-2.34.13.orig/src/core/session.c metacity-2.34.13/src/core/session.c
+--- metacity-2.34.13.orig/src/core/session.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/core/session.c	2012-11-08 21:35:56.896216322 +0100
+@@ -1809,7 +1809,7 @@
+                            "and will have to be restarted manually next time "
+                            "you log in."),
+                          "240",
+-                         meta_screen_get_screen_number (meta_get_display()->active_screen),
++                         meta_get_display()->active_screen->screen_name,
+                          NULL, NULL,
+                          None,
+                          columns,
+diff -Naur metacity-2.34.13.orig/src/core/util.c metacity-2.34.13/src/core/util.c
+--- metacity-2.34.13.orig/src/core/util.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/core/util.c	2012-11-08 21:36:41.373828115 +0100
+@@ -538,11 +538,30 @@
+     }
+ }
+ 
++/* Command line arguments are passed in the locale encoding; in almost
++ * all cases, we'd hope that is UTF-8 and no conversion is necessary.
++ * If it's not UTF-8, then it's possible that the message isn't
++ * representable in the locale encoding.
++ */
++static void
++append_argument (GPtrArray  *args,
++                 const char *arg)
++{
++  char *locale_arg = g_locale_from_utf8 (arg, -1, NULL, NULL, NULL);
++
++  /* This is cheesy, but it's better to have a few ???'s in the dialog
++   * for an unresponsive application than no dialog at all appear */
++  if (!locale_arg)
++    locale_arg = g_strdup ("???");
++
++  g_ptr_array_add (args, locale_arg);
++}
++
+ GPid
+ meta_show_dialog (const char *type,
+                   const char *message,
+                   const char *timeout,
+-                  const gint screen_number,
++                  const char *display,
+                   const char *ok_text,
+                   const char *cancel_text,
+                   const int transient_for,
+@@ -550,61 +569,58 @@
+                   GSList *entries)
+ {
+   GError *error = NULL;
+-  char *screen_number_text = g_strdup_printf("%d", screen_number);
+   GSList *tmp;
+-  int i=0;
+   GPid child_pid;
+-  const char **argvl = g_malloc(sizeof (char*) *
+-                                (17 +
+-                                 g_slist_length (columns)*2 +
+-                                 g_slist_length (entries)));
+-
+-  argvl[i++] = "zenity";
+-  argvl[i++] = type;
+-  argvl[i++] = "--screen";
+-  argvl[i++] = screen_number_text;
+-  argvl[i++] = "--class";
+-  argvl[i++] = "metacity-dialog";
+-  argvl[i++] = "--title";
++  GPtrArray *args;
++
++  args = g_ptr_array_new ();
++
++  append_argument (args, "zenity");
++  append_argument (args, type);
++  append_argument (args, "--display");
++  append_argument (args, display);
++  append_argument (args, "--class");
++  append_argument (args, "metaicty-dialog");
++  append_argument (args, "--title");
+   /* Translators: This is the title used on dialog boxes */
+-  argvl[i++] = _("Metacity");
+-  argvl[i++] = "--text";
+-  argvl[i++] = message;
+-  
++  append_argument (args, _("Metacity"));
++  append_argument (args, "--text");
++  append_argument (args, message);
++
+   if (timeout)
+     {
+-      argvl[i++] = "--timeout";
+-      argvl[i++] = timeout;
++      append_argument (args, "--timeout");
++      append_argument (args, timeout);
+     }
+ 
+   if (ok_text)
+     {
+-      argvl[i++] = "--ok-label";
+-      argvl[i++] = ok_text;
++      append_argument (args, "--ok-label");
++      append_argument (args, ok_text);
+      }
+ 
+   if (cancel_text)
+     {
+-      argvl[i++] = "--cancel-label";
+-      argvl[i++] = cancel_text;
++      append_argument (args, "--cancel-label");
++      append_argument (args, cancel_text);
+     }
+-  
++
+   tmp = columns;
+   while (tmp)
+     {
+-      argvl[i++] = "--column";
+-      argvl[i++] = tmp->data;
++      append_argument (args, "--column");
++      append_argument (args, tmp->data);
+       tmp = tmp->next;
+     }
+ 
+   tmp = entries;
+   while (tmp)
+     {
+-      argvl[i++] = tmp->data;
++      append_argument (args, tmp->data);
+       tmp = tmp->next;
+     }
+-    
+-  argvl[i] = NULL;
++
++  g_ptr_array_add (args, NULL); /* NULL-terminate */
+ 
+   if (transient_for)
+     {
+@@ -615,7 +631,7 @@
+ 
+   g_spawn_async (
+                  "/",
+-                 (gchar**) argvl, /* ugh */
++                 (gchar**) args->pdata,
+                  NULL,
+                  G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+                  NULL, NULL,
+@@ -626,8 +642,7 @@
+   if (transient_for)
+     unsetenv ("WINDOWID");
+ 
+-  g_free (argvl);
+-  g_free (screen_number_text);
++  g_ptr_array_free (args, TRUE);
+ 
+   if (error)
+     {
+diff -Naur metacity-2.34.13.orig/src/include/util.h metacity-2.34.13/src/include/util.h
+--- metacity-2.34.13.orig/src/include/util.h	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/include/util.h	2012-11-08 21:36:27.206860608 +0100
+@@ -99,9 +99,9 @@
+ void  meta_free_gslist_and_elements (GSList *list_to_deep_free);
+ 
+ GPid meta_show_dialog (const char *type,
+-                       const char *title,
+                        const char *message,
+-                       gint timeout,
++                       const char *timeout,
++                       const char *display,
+                        const char *ok_text,
+                        const char *cancel_text,
+                        const int transient_for,
diff --git a/community/metacity/fix_shadows.patch b/community/metacity/fix_shadows.patch
new file mode 100644
index 000000000..8d4bf9939
--- /dev/null
+++ b/community/metacity/fix_shadows.patch
@@ -0,0 +1,39 @@
+diff -Naur metacity-2.34.13.orig/src/compositor/compositor-xrender.c metacity-2.34.13/src/compositor/compositor-xrender.c
+--- metacity-2.34.13.orig/src/compositor/compositor-xrender.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/compositor/compositor-xrender.c	2012-11-09 13:51:42.492411570 +0100
+@@ -905,35 +905,6 @@
+       }
+     }
+ 
+-  /* Never put a shadow around shaped windows */
+-  if (cw->shaped) {
+-    meta_verbose ("Window has no shadow as it is shaped\n");
+-    return FALSE;
+-  }
+-
+-  /* Don't put shadow around DND icon windows */
+-  if (cw->type == META_COMP_WINDOW_DND ||
+-      cw->type == META_COMP_WINDOW_DESKTOP) {
+-    meta_verbose ("Window has no shadow as it is DND or Desktop\n");
+-    return FALSE;
+-  }
+-
+-  if (cw->mode != WINDOW_ARGB) {
+-    meta_verbose ("Window has shadow as it is not ARGB\n");
+-    return TRUE;
+-  }
+-
+-  if (cw->type == META_COMP_WINDOW_MENU || 
+-      cw->type == META_COMP_WINDOW_DROP_DOWN_MENU) {
+-    meta_verbose ("Window has shadow as it is a menu\n");
+-    return TRUE;
+-  }
+-
+-  if (cw->type == META_COMP_WINDOW_TOOLTIP) {
+-    meta_verbose ("Window has shadow as it is a tooltip\n");
+-    return TRUE;
+-  }
+-
+   meta_verbose ("Window has no shadow as it fell through\n");
+   return FALSE;
+ }
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index e77f3c76d..8732424f9 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 85924 2013-03-09 00:51:47Z faidoc $
+# $Id: PKGBUILD 88697 2013-04-21 22:24:03Z heftig $
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
@@ -11,20 +11,16 @@ url="https://github.com/linuxmint/muffin"
 license=('GPL')
 depends=('libsm' 'clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \
 		 'libcanberra' 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils')
-provides=('muffin-wm')
-conflicts=('muffin-wm')
-replaces=('muffin-wm')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver")
-md5sums=('c39cd212959c7de8f834abe9e3fee8da')
+md5sums=('30e329da6af10e825dace490f13e445f')
 
 build() {
   cd linuxmint-muffin-*
 
-  autoreconf -vfi
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
+  PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
   				 			 --localstatedir=/var --disable-static --disable-schemas-compile
   make
 }
diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD
index 8c6f3a4e7..1c36a5330 100644
--- a/community/nemiver/PKGBUILD
+++ b/community/nemiver/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 82907 2013-01-25 12:43:46Z arodseth $
+# $Id: PKGBUILD 88693 2013-04-21 22:17:15Z heftig $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: jordz <jordz@archlinux.us>
 
 pkgname=nemiver
 pkgver=0.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc='C/C++ debugger for GNOME'
 arch=('x86_64' 'i686')
 license=('GPL')
 url='http://www.gnome.org/projects/nemiver/'
-depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas' 'itstool')
-makedepends=('boost' 'intltool' 'gnome-doc-utils')
-install=nemiver.install
+depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas')
+makedepends=('boost' 'intltool' 'itstool')
 source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz")
 options=('!libtool' '!emptydirs')
 sha256sums=('12cc5b6092ba720f2524f59928bee4d736e5e5ffeeffb6fd06f99695f17d683f')
diff --git a/community/nemiver/nemiver.install b/community/nemiver/nemiver.install
deleted file mode 100644
index f6a1886e7..000000000
--- a/community/nemiver/nemiver.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_upgrade() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  #update-desktop-database -q
-  #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 778009bb6..f2b15964c 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,33 +1,39 @@
-# $Id: PKGBUILD 86851 2013-03-22 21:28:54Z faidoc $
+# $Id: PKGBUILD 88773 2013-04-22 09:44:29Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=1.7.2
-pkgrel=1
+pkgver=1.7.3
+pkgrel=2
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo"
 license=('GPL')
 depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
-         'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql')
+         'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql'
+         'cinnamon')
 makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
 optdepends=('gksu: Open as Root')
-provides=('nemo-fm')
-replaces=('nemo-fm')
-conflicts=('nemo-fm')
 options=('!emptydirs' '!libtool')
 install=nemo.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "use-terminal-config.patch")
-md5sums=('809cf58f472a9e5de628a763d441b246'
-         '6cca080cc8fe3df7e725c0f8cd5fa485')
+        "tracker-0.16.patch"
+        "remove-desktop-background.patch")
+md5sums=('04c021da543e2562b712107c2be9a8c2'
+         '9e170cc74eee901634b3367b06a209c6'
+         '700b595dfcf06e39f9dc3bdb7c81e086')
 
 build() {
   cd linuxmint-nemo-*
 
-  # Read the default terminal app from GSettings
-  patch -Np1 -i ../use-terminal-config.patch
+  # Python2 fix
+  sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
+
+  # https://github.com/linuxmint/nemo/pull/258
+  patch -Np1 -i ../tracker-0.16.patch
+
+  # https://github.com/linuxmint/nemo/pull/263
+  patch -Np1 -i ../remove-desktop-background.patch
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
@@ -43,7 +49,4 @@ package() {
   cd linuxmint-nemo-*
 
   make DESTDIR="$pkgdir/" install
-
-  # Python2 fix
-  sed -i 's/bin\/python/bin\/python2/g' "${pkgdir}/usr/share/nemo/actions/myaction.py"
 }
diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch
new file mode 100644
index 000000000..793d5650c
--- /dev/null
+++ b/community/nemo/remove-desktop-background.patch
@@ -0,0 +1,964 @@
+From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 15 Apr 2013 18:44:35 -0400
+Subject: [PATCH 1/4] Don't render the background.  Need to fix selected icon
+ style
+
+---
+ src/nemo-desktop-icon-view.c | 18 +++---------------
+ src/nemo-desktop-window.c    | 15 ++++++++++++++-
+ 2 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
+index b903c5b..37cd8cb 100644
+--- a/src/nemo-desktop-icon-view.c
++++ b/src/nemo-desktop-icon-view.c
+@@ -243,16 +243,6 @@ struct NemoDesktopIconViewDetails
+ static void
+ real_begin_loading (NemoView *object)
+ {
+-	NemoIconContainer *icon_container;
+-	NemoDesktopIconView *view;
+-
+-	view = NEMO_DESKTOP_ICON_VIEW (object);
+-
+-	icon_container = get_icon_container (view);
+-	if (view->details->background == NULL) {
+-		view->details->background = nemo_desktop_background_new (icon_container);
+-	}
+-
+ 	NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object);
+ }
+ 
+@@ -298,11 +288,6 @@ struct NemoDesktopIconViewDetails
+ 					      nemo_view_update_menus,
+ 					      icon_view);
+ 
+-	if (icon_view->details->background != NULL) {
+-		g_object_unref (icon_view->details->background);
+-		icon_view->details->background = NULL;
+-	}
+-
+ 	G_OBJECT_CLASS (nemo_desktop_icon_view_parent_class)->dispose (object);
+ }
+ 
+@@ -652,6 +637,9 @@ struct NemoDesktopIconViewDetails
+ 				  G_CALLBACK (nemo_view_update_menus),
+ 				  desktop_icon_view);
+ 
++    GdkRGBA transparent = { 0, 0, 0, 0 };
++    gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent);
++
+     have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL;
+ }
+ 
+diff --git a/src/nemo-desktop-window.c b/src/nemo-desktop-window.c
+index 9c80c62..2d5c4e8 100644
+--- a/src/nemo-desktop-window.c
++++ b/src/nemo-desktop-window.c
+@@ -97,6 +97,7 @@ struct NemoDesktopWindowDetails {
+ 	g_signal_connect_swapped (nemo_preferences, "changed::" NEMO_PREFERENCES_DESKTOP_IS_HOME_DIR,
+ 				  G_CALLBACK (nemo_desktop_window_update_directory),
+ 				  window);
++
+ }
+ 
+ static void
+@@ -189,6 +190,12 @@ struct NemoDesktopWindowDetails {
+ 	/* Chain up to realize our children */
+ 	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->map (widget);
+ 	gdk_window_lower (gtk_widget_get_window (widget));
++
++    GdkWindow *window;
++    GdkRGBA transparent = { 0, 0, 0, 0 };
++
++    window = gtk_widget_get_window (widget);
++    gdk_window_set_background_rgba (window, &transparent);
+ }
+ 
+ static void
+@@ -254,6 +261,7 @@ struct NemoDesktopWindowDetails {
+ {
+ 	NemoDesktopWindow *window;
+ 	NemoDesktopWindowDetails *details;
++    GdkVisual *visual;
+ 
+ 	window = NEMO_DESKTOP_WINDOW (widget);
+ 	details = window->details;
+@@ -261,7 +269,12 @@ struct NemoDesktopWindowDetails {
+ 	/* Make sure we get keyboard events */
+ 	gtk_widget_set_events (widget, gtk_widget_get_events (widget) 
+ 			      | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
+-			      
++
++    visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
++    if (visual) {
++        gtk_widget_set_visual (widget, visual);
++    }
++
+ 	/* Do the work of realizing. */
+ 	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget);
+ 
+-- 
+1.8.1.5
+
+
+From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 15 Apr 2013 20:03:03 -0400
+Subject: [PATCH 2/4] Remove nemo-desktop-background, the desktop window makes
+ a transparent background and just uses the existing rendered background from
+ muffin/g-s-d
+
+---
+ libnemo-private/Makefile.am               |   2 -
+ libnemo-private/nemo-desktop-background.c | 578 ------------------------------
+ libnemo-private/nemo-desktop-background.h |  65 ----
+ src/nemo-desktop-icon-view.c              |  26 +-
+ 4 files changed, 13 insertions(+), 658 deletions(-)
+ delete mode 100644 libnemo-private/nemo-desktop-background.c
+ delete mode 100644 libnemo-private/nemo-desktop-background.h
+
+diff --git a/libnemo-private/Makefile.am b/libnemo-private/Makefile.am
+index 3b46318..5fd797c 100644
+--- a/libnemo-private/Makefile.am
++++ b/libnemo-private/Makefile.am
+@@ -81,8 +81,6 @@ libnemo_private_la_SOURCES = \
+ 	nemo-debug.h \
+ 	nemo-default-file-icon.c \
+ 	nemo-default-file-icon.h \
+-	nemo-desktop-background.c \
+-	nemo-desktop-background.h \
+ 	nemo-desktop-directory-file.c \
+ 	nemo-desktop-directory-file.h \
+ 	nemo-desktop-directory.c \
+diff --git a/libnemo-private/nemo-desktop-background.c b/libnemo-private/nemo-desktop-background.c
+deleted file mode 100644
+index f8dc979..0000000
+--- a/libnemo-private/nemo-desktop-background.c
++++ /dev/null
+@@ -1,578 +0,0 @@
+-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+-
+-/*
+- * nemo-desktop-background.c: Helper object to handle desktop background
+- *                                changes.
+- *
+- * Copyright (C) 2000 Eazel, Inc.
+- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
+- *
+- * 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., 51 Franklin Street - Suite 500,
+- * Boston, MA 02110-1335, USA.
+- *
+- * Authors: Darin Adler <darin@bentspoon.com>
+- *          Cosimo Cecchi <cosimoc@gnome.org>
+- */
+-
+-#include <config.h>
+-
+-#include "nemo-desktop-background.h"
+-
+-#include <eel/eel-gdk-extensions.h>
+-#include <eel/eel-gtk-extensions.h>
+-
+-#include "nemo-global-preferences.h"
+-
+-#define GNOME_DESKTOP_USE_UNSTABLE_API
+-#include <libgnome-desktop/gnome-bg.h>
+-#include <gdesktop-enums.h>
+-
+-#include <gtk/gtk.h>
+-#include <string.h>
+-
+-static void init_fade (NemoDesktopBackground *self);
+-static void free_fade (NemoDesktopBackground *self);
+-static void queue_background_change (NemoDesktopBackground *self);
+-
+-static NemoDesktopBackground *singleton = NULL;
+-
+-G_DEFINE_TYPE (NemoDesktopBackground, nemo_desktop_background, G_TYPE_OBJECT);
+-
+-enum {
+-        PROP_WIDGET = 1,
+-        NUM_PROPERTIES,
+-};
+-
+-struct NemoDesktopBackgroundDetails {
+-
+-	GtkWidget *widget;
+-        GnomeBG *bg;
+-
+-	/* Realized data: */
+-	cairo_surface_t *background_surface;
+-	GnomeBGCrossfade *fade;
+-	int background_entire_width;
+-	int background_entire_height;
+-	GdkColor default_color;
+-
+-	/* Desktop screen size watcher */
+-	gulong screen_size_handler;
+-	/* Desktop monitors configuration watcher */
+-	gulong screen_monitors_handler;
+-	guint change_idle_id;
+-};
+-
+-
+-static gboolean
+-background_settings_change_event_cb (GSettings *settings,
+-                                     gpointer   keys,
+-                                     gint       n_keys,
+-                                     gpointer   user_data);
+-
+-
+-static void
+-free_fade (NemoDesktopBackground *self)
+-{
+-	if (self->details->fade != NULL) {
+-		g_object_unref (self->details->fade);
+-		self->details->fade = NULL;
+-	}
+-}
+-
+-static void
+-free_background_surface (NemoDesktopBackground *self)
+-{
+-	cairo_surface_t *surface;
+-
+-	surface = self->details->background_surface;
+-	if (surface != NULL) {
+-		cairo_surface_destroy (surface);
+-		self->details->background_surface = NULL;
+-	}
+-}
+-
+-static void
+-nemo_desktop_background_finalize (GObject *object)
+-{
+-	NemoDesktopBackground *self;
+-
+-	self = NEMO_DESKTOP_BACKGROUND (object);
+-
+-	g_signal_handlers_disconnect_by_func (gnome_background_preferences,
+-					      background_settings_change_event_cb,
+-					      self);
+-
+-	free_background_surface (self);
+-	free_fade (self);
+-
+-	g_clear_object (&self->details->bg);
+-
+-	G_OBJECT_CLASS (nemo_desktop_background_parent_class)->finalize (object);
+-}
+-
+-static void
+-nemo_desktop_background_unrealize (NemoDesktopBackground *self)
+-{
+-	free_background_surface (self);
+-
+-	self->details->background_entire_width = 0;
+-	self->details->background_entire_height = 0;
+-	self->details->default_color.red = 0xffff;
+-	self->details->default_color.green = 0xffff;
+-	self->details->default_color.blue = 0xffff;
+-}
+-
+-static void
+-nemo_desktop_background_set_image_uri (NemoDesktopBackground *self,
+-                                           const char *image_uri)
+-{
+-	char *filename;
+-
+-	if (image_uri != NULL) {
+-		filename = g_filename_from_uri (image_uri, NULL, NULL);
+-	}
+-	else {
+-		filename = NULL;
+-	}
+-
+-	gnome_bg_set_filename (self->details->bg, filename);
+-
+-	g_free (filename);
+-}
+-
+-static void
+-init_fade (NemoDesktopBackground *self)
+-{
+-	GtkWidget *widget;
+-	gboolean do_fade;
+-
+-	widget = self->details->widget;
+-
+-	if (widget == NULL || !gtk_widget_get_realized (widget))
+-		return;
+-
+-	do_fade = g_settings_get_boolean (nemo_desktop_preferences,
+-					  NEMO_PREFERENCES_DESKTOP_BACKGROUND_FADE);
+-
+-	if (!do_fade) {
+-		return;
+-	}
+-
+-	if (self->details->fade == NULL) {
+-		GdkWindow *window;
+-		GdkScreen *screen;
+-		int old_width, old_height, width, height;
+-
+-		/* If this was the result of a screen size change,
+-		 * we don't want to crossfade
+-		 */
+-		window = gtk_widget_get_window (widget);
+-		old_width = gdk_window_get_width (window);
+-		old_height = gdk_window_get_height (window);
+-
+-		screen = gtk_widget_get_screen (widget);
+-		width = gdk_screen_get_width (screen);
+-		height = gdk_screen_get_height (screen);
+-
+-		if (old_width == width && old_height == height) {
+-			self->details->fade = gnome_bg_crossfade_new (width, height);
+-			g_signal_connect_swapped (self->details->fade,
+-                                                  "finished",
+-                                                  G_CALLBACK (free_fade),
+-                                                  self);
+-		}
+-	}
+-
+-	if (self->details->fade != NULL && !gnome_bg_crossfade_is_started (self->details->fade)) {
+-		cairo_surface_t *start_surface;
+-
+-		if (self->details->background_surface == NULL) {
+-			start_surface = gnome_bg_get_surface_from_root (gtk_widget_get_screen (widget));
+-		} else {
+-			start_surface = cairo_surface_reference (self->details->background_surface);
+-		}
+-		gnome_bg_crossfade_set_start_surface (self->details->fade,
+-						      start_surface);
+-                cairo_surface_destroy (start_surface);
+-	}
+-}
+-
+-static void
+-screen_size_changed (GdkScreen *screen,
+-                     NemoDesktopBackground *self)
+-{
+-	queue_background_change (self);
+-}
+-
+-static gboolean
+-nemo_desktop_background_ensure_realized (NemoDesktopBackground *self)
+-{
+-	int entire_width;
+-	int entire_height;
+-	GdkScreen *screen;
+-	GdkWindow *window;
+-
+-	screen = gtk_widget_get_screen (self->details->widget);
+-	entire_height = gdk_screen_get_height (screen);
+-	entire_width = gdk_screen_get_width (screen);
+-
+-	/* If the window size is the same as last time, don't update */
+-	if (entire_width == self->details->background_entire_width &&
+-	    entire_height == self->details->background_entire_height) {
+-		return FALSE;
+-	}
+-
+-	free_background_surface (self);
+-
+-	window = gtk_widget_get_window (self->details->widget);
+-	self->details->background_surface = gnome_bg_create_surface (self->details->bg,
+-                                                                     window,
+-                                                                     entire_width, entire_height,
+-                                                                     TRUE);
+-
+-	/* We got the surface and everything, so we don't care about a change
+-	   that is pending (unless things actually change after this time) */
+-	g_object_set_data (G_OBJECT (self),
+-			   "ignore-pending-change", GINT_TO_POINTER (TRUE));
+-
+-	self->details->background_entire_width = entire_width;
+-	self->details->background_entire_height = entire_height;
+-
+-	return TRUE;
+-}
+-
+-static void
+-on_fade_finished (GnomeBGCrossfade *fade,
+-		  GdkWindow *window,
+-		  gpointer user_data)
+-{
+-        NemoDesktopBackground *self = user_data;
+-
+-	nemo_desktop_background_ensure_realized (self);
+-	gnome_bg_set_surface_as_root (gdk_window_get_screen (window),
+-                                      self->details->background_surface);
+-}
+-
+-static gboolean
+-fade_to_surface (NemoDesktopBackground *self,
+-		 GdkWindow     *window,
+-		 cairo_surface_t *surface)
+-{
+-	if (self->details->fade == NULL) {
+-		return FALSE;
+-	}
+-
+-	if (!gnome_bg_crossfade_set_end_surface (self->details->fade,
+-				                 surface)) {
+-		return FALSE;
+-	}
+-
+-	if (!gnome_bg_crossfade_is_started (self->details->fade)) {
+-		gnome_bg_crossfade_start (self->details->fade, window);
+-		g_signal_connect (self->details->fade,
+-				  "finished",
+-				  G_CALLBACK (on_fade_finished), self);
+-	}
+-
+-	return gnome_bg_crossfade_is_started (self->details->fade);
+-}
+-
+-static void
+-nemo_desktop_background_set_up_widget (NemoDesktopBackground *self)
+-{
+-	GdkWindow *window;
+-	gboolean in_fade = FALSE;
+-        GtkWidget *widget;
+-
+-        widget = self->details->widget;
+-
+-	if (!gtk_widget_get_realized (widget)) {
+-		return;
+-	}
+-
+-	nemo_desktop_background_ensure_realized (self);
+-        window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
+-
+-	in_fade = fade_to_surface (self, window,
+-				   self->details->background_surface);
+-
+-	if (!in_fade) {
+-		cairo_pattern_t *pattern;
+-
+-		pattern = cairo_pattern_create_for_surface (self->details->background_surface);
+-		gdk_window_set_background_pattern (window, pattern);
+-		cairo_pattern_destroy (pattern);
+-
+-                gnome_bg_set_surface_as_root (gtk_widget_get_screen (widget),
+-                                              self->details->background_surface);
+-	}
+-}
+-
+-static gboolean
+-background_changed_cb (NemoDesktopBackground *self)
+-{
+-	self->details->change_idle_id = 0;
+-
+-	nemo_desktop_background_unrealize (self);
+-	nemo_desktop_background_set_up_widget (self);
+-
+-	gtk_widget_queue_draw (self->details->widget);
+-
+-	return FALSE;
+-}
+-
+-static void
+-queue_background_change (NemoDesktopBackground *self)
+-{
+-	if (self->details->change_idle_id != 0) {
+-                g_source_remove (self->details->change_idle_id);
+-	}
+-
+-	self->details->change_idle_id =
+-                g_idle_add ((GSourceFunc) background_changed_cb, self);
+-}
+-
+-static void
+-nemo_desktop_background_changed (GnomeBG *bg,
+-                                     gpointer user_data)
+-{
+-        NemoDesktopBackground *self;
+-
+-        self = user_data;
+-	init_fade (self);
+-	queue_background_change (self);
+-}
+-
+-static void
+-nemo_desktop_background_transitioned (GnomeBG *bg,
+-                                          gpointer user_data)
+-{
+-        NemoDesktopBackground *self;
+-
+-        self = user_data;
+-	free_fade (self);
+-	queue_background_change (self);
+-}
+-
+-static void
+-widget_realize_cb (GtkWidget *widget,
+-                   gpointer user_data)
+-{
+-	GdkScreen *screen;
+-        NemoDesktopBackground *self = user_data;
+-
+-	screen = gtk_widget_get_screen (widget);
+-
+-	if (self->details->screen_size_handler > 0) {
+-		g_signal_handler_disconnect (screen,
+-					     self->details->screen_size_handler);
+-	}
+-	self->details->screen_size_handler = 
+-		g_signal_connect (screen, "size_changed",
+-				  G_CALLBACK (screen_size_changed), self);
+-
+-	if (self->details->screen_monitors_handler > 0) {
+-		g_signal_handler_disconnect (screen,
+-					     self->details->screen_monitors_handler);
+-	}
+-	self->details->screen_monitors_handler =
+-		g_signal_connect (screen, "monitors-changed",
+-				  G_CALLBACK (screen_size_changed), self);
+-	nemo_desktop_background_set_up_widget (self);
+-}
+-
+-static void
+-widget_unrealize_cb (GtkWidget *widget,
+-                     gpointer user_data)
+-{
+-        NemoDesktopBackground *self = user_data;
+-
+-	if (self->details->screen_size_handler > 0) {
+-		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
+-				                     self->details->screen_size_handler);
+-			self->details->screen_size_handler = 0;
+-	}
+-	if (self->details->screen_monitors_handler > 0) {
+-		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
+-				                     self->details->screen_monitors_handler);
+-			self->details->screen_monitors_handler = 0;
+-	}
+-}
+-
+-static void
+-on_widget_destroyed (GtkWidget *widget,
+-                     gpointer user_data)
+-{
+-        NemoDesktopBackground *self = user_data;
+-
+-	if (self->details->change_idle_id != 0) {
+-		g_source_remove (self->details->change_idle_id);
+-		self->details->change_idle_id = 0;
+-	}
+-
+-	free_fade (self);
+-	self->details->widget = NULL;
+-}
+-
+-static gboolean
+-background_change_event_idle_cb (NemoDesktopBackground *self)
+-{
+-	gnome_bg_load_from_preferences (self->details->bg,
+-					gnome_background_preferences);
+-
+-	g_object_unref (self);
+-
+-	return FALSE;
+-}
+-
+-static gboolean
+-background_settings_change_event_cb (GSettings *settings,
+-                                     gpointer   keys,
+-                                     gint       n_keys,
+-                                     gpointer   user_data)
+-{
+-	NemoDesktopBackground *self = user_data;
+-
+-	/* Need to defer signal processing otherwise
+-	 * we would make the dconf backend deadlock.
+-	 */
+-	g_idle_add ((GSourceFunc) background_change_event_idle_cb,
+-		    g_object_ref (self));
+-
+-	return FALSE;
+-}
+-
+-static void
+-nemo_desktop_background_constructed (GObject *obj)
+-{
+-        NemoDesktopBackground *self;
+-        GtkWidget *widget;
+-
+-        self = NEMO_DESKTOP_BACKGROUND (obj);
+-
+-        if (G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed != NULL) {
+-                G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed (obj);
+-        }
+-
+-        widget = self->details->widget;
+-
+-        g_assert (widget != NULL);
+-
+- 	g_signal_connect_object (widget, "destroy",
+-                                 G_CALLBACK (on_widget_destroyed), self, 0);
+-	g_signal_connect_object (widget, "realize",
+-				 G_CALLBACK (widget_realize_cb), self, 0);
+-	g_signal_connect_object (widget, "unrealize",
+-				 G_CALLBACK (widget_unrealize_cb), self, 0);
+-
+-        gnome_bg_load_from_preferences (self->details->bg,
+-                                        gnome_background_preferences);
+-
+-        /* Let's receive batch change events instead of every single one */
+-        g_signal_connect (gnome_background_preferences,
+-                          "change-event",
+-                          G_CALLBACK (background_settings_change_event_cb),
+-                          self);
+-
+-	queue_background_change (self);
+-}
+-
+-static void
+-nemo_desktop_background_set_property (GObject *object,
+-                                          guint property_id,
+-                                          const GValue *value,
+-                                          GParamSpec *pspec)
+-{
+-        NemoDesktopBackground *self;
+-
+-        self = NEMO_DESKTOP_BACKGROUND (object);
+-
+-        switch (property_id) {
+-        case PROP_WIDGET:
+-                self->details->widget = g_value_get_object (value);
+-                break;
+-        default:
+-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+-                break;
+-        }
+-}
+-
+-static GObject *
+-nemo_desktop_background_constructor (GType type,
+-                                         guint n_construct_params,
+-                                         GObjectConstructParam *construct_params)
+-{
+-        GObject *retval;
+-
+-        if (singleton != NULL) {
+-                return g_object_ref (singleton);
+-        }
+-
+-        retval = G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructor
+-                (type, n_construct_params, construct_params);
+-
+-        singleton = NEMO_DESKTOP_BACKGROUND (retval);
+-        g_object_add_weak_pointer (retval, (gpointer) &singleton);
+-
+-        return retval;
+-}
+-
+-static void
+-nemo_desktop_background_class_init (NemoDesktopBackgroundClass *klass)
+-{
+-	GObjectClass *object_class;
+-        GParamSpec *pspec;
+-
+-	object_class = G_OBJECT_CLASS (klass);
+-	object_class->finalize = nemo_desktop_background_finalize;
+-        object_class->set_property = nemo_desktop_background_set_property;
+-        object_class->constructor = nemo_desktop_background_constructor;
+-        object_class->constructed = nemo_desktop_background_constructed;
+-
+-        pspec = g_param_spec_object ("widget", "The widget for this background",
+-                                     "The widget that gets its background set",
+-                                     NEMO_TYPE_ICON_CONTAINER,
+-                                     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+-        g_object_class_install_property (object_class, PROP_WIDGET, pspec);
+-
+-	g_type_class_add_private (klass, sizeof (NemoDesktopBackgroundDetails));
+-}
+-
+-static void
+-nemo_desktop_background_init (NemoDesktopBackground *self)
+-{
+-	self->details =
+-		G_TYPE_INSTANCE_GET_PRIVATE (self,
+-					     NEMO_TYPE_DESKTOP_BACKGROUND,
+-					     NemoDesktopBackgroundDetails);
+-
+-        self->details->bg = gnome_bg_new ();
+-	self->details->default_color.red = 0xffff;
+-	self->details->default_color.green = 0xffff;
+-	self->details->default_color.blue = 0xffff;
+-
+-	g_signal_connect (self->details->bg, "changed",
+-			  G_CALLBACK (nemo_desktop_background_changed), self);
+-	g_signal_connect (self->details->bg, "transitioned",
+-			  G_CALLBACK (nemo_desktop_background_transitioned), self);
+-}
+-
+-NemoDesktopBackground *
+-nemo_desktop_background_new (NemoIconContainer *container)
+-{
+-        return g_object_new (NEMO_TYPE_DESKTOP_BACKGROUND,
+-                             "widget", container,
+-                             NULL);
+-}
+diff --git a/libnemo-private/nemo-desktop-background.h b/libnemo-private/nemo-desktop-background.h
+deleted file mode 100644
+index 8755cb1..0000000
+--- a/libnemo-private/nemo-desktop-background.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+-
+-/*
+- * nemo-desktop-background.c: Helper object to handle desktop background
+- *                                changes.
+- *
+- * Copyright (C) 2000 Eazel, Inc.
+- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
+- *
+- * 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., 51 Franklin Street - Suite 500,
+- * Boston, MA 02110-1335, USA.
+- *
+- * Authors: Darin Adler <darin@bentspoon.com>
+- *          Cosimo Cecchi <cosimoc@gnome.org>
+- */
+-
+-#ifndef __NAUTILIUS_DESKTOP_BACKGROUND_H__
+-#define __NAUTILIUS_DESKTOP_BACKGROUND_H__
+-
+-#include <gtk/gtk.h>
+-
+-#include "nemo-icon-container.h"
+-
+-typedef struct NemoDesktopBackground NemoDesktopBackground;
+-typedef struct NemoDesktopBackgroundClass NemoDesktopBackgroundClass;
+-
+-#define NEMO_TYPE_DESKTOP_BACKGROUND nemo_desktop_background_get_type()
+-#define NEMO_DESKTOP_BACKGROUND(obj) \
+-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackground))
+-#define NEMO_DESKTOP_BACKGROUND_CLASS(klass) \
+-  (G_TYPE_CHECK_CLASS_CAST ((klass), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass))
+-#define NEMO_IS_DESKTOP_BACKGROUND(obj) \
+-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NEMO_TYPE_DESKTOP_BACKGROUND))
+-#define NEMO_IS_DESKTOP_BACKGROUND_CLASS(klass) \
+-  (G_TYPE_CHECK_CLASS_TYPE ((klass), NEMO_TYPE_DESKTOP_BACKGROUND))
+-#define NEMO_DESKTOP_BACKGROUND_GET_CLASS(obj) \
+-  (G_TYPE_INSTANCE_GET_CLASS ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass))
+-
+-GType nemo_desktop_background_get_type (void);
+-NemoDesktopBackground * nemo_desktop_background_new (NemoIconContainer *container);
+-
+-typedef struct NemoDesktopBackgroundDetails NemoDesktopBackgroundDetails;
+-
+-struct NemoDesktopBackground {
+-	GObject parent;
+-	NemoDesktopBackgroundDetails *details;
+-};
+-
+-struct NemoDesktopBackgroundClass {
+-	GObjectClass parent_class;
+-};
+-
+-#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */
+diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
+index 37cd8cb..5dec8b5 100644
+--- a/src/nemo-desktop-icon-view.c
++++ b/src/nemo-desktop-icon-view.c
+@@ -41,7 +41,6 @@
+ #include <fcntl.h>
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+-#include <libnemo-private/nemo-desktop-background.h>
+ #include <libnemo-private/nemo-desktop-icon-file.h>
+ #include <libnemo-private/nemo-directory-notify.h>
+ #include <libnemo-private/nemo-file-changes-queue.h>
+@@ -76,8 +75,6 @@ struct NemoDesktopIconViewDetails
+ 	gulong delayed_init_signal;
+ 	guint reload_desktop_timeout;
+ 	gboolean pending_rescan;
+-
+-	NemoDesktopBackground *background;
+ };
+ 
+ static void     default_zoom_level_changed                        (gpointer                user_data);
+@@ -240,12 +237,6 @@ struct NemoDesktopIconViewDetails
+ 	return GDK_FILTER_CONTINUE;
+ }
+ 
+-static void
+-real_begin_loading (NemoView *object)
+-{
+-	NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object);
+-}
+-
+ static const char *
+ real_get_id (NemoView *view)
+ {
+@@ -300,7 +291,6 @@ struct NemoDesktopIconViewDetails
+ 
+ 	G_OBJECT_CLASS (class)->dispose = nemo_desktop_icon_view_dispose;
+ 
+-	vclass->begin_loading = real_begin_loading;
+ 	vclass->merge_menus = real_merge_menus;
+ 	vclass->update_menus = real_update_menus;
+ 	vclass->get_view_id = real_get_id;
+@@ -428,6 +418,17 @@ struct NemoDesktopIconViewDetails
+ 			       desktop_icon_view);
+ }
+ 
++static void
++desktop_icon_container_realize (GtkWidget *widget,
++                                NemoDesktopIconView *desktop_icon_view)
++{
++    GdkWindow *bin_window;
++    GdkRGBA transparent = { 0, 0, 0, 0 };
++
++    bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
++    gdk_window_set_background_rgba (bin_window, &transparent);
++}
++
+ static NemoZoomLevel
+ get_default_zoom_level (void)
+ {
+@@ -614,6 +615,8 @@ struct NemoDesktopIconViewDetails
+ 
+ 	g_signal_connect_object (icon_container, "middle_click",
+ 				 G_CALLBACK (nemo_desktop_icon_view_handle_middle_click), desktop_icon_view, 0);
++    g_signal_connect_object (icon_container, "realize",
++                 G_CALLBACK (desktop_icon_container_realize), desktop_icon_view, 0);
+ 	g_signal_connect_object (desktop_icon_view, "realize",
+ 				 G_CALLBACK (realized_callback), desktop_icon_view, 0);
+ 	g_signal_connect_object (desktop_icon_view, "unrealize",
+@@ -637,9 +640,6 @@ struct NemoDesktopIconViewDetails
+ 				  G_CALLBACK (nemo_view_update_menus),
+ 				  desktop_icon_view);
+ 
+-    GdkRGBA transparent = { 0, 0, 0, 0 };
+-    gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent);
+-
+     have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL;
+ }
+ 
+-- 
+1.8.1.5
+
+
+From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 15 Apr 2013 20:14:40 -0400
+Subject: [PATCH 3/4] Forgot an include
+
+---
+ libnemo-private/nemo-icon-dnd.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libnemo-private/nemo-icon-dnd.c b/libnemo-private/nemo-icon-dnd.c
+index 017c6a7..2ed073c 100644
+--- a/libnemo-private/nemo-icon-dnd.c
++++ b/libnemo-private/nemo-icon-dnd.c
+@@ -52,7 +52,6 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ 
+-#include <libnemo-private/nemo-desktop-background.h>
+ #include <libnemo-private/nemo-file-utilities.h>
+ #include <libnemo-private/nemo-file-changes-queue.h>
+ #include <stdio.h>
+-- 
+1.8.1.5
+
+
+From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 16 Apr 2013 18:00:01 -0400
+Subject: [PATCH 4/4] Change to use cinnamon background keys
+
+---
+ libnemo-private/nemo-global-preferences.c | 2 +-
+ libnemo-private/nemo-global-preferences.h | 2 +-
+ src/nemo-places-sidebar.c                 | 2 +-
+ src/nemo-view.c                           | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
+index d3ad20a..336afc3 100644
+--- a/libnemo-private/nemo-global-preferences.c
++++ b/libnemo-private/nemo-global-preferences.c
+@@ -76,7 +76,7 @@
+ 	nemo_desktop_preferences = g_settings_new("org.nemo.desktop");
+ 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
+ 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
+-	gnome_background_preferences = g_settings_new("org.gnome.desktop.background");
++	cinnamon_background_preferences = g_settings_new("org.cinnamon.background");
+ 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
+ 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
+ }
+diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h
+index 2b9c56a..c1ec61a 100644
+--- a/libnemo-private/nemo-global-preferences.h
++++ b/libnemo-private/nemo-global-preferences.h
+@@ -226,7 +226,7 @@ enum
+ GSettings *nemo_tree_sidebar_preferences;
+ GSettings *nemo_window_state;
+ GSettings *gnome_lockdown_preferences;
+-GSettings *gnome_background_preferences;
++GSettings *cinnamon_background_preferences;
+ GSettings *gnome_media_handling_preferences;
+ GSettings *gnome_terminal_preferences;
+ 
+diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c
+index a0bc4d4..ca32193 100644
+--- a/src/nemo-places-sidebar.c
++++ b/src/nemo-places-sidebar.c
+@@ -3825,7 +3825,7 @@ static void expand_or_collapse_category (NemoPlacesSidebar *sidebar,
+ 					      bookmarks_popup_menu_detach_cb,
+ 					      sidebar);
+ 
+-	g_signal_handlers_disconnect_by_func (gnome_background_preferences,
++	g_signal_handlers_disconnect_by_func (cinnamon_background_preferences,
+ 					      desktop_setting_changed_callback,
+ 					      sidebar);
+ 
+diff --git a/src/nemo-view.c b/src/nemo-view.c
+index ab03b44..3ece32a 100644
+--- a/src/nemo-view.c
++++ b/src/nemo-view.c
+@@ -6945,7 +6945,7 @@ static void slot_changed_pane (NemoWindowSlot *slot,
+ 
+     uri = nemo_file_info_get_uri (file);
+ 
+-    g_settings_set_string (gnome_background_preferences,
++    g_settings_set_string (cinnamon_background_preferences,
+                                     "picture-uri", uri);
+     g_free (uri);
+ }
+-- 
+1.8.1.5
+
diff --git a/community/nemo/tracker-0.16.patch b/community/nemo/tracker-0.16.patch
new file mode 100644
index 000000000..49964678d
--- /dev/null
+++ b/community/nemo/tracker-0.16.patch
@@ -0,0 +1,33 @@
+From 88459a57ac2fcf06400ade5c6d0189bf1aa2334d Mon Sep 17 00:00:00 2001
+From: Nick Black <nick.black@sprezzatech.com>
+Date: Fri, 12 Apr 2013 17:10:46 -0400
+Subject: [PATCH] build with tracker 0.16
+
+---
+ configure.in | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ec72f73..21afbe4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -249,11 +249,13 @@ AC_ARG_ENABLE(tracker,
+ 
+ build_tracker=no
+ if test "x$enable_tracker" != "xno"; then
+-  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
++  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16,
+                     [build_tracker=yes],
+-                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
++  		    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
++                    	[build_tracker=yes],
++                    	[PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
+ 		                       [build_tracker=yes],
+-                                       [build_tracker=no])])
++                                       [build_tracker=no])])])
+   if test "x$build_tracker" = "xyes"; then
+     AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
+   fi
+-- 
+1.8.1.5
+
diff --git a/community/nemo/use-terminal-config.patch b/community/nemo/use-terminal-config.patch
deleted file mode 100644
index a6af75d48..000000000
--- a/community/nemo/use-terminal-config.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c
---- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c	2013-02-19 17:30:18.000000000 +0100
-+++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c	2013-03-04 04:05:13.472897136 +0100
-@@ -77,5 +77,6 @@
- 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
- 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
- 	gnome_background_preferences = g_settings_new("org.gnome.desktop.background");
--    gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
-+	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
-+	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
- }
-diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h
---- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h	2013-02-19 17:30:18.000000000 +0100
-+++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h	2013-03-04 04:49:20.581767625 +0100
-@@ -211,6 +211,9 @@
- #define GNOME_DESKTOP_MEDIA_HANDLING_AUTOMOUNT_OPEN "automount-open"
- #define GNOME_DESKTOP_MEDIA_HANDLING_AUTORUN        "autorun-never"
- 
-+/* Terminal */
-+#define GNOME_DESKTOP_TERMINAL_EXEC        "exec"
-+
- void nemo_global_preferences_init                      (void);
- char *nemo_global_preferences_get_default_folder_viewer_preference_as_iid (void);
- 
-@@ -224,6 +227,7 @@
- GSettings *gnome_lockdown_preferences;
- GSettings *gnome_background_preferences;
- GSettings *gnome_media_handling_preferences;
-+GSettings *gnome_terminal_preferences;
- 
- G_END_DECLS
- 
-diff -Naur linuxmint-nemo-63f7b44.orig/src/nemo-view.c linuxmint-nemo-63f7b44/src/nemo-view.c
---- linuxmint-nemo-63f7b44.orig/src/nemo-view.c	2013-02-19 17:30:18.000000000 +0100
-+++ linuxmint-nemo-63f7b44/src/nemo-view.c	2013-03-04 04:14:47.222310992 +0100
-@@ -6716,7 +6716,8 @@
- open_in_terminal (gchar *location)
- {	
-     gchar *argv[2];
--    argv[0] = "x-terminal-emulator";
-+    argv[0] = g_settings_get_string (gnome_terminal_preferences,
-+				     GNOME_DESKTOP_TERMINAL_EXEC);
-     argv[1] = NULL;
-     g_spawn_async(location, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
- }
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index 7baeaa3d5..a94cee35b 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81125 2012-12-12 00:49:36Z eric $
+# $Id: PKGBUILD 88793 2013-04-22 10:31:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20121114
+pkgver=20130422
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
@@ -16,51 +16,41 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr'
 	     'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra')
 provides=('libtu' 'libextl')
 changelog=ChangleLog
-_gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion"
-	   "git://notion.git.sourceforge.net/gitroot/notion/libtu"
-	   "git://notion.git.sourceforge.net/gitroot/notion/libextl"
-	   "git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux"
-	   "git://notion.git.sourceforge.net/gitroot/notion/contrib")
-md5sums=()
-md5sums=()
+source=("git://notion.git.sourceforge.net/gitroot/notion/notion"
+	"git://notion.git.sourceforge.net/gitroot/notion/libtu"
+	"git://notion.git.sourceforge.net/gitroot/notion/libextl"
+	"git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
+	"git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
+	"git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
+	"git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
+	"git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux"
+	"git://notion.git.sourceforge.net/gitroot/notion/contrib")
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')
 
 build() {
   cd ${srcdir}
 
-  # git clone
-  for _gitroot in ${_gitroots[@]}; do
-    msg "Connecting to the git repository..."
-    _gitname=`basename ${_gitroot}`
-    if [ -d ${srcdir}/${_gitname} ]; then
-        pushd ${srcdir}/${_gitname}
-        git pull origin
-        popd
-    else
-        git clone --depth 1 ${_gitroot}
-    fi
-    msg "GIT checkout done or server timeout"
-  done
-
-  # copy to notion-build
-  rm -rf ${srcdir}/notion-build
-  cp -r  ${srcdir}/notion ${srcdir}/notion-build
   for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do
-    cp -r  ${srcdir}/$i ${srcdir}/notion-build/
+    cp -r  ${srcdir}/$i ${srcdir}/notion/
   done
 
   # build notion
-  cd ${srcdir}/notion-build
+  cd ${srcdir}/notion
   msg "Starting make..."
   sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
 	-e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \
 	-e 's/^\(LUA_DIR=\).*$/\1\/usr/' \
 	-e 's/^\(X11_PREFIX=\).*/\1\/usr/' \
 	-i system-autodetect.mk
-  make INCLUDES=-I${srcdir}/notion-build
+  make INCLUDES=-I${srcdir}/notion
 
   # build doc and modules
   for i in mod_xinerama mod_xkbevents mod_xrandr; do
@@ -71,7 +61,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/notion-build
+  cd ${srcdir}/notion
 
   # notion
   make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index c196db66f..7726c625c 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 87716 2013-04-05 10:40:18Z spupykin $
+# $Id: PKGBUILD 88680 2013-04-21 22:16:49Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
 pkgver=0.14.1
-pkgrel=1
+pkgrel=3
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
-depends=('libgee' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
+depends=('libgee06' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
 	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
 	 'gst-plugins-base' 'libgphoto2')
 makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
diff --git a/community/synapse/PKGBUILD b/community/synapse/PKGBUILD
index c54dbcd3a..c6a3accf1 100644
--- a/community/synapse/PKGBUILD
+++ b/community/synapse/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 81698 2012-12-27 01:23:31Z fyan $
+# $Id: PKGBUILD 88681 2013-04-21 22:16:50Z heftig $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
 
 pkgname=synapse
 pkgver=0.2.10
-pkgrel=3
+pkgrel=5
 pkgdesc="A semantic file launcher"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/synapse-project"
 license=('GPL3')
-depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \
+depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee06' 'libnotify' \
          'libunique' 'libzeitgeist' 'rest' 'xdg-utils')
 makedepends=('intltool' 'vala')
 optdepends=('banshee: banshee plugin'
             'bc: calculator plugin'
             'devhelp: documentation plugin'
             'gnome-screensaver: screensaver plugin'
-            'gnome-utils: dictionary plugin'
+            'gnome-dictionary: dictionary plugin'
             'openssh: ssh plugin'
             'pastebinit: pastebin plugin'
             'rhythmbox: rhythmbox plugin'
diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD
index d3cbd7d1a..c1c9c1c7b 100644
--- a/community/ubuntuone-client-gnome/PKGBUILD
+++ b/community/ubuntuone-client-gnome/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 87514 2013-04-02 00:47:12Z bgyorgy $
+# $Id: PKGBUILD 88682 2013-04-21 22:16:52Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=ubuntuone-client-gnome
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/ubuntuone-client-gnome"
 license=('GPL')
 depends=('nautilus' 'gconf' 'ubuntuone-client')
 makedepends=('intltool' 'gnome-settings-daemon')
-optdepends=('gnome-settings-daemon: shows a warning when Ubuntu One runs out of space')
 options=('!libtool')
 install=$pkgname.install
-source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef')
+source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        disable-gsd-plugin.patch)
+md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef'
+         'e2b1b677844c3b61530f3653808b6644')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Disable gsd plugin, as it's not compatible with gnome-settings-daemon 3.8
+  patch -Np1 -i "$srcdir/disable-gsd-plugin.patch"
+
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make
diff --git a/community/ubuntuone-client-gnome/disable-gsd-plugin.patch b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch
new file mode 100644
index 000000000..2199536e2
--- /dev/null
+++ b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch
@@ -0,0 +1,21 @@
+diff -Naur ubuntuone-client-gnome-4.2.0.orig/configure.ac ubuntuone-client-gnome-4.2.0/configure.ac
+--- ubuntuone-client-gnome-4.2.0.orig/configure.ac	2013-03-26 20:48:40.000000000 +0100
++++ ubuntuone-client-gnome-4.2.0/configure.ac	2013-04-09 22:26:38.135983473 +0200
+@@ -5,7 +5,7 @@
+ AC_CONFIG_SRCDIR([config.h.in])
+ 
+ AM_INIT_AUTOMAKE([1.10 foreign])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ 
+diff -Naur ubuntuone-client-gnome-4.2.0.orig/Makefile.am ubuntuone-client-gnome-4.2.0/Makefile.am
+--- ubuntuone-client-gnome-4.2.0.orig/Makefile.am	2013-03-21 18:13:58.000000000 +0100
++++ ubuntuone-client-gnome-4.2.0/Makefile.am	2013-04-09 22:22:05.109626589 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = gsd nautilus po
++SUBDIRS = nautilus po
+ 
+ # Shut libtoolize up
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index dd6ecae95..4dba9fb7f 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88157 2013-04-12 15:58:47Z seblu $
+# $Id: PKGBUILD 88762 2013-04-22 09:40:39Z tpowa $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
 pkgver=4.2.12
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 3941dbe84..7d2e3f867 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88161 2013-04-12 16:17:46Z seblu $
+# $Id: PKGBUILD 88763 2013-04-22 09:42:07Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.12
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index 505bd2f59..d35adfd72 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88528 2013-04-19 10:32:46Z spupykin $
+# $Id: PKGBUILD 88795 2013-04-22 10:32:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: Jonathan Wiersma <arch aur at jonw dot org>
@@ -6,7 +6,7 @@
 
 pkgname=xdebug
 pkgver=2.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="PHP debugging extension"
 arch=('i686' 'x86_64')
 url="http://www.xdebug.org"
@@ -22,8 +22,6 @@ md5sums=('5687bca6270b9668721090d780c7c966'
          '68de800943369d4c76bdf7eb35c8463b')
 
 build() {
-  local PHPVER=`php -r 'echo phpversion();'`
-
   cd $srcdir/$pkgname-$pkgver
   phpize
   ./configure --prefix=/usr --enable-xdebug
@@ -35,12 +33,14 @@ build() {
 }
 
 package() {
+  local PHPVER=`php -r 'echo phpversion();'`
+
   cd $srcdir/$pkgname-$pkgver/debugclient
   make DESTDIR=$pkgdir install
 
   cd $srcdir/$pkgname-$pkgver
   if [ "$PHPVER" \< "5.3.0" ] ; then
-    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/xdebug.so
+    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
     install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini
   else
     install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
diff --git a/community/xsettings-client/PKGBUILD b/community/xsettings-client/PKGBUILD
index afef330ad..d314d7aa4 100644
--- a/community/xsettings-client/PKGBUILD
+++ b/community/xsettings-client/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65273 2012-02-20 12:44:47Z spupykin $
+# $Id: PKGBUILD 88791 2013-04-22 10:19:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alois Belaska <lloyd@centrum.cz>
 
@@ -11,12 +11,16 @@ license=('GPL')
 url="http://matchbox-project.org"
 depends=('libx11')
 options=('!libtool')
-source=(http://matchbox-project.org/sources/optional-dependencies/Xsettings-client-$pkgver.tar.gz)
+source=(http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-$pkgver.tar.gz)
 md5sums=('c14aa9db6c097e0306dac97fb7da1add')
 
 build() {
   cd $srcdir/Xsettings-client-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/Xsettings-client-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/zeitgeist-datahub/PKGBUILD b/community/zeitgeist-datahub/PKGBUILD
deleted file mode 100644
index 535899a65..000000000
--- a/community/zeitgeist-datahub/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 79124 2012-10-30 23:06:48Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Leontius Adhika Pradhana <leon@leapon.net>
-# Contributor: Ner0
-
-pkgname=zeitgeist-datahub
-pkgver=0.9.5
-pkgrel=2
-pkgdesc="Provides passive plugins which insert events into Zeitgeist"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/zeitgeist-datahub"
-license=('GPL3')
-depends=('libzeitgeist' 'json-glib' 'gtk2' 'telepathy-glib' 'zeitgeist')
-makedepends=('intltool' 'vala')
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('b2b76b82b67363c45e5fe4f39a172775')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD
index 40e0c74fc..1a623548b 100644
--- a/core/dirmngr/PKGBUILD
+++ b/core/dirmngr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155870 2012-04-08 07:13:40Z tpowa $
+# $Id: PKGBUILD 183488 2013-04-22 09:10:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=dirmngr
 pkgver=1.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A daemon to handle CRL and certificate requests"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch
new file mode 100644
index 000000000..b4ce93e83
--- /dev/null
+++ b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch
@@ -0,0 +1,60 @@
+From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc@archlinux.org>
+Date: Thu, 21 Mar 2013 20:47:57 +0100
+Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations
+ (tabs to spaces) - Replace print with print(), still works with Python 2.x
+
+---
+ glib/gtester-report | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/glib/gtester-report b/glib/gtester-report
+index 0fcdd9a..00296ea 100755
+--- a/glib/gtester-report
++++ b/glib/gtester-report
+@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter):
+     if binary.success_cases:
+       oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter
+     if real_cases != 0:
+-	self.oprint ('<a %s>ER</a>\n' % erlink)
+-	self.oprint ('<a %s>OK</a>\n' % oklink)
+-	self.oprint ('</td>\n')
+-	perc = binary.success_cases * 100.0 / real_cases
+-	pcolor = {
+-	  100 : 'bgcolor="lightgreen"',
+-	  0   : 'bgcolor="red"',
+-	}.get (int (perc), 'bgcolor="yellow"')
+-	self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc))
+-	self.oprint ('</tr>\n')
++        self.oprint ('<a %s>ER</a>\n' % erlink)
++        self.oprint ('<a %s>OK</a>\n' % oklink)
++        self.oprint ('</td>\n')
++        perc = binary.success_cases * 100.0 / real_cases
++        pcolor = {
++          100 : 'bgcolor="lightgreen"',
++          0   : 'bgcolor="red"',
++        }.get (int (perc), 'bgcolor="yellow"')
++        self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc))
++        self.oprint ('</tr>\n')
+     else:
+-	self.oprint ('Empty\n')
+-	self.oprint ('</td>\n')
+-	self.oprint ('</tr>\n')
++        self.oprint ('Empty\n')
++        self.oprint ('</td>\n')
++        self.oprint ('</tr>\n')
+     for tc in binary.testcases:
+       self.handle_testcase (tc, binary)
+   def handle_totals (self):
+@@ -466,7 +466,7 @@ def parse_opts():
+             " Needs python-subunit]")
+     options, files = parser.parse_args()
+     if options.version:
+-        print parser.epilog
++        print(parser.epilog)
+         return None, None
+     if len(files) != 1:
+         parser.error("Must supply a log file to parse.")
+-- 
+1.8.2
+
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 9a79b47ed..d277d9892 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 172097 2012-11-28 10:31:12Z jgc $
+# $Id: PKGBUILD 183313 2013-04-21 22:06:25Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=glib2
-pkgver=2.34.3
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.36.1
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre' 'libffi')
-makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
+makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7'
+sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 build() {
   cd glib-$pkgver
-  patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
+  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
       --sysconfdir=/etc \
       --with-pcre=system \
@@ -27,12 +24,40 @@ build() {
   make
 }
 
-package() {
+check() {
+  cd glib-$pkgver
+  #make -k check || :
+}
+
+package_glib2() {
+  depends=('pcre' 'libffi')
+  optdepends=('python2: for gdbus-codegen and gtester-report'
+              'elfutils: gresource inspection tool')
+  options=('!docs' '!libtool' '!emptydirs')
+  license=('LGPL')
+
   cd glib-$pkgver
   make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
 
   for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
       chmod -x "$_i"
   done
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
+
+  # Our gdb does not ship the required python modules, so remove it
+  rm -rf "$pkgdir/usr/share/gdb/"
+}
+
+package_glib2-docs() {
+  pkgdesc="Documentation for glib2"
+  conflicts=('gobject2-docs')
+  replaces=('gobject2-docs')
+  license=('custom')
+  options=('docs' '!emptydirs')
+  
+  cd glib-$pkgver/docs
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs"
+  install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/"
+
+  rm -rf "${pkgdir}/usr/share/man"
 }
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index db0e5dd2e..31081061f 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178149 2013-02-17 00:23:25Z bisson $
+# $Id: PKGBUILD 183489 2013-04-22 09:10:16Z tpowa $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.0.19
-pkgrel=6
+pkgrel=7
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index 2a97025bd..2893dac39 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180087 2013-03-16 12:44:18Z tpowa $
+# $Id: PKGBUILD 183490 2013-04-22 09:10:17Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=gpgme
-pkgver=1.3.2
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64')
@@ -14,12 +14,12 @@ depends=('libgpg-error' 'pth' 'gnupg>=2')
 install=${pkgname}.install
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('326fe97077141713f0930aa87949a287'
-         '4849bea218571c5ab6094d77049bd5d7')
+md5sums=('a0f93aba6d8a831ba14905085027f2f9'
+         'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr --disable-static --disable-gpgsm-test
   make
 }
 
diff --git a/core/libksba/PKGBUILD b/core/libksba/PKGBUILD
index 2d9c74a2d..e4378f847 100644
--- a/core/libksba/PKGBUILD
+++ b/core/libksba/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177036 2013-02-05 00:36:51Z allan $
+# $Id: PKGBUILD 183487 2013-04-22 09:10:14Z tpowa $
 # Maintainer: 
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libksba
-pkgver=1.2.0
-pkgrel=3
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="A CMS and X.509 access library"
 arch=(i686 x86_64)
 license=('GPL')
@@ -29,4 +29,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
-md5sums=('e797f370b69b4dc776499d6a071ae137')
+md5sums=('cd86fad9c9d360b2cf80449f8a4a4075')
diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD
index c1d1daf32..fea42b7ac 100644
--- a/core/libusbx/PKGBUILD
+++ b/core/libusbx/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 168151 2012-10-06 11:21:13Z tpowa $
+# $Id: PKGBUILD 183491 2013-04-22 09:10:18Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=libusbx
-pkgver=1.0.14
+pkgver=1.0.15
 pkgrel=1
 depends=('glibc')
 pkgdesc="Library that provides generic access to USB device"
@@ -13,7 +13,7 @@ options=(!libtool)
 replaces=('libusb1' 'libusb')
 provides=("libusb=$pkgver")
 conflicts=("libusb")
-md5sums=('0a6a75edb4b4eae7dc82c1dd71ddc470')
+md5sums=('0fa83bfd8845893b9b28a921297606d0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 29693141f..ce3d5ac29 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182787 2013-04-15 10:15:37Z bluewind $
+# $Id: PKGBUILD 183473 2013-04-21 22:15:16Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: kevin <kevin.archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=perl
 pkgver=5.16.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -39,6 +39,9 @@ build() {
   patch -i "$srcdir/cgi-cr-escaping.diff" -p1
   patch -i "$srcdir/CVE-2012-6329.patch" -p1
 
+  # Fix FS#34531; in perl upstream >= 5.17.9
+  sed -i "s/Is_dos/is_dos/" cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+
   if [ "${CARCH}" = "x86_64" ]; then
     # for x86_64
     arch_opts="-Dcccdlflags='-fPIC'"
diff --git a/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch b/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
deleted file mode 100644
index c245ce1e2..000000000
--- a/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sat, 13 Apr 2013 20:22:53 -0400
-Subject: [PATCH] fileio: in envfiles, do not skip lines following empty lines
-
-https://bugs.freedesktop.org/show_bug.cgi?id=63477
----
- src/binfmt/binfmt.c             |  2 +-
- src/journal/catalog.c           |  2 +-
- src/modules-load/modules-load.c |  2 +-
- src/shared/conf-parser.c        |  2 +-
- src/shared/install.c            |  2 +-
- src/shared/util.h               |  2 +-
- src/sysctl/sysctl.c             |  2 +-
- src/test/test-unit-file.c       | 31 +++++++++++++++++++++++++++++++
- 8 files changed, 38 insertions(+), 7 deletions(-)
-
-diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
-index 9ca1e60..5a42b3d 100644
---- a/src/binfmt/binfmt.c
-+++ b/src/binfmt/binfmt.c
-@@ -110,7 +110,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
-                 p = strstrip(l);
-                 if (!*p)
-                         continue;
--                if (strchr(COMMENTS, *p))
-+                if (strchr(COMMENTS "\n", *p))
-                         continue;
- 
-                 k = apply_rule(p);
-diff --git a/src/journal/catalog.c b/src/journal/catalog.c
-index ebf0622..7681af6 100644
---- a/src/journal/catalog.c
-+++ b/src/journal/catalog.c
-@@ -180,7 +180,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
-                         continue;
-                 }
- 
--                if (strchr(COMMENTS, line[0]))
-+                if (strchr(COMMENTS "\n", line[0]))
-                         continue;
- 
-                 if (empty_line &&
-diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 9ee2603..b3f7af0 100644
---- a/src/modules-load/modules-load.c
-+++ b/src/modules-load/modules-load.c
-@@ -206,7 +206,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
-                 l = strstrip(line);
-                 if (!*l)
-                         continue;
--                if (strchr(COMMENTS, *l))
-+                if (strchr(COMMENTS "\n", *l))
-                         continue;
- 
-                 k = load_module(ctx, l);
-diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index fbacf98..fea2e56 100644
---- a/src/shared/conf-parser.c
-+++ b/src/shared/conf-parser.c
-@@ -174,7 +174,7 @@ static int parse_line(
-         if (!*l)
-                 return 0;
- 
--        if (strchr(COMMENTS, *l))
-+        if (strchr(COMMENTS "\n", *l))
-                 return 0;
- 
-         if (startswith(l, ".include ")) {
-diff --git a/src/shared/install.c b/src/shared/install.c
-index f9d223e..71e0433 100644
---- a/src/shared/install.c
-+++ b/src/shared/install.c
-@@ -1699,7 +1699,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) {
-                         if (!*l)
-                                 continue;
- 
--                        if (strchr(COMMENTS, *l))
-+                        if (strchr(COMMENTS "\n", *l))
-                                 continue;
- 
-                         if (first_word(l, "enable")) {
-diff --git a/src/shared/util.h b/src/shared/util.h
-index 99ec0a3..ad97536 100644
---- a/src/shared/util.h
-+++ b/src/shared/util.h
-@@ -52,7 +52,7 @@ union dirent_storage {
- #define WHITESPACE " \t\n\r"
- #define NEWLINE "\n\r"
- #define QUOTES "\"\'"
--#define COMMENTS "#;\n"
-+#define COMMENTS "#;"
- 
- #define FORMAT_BYTES_MAX 8
- 
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index e0ba78a..db18dd9 100644
---- a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -149,7 +149,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
-                 if (!*p)
-                         continue;
- 
--                if (strchr(COMMENTS, *p))
-+                if (strchr(COMMENTS "\n", *p))
-                         continue;
- 
-                 value = strchr(p, '=');
-diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 3cf8463..1bf11e6 100644
---- a/src/test/test-unit-file.c
-+++ b/src/test/test-unit-file.c
-@@ -199,6 +199,17 @@ static void test_config_parse_exec(void) {
-         "#--nouser-config                                     \\\n" \
-         "normal=line"
- 
-+#define env_file_4 \
-+       "# Generated\n" \
-+       "\n" \
-+       "HWMON_MODULES=\"coretemp f71882fg\"\n" \
-+       "\n" \
-+       "# For compatibility reasons\n" \
-+       "\n" \
-+       "MODULE_0=coretemp\n" \
-+       "MODULE_1=f71882fg"
-+
-+
- static void test_load_env_file_1(void) {
-         char _cleanup_strv_free_ **data = NULL;
-         int r;
-@@ -251,6 +262,25 @@ static void test_load_env_file_3(void) {
-         unlink(name);
- }
- 
-+static void test_load_env_file_4(void) {
-+        char _cleanup_strv_free_ **data = NULL;
-+        int r;
-+
-+        char name[] = "/tmp/test-load-env-file.XXXXXX";
-+        int _cleanup_close_ fd = mkstemp(name);
-+        assert(fd >= 0);
-+        assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));
-+
-+        r = load_env_file(name, NULL, &data);
-+        assert(r == 0);
-+        assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg"));
-+        assert(streq(data[1], "MODULE_0=coretemp"));
-+        assert(streq(data[2], "MODULE_1=f71882fg"));
-+        assert(data[3] == NULL);
-+        unlink(name);
-+}
-+
-+
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wnonnull"
- 
-@@ -327,6 +357,7 @@ int main(int argc, char *argv[]) {
-         test_load_env_file_1();
-         test_load_env_file_2();
-         test_load_env_file_3();
-+        test_load_env_file_4();
-         test_install_printf();
- 
-         return 0;
--- 
-1.8.2.1
-
diff --git a/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch b/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch
deleted file mode 100644
index 19edce5f4..000000000
--- a/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d378991747d67fff1d4dc39e7fb2bc8f49f1b561 Mon Sep 17 00:00:00 2001
-From: Mirco Tischler <mt-ml@gmx.de>
-Date: Sat, 13 Apr 2013 01:03:49 +0200
-Subject: [PATCH] journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and
- _MACHINE_ID
-
----
- src/journal/journald-server.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 53e3830..be84323 100644
---- a/src/journal/journald-server.c
-+++ b/src/journal/journald-server.c
-@@ -538,7 +538,7 @@ static void dispatch_message_real(
-         char pid[sizeof("_PID=") + DECIMAL_STR_MAX(ucred->pid)],
-                 uid[sizeof("_UID=") + DECIMAL_STR_MAX(ucred->uid)],
-                 gid[sizeof("_GID=") + DECIMAL_STR_MAX(ucred->gid)],
--                source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=" + DECIMAL_STR_MAX(usec_t))],
-+                source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)],
-                 boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=",
-                 machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID=";
- 
-@@ -699,7 +699,7 @@ static void dispatch_message_real(
- 
-         r = sd_id128_get_machine(&id);
-         if (r >= 0) {
--                sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID") - 1);
-+                sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID=") - 1);
-                 IOVEC_SET_STRING(iovec[n++], machine_id);
-         }
- 
--- 
-1.8.2.1
-
diff --git a/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch b/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch
deleted file mode 100644
index 9cac29b77..000000000
--- a/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 50fb97935d689a520251b2d543599be14bdfd0ed Mon Sep 17 00:00:00 2001
-From: Fedora systemd team <systemd-maint@redhat.com>
-Date: Wed, 10 Apr 2013 09:49:24 +0200
-Subject: [PATCH] logind: avoid creating stale session state files
-
-There were old session state files accumulating in /run/systemd/session.
-They confused e.g. "reboot", which thought there were still users logged
-in. The files got created like this:
-
-session_stop(Session *s) ->
-        ...
-        unlink(s->state_file);
-        ...
-        seat_set_active(s->seat, NULL) ->
-                session_save(...);  /* re-creates the state file we just
-                                       unlinked */
-
-Fix it simply by clearing the s->started flag earlier to prevent
-any further writes of the state file (session_save() checks the flag).
----
- src/login/logind-session.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 508336d..e2f41d3 100644
---- a/src/login/logind-session.c
-+++ b/src/login/logind-session.c
-@@ -710,6 +710,8 @@ int session_stop(Session *s) {
-         if (s->started)
-                 session_send_signal(s, false);
- 
-+        s->started = false;
-+
-         if (s->seat) {
-                 if (s->seat->active == s)
-                         seat_set_active(s->seat, NULL);
-@@ -721,8 +723,6 @@ int session_stop(Session *s) {
-         user_send_changed(s->user, "Sessions\0");
-         user_save(s->user);
- 
--        s->started = false;
--
-         return r;
- }
- 
--- 
-1.8.2.1
-
diff --git a/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch b/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
new file mode 100644
index 000000000..24dd6d766
--- /dev/null
+++ b/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
@@ -0,0 +1,36 @@
+From 1e335af70f29d1a1e9c132338aa35b8971934441 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Fri, 19 Apr 2013 16:31:25 -0400
+Subject: [PATCH] nss-myhostname: ensure that glibc's assert is used
+
+---
+ src/nss-myhostname/nss-myhostname.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
+index 16ccb3e..8699098 100644
+--- a/src/nss-myhostname/nss-myhostname.c
++++ b/src/nss-myhostname/nss-myhostname.c
+@@ -25,7 +25,6 @@
+ #include <netdb.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <assert.h>
+ #include <unistd.h>
+ #include <net/if.h>
+ #include <stdlib.h>
+@@ -35,6 +34,11 @@
+ #include "macro.h"
+ #include "util.h"
+ 
++/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as
++ * libnss_myhostname will be linked into arbitrary programs which will, in turn
++ * attempt to write to the journal via log_dispatch() */
++#include <assert.h>
++
+ /* We use 127.0.0.2 as IPv4 address. This has the advantage over
+  * 127.0.0.1 that it can be translated back to the local hostname. For
+  * IPv6 we use ::1 which unfortunately will not translate back to the
+-- 
+1.8.2.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 360aec4fd..9ba7c9f71 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=201
+pkgver=202
 pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -16,17 +16,13 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
-        '0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch'
-        '0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch'
-        '0001-logind-avoid-creating-stale-session-state-files.patch'
+        '0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch'
         'use-split-usr-path.patch')
-md5sums=('3e758392ff0e9206b3f7ee252b4a654b'
+md5sums=('3136c6912d3ee1f6d4deb16234783731'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
-         'd575a29ca735944aa45126ab9d3087a5'
-         '8170482f10bb0420770a64dce23975bc'
-         'b1355aae98071e83fca27549a0ac3def'
+         '3090c0b9b19b76731b4cf9c01c10c534'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 prepare() {
@@ -35,9 +31,7 @@ prepare() {
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
-  patch -Np1 <"$srcdir/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch"
-  patch -Np1 <"$srcdir/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch"
-  patch -Np1 <"$srcdir/0001-logind-avoid-creating-stale-session-state-files.patch"
+  patch -Np1 <"$srcdir/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch"
 }
 
 build() {
@@ -67,7 +61,9 @@ package_systemd() {
   pkgdesc="system and service manager"
   depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
            'pam' 'util-linux' 'xz')
-  provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+  provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
+            'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
+            'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so')
   replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
   conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
   optdepends=('cryptsetup: required for encrypted block devices'
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
index 4a3a1bc49..ebcdc4acd 100644
--- a/extra/anjuta-extras/PKGBUILD
+++ b/extra/anjuta-extras/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169845 2012-10-30 22:23:48Z heftig $
+# $Id: PKGBUILD 183329 2013-04-21 22:08:26Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=anjuta-extras
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Anjuta Integrated Development Environment extra plugins"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ install=anjuta-extras.install
 url="http://www.anjuta.org/"
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('69df64e6e13a6e0683ebaee5a26ee9b9368eda9ed157607d1e6935b52d7f0b9c')
+sha256sums=('115c2f51017aa51edc6bfc7a2d2084e26b29d3df353ed2a92e40f9e3ae28a761')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index b84a86c2c..e9e5fadfb 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,30 +1,42 @@
-# $Id: PKGBUILD 180677 2013-03-25 19:13:50Z bpiotrowski $
+# $Id: PKGBUILD 183314 2013-04-21 22:06:32Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
+arch=(i686 x86_64)
+license=(GPL)
+makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf
+             gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs
+             python)
 url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('2cf44120dcf22c4f4f25bbc65d3641c206e627776ab0f3a37ff0059844d581a2')
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+        fix-compile-error.patch anjuta-glade.xml.diff)
+sha256sums=('ef5d8a5032d4c2025e1870bef044fa025f01096a86f8f226eb178688a960c5b9'
+            'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d'
+            'e480c41a92198c9158f7d66f248b83464e6d0745d5756dae581b204d5439cc4d')
 
 build() {
   cd "$pkgbase-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
+
+  patch -Np1 -i ../fix-compile-error.patch
+  patch -Np1 -i ../anjuta-glade.xml.diff
+
+  # Bump vala version
+  sed -i '/vala/s/-0\.18/-0.20/' configure.ac
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum
   make
 }
 
 package_libanjuta(){
   pkgdesc="Anjuta runtime library"
-  depends=('gdl')
+  depends=(gdl)
   conflicts=('anjuta<3.4.4')
 
   cd "$pkgbase-$pkgver/libanjuta"
@@ -35,7 +47,8 @@ package_libanjuta(){
 
 package_anjuta(){
   pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
+  depends=(libanjuta vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf)
+  groups=('gnome-extra')
 
   install=anjuta.install
 
@@ -44,7 +57,4 @@ package_anjuta(){
 
   cd libanjuta
   make -j1 DESTDIR="$pkgdir" uninstall
-  
-  sed -i "1s|#!/usr/bin/python$|&2|" \
-    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
 }
diff --git a/extra/anjuta/anjuta-glade.xml.diff b/extra/anjuta/anjuta-glade.xml.diff
new file mode 100644
index 000000000..a33c530e5
--- /dev/null
+++ b/extra/anjuta/anjuta-glade.xml.diff
@@ -0,0 +1,101 @@
+diff -u -rN anjuta-3.8.1/libanjuta/anjuta-glade.xml anjuta-3.8.0/libanjuta/anjuta-glade.xml
+--- anjuta-3.8.1/libanjuta/anjuta-glade.xml	1970-01-01 01:00:00.000000000 +0100
++++ anjuta-3.8.0/libanjuta/anjuta-glade.xml	2012-09-26 22:53:46.000000000 +0200
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++<glade-catalog name="anjuta" supports="gtkbuilder" 
++ library="gladeanjuta" depends="gtk+">
++
++	<glade-widget-classes>
++		<glade-widget-class name="AnjutaVcsStatusTreeView" title="Status Tree View" 
++		 generic-name="vcsstatus">
++
++			<properties>
++				<property id="show-status" default="True" />
++				<property id="conflicted-selectable" default="True" />
++				<property id="status-codes" ignore="True">
++					<displayable-values>
++						<value id="ANJUTA_VCS_STATUS_MODIFIED" name="Modified" />
++						<value id="ANJUTA_VCS_STATUS_ADDED" name="Added" />
++						<value id="ANJUTA_VCS_STATUS_DELETED" name="Deleted" />
++						<value id="ANJUTA_VCS_STATUS_CONFLICTED" name="Conflicted" />
++						<value id="ANJUTA_VCS_STATUS_UPTODATE" name="Up to date" />
++						<value id="ANJUTA_VCS_STATUS_LOCKED" name="Locked" />
++						<value id="ANJUTA_VCS_STATUS_MISSING" name="Missing" />
++						<value id="ANJUTA_VCS_STATUS_UNVERSIONED" name="Unversioned" />
++						<value id="ANJUTA_VCS_STATUS_IGNORED" name="Ignored" />
++					</displayable-values>
++				</property>
++			</properties>
++		</glade-widget-class>
++
++		<glade-widget-class name="AnjutaDropEntry" title="Drop Entry"
++		 generic-name="dropentry" />
++
++		 <glade-widget-class name="AnjutaFileList" title="File List"
++		 generic-name="filelist">
++		 
++		 	<properties>
++		 		<property id="show-add-button" default="False" />
++		 	</properties>
++		 </glade-widget-class>
++		 
++	     <glade-widget-class name="AnjutaPkgConfigChooser" title="pkg-config chooser" 
++		 generic-name="pkg_config_chooser" />
++
++		<glade-widget-class name="AnjutaColumnTextView" title="Column Text View"
++		 generic-name="columntextview" />
++
++		 <glade-widget-class name="AnjutaFileDropEntry" title="File Drop Entry"
++		 generic-name="filedropentry" />
++		 
++		 <glade-widget-class name="AnjutaEntry" title="Entry" 
++		 generic-name="entry">
++		 	
++		 	<properties>
++		 		<property translatable="True" id="help-text" default="" />
++		 	</properties>
++		 </glade-widget-class>
++
++		 <glade-widget-class name="AnjutaEnvironmentEditor" title="Environment editor"
++		 generic-name="environment_editor" />
++
++		<glade-widget-class name="AnjutaTreeComboBox" title="Tree combo box"
++		 generic-name="combo">
++			<properties>
++				<property id="glade-type" disabled="True"/>
++				<property id="label" disabled="True"/>
++				<property id="use-underline" disabled="True"/>
++				<property id="stock" disabled="True"/>
++			</properties>
++		</glade-widget-class>
++		<glade-widget-class name="AnjutaPmChooserButton" title="Project node chooser"
++		 generic-name="button" parent="AnjutaTreeComboBox">
++			<properties>
++				<property id="glade-type" disabled="True"/>
++				<property id="label" disabled="True"/>
++				<property id="use-underline" disabled="True"/>
++				<property id="stock" disabled="True"/>
++			</properties>
++		</glade-widget-class>
++		<glade-widget-class name="GbfProjectView" title="Project node view"
++		 generic-name="view" parent="GtkTreeView">
++		</glade-widget-class>
++
++	</glade-widget-classes>
++
++	<glade-widget-group name="Anjuta" title="Anjuta">
++		<glade-widget-class-ref name="AnjutaVcsStatusTreeView" />
++		<glade-widget-class-ref name="AnjutaDropEntry" />
++		<glade-widget-class-ref name="AnjutaFileList" />
++		<glade-widget-class-ref name="AnjutaPkgConfigChooser" />
++		<glade-widget-class-ref name="AnjutaColumnTextView" />
++		<glade-widget-class-ref name="AnjutaFileDropEntry" />
++		<glade-widget-class-ref name="AnjutaEntry" />
++		<glade-widget-class-ref name="AnjutaEnvironmentEditor" />
++		<glade-widget-class-ref name="AnjutaTreeComboBox" />
++		<glade-widget-class-ref name="AnjutaPmChooserButton" />
++		<glade-widget-class-ref name="GbfProjectView" />
++	</glade-widget-group>
++</glade-catalog>
diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch
new file mode 100644
index 000000000..bc8fa7c41
--- /dev/null
+++ b/extra/anjuta/fix-compile-error.patch
@@ -0,0 +1,24 @@
+diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c
+--- anjuta-3.8.0/libanjuta/anjuta-token.c	2013-01-14 22:45:09.000000000 +0100
++++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c	2013-03-31 13:56:11.722332230 +0200
+@@ -329,7 +329,7 @@
+ 	if (string == NULL)
+ 	{
+ 		/* Value doesn't contain a newline */
+-		fprintf (stderr, "(%lu)", length);
++		fprintf (stderr, "(%lu)", (long unsigned)length);
+ 	}
+ 	else
+ 	{
+diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c
+--- anjuta-3.8.0/plugins/dir-project/dir-project.c	2012-11-19 00:34:57.000000000 +0100
++++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c	2013-03-31 13:55:35.922610895 +0200
+@@ -268,7 +268,7 @@
+ 			{
+ 				ptr++;
+ 			} while  (*ptr == '?');
+-			g_string_append_printf (regex, "(.{%d})", ptr - next);
++			g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next));
+ 		}
+ 		else if (*ptr == '\\')
+ 		{
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index ca6c85c99..520ac9876 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 170879 2012-11-12 21:34:54Z heftig $
+# $Id: PKGBUILD 183331 2013-04-21 22:08:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
-pkgver=2.6.2
+pkgver=2.8.1
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org"
 license=('GPL2')
-depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
+depends=('at-spi2-core' 'libx11' 'atk')
 makedepends=('intltool')
-install=at-spi2-atk.install
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('496c8432e8ab82735145f9af5d45209e9b708bf3c94e527ee091d08641a9bcfa')
+sha256sums=('eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index 61e23ebaf..dbbdd3d22 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 173097 2012-12-10 22:25:55Z heftig $
+# $Id: PKGBUILD 183332 2013-04-21 22:08:31Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.6.3
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org"
 license=('GPL2')
-depends=('dbus-core' 'glib2' 'libxtst')
+depends=('dbus' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fc4487ae46e847cfd057b329b852cf99923772ecd2ddc29f29670c9f2b15d0ea')
+sha256sums=('1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD
index a59f6258f..969a1cfb1 100644
--- a/extra/atk/PKGBUILD
+++ b/extra/atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169846 2012-10-30 22:23:52Z heftig $
+# $Id: PKGBUILD 183330 2013-04-21 22:08:28Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=atk
-pkgver=2.6.0
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 url='http://www.gtk.org/'
-sha256sums=('eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f')
+sha256sums=('b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD
index f9d035aa2..342f9ccfb 100644
--- a/extra/baobab/PKGBUILD
+++ b/extra/baobab/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175196 2013-01-16 11:12:55Z jgc $
+# $Id: PKGBUILD 183333 2013-04-21 22:08:32Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=baobab
-pkgver=3.6.4
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
 arch=(i686 x86_64)
@@ -10,10 +10,10 @@ url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
-groups=('gnome-extra')
+groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e5539558ef3411e14cb165a3e77f2d0451e984722a71a7a7d0f72fe29360cb2e')
+sha256sums=('740c123cbc49f0e479a9c67d7cc7a6330b2a9d3e6a7ffde55665a1130d9209bb')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD
new file mode 100644
index 000000000..3deecf27b
--- /dev/null
+++ b/extra/bijiben/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 183334 2013-04-21 22:08:33Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=bijiben
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Write out notes, every detail matters"
+arch=(i686 x86_64)
+url="https://live.gnome.org/Bijiben"
+license=(GPL)
+depends=(libtracker-sparql clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils)
+makedepends=(intltool itstool)
+options=(!emptydirs)
+install=bijiben.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('a0965874c68ca8492dcffc25cbf6f51549ff4a005c1fa1d87a1d82021aae7908')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/bijiben/bijiben.install b/extra/bijiben/bijiben.install
new file mode 100644
index 000000000..8b17fa3d4
--- /dev/null
+++ b/extra/bijiben/bijiben.install
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index 5d6c62f84..b96d207bc 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 180254 2013-03-18 23:32:28Z jgc $
+# $Id: PKGBUILD 183335 2013-04-21 22:08:35Z heftig $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=brasero
-pkgver=3.6.1
+pkgver=3.8.0
 pkgrel=2
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/brasero"
 license=('GPL')
 options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
+depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify')
+makedepends=('gtk-doc' 'yelp-tools' 'gnome-common' 'intltool' 'libburn' 'libisofs' 'libnautilus-extension' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
 optdepends=('libburn: alternative back-end'
             'libisofs: libburn back-end'
             'dvdauthor: video project'
             'vcdimager: video project')
 replaces=('nautilus-cd-burner')
 install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        use-mpegaudioparse.patch)
-sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932'
-            'c75331d130c248edeaa68211cf96f386d86905510d09b104e4e0cd0ff4c92218')
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i ../use-mpegaudioparse.patch
+
+  # Update tracker dep
+  sed -i '/tracker/s/0\.14/0.16/' configure.ac
+  autoreconf -f -v -i
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-caches \
       --disable-schemas-compile
diff --git a/extra/brasero/use-mpegaudioparse.patch b/extra/brasero/use-mpegaudioparse.patch
deleted file mode 100644
index 79c24d6a8..000000000
--- a/extra/brasero/use-mpegaudioparse.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 895777890485428a23f2e0da0e8ccd2edf624f6e Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Fri, 25 Jan 2013 03:26:10 +0000
-Subject: use mpegaudioparse gstreamer plugin instead of mp3parse
-
-Fix "not suitable for audio or video media" error when
-attempting to create a mp3 audio project
-The plugin was basically renamed for gstreamer 1.0.
-Thanks tuxor for identifying the problem!
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687886
----
-diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
-index 1088121..7f10088 100644
---- a/libbrasero-utils/brasero-metadata.c
-+++ b/libbrasero-utils/brasero-metadata.c
-@@ -1200,12 +1200,12 @@ brasero_metadata_create_mp3_pipeline (BraseroMetadata *self)
- 	}
- 	gst_bin_add (GST_BIN (priv->pipeline_mp3), source);
- 
--	parse = gst_element_factory_make ("mp3parse", NULL);
-+	parse = gst_element_factory_make ("mpegaudioparse", NULL);
- 	if (!parse) {
- 		priv->error = g_error_new (BRASERO_UTILS_ERROR,
- 					   BRASERO_UTILS_ERROR_GENERAL,
- 					   _("%s element could not be created"),
--					   "\"mp3parse\"");
-+					   "\"mpegaudioparse\"");
- 
- 		g_object_unref (priv->pipeline_mp3);
- 		priv->pipeline_mp3 = NULL;
-diff --git a/plugins/transcode/burn-transcode.c b/plugins/transcode/burn-transcode.c
-index a6a0f40..6861168 100644
---- a/plugins/transcode/burn-transcode.c
-+++ b/plugins/transcode/burn-transcode.c
-@@ -284,13 +284,13 @@ brasero_transcode_create_pipeline_size_mp3 (BraseroTranscode *transcode,
- 
- 	BRASERO_JOB_LOG (transcode, "Creating specific pipeline for MP3s");
- 
--	parse = gst_element_factory_make ("mp3parse", NULL);
-+	parse = gst_element_factory_make ("mpegaudioparse", NULL);
- 	if (!parse) {
- 		g_set_error (error,
- 			     BRASERO_BURN_ERROR,
- 			     BRASERO_BURN_ERROR_GENERAL,
- 			     _("%s element could not be created"),
--			     "\"Mp3parse\"");
-+			     "\"mpegaudioparse\"");
- 		g_object_unref (pipeline);
- 		return FALSE;
- 	}
---
-cgit v0.9.1
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 1405c33f0..c86f5b324 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,49 +1,41 @@
-# $Id: PKGBUILD 180801 2013-03-26 11:49:28Z foutrelis $
+# $Id: PKGBUILD 183336 2013-04-21 22:08:36Z heftig $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=brltty
-pkgver=4.4
-pkgrel=4
+pkgver=4.5
+pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://mielke.cc/brltty"
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=51.1' 'tcl' 'atk' 'pyrex')
-makedepends=('bluez')
+license=(GPL LGPL)
+depends=(libxaw at-spi2-core gpm 'icu>=51.1' tcl atk cython)
+makedepends=(bluez)
 optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
+backup=(etc/brltty.conf)
+options=('!emptydirs')
 install=brltty.install
 source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
-        'brltty'
-        'brltty.conf'
-	     'brltty.service')
-md5sums=('8ebe96efe679f5f6ccff08928fec5b26'
-         '831ebaf0c56091702929c68805d20c4f'
-         'a8ab8b3dd059e96e1734bc9cdcf844fc'
+        brltty.service)
+md5sums=('7b52fa7746fed41ed344a1f75ce55951'
          '7acecd700b9f94d76fe4a6ad56cb0448')
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' Tables/latex-access.ctb
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --mandir=/usr/share/man \
-    --localstatedir=/var \
+    --with-tables-directory=/usr/share/brltty \
     --with-screen-driver=a2 \
     --enable-gpm \
     --disable-java-bindings \
-    PYTHON=/usr/bin/python2
+    --disable-static
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make INSTALL_ROOT="$pkgdir" install
-  install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
-  install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
-  install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
-  install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
+  install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
+  install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service"
 }
diff --git a/extra/brltty/brltty b/extra/brltty/brltty
deleted file mode 100755
index 5ed21a52d..000000000
--- a/extra/brltty/brltty
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=brltty
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $brltty_args
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/brltty/brltty.conf b/extra/brltty/brltty.conf
deleted file mode 100644
index 94115e1d5..000000000
--- a/extra/brltty/brltty.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Specify any arguments to pass to brltty here.
-brltty_args=""
\ No newline at end of file
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index 8a7abfab6..fec6a9ddc 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170864 2012-11-12 20:12:13Z heftig $
+# $Id: PKGBUILD 183337 2013-04-21 22:08:38Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Adam Hani Schakaki <krzd@krzd.net>
 
 pkgname=caribou
-pkgver=0.4.4.2
+pkgver=0.4.10
 pkgrel=1
 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Caribou"
-license=('LGPL')
-depends=('at-spi2-atk' 'pyatspi' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf')
-makedepends=('intltool' 'docbook-xsl')
+license=(LGPL)
+depends=(at-spi2-atk python2-atspi python2-gobject gtk3 libxklavier libgee clutter dconf)
+makedepends=(intltool docbook-xsl gtk2)
 install=caribou.install
 options=(!libtool !emptydirs)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('22fba681b3e6041494ac4fa41b8286957bade0cc6158c110fe8f3c980af6913d')
+sha256sums=('6480ce3a87cf4f01dd1fb52edbb31a2aa9f5573a0860b67115c86bbcd7b17865')
 
 build() {
   cd $pkgname-$pkgver
@@ -28,6 +28,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index 160a2944c..78948b2c3 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 170886 2012-11-12 22:06:48Z heftig $
+# $Id: PKGBUILD 183338 2013-04-21 22:08:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto')
-optdepends=('nautilus-sendto: Send snapshots'
-            'frei0r-plugins: More camera effects')
+depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'gnome-video-effects' 'librsvg' 'gnome-desktop' 'nautilus-sendto' 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala')
+optdepends=('frei0r-plugins: More camera effects')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('745262a0db7d0dbe973497a4f36dd4d85b8a42426d8f431e4b6898351ad6459e')
+sha256sums=('e9f7a7855c52451cfc59ffa23962eaa5fda7c9bc629bb975f4328af061d01eeb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 5535ed99d..67d7a17dd 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178920 2013-02-28 18:58:26Z ioni $
+# $Id: PKGBUILD 183340 2013-04-21 22:08:41Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer bindings for clutter"
 arch=('i686' 'x86_64')
 url="http://www.clutter-project.org/"
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index 19dd7a35a..d09988c74 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175998 2013-01-25 16:33:00Z ioni $
+# $Id: PKGBUILD 183341 2013-04-21 22:08:42Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=clutter-gtk
-pkgver=1.4.2
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('clutter' 'gtk3')
 makedepends=('gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974')
+sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 698f314b6..fd8b05e04 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 169854 2012-10-30 22:24:23Z heftig $
+# $Id: PKGBUILD 183339 2013-04-21 22:08:40Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.12.2
-pkgrel=1
+pkgver=1.14.2
+pkgrel=2
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
-depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi')
-makedepends=('gobject-introspection' 'mesa')
+depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon')
+makedepends=('gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13')
+sha256sums=('b2bdf7090f7ba34a69e07a58d43ff8088c81d6dbb56677ae4b103b6cba1920a8')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-introspection
+  ./configure --prefix=/usr --enable-introspection \
+    --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input
   make
 }
 
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 9b5159460..ce0b3dacb 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163754 2012-07-19 07:57:34Z heftig $
+# $Id: PKGBUILD 183342 2013-04-21 22:08:43Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.10.4
-pkgrel=1
+pkgver=1.14.0
+pkgrel=2
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=('i686' 'x86_64')
 url="http://www.clutter-project.org/"
@@ -12,11 +12,12 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool !emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9')
+sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+    --enable-wayland-egl-{platform,server} --enable-gles{1,2}
   make
 }
 
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 7cdc809f2..d7557337a 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 170097 2012-11-01 16:50:36Z heftig $
+# $Id: PKGBUILD 183343 2013-04-21 22:08:45Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
-pkgver=0.14.1
+pkgver=0.16.0
 pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64)
 url="http://live.gnome.org/dconf"
 license=('LGPL2.1')
 depends=('glib2' 'gtk-update-icon-cache')
-makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl')
+makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('59c58c5eafa0ebd616287d078f4441d5342870a44634445d324e88fc0287f0b8')
+sha256sums=('192d682b8e160e22506f3fac6847444013c7cdbef188d937a6ae2b357f9134bb')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD
index d51581202..fae630d93 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 170977 2012-11-14 07:19:21Z heftig $
+# $Id: PKGBUILD 183344 2013-04-21 22:08:46Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=devhelp
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64)
-license=('GPL')
+license=(GPL)
 url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'webkitgtk3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'python2')
+depends=(webkitgtk3 hicolor-icon-theme)
+makedepends=(pkgconfig intltool python)
 options=('!libtool' '!emptydirs')
 install=devhelp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('71c6933422bf876745fc10276a2b2ee0f8c4c4ddfe034b3f6380507725fd4e63')
+sha256sums=('4548fb0b17d4716851cf044294a8ee59e72c8de97e793842faf510a6dbfd3c96')
 
 build() {
   cd $pkgname-$pkgver
@@ -27,9 +27,5 @@ build() {
 
 package() {
   cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/devhelp/devhelp.install b/extra/devhelp/devhelp.install
index 4db5f6e5c..03f95852c 100644
--- a/extra/devhelp/devhelp.install
+++ b/extra/devhelp/devhelp.install
@@ -1,22 +1,18 @@
-pkgname=devhelp
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove
+  if (( $(vercmp $2 3.8.0) < 0 )); then
+    gconfpkg --uninstall devhelp
+  fi
 }
 
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 09602b212..52c8b2df8 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 181118 2013-03-31 19:16:41Z stephane $
+# $Id: PKGBUILD 183345 2013-04-21 22:08:47Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
@@ -13,7 +13,6 @@ depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'g
 makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
 optdepends=('evolution-data-server: Evolution integration')
 options=(!emptydirs)
-groups=('gnome-extra')
 install=ekiga.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b')
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 7666e4f8f..b9c5774ea 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD 175978 2013-01-25 14:51:01Z ioni $
+# $Id: PKGBUILD 183346 2013-04-21 22:08:49Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto')
+license=(GPL2)
+depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control)
+makedepends=(intltool itstool docbook-xsl python2)
 optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-idle: IRC support'
             'telepathy-salut: Link-local XMPP support'
             'telepathy-rakia: SIP support'
-            'telepathy-haze: libpurple support'
-            'nautilus-sendto: Send files from nautilus')
+            'telepathy-haze: libpurple support')
 options=('!libtool' '!makeflags')
-groups=('gnome-extra')
+groups=(gnome)
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eaae20e8e9b8660979ed7a9a65deba61d6d795c6f698e684f21c3821f042704d')
+sha256sums=('45accc06e9c1711741b0f1476971c7e705b57ea0718a2b10ee66c5dd0397b917')
 
 build() {
   cd $pkgname-$pkgver
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
       --sysconfdir=/etc  \
       --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-schemas-compile \
-      --enable-gst-1.0=yes
+      --disable-static
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index 801dcd172..8402f9795 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169864 2012-10-30 22:25:02Z heftig $
+# $Id: PKGBUILD 183348 2013-04-21 22:08:51Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
-pkgver=3.6.1
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/"
@@ -12,9 +12,8 @@ depends=('eog' 'libchamplain' 'libgdata')
 makedepends=('intltool')
 install=eog-plugins.install
 options=('!libtool')
-groups=(gnome-extra)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac')
+sha256sums=('a7e4822c46654f67ef25cbc82e4c955ee84ecae92cf356e15a136032cff35e78')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index c26151ba6..96a256a7d 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 170865 2012-11-12 20:14:53Z heftig $
+# $Id: PKGBUILD 183347 2013-04-21 22:08:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool' 'itstool')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gnome-desktop libexif lcms2 desktop-file-utils exempi libpeas librsvg gnome-icon-theme dconf)
+makedepends=(gtk-doc intltool itstool)
 install=eog.install
-groups=('gnome-extra')
+groups=(gnome)
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5879f26a11fa7cd2fa4038e5c51d31e4959456be4fba570dcde89ed0d966ffda')
+sha256sums=('0f2f6f1eb1a373b2a6f8e5627b20815e5bf13b8c856b67d8f72d2a10b6012f2b')
 
 build() {
   cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+  ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var
   make
 }
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index 6b65b5e6a..99eac194a 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 169865 2012-10-30 22:25:05Z heftig $
+# $Id: PKGBUILD 183349 2013-04-21 22:08:53Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme' 'gcr' 'gnome-desktop')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
+depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils'
+         'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3')
+makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008')
+sha256sums=('8c231bb1af8daf739524bd89aa44873f5936b8a849da49326427486ed825523f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 04e7dc001..bc6151ddc 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 179104 2013-03-03 17:28:32Z dreisner $
+# $Id: PKGBUILD 183350 2013-04-21 22:08:55Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
-pkgver=3.6.1
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas)
+makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python)
 optdepends=('texlive-bin: DVI support'
 	    'gvfs: bookmark support and session saving')
-groups=('gnome-extra')
+groups=(gnome)
 install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b87b2579d438a126391f9044611b472e9f7b5b712e40b5645b0810164bc41b5')
+sha256sums=('cf136d2a025ef486c4e248e0dc134e7a9420557d9edc0df1ceb6a6330fbd4e9a')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr   --sysconfdir=/etc \
       --localstatedir=/var    --libexecdir=/usr/lib/evince \
       --disable-static        --enable-nautilus \
@@ -32,6 +32,6 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index bce513ea2..d075a808d 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 179957 2013-03-13 12:28:12Z jgc $
+# $Id: PKGBUILD 183352 2013-04-21 22:08:58Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.6.4
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=$pkgname.install
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('50b4ca21bc57d2fe4933ea3072bf11d5e6069d0ecaacced0bd0f55f098d09f4e')
+sha256sums=('0425d8b73dcf705840cdf9fc955b3ca05b9aacc6eb2d2d97f159725be3a8b896')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -21,7 +21,7 @@ build() {
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
       --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings
+      --enable-vala-bindings --disable-uoa
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 46addbb0b..a8de938ca 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176004 2013-01-25 17:34:07Z ioni $
+# $Id: PKGBUILD 183353 2013-04-21 22:09:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64')
@@ -12,12 +12,12 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d044bf8f7753d9489d65a5b94b117cef1369d78c57810125fab229368d01fec6')
+sha256sums=('26fea90285189ee0e370ea04baef31bc0907d0cf400a63fafc95631111d378c9')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static
+      --libexecdir=/usr/lib/evolution --disable-static --with-krb5
   make
 }
 
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index dccdcd330..d0a613d92 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 179984 2013-03-13 20:18:27Z jgc $
+# $Id: PKGBUILD 183351 2013-04-21 22:08:56Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.6.4
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gnome-desktop evolution-data-server gtkhtml4 libcanberra libpst libytnef psmisc
+         desktop-file-utils hicolor-icon-theme dconf)
+makedepends=(intltool itstool docbook-xsl networkmanager bogofilter spamassassin highlight)
 optdepends=('bogofilter: possible junk filter plugin'
-            'spamassassin: possible junk filter plugin')
+            'spamassassin: possible junk filter plugin'
+            'highlight: text highlight plugin')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1')
+sha256sums=('89b775c5757ddf791d181c82eaee6ddc42252eb54aa2f5dc5a80ff5b9246803b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD
new file mode 100644
index 000000000..47eefa009
--- /dev/null
+++ b/extra/five-or-more/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 183355 2013-04-21 22:09:04Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=five-or-more
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Remove colored balls from the board by forming lines"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=five-or-more.install
+url="https://live.gnome.org/Five%20or%20more"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a050f472dadbb3f44e5cd5e4ab31058a6058f4ccaa03558311706ec0c052b056')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+}
diff --git a/extra/five-or-more/five-or-more.install b/extra/five-or-more/five-or-more.install
new file mode 100644
index 000000000..eb9e34de3
--- /dev/null
+++ b/extra/five-or-more/five-or-more.install
@@ -0,0 +1,35 @@
+_scores=(
+	glines.Small.scores
+	glines.Medium.scores
+	glines.Large.scores
+)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index dfe526e68..759e81b4b 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 169873 2012-10-30 22:25:29Z heftig $
+# $Id: PKGBUILD 183356 2013-04-21 22:09:07Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
-pkgver=0.8.0
-pkgrel=1
+pkgver=0.9.1
+pkgrel=3
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/Folks"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb' 'libzeitgeist')
-makedepends=('gobject-introspection' 'intltool')
+license=(LGPL2.1)
+depends=(telepathy-glib libgee libxml2 evolution-data-server libzeitgeist libtracker-sparql)
+makedepends=(gobject-introspection intltool)
 install=folks.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d')
+sha256sums=('102b1867355d16e73a837871a058dda13c74fa385908ddda1623893ab0baee4a')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-schemas-compile
+  ./configure --prefix=/usr --disable-schemas-compile --enable-tracker-backend \
+    --disable-libsocialweb-backend
   make
 }
 
diff --git a/extra/fontconfig/29-replace-bitmap-fonts.conf b/extra/fontconfig/29-replace-bitmap-fonts.conf
index 7ac4483c4..391ffef94 100644
--- a/extra/fontconfig/29-replace-bitmap-fonts.conf
+++ b/extra/fontconfig/29-replace-bitmap-fonts.conf
@@ -1,37 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-    <!-- Replace generic bitmap font names by generic font families.
-         These font-families will get replaced by other rules and
-	 default to scaled ones. -->
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Helvetica</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Arial</string>
-            <string>Liberation Sans</string>	    
-            <string>sans-serif</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Courier</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Courier New</string>
-            <string>Liberation Mono</string>
-            <string>monospace</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Times</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Times New Roman</string>
-            <string>Liberation Serif</string>
-            <string>serif</string>
-        </edit>
-    </match>
+  <!-- Prefer Microsoft versions of PostScript fonts, as these typically render a lot better on-screen 
+       30-metric-aliases.conf will then also add the free clones of these fonts -->
+  <alias binding="same">
+    <family>Helvetica</family>
+    <prefer><family>Arial</family></prefer>
+  </alias>
+  <alias binding="same">
+    <family>Times</family>
+    <prefer><family>Times New Roman</family></prefer>
+  </alias>
+  <alias binding="same">
+    <family>Courier</family>
+    <prefer><family>Courier New</family></prefer>
+  </alias>
 </fontconfig>
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index ab3dad32d..f051c8010 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175209 2013-01-16 17:39:36Z andyrtr $
+# $Id: PKGBUILD 183357 2013-04-21 22:09:09Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.10.2
-pkgrel=2
+pkgver=2.10.92
+pkgrel=4
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
@@ -12,13 +12,20 @@ depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-        29-replace-bitmap-fonts.conf)
-sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952'
-            '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc')
+        29-replace-bitmap-fonts.conf git_fixes.diff)
+sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22'
+            '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6'
+            '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0')
+
+  # a nice page to test font matching:
+  # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # post release fixes
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
   libtoolize -f
   autoreconf -fi
@@ -43,12 +50,9 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  # not upstream, not in FC and not in Gentoo, this should probably go upstream
-  # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back
   install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
-  pushd $pkgdir/etc/fonts/conf.d
-  ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf .
-  popd
+  ln -s ../conf.avail/29-replace-bitmap-fonts.conf \
+    "$pkgdir/etc/fonts/conf.d/29-replace-bitmap-fonts.conf"
 
   #Install license
   install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
diff --git a/extra/fontconfig/git_fixes.diff b/extra/fontconfig/git_fixes.diff
new file mode 100644
index 000000000..209cba64c
--- /dev/null
+++ b/extra/fontconfig/git_fixes.diff
@@ -0,0 +1,732 @@
+From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Mon, 01 Apr 2013 09:16:28 +0000
+Subject: Bug 62980 - matching native fonts with even :lang=en
+
+Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc
+to deal with both strong and weak of FC_LANG as the same location in the score
+---
+diff --git a/src/fcmatch.c b/src/fcmatch.c
+index 68f39ae..2d7b798 100644
+--- a/src/fcmatch.c
++++ b/src/fcmatch.c
+@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy {
+ #undef FC_OBJECT
+ 
+ #undef PRI1
+-#define PRI1(n)			\
+-    PRI_ ## n ## _STRONG,	\
+-    PRI_ ## n ## _WEAK
++#define PRI1(n)					\
++    PRI_ ## n,					\
++    PRI_ ## n ## _STRONG = PRI_ ## n,		\
++    PRI_ ## n ## _WEAK = PRI_ ## n
+ 
+ typedef enum _FcMatcherPriority {
+     PRI1(HASH),
+@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority {
+     PRI1(FOUNDRY),
+     PRI1(CHARSET),
+     PRI_FAMILY_STRONG,
+-    PRI_LANG_STRONG,
+     PRI_POSTSCRIPT_NAME_STRONG,
+-    PRI_LANG_WEAK,
++    PRI1(LANG),
+     PRI_FAMILY_WEAK,
+     PRI_POSTSCRIPT_NAME_WEAK,
+     PRI1(SPACING),
+@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 	 * If this node matches any language, go check
+ 	 * which ones and satisfy those entries
+ 	 */
+-	if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 ||
+-	    nodeps[f]->score[PRI_LANG_WEAK] < 2000)
++	if (nodeps[f]->score[PRI_LANG] < 2000)
+ 	{
+ 	    for (i = 0; i < nPatternLang; i++)
+ 	    {
+@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 			}
+ 			patternLangSat[i] = FcTrue;
+ 			satisfies = FcTrue;
+-			/* adjust score to ensure it's not more than 10000.0
+-			 * which would means the lang didn't satisfy the requirements
+-			 */
+-			if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0)
+-			    nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
+-			if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0)
+-			    nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
+ 			break;
+ 		    }
+ 		}
+@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 	}
+ 	if (!satisfies)
+ 	{
+-	    nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
+-	    nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
++	    nodeps[f]->score[PRI_LANG] = 10000.0;
+ 	}
+     }
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 18bf57c70aafcad031c0b43756b754dcaf6a756a Mon Sep 17 00:00:00 2001
+From: Sebastian Freundt <hroptatyr@fresse.org>
+Date: Sun, 07 Apr 2013 00:02:58 +0000
+Subject: build-chain, replace INCLUDES directive by AM_CPPFLAGS
+
+As of automake-13.1 the INCLUDES directive is no longer supported.
+An automake run will return with an error.
+
+This changeset simply follows automake's advice to replace INCLUDES
+by AM_CPPFLAGS.
+---
+diff --git a/Tools.mk b/Tools.mk
+index 56766da..f0fa0ec 100644
+--- a/Tools.mk
++++ b/Tools.mk
+@@ -32,7 +32,7 @@ TOOL=./$(DIR)$(EXEEXT_FOR_BUILD)
+ 
+ EXTRA_DIST = $(TARG) $(TMPL) $(TSRC) $(DIST)
+ 
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	   -I$(builddir) \
+ 	   -I$(srcdir) \
+ 	   -I$(top_builddir)/src \
+@@ -43,7 +43,7 @@ INCLUDES = \
+ 	   $(WARN_CFLAGS)
+ 
+ $(TOOL): $(TSRC) $(ALIAS_FILES)
+-	$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(INCLUDES)
++	$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS)
+ 
+ $(TARG): $(TMPL) $(TSRC) $(DEPS)
+ 	$(AM_V_GEN) $(MAKE) $(TOOL) && \
+diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
+index 7f7d1b1..0e10786 100644
+--- a/fc-cache/Makefile.am
++++ b/fc-cache/Makefile.am
+@@ -36,7 +36,7 @@ uninstall-local:
+ 	-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
+ endif
+ 
+-INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
+ 
+ bin_PROGRAMS=fc-cache
+ 
+diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
+index b426723..04c1cc4 100644
+--- a/fc-cat/Makefile.am
++++ b/fc-cat/Makefile.am
+@@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat
+ 
+ SGML = ${FC_CAT_SRC}/fc-cat.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
+ 
+ bin_PROGRAMS=fc-cat
+ 
+diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
+index b2c499d..c58540e 100644
+--- a/fc-list/Makefile.am
++++ b/fc-list/Makefile.am
+@@ -29,7 +29,7 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml
+ 
+ bin_PROGRAMS=fc-list
+ 
+-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-list.1
+ 
+diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
+index 0e9e8fd..84afb8b 100644
+--- a/fc-match/Makefile.am
++++ b/fc-match/Makefile.am
+@@ -29,7 +29,7 @@ FC_MATCH_SRC=${top_srcdir}/fc-match
+ 
+ SGML = ${FC_MATCH_SRC}/fc-match.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-match.1
+ 
+diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am
+index 92b0433..c456247 100644
+--- a/fc-pattern/Makefile.am
++++ b/fc-pattern/Makefile.am
+@@ -29,7 +29,7 @@ FC_PATTERN_SRC=${top_srcdir}/fc-pattern
+ 
+ SGML = ${FC_PATTERN_SRC}/fc-pattern.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-pattern.1
+ 
+diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am
+index b3ea1e6..73b3f11 100644
+--- a/fc-query/Makefile.am
++++ b/fc-query/Makefile.am
+@@ -29,7 +29,7 @@ FC_QUERY_SRC=${top_srcdir}/fc-query
+ 
+ SGML = ${FC_QUERY_SRC}/fc-query.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-query.1
+ 
+diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am
+index 2063405..471a42f 100644
+--- a/fc-scan/Makefile.am
++++ b/fc-scan/Makefile.am
+@@ -29,7 +29,7 @@ FC_SCAN_SRC=${top_srcdir}/fc-scan
+ 
+ SGML = ${FC_SCAN_SRC}/fc-scan.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-scan.1
+ 
+diff --git a/fc-validate/Makefile.am b/fc-validate/Makefile.am
+index 54edec2..782cead 100644
+--- a/fc-validate/Makefile.am
++++ b/fc-validate/Makefile.am
+@@ -29,7 +29,7 @@ FC_VALIDATE_SRC=${top_srcdir}/fc-validate
+ 
+ SGML = ${FC_VALIDATE_SRC}/fc-validate.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-validate.1
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9fd7dd8..066cc03 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -70,7 +70,7 @@ uninstall-ms-import-lib:
+ 
+ endif
+ 
+-INCLUDES = 						\
++AM_CPPFLAGS = 						\
+ 	-I$(top_srcdir)					\
+ 	-I$(top_srcdir)/src				\
+ 	$(FREETYPE_CFLAGS)				\
+--
+cgit v0.9.0.2-2-gbebe
+From 9299155b5247255d6b6687448173056c3ca8d09b Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Tue, 09 Apr 2013 02:34:35 +0000
+Subject: Ensure closing fp on error
+
+---
+diff --git a/src/fchash.c b/src/fchash.c
+index 827b20f..4ea5f37 100644
+--- a/src/fchash.c
++++ b/src/fchash.c
+@@ -220,7 +220,7 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
+ 
+     ret = FcHashInitSHA256Digest ();
+     if (!ret)
+-	return NULL;
++	goto bail0;
+ 
+     while (!feof (fp))
+     {
+--
+cgit v0.9.0.2-2-gbebe
+From c93a8b8b54afe33e5ecf9870723543cb4058fa94 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Tue, 09 Apr 2013 03:46:30 +0000
+Subject: Obtain fonts data via FT_Face instead of opening a file directly
+
+---
+diff --git a/src/fcfreetype.c b/src/fcfreetype.c
+index 8a037c0..1eecfdb 100644
+--- a/src/fcfreetype.c
++++ b/src/fcfreetype.c
+@@ -1662,7 +1662,7 @@ FcFreeTypeQueryFace (const FT_Face  face,
+     if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative))
+ 	goto bail1;
+ 
+-    hashstr = FcHashGetSHA256DigestFromFile (file);
++    hashstr = FcHashGetSHA256DigestFromFace (face);
+     if (!hashstr)
+ 	goto bail1;
+     if (!FcPatternAddString (pat, FC_HASH, hashstr))
+diff --git a/src/fchash.c b/src/fchash.c
+index 4ea5f37..043d94b 100644
+--- a/src/fchash.c
++++ b/src/fchash.c
+@@ -29,6 +29,9 @@
+ #include "fcint.h"
+ #include <stdio.h>
+ #include <string.h>
++#include <ft2build.h>
++#include FT_TRUETYPE_TABLES_H
++#include FT_TRUETYPE_TAGS_H
+ 
+ #define ROTRN(w, v, n)	((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n)))
+ #define ROTR32(v, n)	ROTRN(32, v, n)
+@@ -204,41 +207,50 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ }
+ 
+ FcChar8 *
+-FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
++FcHashGetSHA256DigestFromFace (const FT_Face face)
+ {
+-    FILE *fp = fopen ((const char *)filename, "rb");
+-    char ibuf[64];
++    char ibuf[64], *buf = NULL;
+     FcChar32 *ret;
+-    size_t len;
+-    struct stat st;
++    FT_Error err;
++    FT_ULong len = 0, alen, i = 0;
+ 
+-    if (!fp)
++    err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
++    if (err != FT_Err_Ok)
+ 	return NULL;
+-
+-    if (FcStat (filename, &st))
++    alen = (len + 63) & ~63;
++    buf = malloc (alen);
++    if (!buf)
++	return NULL;
++    err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len);
++    if (err != FT_Err_Ok)
+ 	goto bail0;
++    memset (&buf[len], 0, alen - len);
+ 
+     ret = FcHashInitSHA256Digest ();
+     if (!ret)
+ 	goto bail0;
+ 
+-    while (!feof (fp))
++    while (i <= len)
+     {
+-	if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64)
++	if ((len - i) < 64)
+ 	{
+ 	    long v;
++	    int n;
+ 
+ 	    /* add a padding */
+-	    memset (&ibuf[len], 0, 64 - len);
+-	    ibuf[len] = 0x80;
+-	    if ((64 - len) < 9)
++	    n = len - i;
++	    if (n > 0)
++		memcpy (ibuf, &buf[i], n);
++	    memset (&ibuf[n], 0, 64 - n);
++	    ibuf[n] = 0x80;
++	    if ((64 - n) < 9)
+ 	    {
+ 		/* process a block once */
+ 		FcHashComputeSHA256Digest (ret, ibuf);
+ 		memset (ibuf, 0, 64);
+ 	    }
+ 	    /* set input size at the end */
+-	    v = (long)st.st_size * 8;
++	    v = len * 8;
+ 	    ibuf[63 - 0] =  v        & 0xff;
+ 	    ibuf[63 - 1] = (v >>  8) & 0xff;
+ 	    ibuf[63 - 2] = (v >> 16) & 0xff;
+@@ -252,14 +264,18 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
+ 	}
+ 	else
+ 	{
+-	    FcHashComputeSHA256Digest (ret, ibuf);
++	    FcHashComputeSHA256Digest (ret, &buf[i]);
+ 	}
++	i += 64;
+     }
+-    fclose (fp);
++    if (buf)
++	free (buf);
+ 
+     return FcHashSHA256ToString (ret);
+ 
+ bail0:
+-    fclose (fp);
++    if (buf)
++	free (buf);
++
+     return NULL;
+ }
+diff --git a/src/fcint.h b/src/fcint.h
+index c45075e..703b983 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -47,6 +47,8 @@
+ #include "fcdeprecate.h"
+ #include "fcmutex.h"
+ #include "fcatomic.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #ifndef FC_CONFIG_PATH
+ #define FC_CONFIG_PATH "fonts.conf"
+@@ -819,7 +821,7 @@ FcPrivate FcChar8 *
+ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ 		       size_t         len);
+ FcPrivate FcChar8 *
+-FcHashGetSHA256DigestFromFile (const FcChar8 *filename);
++FcHashGetSHA256DigestFromFace (const FT_Face face);
+ 
+ /* fcinit.c */
+ FcPrivate FcConfig *
+--
+cgit v0.9.0.2-2-gbebe
+From fc5a589abad0e8285f7d95007ebda76536e8fa7d Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Tue, 09 Apr 2013 08:18:43 +0000
+Subject: Revert the previous change and rework to not export freetype API outside fcfreetype.c
+
+---
+diff --git a/src/fcfreetype.c b/src/fcfreetype.c
+index 1eecfdb..22064b3 100644
+--- a/src/fcfreetype.c
++++ b/src/fcfreetype.c
+@@ -1104,7 +1104,10 @@ FcFreeTypeQueryFace (const FT_Face  face,
+     char	    psname[256];
+     const char	    *tmp;
+ 
+-    FcChar8	    *hashstr;
++    FcChar8	    *hashstr = NULL;
++    char	    *fontdata = NULL;
++    FT_Error	    err;
++    FT_ULong	    len = 0, alen;
+ 
+     pat = FcPatternCreate ();
+     if (!pat)
+@@ -1662,12 +1665,22 @@ FcFreeTypeQueryFace (const FT_Face  face,
+     if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative))
+ 	goto bail1;
+ 
+-    hashstr = FcHashGetSHA256DigestFromFace (face);
++    err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
++    if (err != FT_Err_Ok)
++	goto bail1;
++    alen = (len + 63) & ~63;
++    fontdata = malloc (alen);
++    if (!fontdata)
++	goto bail1;
++    err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
++    if (err != FT_Err_Ok)
++	goto bail1;
++    memset (&fontdata[len], 0, alen - len);
++    hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
+     if (!hashstr)
+ 	goto bail1;
+     if (!FcPatternAddString (pat, FC_HASH, hashstr))
+ 	goto bail1;
+-    free (hashstr);
+ 
+     /*
+      * Compute the unicode coverage for the font
+@@ -1756,6 +1769,10 @@ FcFreeTypeQueryFace (const FT_Face  face,
+ bail2:
+     FcCharSetDestroy (cs);
+ bail1:
++    if (hashstr)
++	free (hashstr);
++    if (fontdata)
++	free (fontdata);
+     FcPatternDestroy (pat);
+ bail0:
+     return NULL;
+diff --git a/src/fchash.c b/src/fchash.c
+index 043d94b..1ef1e16 100644
+--- a/src/fchash.c
++++ b/src/fchash.c
+@@ -29,9 +29,6 @@
+ #include "fcint.h"
+ #include <stdio.h>
+ #include <string.h>
+-#include <ft2build.h>
+-#include FT_TRUETYPE_TABLES_H
+-#include FT_TRUETYPE_TAGS_H
+ 
+ #define ROTRN(w, v, n)	((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n)))
+ #define ROTR32(v, n)	ROTRN(32, v, n)
+@@ -207,40 +204,28 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ }
+ 
+ FcChar8 *
+-FcHashGetSHA256DigestFromFace (const FT_Face face)
++FcHashGetSHA256DigestFromMemory (const char *fontdata,
++				 size_t      length)
+ {
+-    char ibuf[64], *buf = NULL;
++    char ibuf[64];
+     FcChar32 *ret;
+-    FT_Error err;
+-    FT_ULong len = 0, alen, i = 0;
+-
+-    err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
+-    if (err != FT_Err_Ok)
+-	return NULL;
+-    alen = (len + 63) & ~63;
+-    buf = malloc (alen);
+-    if (!buf)
+-	return NULL;
+-    err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len);
+-    if (err != FT_Err_Ok)
+-	goto bail0;
+-    memset (&buf[len], 0, alen - len);
++    size_t i = 0;
+ 
+     ret = FcHashInitSHA256Digest ();
+     if (!ret)
+-	goto bail0;
++	return NULL;
+ 
+-    while (i <= len)
++    while (i <= length)
+     {
+-	if ((len - i) < 64)
++	if ((length - i) < 64)
+ 	{
+ 	    long v;
+-	    int n;
++	    size_t n;
+ 
+ 	    /* add a padding */
+-	    n = len - i;
++	    n = length - i;
+ 	    if (n > 0)
+-		memcpy (ibuf, &buf[i], n);
++		memcpy (ibuf, &fontdata[i], n);
+ 	    memset (&ibuf[n], 0, 64 - n);
+ 	    ibuf[n] = 0x80;
+ 	    if ((64 - n) < 9)
+@@ -250,7 +235,7 @@ FcHashGetSHA256DigestFromFace (const FT_Face face)
+ 		memset (ibuf, 0, 64);
+ 	    }
+ 	    /* set input size at the end */
+-	    v = len * 8;
++	    v = length * 8;
+ 	    ibuf[63 - 0] =  v        & 0xff;
+ 	    ibuf[63 - 1] = (v >>  8) & 0xff;
+ 	    ibuf[63 - 2] = (v >> 16) & 0xff;
+@@ -264,18 +249,10 @@ FcHashGetSHA256DigestFromFace (const FT_Face face)
+ 	}
+ 	else
+ 	{
+-	    FcHashComputeSHA256Digest (ret, &buf[i]);
++	    FcHashComputeSHA256Digest (ret, &fontdata[i]);
+ 	}
+ 	i += 64;
+     }
+-    if (buf)
+-	free (buf);
+ 
+     return FcHashSHA256ToString (ret);
+-
+-bail0:
+-    if (buf)
+-	free (buf);
+-
+-    return NULL;
+ }
+diff --git a/src/fcint.h b/src/fcint.h
+index 703b983..a662dbf 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -47,8 +47,6 @@
+ #include "fcdeprecate.h"
+ #include "fcmutex.h"
+ #include "fcatomic.h"
+-#include <ft2build.h>
+-#include FT_FREETYPE_H
+ 
+ #ifndef FC_CONFIG_PATH
+ #define FC_CONFIG_PATH "fonts.conf"
+@@ -821,7 +819,8 @@ FcPrivate FcChar8 *
+ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ 		       size_t         len);
+ FcPrivate FcChar8 *
+-FcHashGetSHA256DigestFromFace (const FT_Face face);
++FcHashGetSHA256DigestFromMemory (const char *fontdata,
++				 size_t      length);
+ 
+ /* fcinit.c */
+ FcPrivate FcConfig *
+--
+cgit v0.9.0.2-2-gbebe
+From 77419a4dfdf41ed34dd03e74d0e4e6f89dbc65e1 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Wed, 10 Apr 2013 02:14:39 +0000
+Subject: documented FC_HASH and FC_POSTSCRIPT_NAME
+
+---
+diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
+index 05c5c09..a7b8530 100644
+--- a/doc/fontconfig-devel.sgml
++++ b/doc/fontconfig-devel.sgml
+@@ -196,6 +196,9 @@ convenience for the application's rendering mechanism.
+                                                   default value of familylang,
+                                                   stylelang and fullnamelang
+     prgname        FC_PRGNAME             String  Name of the running program
++    hash           FC_HASH                String  SHA256 hash value of the font data
++                                                  with "sha256:" prefix.
++    postscriptname FC_POSTSCRIPT_NAME     String  Font name in PostScript
+     </programlisting>
+   </sect2>
+ </sect1>
+--
+cgit v0.9.0.2-2-gbebe
+From 03216ccf4ca0808f9c7b9513efcaeb7f4058b575 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Wed, 10 Apr 2013 09:41:22 +0000
+Subject: Bug 63329 - make check fails: .. contents:: :depth: 2
+
+Add back FcHashGetSHA256DigestFromFile() and fall back to it
+when font isn't SFNT-based font because FT_Load_Sfnt_Table
+fails with FT_Err_Invalid_Face_Handle.
+---
+diff --git a/src/fcfreetype.c b/src/fcfreetype.c
+index 22064b3..5e8990d 100644
+--- a/src/fcfreetype.c
++++ b/src/fcfreetype.c
+@@ -1666,17 +1666,29 @@ FcFreeTypeQueryFace (const FT_Face  face,
+ 	goto bail1;
+ 
+     err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
+-    if (err != FT_Err_Ok)
+-	goto bail1;
+-    alen = (len + 63) & ~63;
+-    fontdata = malloc (alen);
+-    if (!fontdata)
+-	goto bail1;
+-    err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
+-    if (err != FT_Err_Ok)
++    if (err == FT_Err_Ok)
++    {
++	alen = (len + 63) & ~63;
++	fontdata = malloc (alen);
++	if (!fontdata)
++	    goto bail1;
++	err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
++	if (err != FT_Err_Ok)
++	    goto bail1;
++	memset (&fontdata[len], 0, alen - len);
++	hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
++    }
++    else if (err == FT_Err_Invalid_Face_Handle)
++    {
++	/* font may not support SFNT. falling back to
++	 * read the font data from file directly
++	 */
++	hashstr = FcHashGetSHA256DigestFromFile (file);
++    }
++    else
++    {
+ 	goto bail1;
+-    memset (&fontdata[len], 0, alen - len);
+-    hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
++    }
+     if (!hashstr)
+ 	goto bail1;
+     if (!FcPatternAddString (pat, FC_HASH, hashstr))
+diff --git a/src/fchash.c b/src/fchash.c
+index 1ef1e16..92585a6 100644
+--- a/src/fchash.c
++++ b/src/fchash.c
+@@ -204,6 +204,68 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ }
+ 
+ FcChar8 *
++FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
++{
++    FILE *fp = fopen ((const char *)filename, "rb");
++    char ibuf[64];
++    FcChar32 *ret;
++    size_t len;
++    struct stat st;
++
++    if (!fp)
++	return NULL;
++
++    if (FcStat (filename, &st))
++	goto bail0;
++
++    ret = FcHashInitSHA256Digest ();
++    if (!ret)
++	goto bail0;
++
++    while (!feof (fp))
++    {
++	if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64)
++	{
++	    long v;
++
++	    /* add a padding */
++	    memset (&ibuf[len], 0, 64 - len);
++	    ibuf[len] = 0x80;
++	    if ((64 - len) < 9)
++	    {
++		/* process a block once */
++		FcHashComputeSHA256Digest (ret, ibuf);
++		memset (ibuf, 0, 64);
++	    }
++	    /* set input size at the end */
++	    v = (long)st.st_size * 8;
++	    ibuf[63 - 0] =  v        & 0xff;
++	    ibuf[63 - 1] = (v >>  8) & 0xff;
++	    ibuf[63 - 2] = (v >> 16) & 0xff;
++	    ibuf[63 - 3] = (v >> 24) & 0xff;
++	    ibuf[63 - 4] = (v >> 32) & 0xff;
++	    ibuf[63 - 5] = (v >> 40) & 0xff;
++	    ibuf[63 - 6] = (v >> 48) & 0xff;
++	    ibuf[63 - 7] = (v >> 56) & 0xff;
++	    FcHashComputeSHA256Digest (ret, ibuf);
++	    break;
++	}
++	else
++	{
++	    FcHashComputeSHA256Digest (ret, ibuf);
++	}
++    }
++    fclose (fp);
++
++    return FcHashSHA256ToString (ret);
++
++bail0:
++    fclose (fp);
++
++    return NULL;
++}
++
++FcChar8 *
+ FcHashGetSHA256DigestFromMemory (const char *fontdata,
+ 				 size_t      length)
+ {
+diff --git a/src/fcint.h b/src/fcint.h
+index a662dbf..8919958 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -818,6 +818,10 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s);
+ FcPrivate FcChar8 *
+ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ 		       size_t         len);
++
++FcPrivate FcChar8 *
++FcHashGetSHA256DigestFromFile (const FcChar8 *filename);
++
+ FcPrivate FcChar8 *
+ FcHashGetSHA256DigestFromMemory (const char *fontdata,
+ 				 size_t      length);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD
new file mode 100644
index 000000000..5300d1e79
--- /dev/null
+++ b/extra/four-in-a-row/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183358 2013-04-21 22:09:11Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=four-in-a-row
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Make lines of the same color to win"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=four-in-a-row.install
+url="https://live.gnome.org/Four-in-a-row"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('eb44c8508a7d4281df1e52c75a4dc8b31a0de108b94c0f37c4e8d99ea380019d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/four-in-a-row/four-in-a-row.install b/extra/four-in-a-row/four-in-a-row.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/four-in-a-row/four-in-a-row.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gcalctool/gcalctool.install b/extra/gcalctool/gcalctool.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/extra/gcalctool/gcalctool.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD
index 43e03ae09..aad63a6e5 100644
--- a/extra/gconf-editor/PKGBUILD
+++ b/extra/gconf-editor/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 170049 2012-10-31 09:09:59Z jgc $
+# $Id: PKGBUILD 183359 2013-04-21 22:09:12Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gconf-editor
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('gconf' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
-groups=('gnome-extra')
 options=(!emptydirs)
 install=gconf-editor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index bdb1d23c1..96eb71ee8 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170868 2012-11-12 21:20:07Z heftig $
+# $Id: PKGBUILD 183360 2013-04-21 22:09:15Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
 license=('GPL2')
 depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
+makedepends=('intltool' 'gobject-introspection' 'python')
 options=(!libtool)
 install=gcr.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
         10-gcr.conf)
-sha256sums=('f709db2435e3635b68d8aa212863e0a8e81b1cc33442852a5183762876c7be9b'
+sha256sums=('38f158d71ce8fb14dca74928053a3edf32751e142400d1429bec5fe0f4bbb8f0'
             '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
 
 build() {
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index d587c7832..d56a3364a 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180259 2013-03-18 23:57:36Z jgc $
+# $Id: PKGBUILD 183361 2013-04-21 22:09:16Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.26.5
-pkgrel=2
+pkgver=2.28.1
+pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84')
+sha256sums=('bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb')
 
 build() {
   cd gdk-pixbuf-$pkgver
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index 163735e0a..7c843b23c 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170733 2012-11-10 16:00:06Z heftig $
+# $Id: PKGBUILD 183362 2013-04-21 22:09:18Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME Docking Library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e772319f1b133047f54e3c1b7e95a718168071cfef972f981337f6bf570ddf1c')
+sha256sums=('c9911e9eec5a62497fff7e044ca9eaae47354658238e6b9e9a0a744f05b4ebdb')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index dcf685850..79c74ba78 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,40 +1,28 @@
-# $Id: PKGBUILD 178235 2013-02-18 16:38:26Z jgc $
+# $Id: PKGBUILD 183315 2013-04-21 22:06:33Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gdm
-pkgver=3.6.2
-pkgrel=2
+pkgbase=gdm
+pkgname=(gdm libgdm)
+pkgver=3.8.1.1
+pkgrel=1
 pkgdesc="Gnome Display Manager"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://www.gnome.org"
-backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
-        etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf)
-groups=(gnome)
 options=('!libtool')
-depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
-         xorg-xrdb nss polkit-gnome xorg-server gnome-icon-theme)
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server)
 makedepends=(itstool intltool gnome-doc-utils gobject-introspection)
-optdepends=('gnome-shell: new login interface'
-            'fprintd: fingerprint authentication')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix_external_program_directories.patch
-        git-fixes.patch
-        maintain-FamilyLocal-cookie.patch)
-sha256sums=('fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9'
-            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2'
-            '1f21838553e4b0eec12465019f11ae3166b502566b3dbefbf0cb6573d77f8031'
-            '59e9c1fb86e39672b61a30dd75b16f6bea6293d23356422624f445966ddeb1ed')
+checkdepends=('check')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz
+        fix_external_program_directories.patch)
+sha256sums=('16f8141040798ba00be0d718ba24cce927d6412b767d091f9ee5bf93f5800ba8'
+            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgbase-$pkgver
   patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
 
-  patch -Np1 -i "$srcdir/git-fixes.patch"
-  patch -Np1 -i "$srcdir/maintain-FamilyLocal-cookie.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -52,14 +40,39 @@ build() {
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
-  make -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h
+  make
+}
+
+check() {
+  cd $pkgbase-$pkgver
+  make check
 }
 
-package() {
-  cd "$pkgname-$pkgver"
+package_gdm() {
+  depends+=(libgdm)
+  optdepends=('fprintd: fingerprint authentication')
+  backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
+          etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf
+          etc/gdm/Xsession
+          etc/gdm/PostSession/Default etc/gdm/PreSession/Default)
+  groups=(gnome)
+  install=gdm.install
+
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
   chmod 1770 "$pkgdir/var/log/gdm"
   chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
   rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
+
+### Split libgdm
+  make -C gui/libgdm DESTDIR="$pkgdir" uninstall
+}
+
+package_libgdm() {
+  pkgdesc="GDM support library"
+  depends=(systemd)
+
+  cd $pkgbase-$pkgver
+  make -C gui/libgdm DESTDIR="$pkgdir" install
 }
diff --git a/extra/gdm/git-fixes.patch b/extra/gdm/git-fixes.patch
deleted file mode 100644
index bf1772657..000000000
--- a/extra/gdm/git-fixes.patch
+++ /dev/null
@@ -1,9067 +0,0 @@
-diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c
-index cff8b70..02bd414 100644
---- a/daemon/gdm-display-access-file.c
-+++ b/daemon/gdm-display-access-file.c
-@@ -438,13 +438,8 @@ _get_auth_info_for_display (GdmDisplayAccessFile *file,
-         gdm_display_is_local (display, &is_local, NULL);
- 
-         if (is_local) {
--                char localhost[HOST_NAME_MAX + 1] = "";
--                *family = FamilyLocal;
--                if (gethostname (localhost, HOST_NAME_MAX) == 0) {
--                        *address = g_strdup (localhost);
--                } else {
--                        *address = g_strdup ("localhost");
--                }
-+                *family = FamilyWild;
-+                *address = g_strdup ("localhost");
-         } else {
-                 *family = FamilyWild;
-                 gdm_display_get_remote_hostname (display, address, NULL);
-diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 8f5f0c6..1475671 100644
---- a/daemon/gdm-simple-slave.c
-+++ b/daemon/gdm-simple-slave.c
-@@ -485,8 +485,12 @@ on_session_conversation_started (GdmSession       *session,
-         char    *username;
-         int      delay;
- 
-+        g_debug ("GdmSimpleSlave: session conversation started for service %s", service_name);
-+
-+        if (g_strcmp0 (service_name, "gdm-autologin") != 0) {
-+                return;
-+        }
- 
--        g_debug ("GdmSimpleSlave: session conversation started");
-         enabled = FALSE;
-         gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay);
-         if (! enabled) {
-@@ -1567,6 +1571,14 @@ gdm_simple_slave_stop (GdmSlave *slave)
-                 self->priv->greeter_environment = NULL;
-         }
- 
-+        if (self->priv->start_session_id > 0) {
-+                g_source_remove (self->priv->start_session_id);
-+                self->priv->start_session_id = 0;
-+        }
-+
-+        g_clear_pointer (&self->priv->start_session_service_name,
-+                         (GDestroyNotify) g_free);
-+
-         if (self->priv->session_is_running) {
-                 char *username;
- 
-diff --git a/docs/C/index.docbook b/docs/C/index.docbook
-index ca6c6ee..a7f1d75 100644
---- a/docs/C/index.docbook
-+++ b/docs/C/index.docbook
-@@ -532,14 +532,16 @@
- 
-       <para>
-         The session output is piped through the GDM daemon to the
--        <filename>~/.xsession-errors</filename> file.  The file is overwritten
--        on each login, so logging out and logging back into the same user via
--        GDM will cause any messages from the previous session to be lost.
-+        <filename>~/<replaceable>$XDG_CACHE_HOME</replaceable>/gdm/session.log</filename>
-+        file which usually expands to <filename>~/.cache/gdm/session.log</filename>.
-+        The file is overwritten on each login, so logging out and logging back
-+        into the same user via GDM will cause any messages from the previous
-+        session to be lost.
-       </para>
- 
-       <para>
-         Note that if GDM can not create this file for some reason, then a
--        fallback file will be created named <filename>~/.xsession-errors.XXXXXXXX</filename>
-+        fallback file will be created named <filename>~/<replaceable>$XDG_CACHE_HOME</replaceable>/gdm/session.log.XXXXXXXX</filename>
-         where the <filename>XXXXXXXX</filename> are some random characters.
-       </para>
-     </sect2>
-diff --git a/docs/es/es.po b/docs/es/es.po
-index 5c93fb2..1fe8a6e 100644
---- a/docs/es/es.po
-+++ b/docs/es/es.po
-@@ -9,16 +9,16 @@ msgid ""
- msgstr ""
- "Project-Id-Version: gdm-help.master\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2012-09-06 16:12+0000\n"
--"PO-Revision-Date: 2012-09-06 18:03+0200\n"
-+"POT-Creation-Date: 2012-12-01 00:31+0000\n"
-+"PO-Revision-Date: 2012-12-02 20:13+0100\n"
- "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
--"Language-Team: Español <gnome-es-list@gnome.org>\n"
-+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
- "Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"X-Generator: KBabel 1.11.4\n"
--"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-+"X-Generator: Gtranslator 2.91.5\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- 
- #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
- msgctxt "_"
-@@ -900,34 +900,48 @@ msgstr ""
- "valor de la pantalla, <filename>&lt;display&gt;.log</filename>."
- 
- #: C/index.docbook:533(sect2/para)
--msgid ""
--"The session output is piped through the GDM daemon to the <filename>~/."
--"xsession-errors</filename> file. The file is overwritten on each login, so "
--"logging out and logging back into the same user via GDM will cause any "
--"messages from the previous session to be lost."
-+#| msgid ""
-+#| "The session output is piped through the GDM daemon to the <filename>~/."
-+#| "xsession-errors</filename> file. The file is overwritten on each login, "
-+#| "so logging out and logging back into the same user via GDM will cause any "
-+#| "messages from the previous session to be lost."
-+msgid ""
-+"The session output is piped through the GDM daemon to the <filename>~/"
-+"<replaceable>$XDG_CACHE_HOME</replaceable>/gdm/session.log</filename> file "
-+"which usually expands to <filename>~/.cache/gdm/session.log</filename>. The "
-+"file is overwritten on each login, so logging out and logging back into the "
-+"same user via GDM will cause any messages from the previous session to be "
-+"lost."
- msgstr ""
- "La salida de la sesión se redirecciona a través del demonio de GDM al "
--"archivo <filename>~/.xsession-errors</filename>. El archivo se sobreescribe "
--"con cada inicio de sesión, de tal forma que iniciar de nuevo sesión con el "
--"mismo usuario a través de GDM hará que cualquier mensaje de la sesión "
--"anterior se pierda."
--
--#: C/index.docbook:540(sect2/para)
-+"archivo <filename>~/<replaceable>$XDG_CACHE_HOME</replaceable>/gdm/session."
-+"log</filename> que generalmente se expande a <filename>~/.cache/gdm/session."
-+"log</filename>. El archivo se sobreescribe con cada inicio de sesión, de tal "
-+"forma que iniciar de nuevo sesión con el mismo usuario a través de GDM hará "
-+"que cualquier mensaje de la sesión anterior se pierda."
-+
-+#: C/index.docbook:542(sect2/para)
-+#| msgid ""
-+#| "Note that if GDM can not create this file for some reason, then a "
-+#| "fallback file will be created named <filename>~/.xsession-errors."
-+#| "XXXXXXXX</filename> where the <filename>XXXXXXXX</filename> are some "
-+#| "random characters."
- msgid ""
- "Note that if GDM can not create this file for some reason, then a fallback "
--"file will be created named <filename>~/.xsession-errors.XXXXXXXX</filename> "
--"where the <filename>XXXXXXXX</filename> are some random characters."
-+"file will be created named <filename>~/<replaceable>$XDG_CACHE_HOME</"
-+"replaceable>/gdm/session.log.XXXXXXXX</filename> where the "
-+"<filename>XXXXXXXX</filename> are some random characters."
- msgstr ""
--"Note que si GDM no puede crear este archivo por alguna razón, entonces se "
--"creará un archivo de apoyo llamado <filename>~/.xsession-errors.XXXXXXXX</"
--"filename> donde <filename>XXXXXX</filename> son algunos caracteres "
--"aleatorios."
-+"Tenga en cuneta que si GDM no puede crear este archivo por alguna razón, "
-+"entonces se creará un archivo alternativo llamado <filename>~/<replaceable>"
-+"$XDG_CACHE_HOME</replaceable>/gdm/session.log.XXXXXXXX</filename> donde el "
-+"archivo <filename>XXXXXXXX</filename> son algunos caracteres aleatorios."
- 
--#: C/index.docbook:548(sect2/title)
-+#: C/index.docbook:550(sect2/title)
- msgid "Fast User Switching"
- msgstr "Cambio rápido de usuarios"
- 
--#: C/index.docbook:550(sect2/para)
-+#: C/index.docbook:552(sect2/para)
- msgid ""
- "GDM allows multiple users to be logged in at the same time. After one user "
- "is logged in, additional users can log in via the User Switcher on the GNOME "
-@@ -945,7 +959,7 @@ msgstr ""
- "predeterminada del panel. Se puede añadir usando el menú contextual del "
- "panel."
- 
--#: C/index.docbook:559(sect2/para)
-+#: C/index.docbook:561(sect2/para)
- msgid ""
- "Note this feature is available on systems that support Virtual Terminals. "
- "This feature will not function if Virtual Terminals is not available."
-@@ -954,15 +968,15 @@ msgstr ""
- "Terminales virtuales. Esta característica no funcionará si los Terminales "
- "virtuales no están disponibles."
- 
--#: C/index.docbook:570(sect1/title)
-+#: C/index.docbook:572(sect1/title)
- msgid "Security"
- msgstr "Seguridad"
- 
--#: C/index.docbook:573(sect2/title)
-+#: C/index.docbook:575(sect2/title)
- msgid "The GDM User And Group"
- msgstr "El usuario y grupo GDM"
- 
--#: C/index.docbook:575(sect2/para)
-+#: C/index.docbook:577(sect2/para)
- msgid ""
- "For security reasons a dedicated user and group id are recommended for "
- "proper operation. This user and group are normally \"gdm\" on most systems, "
-@@ -977,7 +991,7 @@ msgstr ""
- "forma que programas que interactúan con el usuario se ejecutan en una "
- "«sandbox». Este usuario y grupo deberían tener privilegios limitados."
- 
--#: C/index.docbook:584(sect2/para)
-+#: C/index.docbook:586(sect2/para)
- msgid ""
- "The only special privilege the \"gdm\" user requires is the ability to read "
- "and write Xauth files to the <filename>&lt;var&gt;/run/gdm</filename> "
-@@ -989,7 +1003,7 @@ msgstr ""
- "gdm</filename>. La carpeta <filename>&lt;var&gt;/run/gdm</filename> debería "
- "tener un propietario root:gdm y permisos 1777."
- 
--#: C/index.docbook:592(sect2/para)
-+#: C/index.docbook:594(sect2/para)
- msgid ""
- "You should not, under any circumstances, configure the GDM user/group to a "
- "user which a user could easily gain access to, such as the user "
-@@ -1012,7 +1026,7 @@ msgstr ""
- "debería configurarse para no tener contraseña ni permitir que usuarios que "
- "no sean root inicien sesión en la cuenta."
- 
--#: C/index.docbook:605(sect2/para)
-+#: C/index.docbook:607(sect2/para)
- msgid ""
- "The GDM greeter configuration is stored in GConf. To allow the GDM user to "
- "be able to write configuration, it is necessary for the \"gdm\" user to have "
-@@ -1030,11 +1044,11 @@ msgstr ""
- "pueden estar desactivadas si no se puede escribir información de estado en "
- "la configuración de GConf."
- 
--#: C/index.docbook:617(sect2/title)
-+#: C/index.docbook:619(sect2/title)
- msgid "PAM"
- msgstr "PAM"
- 
--#: C/index.docbook:619(sect2/para)
-+#: C/index.docbook:621(sect2/para)
- msgid ""
- "GDM uses PAM for login authentication. PAM stands for Pluggable "
- "Authentication Module, and is used by most programs that request "
-@@ -1048,7 +1062,7 @@ msgstr ""
- "diferentes comportamientos de autenticación para distintos programas (tales "
- "como SSH, IGU de inicio de sesión, salvapantallas, etc.)."
- 
--#: C/index.docbook:627(sect2/para)
-+#: C/index.docbook:629(sect2/para)
- msgid ""
- "PAM is complicated and highly configurable, and this documentation does not "
- "intend to explain this in detail. Instead, it is intended to give an "
-@@ -1066,7 +1080,7 @@ msgstr ""
- "de PAM para entender cómo configurar PAM y entender términos usados en esta "
- "sección."
- 
--#: C/index.docbook:637(sect2/para)
-+#: C/index.docbook:639(sect2/para)
- msgid ""
- "PAM configuration has different, but similar, interfaces on different "
- "Operating Systems, so check the <ulink type=\"help\" url=\"man:pam.d\">pam."
-@@ -1082,7 +1096,7 @@ msgstr ""
- "leer la documentación de PAM y tenga cuidado con las implicaciones de "
- "seguridad de cualquier cambio que intente hacer a su configuración."
- 
--#: C/index.docbook:647(sect2/para)
-+#: C/index.docbook:649(sect2/para)
- msgid ""
- "Note that, by default, GDM uses the \"gdm\" PAM service name for normal "
- "login and the \"gdm-autologin\" PAM service name for automatic login. These "
-@@ -1100,7 +1114,7 @@ msgstr ""
- "característica de inicio de sesión automático puede no funcionar si el "
- "servicio gdm-autologin no está definido."
- 
--#: C/index.docbook:657(sect2/para)
-+#: C/index.docbook:659(sect2/para)
- msgid ""
- "The <filename>PostLogin</filename> script is run before pam_open_session is "
- "called, and the <filename>PreSession</filename> script is called after. This "
-@@ -1113,7 +1127,7 @@ msgstr ""
- "al proceso de inicio de sesión antes o después de que PAM inicialice la "
- "sesión."
- 
--#: C/index.docbook:665(sect2/para)
-+#: C/index.docbook:667(sect2/para)
- msgid ""
- "If you wish to make GDM work with other types of authentication mechanisms "
- "(such as a fingerprint or SmartCard reader), then you should implement this "
-@@ -1132,7 +1146,7 @@ msgstr ""
- "list@gnome.org</email></address>, así que puede referirse a los archivos de "
- "la lista para obtener más información."
- 
--#: C/index.docbook:676(sect2/para)
-+#: C/index.docbook:678(sect2/para)
- msgid ""
- "PAM does have some limitations regarding being able to work with multiple "
- "types of authentication at the same time, like supporting the ability to "
-@@ -1148,7 +1162,7 @@ msgstr ""
- "esto funcione, y es mejor conocer cómo se soluciona comúnmente este problema "
- "al establecer tal tipo de configuración."
- 
--#: C/index.docbook:685(sect2/para)
-+#: C/index.docbook:687(sect2/para)
- msgid ""
- "If automatic login does not work on a system, check to see if the \"gdm-"
- "autologin\" PAM stack is defined in the PAM configuration. For this to work, "
-@@ -1165,7 +1179,7 @@ msgstr ""
- "módulo PAM lo haga, una configuración PAM para activara «gdm-autologin» "
- "podría ser la siguiente:"
- 
--#: C/index.docbook:695(sect2/screen)
-+#: C/index.docbook:697(sect2/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -1182,7 +1196,7 @@ msgstr ""
- "    gdm-autologin session sufficient pam_allow.so.1\n"
- "    gdm-autologin password sufficient pam_allow.so.1\n"
- 
--#: C/index.docbook:703(sect2/para)
-+#: C/index.docbook:705(sect2/para)
- msgid ""
- "The above setup will cause no lastlog entry to be generated. If a lastlog "
- "entry is desired, then use the following for the session:"
-@@ -1190,7 +1204,7 @@ msgstr ""
- "La configuración anterior hará que no se genere información de «lastlog». Si "
- "quiere una entrada de «lastlog», use lo siguiente para la sesión:"
- 
--#: C/index.docbook:708(sect2/screen)
-+#: C/index.docbook:710(sect2/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -1199,7 +1213,7 @@ msgstr ""
- "\n"
- "    gdm-autologin session required pam_unix_session.so.1\n"
- 
--#: C/index.docbook:712(sect2/para)
-+#: C/index.docbook:714(sect2/para)
- msgid ""
- "If the computer is used by several people, which makes automatic login "
- "unsuitable, you may want to allow some users to log in without entering "
-@@ -1218,7 +1232,7 @@ msgstr ""
- "funcione el archivo de configuración PAM para el servicio «gdm» debe incluir "
- "una línea así:"
- 
--#: C/index.docbook:723(sect2/screen)
-+#: C/index.docbook:725(sect2/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -1227,11 +1241,11 @@ msgstr ""
- "\n"
- "      gdm auth  sufficient  pam_succeed_if.so  user ingroup nopasswdlogin\n"
- 
--#: C/index.docbook:730(sect2/title)
-+#: C/index.docbook:732(sect2/title)
- msgid "utmp and wtmp"
- msgstr "utmp y wtmp"
- 
--#: C/index.docbook:732(sect2/para)
-+#: C/index.docbook:734(sect2/para)
- msgid ""
- "GDM generates utmp and wtmp User Accounting Database entries upon session "
- "login and logout. The utmp database contains user access and accounting "
-@@ -1252,11 +1266,11 @@ msgstr ""
- "\"help\" url=\"man:utmp\">utmp</ulink> y <ulink type=\"help\" url=\"man:wtmp"
- "\">wtmp</ulink> para su sistema operativo."
- 
--#: C/index.docbook:747(sect2/title)
-+#: C/index.docbook:749(sect2/title)
- msgid "Xserver Authentication Scheme"
- msgstr "Esquema de autenticación del servidor X"
- 
--#: C/index.docbook:749(sect2/para)
-+#: C/index.docbook:751(sect2/para)
- msgid ""
- "Xserver authorization files are stored in a newly created subdirectory of "
- "<filename>&lt;var&gt;/run/gdm</filename> at start up. These files are used "
-@@ -1271,7 +1285,7 @@ msgstr ""
- "sesión, de tal forma que los usuarios de una sesión no pueden fisgar sobre "
- "otros."
- 
--#: C/index.docbook:757(sect2/para)
-+#: C/index.docbook:759(sect2/para)
- msgid ""
- "GDM only supports the MIT-MAGIC-COOKIE-1 Xserver authentication scheme. "
- "Normally little is gained from the other schemes, and no effort has been "
-@@ -1297,11 +1311,11 @@ msgstr ""
- "problemas de seguridad. En la mayoría de los casos se debería preferir SSH "
- "sobre las características XDMCP de GDM."
- 
--#: C/index.docbook:774(sect2/title)
-+#: C/index.docbook:776(sect2/title)
- msgid "XDMCP Security"
- msgstr "Seguridad XDMCP"
- 
--#: C/index.docbook:776(sect2/para)
-+#: C/index.docbook:778(sect2/para)
- msgid ""
- "Even though your display is protected by cookies, XEvents and thus "
- "keystrokes typed when entering passwords will still go over the wire in "
-@@ -1311,7 +1325,7 @@ msgstr ""
- "pulsaciones de teclas que se introducen al escribir las contraseñas aún irán "
- "sobre el cable en texto claro. Es trivial capturarlas."
- 
--#: C/index.docbook:782(sect2/para)
-+#: C/index.docbook:784(sect2/para)
- msgid ""
- "XDMCP is primarily useful for running thin clients such as in terminal labs. "
- "Those thin clients will only ever need the network to access the server, and "
-@@ -1330,11 +1344,11 @@ msgstr ""
- "servidor. Este tipo de configuración nunca debería usar un concentrador no "
- "gestionado u otra red que pueda ser vigilada (con un «sniffer»)."
- 
--#: C/index.docbook:795(sect2/title)
-+#: C/index.docbook:797(sect2/title)
- msgid "XDMCP Access Control"
- msgstr "Control de acceso XDMCP"
- 
--#: C/index.docbook:797(sect2/para)
-+#: C/index.docbook:799(sect2/para)
- msgid ""
- "XDMCP access control is done using TCP wrappers. It is possible to compile "
- "GDM without TCP wrapper support, so this feature may not be supported on "
-@@ -1344,7 +1358,7 @@ msgstr ""
- "compilar GDM sin TCP wrappers ya que esta característica puede que no esté "
- "soportada en algunos sistemas operativos."
- 
--#: C/index.docbook:803(sect2/para)
-+#: C/index.docbook:805(sect2/para)
- msgid ""
- "You should use the daemon name <command>gdm</command> in the <filename>&lt;"
- "etc&gt;/hosts.allow</filename> and <filename>&lt;etc&gt;/hosts.deny</"
-@@ -1356,7 +1370,7 @@ msgstr ""
- "etc&gt;hosts.deny</filename>. Por ejemplo para denegar la entrada a equipos "
- "de <filename>.evil.domain</filename> , añada"
- 
--#: C/index.docbook:810(sect2/screen)
-+#: C/index.docbook:812(sect2/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -1365,13 +1379,13 @@ msgstr ""
- "\n"
- "gdm: .dominio.maligno\n"
- 
--#: C/index.docbook:813(sect2/para)
-+#: C/index.docbook:815(sect2/para)
- msgid ""
- "to <filename>&lt;etc&gt;/hosts.deny</filename>. You may also need to add"
- msgstr ""
- "a <filename>&lt;etc&gt;/hosts.deny</filename>. También necesitará añadir "
- 
--#: C/index.docbook:817(sect2/screen)
-+#: C/index.docbook:819(sect2/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -1380,7 +1394,7 @@ msgstr ""
- "\n"
- "gdm: .su.dominio\n"
- 
--#: C/index.docbook:820(sect2/para)
-+#: C/index.docbook:822(sect2/para)
- msgid ""
- "to your <filename>&lt;etc&gt;/hosts.allow</filename> if you normally "
- "disallow all services from all hosts. See the <ulink type=\"help\" url=\"man:"
-@@ -1391,11 +1405,11 @@ msgstr ""
- "type=\"help\" url=\"man:hosts.allow\">hosts.allow(5)</ulink> para más "
- "detalles."
- 
--#: C/index.docbook:829(sect2/title)
-+#: C/index.docbook:831(sect2/title)
- msgid "Firewall Security"
- msgstr "Seguridad con cortafuegos"
- 
--#: C/index.docbook:831(sect2/para)
-+#: C/index.docbook:833(sect2/para)
- msgid ""
- "Even though GDM tries to outsmart potential attackers trying to take "
- "advantage of XDMCP, it is still advised that you block the XDMCP port "
-@@ -1413,7 +1427,7 @@ msgstr ""
- "Además cada conexión remota toma muchos recursos, así que es más fácil hacer "
- "una denegación de servicios a un servidor XDMCP que a un servidor web."
- 
--#: C/index.docbook:842(sect2/para)
-+#: C/index.docbook:844(sect2/para)
- msgid ""
- "It is also wise to block all of the Xserver ports. These are TCP ports 6000+ "
- "(one for each display number) on your firewall. Note that GDM will use "
-@@ -1424,7 +1438,7 @@ msgstr ""
- "cortafuegos. Note que GDM usará los números de pantalla 20 y superiores para "
- "los servidores flexibles bajo demanda."
- 
--#: C/index.docbook:849(sect2/para)
-+#: C/index.docbook:851(sect2/para)
- msgid ""
- "X is not a very safe protocol when using it over the Internet, and XDMCP is "
- "even less safe."
-@@ -1432,11 +1446,11 @@ msgstr ""
- "X no es un protocolo muy seguro para dejarlo en la red, y XDMCP es aún menos "
- "seguro."
- 
--#: C/index.docbook:856(sect2/title)
-+#: C/index.docbook:858(sect2/title)
- msgid "PolicyKit"
- msgstr "PolicyKit"
- 
--#: C/index.docbook:864(sect2/para)
-+#: C/index.docbook:866(sect2/para)
- msgid ""
- "GDM may be configured to use PolicyKit to allow the system administrator to "
- "control whether the login screen should provide the shutdown and restart "
-@@ -1447,7 +1461,7 @@ msgstr ""
- "proporcionar los botones de apagado y reinicio en la pantalla gráfica con "
- "temas."
- 
--#: C/index.docbook:870(sect2/para)
-+#: C/index.docbook:872(sect2/para)
- msgid ""
- "These buttons are controlled by the <filename>org.freedesktop.consolekit."
- "system.stop-multiple-users</filename> and <filename>org.freedesktop."
-@@ -1461,11 +1475,11 @@ msgstr ""
- "puede ajustar la política para estas acciones usando la herramienta polkit-"
- "gnome-authorization o el programa de línea de comandos polkit-auth."
- 
--#: C/index.docbook:882(sect2/title)
-+#: C/index.docbook:884(sect2/title)
- msgid "RBAC (Role Based Access Control)"
- msgstr "RBAC (Control de acceso basado en rol)"
- 
--#: C/index.docbook:884(sect2/para)
-+#: C/index.docbook:886(sect2/para)
- msgid ""
- "GDM may be configured to use RBAC instead of PolicyKit. In this case the "
- "RBAC configuration is used to control whether the login screen should "
-@@ -1476,7 +1490,7 @@ msgstr ""
- "de sesión debería proporcionar los botones de apagado y reinicio en la "
- "pantalla gráfica."
- 
--#: C/index.docbook:890(sect2/para)
-+#: C/index.docbook:892(sect2/para)
- msgid ""
- "For example, on Oracle Solaris, the \"solaris.system.shutdown\" "
- "authorization is used to control this. Simply modify the <filename>/etc/"
-@@ -1486,11 +1500,11 @@ msgstr ""
- "usa para controlar esto. Simplemente modifique el archivo <filename>/etc/"
- "user_attr</filename> para que el usuario «gdm» tenga esta autorización."
- 
--#: C/index.docbook:903(sect1/title)
-+#: C/index.docbook:905(sect1/title)
- msgid "Support for ConsoleKit"
- msgstr "Soporte para ConsoleKit"
- 
--#: C/index.docbook:914(sect1/para)
-+#: C/index.docbook:916(sect1/para)
- msgid ""
- "GDM includes support for publishing user login information with the user and "
- "login session accounting framework known as ConsoleKit. ConsoleKit is able "
-@@ -1505,7 +1519,7 @@ msgstr ""
- "reemplazo de los archivos utmp y utmpx que están disponibles en la mayoría "
- "de los sistemas Unix."
- 
--#: C/index.docbook:922(sect1/para)
-+#: C/index.docbook:924(sect1/para)
- msgid ""
- "When GDM is about to create a new login process for a user it will call a "
- "privileged method of ConsoleKit in order to open a new session for this "
-@@ -1530,7 +1544,7 @@ msgstr ""
- "privilegiado está restringido por el uso de una norma de seguridad del "
- "sistema de bus de mensajes D-Bus."
- 
--#: C/index.docbook:936(sect1/para)
-+#: C/index.docbook:938(sect1/para)
- msgid ""
- "In case a user with an existing session has authenticated at GDM and "
- "requests to resume that existing session, GDM calls a privileged method of "
-@@ -1545,7 +1559,7 @@ msgstr ""
- "indefinidos y son específicos de la sesión. Sin embargo la mayoría de las "
- "sesiones desbloquearán un salvapantallas en respuesta."
- 
--#: C/index.docbook:945(sect1/para)
-+#: C/index.docbook:947(sect1/para)
- msgid ""
- "When the user chooses to log out, or if GDM or the session quit unexpectedly "
- "the user session will be unregistered from ConsoleKit."
-@@ -1553,11 +1567,11 @@ msgstr ""
- "Cuando el usuario elige salir, o si GDM o la sesión terminan de forma "
- "inesperada, la sesión de usuario se desregistra de ConsoleKit."
- 
--#: C/index.docbook:954(sect1/title)
-+#: C/index.docbook:956(sect1/title)
- msgid "Configuration"
- msgstr "Configuración"
- 
--#: C/index.docbook:956(sect1/para)
-+#: C/index.docbook:958(sect1/para)
- msgid ""
- "GDM has a number of configuration interfaces. These include scripting "
- "integration points, daemon configuration, greeter configuration, general "
-@@ -1571,11 +1585,11 @@ msgstr ""
- "gnome-settings-daemon y configuración de la sesión. Estos tipos de "
- "integración se describen debajo en detalle."
- 
--#: C/index.docbook:965(sect2/title)
-+#: C/index.docbook:967(sect2/title)
- msgid "Scripting Integration Points"
- msgstr "Puntos de integración de scripts"
- 
--#: C/index.docbook:967(sect2/para)
-+#: C/index.docbook:969(sect2/para)
- msgid ""
- "The GDM script integration points can be found in the <filename>&lt;etc&gt;/"
- "gdm/</filename> directory:"
-@@ -1583,7 +1597,7 @@ msgstr ""
- "Los puntos de integración de scripts para GDM se pueden encontrar en la "
- "carpeta <filename>&lt;etc&gt;/gdm/</filename>:"
- 
--#: C/index.docbook:972(sect2/screen)
-+#: C/index.docbook:974(sect2/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -1600,7 +1614,7 @@ msgstr ""
- "PreSession/\n"
- "PostSession/\n"
- 
--#: C/index.docbook:980(sect2/para)
-+#: C/index.docbook:982(sect2/para)
- msgid ""
- "The <filename>Init</filename>, <filename>PostLogin</filename>, "
- "<filename>PreSession</filename>, and <filename>PostSession</filename> "
-@@ -1610,7 +1624,7 @@ msgstr ""
- "<filename>PreSession</filename> y <filename>PostSession</filename> trabajan "
- "como se describe debajo."
- 
--#: C/index.docbook:986(sect2/para)
-+#: C/index.docbook:988(sect2/para)
- msgid ""
- "For each type of script, the default one which will be executed is called "
- "\"Default\" and is stored in a directory associated with the script type. So "
-@@ -1631,7 +1645,7 @@ msgstr ""
- "para esa pantalla. Por ejemplo, si existe el script <filename>&lt;"
- "Init&gt;/:0</filename>, se ejecutará para la PANTALLA «:0»."
- 
--#: C/index.docbook:998(sect2/para)
-+#: C/index.docbook:1000(sect2/para)
- msgid ""
- "All of these scripts are run with root privilege and return 0 if run "
- "successfully, and a non-zero return code if there was any failure that "
-@@ -1645,7 +1659,7 @@ msgstr ""
- "que los scripts hayan finalizado, de tal forma que si algún script se cuelga "
- "hará que también se cuelgue el proceso de inicio de sesión."
- 
--#: C/index.docbook:1006(sect2/para)
-+#: C/index.docbook:1008(sect2/para)
- msgid ""
- "When the Xserver for the login GUI has been successfully started, but before "
- "the login GUI is actually displayed, GDM will run the <filename>Init</"
-@@ -1659,7 +1673,7 @@ msgstr ""
- "deberían ejecutarse mientras se está mostrando la pantalla de inicio, o para "
- "cualquier inicialización especial requerida."
- 
--#: C/index.docbook:1014(sect2/para)
-+#: C/index.docbook:1016(sect2/para)
- msgid ""
- "After the user has been successfully authenticated GDM will run the "
- "<filename>PostLogin</filename> script. This is done before any session setup "
-@@ -1675,7 +1689,7 @@ msgstr ""
- "de que la sesión se inicie. Por ejemplo, puede configurar la carpeta $HOME "
- "del usuario, si es necesario."
- 
--#: C/index.docbook:1023(sect2/para)
-+#: C/index.docbook:1025(sect2/para)
- msgid ""
- "After the user session has been initialized, GDM will run the "
- "<filename>PreSession</filename> script. This script is useful for doing any "
-@@ -1689,7 +1703,7 @@ msgstr ""
- "sesión se haya inicializado. Se puede usar para gestión de sesiones o "
- "cuentes, por ejemplo."
- 
--#: C/index.docbook:1031(sect2/para)
-+#: C/index.docbook:1033(sect2/para)
- msgid ""
- "When a user terminates their session, GDM will run the "
- "<filename>PostSession</filename> script. Note that the Xserver will have "
-@@ -1700,7 +1714,7 @@ msgstr ""
- "momento en el que se ejecute este script, de forma que no debe accederse a "
- "él."
- 
--#: C/index.docbook:1038(sect2/para)
-+#: C/index.docbook:1040(sect2/para)
- msgid ""
- "Note that the <filename>PostSession</filename> script will be run even when "
- "the display fails to respond due to an I/O error or similar. Thus, there is "
-@@ -1711,7 +1725,7 @@ msgstr ""
- "similar. Así que, no hay garantía de que funcionen las aplicaciones X "
- "durante la ejecución del script."
- 
--#: C/index.docbook:1045(sect2/para)
-+#: C/index.docbook:1047(sect2/para)
- msgid ""
- "All of the above scripts will set the <filename>$RUNNING_UNDER_GDM</"
- "filename> environment variable to <filename>yes</filename>. If the scripts "
-@@ -1725,11 +1739,11 @@ msgstr ""
- "identificar cuándo GDM llama a estos scripts, de tal forma que podrá "
- "ejecutar código específico cuando se use GDM."
- 
--#: C/index.docbook:1055(sect2/title)
-+#: C/index.docbook:1057(sect2/title)
- msgid "Autostart Configuration"
- msgstr "Configuración automática al inicio"
- 
--#: C/index.docbook:1057(sect2/para)
-+#: C/index.docbook:1059(sect2/para)
- msgid ""
- "The <filename>&lt;share&gt;/gdm/autostart/LoginWindow</filename> directory "
- "contains files in the format specified by the \"FreeDesktop.org Desktop "
-@@ -1744,7 +1758,7 @@ msgstr ""
- "automáticamente o sólo se lancen si un valor de configuración de GConf está "
- "establecido, etc."
- 
--#: C/index.docbook:1066(sect2/para)
-+#: C/index.docbook:1068(sect2/para)
- msgid ""
- "Any <filename>.desktop</filename> files in this directory will cause the "
- "associated program to automatically start with the login GUI greeter. By "
-@@ -1765,11 +1779,11 @@ msgstr ""
- "valores de configuración especificados en la sección Configuración de la "
- "accesibilidad están establecidos."
- 
--#: C/index.docbook:1080(sect2/title)
-+#: C/index.docbook:1082(sect2/title)
- msgid "Xsession Script"
- msgstr "Script Xsession"
- 
--#: C/index.docbook:1082(sect2/para)
-+#: C/index.docbook:1084(sect2/para)
- msgid ""
- "There is also an <filename>Xsession</filename> script located at "
- "<filename>&lt;etc&gt;/gdm/Xsession</filename> which is called between the "
-@@ -1788,11 +1802,11 @@ msgstr ""
- "especificada por el archivo de sesión de escritorio que el usuario "
- "seleccionó para iniciar."
- 
--#: C/index.docbook:1095(sect2/title)
-+#: C/index.docbook:1097(sect2/title)
- msgid "Daemon Configuration"
- msgstr "Configuración del demonio"
- 
--#: C/index.docbook:1097(sect2/para)
-+#: C/index.docbook:1099(sect2/para)
- msgid ""
- "The GDM daemon is configured using the <filename>&lt;etc&gt;/gdm/custom."
- "conf</filename> file. Default values are stored in GConf in the "
-@@ -1808,7 +1822,7 @@ msgstr ""
- "conf</filename> ya que puede que el archivo de esquemas se sobreescriba "
- "cuando el usuario actualiza su sistema con una nueva versión de GDM."
- 
--#: C/index.docbook:1107(sect2/para)
-+#: C/index.docbook:1109(sect2/para)
- msgid ""
- "Note that older versions of GDM supported additional configuration options "
- "which are no longer supported in the latest versions of GDM."
-@@ -1816,7 +1830,7 @@ msgstr ""
- "Note que las versiones antiguas de GDM soportaban opciones de configuración "
- "adicional que ya no se soportan en las últimas versiones de GDM."
- 
--#: C/index.docbook:1112(sect2/para)
-+#: C/index.docbook:1114(sect2/para)
- msgid ""
- "The <filename>&lt;etc&gt;/gdm/custom.conf</filename> file is in the "
- "<filename>keyfile</filename> format. Keywords in brackets define group "
-@@ -1830,7 +1844,7 @@ msgstr ""
- "los datos después del signo igual representan su valor. Las líneas vacías o "
- "las que comienzan por la marca almohadilla (#) se ignoran."
- 
--#: C/index.docbook:1120(sect2/para)
-+#: C/index.docbook:1122(sect2/para)
- msgid ""
- "The file <filename>&lt;etc&gt;/gdm/custom.conf</filename> supports the "
- "\"[daemon]\", \"[security]\", and \"[xdmcp]\" group sections. Within each "
-@@ -1846,7 +1860,7 @@ msgstr ""
- "especificar que el usuario de ese inicio de sesión temporizado sea «usted», "
- "deberá modificar el archivo para que contenga las siguientes líneas:"
- 
--#: C/index.docbook:1130(sect2/screen)
-+#: C/index.docbook:1132(sect2/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -1859,26 +1873,26 @@ msgstr ""
- "TimedLoginEnable=true\n"
- "TimedLogin=usted\n"
- 
--#: C/index.docbook:1136(sect2/para)
-+#: C/index.docbook:1138(sect2/para)
- msgid "A full list of supported configuration keys follow:"
- msgstr ""
- "A continuación está la lista completa de las claves de configuración "
- "soportadas:"
- 
--#: C/index.docbook:1141(sect3/title)
-+#: C/index.docbook:1143(sect3/title)
- msgid "[chooser]"
- msgstr "[chooser]"
- 
--#: C/index.docbook:1145(varlistentry/term)
-+#: C/index.docbook:1147(varlistentry/term)
- msgid "Multicast"
- msgstr "Multicast"
- 
--#: C/index.docbook:1147(listitem/synopsis)
-+#: C/index.docbook:1149(listitem/synopsis)
- #, no-wrap
- msgid "Multicast=false"
- msgstr "Multicast=false"
- 
--#: C/index.docbook:1148(listitem/para)
-+#: C/index.docbook:1150(listitem/para)
- msgid ""
- "If true and IPv6 is enabled, the chooser will send a multicast query to the "
- "local network and collect responses from the hosts who have joined multicast "
-@@ -1888,33 +1902,33 @@ msgstr ""
- "multicast a la red local y recogerá las respuestas de los servidores que se "
- "hayan unido al grupo multicast."
- 
--#: C/index.docbook:1157(varlistentry/term)
-+#: C/index.docbook:1159(varlistentry/term)
- msgid "MulticastAddr"
- msgstr "MulticastAddr"
- 
--#: C/index.docbook:1159(listitem/synopsis)
-+#: C/index.docbook:1161(listitem/synopsis)
- #, no-wrap
- msgid "MulticastAddr=ff02::1"
- msgstr "MulticastAddr=ff02::1"
- 
--#: C/index.docbook:1160(listitem/para)
-+#: C/index.docbook:1162(listitem/para)
- msgid "This is the Link-local multicast address."
- msgstr "Esta es la dirección de enlace local multicast."
- 
--#: C/index.docbook:1169(sect3/title)
-+#: C/index.docbook:1171(sect3/title)
- msgid "[daemon]"
- msgstr "[daemon]"
- 
--#: C/index.docbook:1172(varlistentry/term)
-+#: C/index.docbook:1174(varlistentry/term)
- msgid "TimedLoginEnable"
- msgstr "TimedLoginEnable"
- 
--#: C/index.docbook:1174(listitem/synopsis)
-+#: C/index.docbook:1176(listitem/synopsis)
- #, no-wrap
- msgid "TimedLoginEnable=false"
- msgstr "TimedLoginEnable=false"
- 
--#: C/index.docbook:1175(listitem/para)
-+#: C/index.docbook:1177(listitem/para)
- msgid ""
- "If the user given in <filename>TimedLogin</filename> should be logged in "
- "after a number of seconds (set with <filename>TimedLoginDelay</filename>) of "
-@@ -1945,16 +1959,16 @@ msgstr ""
- "«Seguridad -&gt;PAM» del manual para obtener más información, o para obtener "
- "ayuda si esta característica parece no funcionar."
- 
--#: C/index.docbook:1197(varlistentry/term)
-+#: C/index.docbook:1199(varlistentry/term)
- msgid "TimedLogin"
- msgstr "TimedLogin"
- 
--#: C/index.docbook:1199(listitem/synopsis)
-+#: C/index.docbook:1201(listitem/synopsis)
- #, no-wrap
- msgid "TimedLogin="
- msgstr "TimedLogin="
- 
--#: C/index.docbook:1200(listitem/para)
-+#: C/index.docbook:1202(listitem/para)
- msgid ""
- "This is the user that should be logged in after a specified number of "
- "seconds of inactivity."
-@@ -1962,7 +1976,7 @@ msgstr ""
- "Éste es el usuario que debería iniciar sesión después de un número de "
- "segundos de inactividad especificado."
- 
--#: C/index.docbook:1204(listitem/para) C/index.docbook:1248(listitem/para)
-+#: C/index.docbook:1206(listitem/para) C/index.docbook:1250(listitem/para)
- msgid ""
- "If the value ends with a vertical bar | (the pipe symbol), then GDM will "
- "execute the program specified and use whatever value is returned on standard "
-@@ -1979,16 +1993,16 @@ msgstr ""
- "si el valor es «/usr/bin/getloginuser|», entonces el programa «/usr/bin/"
- "getloginuser» se ejecutará para obtener la variable del usuario"
- 
--#: C/index.docbook:1218(varlistentry/term)
-+#: C/index.docbook:1220(varlistentry/term)
- msgid "TimedLoginDelay"
- msgstr "TimedLoginDelay"
- 
--#: C/index.docbook:1220(listitem/synopsis)
-+#: C/index.docbook:1222(listitem/synopsis)
- #, no-wrap
- msgid "TimedLoginDelay=30"
- msgstr "TimedLoginDelay=30"
- 
--#: C/index.docbook:1221(listitem/para)
-+#: C/index.docbook:1223(listitem/para)
- msgid ""
- "Delay in seconds before the <filename>TimedLogin</filename> user will be "
- "logged in."
-@@ -1996,16 +2010,16 @@ msgstr ""
- "Retardo en segundos antes de que el usuario <filename>TimedLogin</filename> "
- "entre en la sesión."
- 
--#: C/index.docbook:1229(varlistentry/term)
-+#: C/index.docbook:1231(varlistentry/term)
- msgid "AutomaticLoginEnable"
- msgstr "AutomaticLoginEnable"
- 
--#: C/index.docbook:1231(listitem/synopsis)
-+#: C/index.docbook:1233(listitem/synopsis)
- #, no-wrap
- msgid "AutomaticLoginEnable=false"
- msgstr "AutomaticLoginEnable=false"
- 
--#: C/index.docbook:1232(listitem/para)
-+#: C/index.docbook:1234(listitem/para)
- msgid ""
- "If true, the user given in <filename>AutomaticLogin</filename> should be "
- "logged in immediately. This feature is like timed login with a delay of 0 "
-@@ -2015,16 +2029,16 @@ msgstr ""
- "filename> debería iniciar sesión inmediatamente. Esta característica es como "
- "un inicio de sesión temporizado con retraso 0."
- 
--#: C/index.docbook:1241(varlistentry/term)
-+#: C/index.docbook:1243(varlistentry/term)
- msgid "AutomaticLogin"
- msgstr "AutomaticLogin"
- 
--#: C/index.docbook:1243(listitem/synopsis)
-+#: C/index.docbook:1245(listitem/synopsis)
- #, no-wrap
- msgid "AutomaticLogin="
- msgstr "AutomaticLogin="
- 
--#: C/index.docbook:1244(listitem/para)
-+#: C/index.docbook:1246(listitem/para)
- msgid ""
- "This is the user that should be logged in immediately if "
- "<filename>AutomaticLoginEnable</filename> is true."
-@@ -2032,16 +2046,16 @@ msgstr ""
- "Este es el usuario que debería iniciar sesión inmediatamente si "
- "<filename>AutomaticLoginEnable</filename> está activada (true)."
- 
--#: C/index.docbook:1262(varlistentry/term)
-+#: C/index.docbook:1264(varlistentry/term)
- msgid "User"
- msgstr "User"
- 
--#: C/index.docbook:1264(listitem/synopsis)
-+#: C/index.docbook:1266(listitem/synopsis)
- #, no-wrap
- msgid "User=gdm"
- msgstr "User=gdm"
- 
--#: C/index.docbook:1265(listitem/para)
-+#: C/index.docbook:1267(listitem/para)
- msgid ""
- "The username under which the greeter and other GUI programs are run. Refer "
- "to the <filename>Group</filename> configuration key and to the \"Security-"
-@@ -2052,16 +2066,16 @@ msgstr ""
- "«Seguridad -&gt;El usuario y grupo GDM» de este documento para obtener más "
- "información."
- 
--#: C/index.docbook:1275(varlistentry/term)
-+#: C/index.docbook:1277(varlistentry/term)
- msgid "Group"
- msgstr "Group"
- 
--#: C/index.docbook:1277(listitem/synopsis)
-+#: C/index.docbook:1279(listitem/synopsis)
- #, no-wrap
- msgid "Group=gdm"
- msgstr "Group=gdm"
- 
--#: C/index.docbook:1278(listitem/para)
-+#: C/index.docbook:1280(listitem/para)
- msgid ""
- "The group name under which the greeter and other GUI programs are run. Refer "
- "to the <filename>User</filename> configuration key and to the \"Security-&gt;"
-@@ -2072,26 +2086,26 @@ msgstr ""
- "sección «Seguridad -&gt;Usuario y grupo GDM» de este documento para obtener "
- "más información."
- 
--#: C/index.docbook:1290(sect3/title)
-+#: C/index.docbook:1292(sect3/title)
- msgid "Debug Options"
- msgstr "Opciones de depuración"
- 
--#: C/index.docbook:1293(variablelist/title)
-+#: C/index.docbook:1295(variablelist/title)
- msgid "[debug]"
- msgstr "[debug]"
- 
--#: C/index.docbook:1296(varlistentry/term)
--#: C/index.docbook:1427(varlistentry/term)
-+#: C/index.docbook:1298(varlistentry/term)
-+#: C/index.docbook:1429(varlistentry/term)
- msgid "Enable"
- msgstr "Enable"
- 
--#: C/index.docbook:1298(listitem/synopsis)
--#: C/index.docbook:1429(listitem/synopsis)
-+#: C/index.docbook:1300(listitem/synopsis)
-+#: C/index.docbook:1431(listitem/synopsis)
- #, no-wrap
- msgid "Enable=false"
- msgstr "Enable=false"
- 
--#: C/index.docbook:1299(listitem/para)
-+#: C/index.docbook:1301(listitem/para)
- msgid ""
- "To enable debugging, set the debug/Enable key to \"true\" in the "
- "<filename>&lt;etc&gt;/gdm/custom.conf</filename> file and restart GDM. Then "
-@@ -2105,24 +2119,24 @@ msgstr ""
- "sistema (<filename>&lt;var&gt;/log/messages</filename> o <filename>&lt;"
- "var&gt;/adm/messages</filename> dependiendo de su sistema operativo)."
- 
--#: C/index.docbook:1314(sect3/title)
-+#: C/index.docbook:1316(sect3/title)
- msgid "Greeter Options"
- msgstr "Opciones de la interfaz"
- 
--#: C/index.docbook:1317(variablelist/title)
-+#: C/index.docbook:1319(variablelist/title)
- msgid "[greeter]"
- msgstr "[greeter]"
- 
--#: C/index.docbook:1320(varlistentry/term)
-+#: C/index.docbook:1322(varlistentry/term)
- msgid "IncludeAll"
- msgstr "IncludeAll"
- 
--#: C/index.docbook:1322(listitem/synopsis)
-+#: C/index.docbook:1324(listitem/synopsis)
- #, no-wrap
- msgid "IncludeAll=true"
- msgstr "IncludeAll=true"
- 
--#: C/index.docbook:1323(listitem/para)
-+#: C/index.docbook:1325(listitem/para)
- msgid ""
- "If true, then the face browser will show all users on the local machine. If "
- "false, the face browser will only show users who have recently logged in."
-@@ -2131,7 +2145,7 @@ msgstr ""
- "en el equipo local. Si es falso, el examinador de rostros sólo mostrará los "
- "usuarios que han iniciado sesión recientemente."
- 
--#: C/index.docbook:1329(listitem/para)
-+#: C/index.docbook:1331(listitem/para)
- msgid ""
- "When this key is true, GDM will call fgetpwent() to get a list of local "
- "users on the system. Any users with a user id less than 500 (or 100 if "
-@@ -2154,7 +2168,7 @@ msgstr ""
- "() devuelve; /sbin/nologin o /bin/false se consideran «shell» no válidas "
- "incluso si getusershell() las devuelve)."
- 
--#: C/index.docbook:1343(listitem/para)
-+#: C/index.docbook:1345(listitem/para)
- msgid ""
- "If false, then GDM more simply only displays users that have previously "
- "logged in on the system (local or NIS/LDAP users) by calling the <command>ck-"
-@@ -2164,16 +2178,16 @@ msgstr ""
- "iniciado sesión en el sistema (localmente o usuarios NIS/LDAP) llamando a la "
- "interfaz de ConsoleKit <command>ck-history</command>."
- 
--#: C/index.docbook:1352(varlistentry/term)
-+#: C/index.docbook:1354(varlistentry/term)
- msgid "Include"
- msgstr "Include"
- 
--#: C/index.docbook:1354(listitem/synopsis)
-+#: C/index.docbook:1356(listitem/synopsis)
- #, no-wrap
- msgid "Include="
- msgstr "Include="
- 
--#: C/index.docbook:1355(listitem/para)
-+#: C/index.docbook:1357(listitem/para)
- msgid ""
- "Set to a list of users to always include in the Face Browser. This value is "
- "set to a list of users separated by commas. By default, the value is empty."
-@@ -2182,16 +2196,16 @@ msgstr ""
- "rostros. Este valor está establecido a una lista de usuarios separados por "
- "comas. De forma predeterminada el valor está vacío."
- 
--#: C/index.docbook:1364(varlistentry/term)
-+#: C/index.docbook:1366(varlistentry/term)
- msgid "Exclude"
- msgstr "Exclude"
- 
--#: C/index.docbook:1366(listitem/synopsis)
-+#: C/index.docbook:1368(listitem/synopsis)
- #, no-wrap
- msgid "Exclude=bin,root,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,nobody4,noaccess,postgres,pvm,rpm,nfsnobody,pcap"
- msgstr "Exclude=bin,root,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,nobody4,noaccess,postgres,pvm,rpm,nfsnobody,pcap"
- 
--#: C/index.docbook:1367(listitem/para)
-+#: C/index.docbook:1369(listitem/para)
- msgid ""
- "Set to a list of users to always exclude in the Face Browser. This value is "
- "set to a list of users separated by commas. Note that the setting in the "
-@@ -2206,24 +2220,24 @@ msgstr ""
- "a la lista, entonces debe establecer el valor al predeterminado con los "
- "valores adicionales añadidos a la lista."
- 
--#: C/index.docbook:1381(sect3/title)
-+#: C/index.docbook:1383(sect3/title)
- msgid "Security Options"
- msgstr "Opciones de seguridad"
- 
--#: C/index.docbook:1384(variablelist/title)
-+#: C/index.docbook:1386(variablelist/title)
- msgid "[security]"
- msgstr "[security]"
- 
--#: C/index.docbook:1387(varlistentry/term)
-+#: C/index.docbook:1389(varlistentry/term)
- msgid "DisallowTCP"
- msgstr "DisallowTCP"
- 
--#: C/index.docbook:1389(listitem/synopsis)
-+#: C/index.docbook:1391(listitem/synopsis)
- #, no-wrap
- msgid "DisallowTCP=true"
- msgstr "DisallowTCP=true"
- 
--#: C/index.docbook:1390(listitem/para)
-+#: C/index.docbook:1392(listitem/para)
- msgid ""
- "If true, then always append <filename>-nolisten tcp</filename> to the "
- "command line when starting attached Xservers, thus disallowing TCP "
-@@ -2235,24 +2249,24 @@ msgstr ""
- "deshabilitar las conexiones TCP. Esta configuración es más segura si no se "
- "van a usar conexiones remotas."
- 
--#: C/index.docbook:1402(sect3/title)
-+#: C/index.docbook:1404(sect3/title)
- msgid "XDCMP Support"
- msgstr "Soporte XDMCP"
- 
--#: C/index.docbook:1405(variablelist/title)
-+#: C/index.docbook:1407(variablelist/title)
- msgid "[xdmcp]"
- msgstr "[xdmcp]"
- 
--#: C/index.docbook:1408(varlistentry/term)
-+#: C/index.docbook:1410(varlistentry/term)
- msgid "DisplaysPerHost"
- msgstr "DisplaysPerHost"
- 
--#: C/index.docbook:1410(listitem/synopsis)
-+#: C/index.docbook:1412(listitem/synopsis)
- #, no-wrap
- msgid "DisplaysPerHost=1"
- msgstr "DisplaysPerHost=1"
- 
--#: C/index.docbook:1411(listitem/para)
-+#: C/index.docbook:1413(listitem/para)
- msgid ""
- "To prevent attackers from filling up the pending queue, GDM will only allow "
- "one connection for each remote computer. If you want to provide display "
-@@ -2264,7 +2278,7 @@ msgstr ""
- "servicios de pantalla a equipos con más de un monitor debería incrementar "
- "este valor."
- 
--#: C/index.docbook:1418(listitem/para)
-+#: C/index.docbook:1420(listitem/para)
- msgid ""
- "Note that the number of attached DISPLAYS allowed is not limited. Only "
- "remote connections via XDMCP are limited by this configuration option."
-@@ -2273,7 +2287,7 @@ msgstr ""
- "conexiones remotas a través de XDMCP están limitadas por esta opción de la "
- "configuración."
- 
--#: C/index.docbook:1430(listitem/para)
-+#: C/index.docbook:1432(listitem/para)
- msgid ""
- "Setting this to true enables XDMCP support allowing remote displays/X "
- "terminals to be managed by GDM."
-@@ -2281,7 +2295,7 @@ msgstr ""
- "Establecer esto a true activa el soporte XDMCP permitiento que las pantallas "
- "X remotas o los terminales X se gestiones por medio de GDM."
- 
--#: C/index.docbook:1435(listitem/para)
-+#: C/index.docbook:1437(listitem/para)
- msgid ""
- "<filename>gdm</filename> listens for requests on UDP port 177. See the Port "
- "option for more information."
-@@ -2289,7 +2303,7 @@ msgstr ""
- "<filename>gdm</filename> escucha peticiones en el puerto UDP 177. Vea la "
- "opción Puerto para más información."
- 
--#: C/index.docbook:1440(listitem/para)
-+#: C/index.docbook:1442(listitem/para)
- msgid ""
- "If GDM is compiled to support it, access from remote displays can be "
- "controlled using the TCP Wrappers library. The service name is "
-@@ -2299,7 +2313,7 @@ msgstr ""
- "se puede controlar usando la biblioteca TCPWrappers. El nombre del servicio "
- "es <filename>gdm</filename>"
- 
--#: C/index.docbook:1448(para/screen)
-+#: C/index.docbook:1450(para/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -2308,7 +2322,7 @@ msgstr ""
- "\n"
- "gdm:.mi.dominio\n"
- 
--#: C/index.docbook:1446(listitem/para)
-+#: C/index.docbook:1448(listitem/para)
- msgid ""
- "You should add <_:screen-1/> to your <filename>&lt;etc&gt;/hosts.allow</"
- "filename>, depending on your TCP Wrappers configuration. See the <ulink type="
-@@ -2319,7 +2333,7 @@ msgstr ""
- "del manual <ulink type=\"help\" url=\"man:hosts.allow\">hosts.allow</ulink> "
- "para obtener más detalles."
- 
--#: C/index.docbook:1457(listitem/para)
-+#: C/index.docbook:1459(listitem/para)
- msgid ""
- "Please note that XDMCP is not a particularly secure protocol and that it is "
- "a good idea to block UDP port 177 on your firewall unless you really need it."
-@@ -2328,16 +2342,16 @@ msgstr ""
- "idea bloquear el puerto UDP 177 en su cortafuegos a no ser que realmente lo "
- "necesite."
- 
--#: C/index.docbook:1466(varlistentry/term)
-+#: C/index.docbook:1468(varlistentry/term)
- msgid "HonorIndirect"
- msgstr "HonorIndirect"
- 
--#: C/index.docbook:1468(listitem/synopsis)
-+#: C/index.docbook:1470(listitem/synopsis)
- #, no-wrap
- msgid "HonorIndirect=true"
- msgstr "HonorIndirect=true"
- 
--#: C/index.docbook:1469(listitem/para)
-+#: C/index.docbook:1471(listitem/para)
- msgid ""
- "Enables XDMCP INDIRECT choosing (i.e. remote execution of "
- "<filename>gdmchooser</filename>) for X-terminals which do not supply their "
-@@ -2347,16 +2361,16 @@ msgstr ""
- "<filename>gdmchooser</filename>) para terminales X que no suministran su "
- "propio examinador de pantallas."
- 
--#: C/index.docbook:1478(varlistentry/term)
-+#: C/index.docbook:1480(varlistentry/term)
- msgid "MaxPending"
- msgstr "MaxPending"
- 
--#: C/index.docbook:1480(listitem/synopsis)
-+#: C/index.docbook:1482(listitem/synopsis)
- #, no-wrap
- msgid "MaxPending=4"
- msgstr "MaxPending=4"
- 
--#: C/index.docbook:1481(listitem/para)
-+#: C/index.docbook:1483(listitem/para)
- msgid ""
- "To avoid denial of service attacks, GDM has fixed size queue of pending "
- "connections. Only MaxPending displays can start at the same time."
-@@ -2365,7 +2379,7 @@ msgstr ""
- "fijo de conexiones pendientes. Sólo pueden iniciarse a la vez MaxPending "
- "pantallas."
- 
--#: C/index.docbook:1487(listitem/para)
-+#: C/index.docbook:1489(listitem/para)
- msgid ""
- "Please note that this parameter does not limit the number of remote displays "
- "which can be managed. It only limits the number of displays initiating a "
-@@ -2375,16 +2389,16 @@ msgstr ""
- "puedan gestionar. Sólo limita el número de pantallas iniciando una conexión "
- "simultáneamente."
- 
--#: C/index.docbook:1496(varlistentry/term)
-+#: C/index.docbook:1498(varlistentry/term)
- msgid "MaxSessions"
- msgstr "MaxSessions"
- 
--#: C/index.docbook:1498(listitem/synopsis)
-+#: C/index.docbook:1500(listitem/synopsis)
- #, no-wrap
- msgid "MaxSessions=16"
- msgstr "MaxSessions=16"
- 
--#: C/index.docbook:1499(listitem/para)
-+#: C/index.docbook:1501(listitem/para)
- msgid ""
- "Determines the maximum number of remote display connections which will be "
- "managed simultaneously. I.e. the total number of remote displays that can "
-@@ -2394,16 +2408,16 @@ msgstr ""
- "gestionadas simultáneamente. Ej: el número total de pantallas remotas que "
- "puede usar su host."
- 
--#: C/index.docbook:1508(varlistentry/term)
-+#: C/index.docbook:1510(varlistentry/term)
- msgid "MaxWait"
- msgstr "MaxWait"
- 
--#: C/index.docbook:1510(listitem/synopsis)
-+#: C/index.docbook:1512(listitem/synopsis)
- #, no-wrap
- msgid "MaxWait=30"
- msgstr "MaxWait=30"
- 
--#: C/index.docbook:1511(listitem/para)
-+#: C/index.docbook:1513(listitem/para)
- msgid ""
- "When GDM is ready to manage a display an ACCEPT packet is sent to it "
- "containing a unique session id which will be used in future XDMCP "
-@@ -2413,7 +2427,7 @@ msgstr ""
- "ACCEPT a ella conteniendo un id único de sesión que será usado en las "
- "conversaciones XDMCP futuras."
- 
--#: C/index.docbook:1517(listitem/para)
-+#: C/index.docbook:1519(listitem/para)
- msgid ""
- "GDM will then place the session id in the pending queue waiting for the "
- "display to respond with a MANAGE request."
-@@ -2421,7 +2435,7 @@ msgstr ""
- "GDM entonces colocará el id de sesión en la cola de pendientes esperando a "
- "que la pantalla responda con una petición MANAGE."
- 
--#: C/index.docbook:1522(listitem/para)
-+#: C/index.docbook:1524(listitem/para)
- msgid ""
- "If no response is received within MaxWait seconds, GDM will declare the "
- "display dead and erase it from the pending queue freeing up the slot for "
-@@ -2431,16 +2445,16 @@ msgstr ""
- "la pantalla muerta y la eliminará de la cola pendiente liberando el espacio "
- "para otras pantallas."
- 
--#: C/index.docbook:1531(varlistentry/term)
-+#: C/index.docbook:1533(varlistentry/term)
- msgid "MaxWaitIndirect"
- msgstr "MaxWaitIndirect"
- 
--#: C/index.docbook:1533(listitem/synopsis)
-+#: C/index.docbook:1535(listitem/synopsis)
- #, no-wrap
- msgid "MaxWaitIndirect=30"
- msgstr "MaxWaitIndirect=30"
- 
--#: C/index.docbook:1534(listitem/para)
-+#: C/index.docbook:1536(listitem/para)
- msgid ""
- "The MaxWaitIndirect parameter determines the maximum number of seconds "
- "between the time where a user chooses a host and the subsequent indirect "
-@@ -2458,16 +2472,16 @@ msgstr ""
- "más hosts intentando enviar solicitudes que <filename>MaxPendingIndirect</"
- "filename>."
- 
--#: C/index.docbook:1548(varlistentry/term)
-+#: C/index.docbook:1550(varlistentry/term)
- msgid "PingIntervalSeconds"
- msgstr "PingIntervalSeconds"
- 
--#: C/index.docbook:1550(listitem/synopsis)
-+#: C/index.docbook:1552(listitem/synopsis)
- #, no-wrap
- msgid "PingIntervalSeconds=60"
- msgstr "PingIntervalSeconds=60"
- 
--#: C/index.docbook:1551(listitem/para)
-+#: C/index.docbook:1553(listitem/para)
- msgid ""
- "If the Xserver does not respond in the specified number of seconds, then the "
- "connection is stopped and the session ended. When this happens the slave "
-@@ -2482,7 +2496,7 @@ msgstr ""
- "el tiempo de expiración si se está actualizando desde la versión 2.20 de GDM "
- "y anteriores, a una versión más moderna."
- 
--#: C/index.docbook:1560(listitem/para)
-+#: C/index.docbook:1562(listitem/para)
- msgid ""
- "Note that GDM in the past used to have a <filename>PingInterval</filename> "
- "configuration key which was also in minutes. For most purposes you'd want "
-@@ -2498,16 +2512,16 @@ msgstr ""
- "laboratorio), un retraso de más de 15 segundos realmente significaría que el "
- "terminal se ha apagado o reiniciado y usted querría terminar la sesión."
- 
--#: C/index.docbook:1573(varlistentry/term)
-+#: C/index.docbook:1575(varlistentry/term)
- msgid "Port"
- msgstr "Port"
- 
--#: C/index.docbook:1575(listitem/synopsis)
-+#: C/index.docbook:1577(listitem/synopsis)
- #, no-wrap
- msgid "Port=177"
- msgstr "Port=177"
- 
--#: C/index.docbook:1576(listitem/para)
-+#: C/index.docbook:1578(listitem/para)
- msgid ""
- "The UDP port number <filename>gdm</filename> should listen to for XDMCP "
- "requests. Do not change this unless you know what you are doing."
-@@ -2515,16 +2529,16 @@ msgstr ""
- "El número de puerto UDP en el que <filename>gdm</filename> debería escuchar "
- "las peticiones XDMCP. No cambie esto a no ser que sepa lo que está haciendo."
- 
--#: C/index.docbook:1585(varlistentry/term)
-+#: C/index.docbook:1587(varlistentry/term)
- msgid "Willing"
- msgstr "Willing"
- 
--#: C/index.docbook:1587(listitem/synopsis)
-+#: C/index.docbook:1589(listitem/synopsis)
- #, no-wrap
- msgid "Willing=&lt;etc&gt;/gdm/Xwilling"
- msgstr "Willing=&lt;etc&gt;/gdm/Xwilling"
- 
--#: C/index.docbook:1588(listitem/para)
-+#: C/index.docbook:1590(listitem/para)
- msgid ""
- "When the machine sends a WILLING packet back after a QUERY it sends a string "
- "that gives the current status of this server. The default message is the "
-@@ -2544,11 +2558,11 @@ msgstr ""
- "como mucho una vez cada 3 segundos para impedir una posible denegación de "
- "servicio inundando la máquina de paquetes QUERY."
- 
--#: C/index.docbook:1607(sect2/title)
-+#: C/index.docbook:1609(sect2/title)
- msgid "Simple Greeter Configuration"
- msgstr "Configuración de la interfaz simple"
- 
--#: C/index.docbook:1609(sect2/para)
-+#: C/index.docbook:1611(sect2/para)
- msgid ""
- "The GDM default greeter is called the simple Greeter and is configured via "
- "GConf. Default values are stored in GConf in the <filename>gdm-simple-"
-@@ -2567,59 +2581,59 @@ msgstr ""
- "<command>gconf-editor</command>. Las siguientes opciones de configuración "
- "están soportadas:"
- 
--#: C/index.docbook:1620(variablelist/title)
-+#: C/index.docbook:1622(variablelist/title)
- msgid "Greeter Configuration Keys"
- msgstr "Claves de configuración de la interfaz"
- 
--#: C/index.docbook:1623(varlistentry/term)
-+#: C/index.docbook:1625(varlistentry/term)
- msgid "/apps/gdm/simple-greeter/banner_message_enable"
- msgstr "/apps/gdm/simple-greeter/banner_message_enable"
- 
--#: C/index.docbook:1625(listitem/synopsis)
--#: C/index.docbook:1646(listitem/synopsis)
--#: C/index.docbook:1657(listitem/synopsis)
--#: C/index.docbook:1722(listitem/synopsis)
--#: C/index.docbook:1787(listitem/synopsis)
--#: C/index.docbook:1798(listitem/synopsis)
--#: C/index.docbook:1809(listitem/synopsis)
--#: C/index.docbook:1820(listitem/synopsis)
-+#: C/index.docbook:1627(listitem/synopsis)
-+#: C/index.docbook:1648(listitem/synopsis)
-+#: C/index.docbook:1659(listitem/synopsis)
-+#: C/index.docbook:1724(listitem/synopsis)
-+#: C/index.docbook:1789(listitem/synopsis)
-+#: C/index.docbook:1800(listitem/synopsis)
-+#: C/index.docbook:1811(listitem/synopsis)
-+#: C/index.docbook:1822(listitem/synopsis)
- #, no-wrap
- msgid "false (boolean)"
- msgstr "false (booleano)"
- 
--#: C/index.docbook:1626(listitem/para)
-+#: C/index.docbook:1628(listitem/para)
- msgid "Controls whether the banner message text is displayed."
- msgstr "Controla si se muestra o no el mensaje de texto."
- 
--#: C/index.docbook:1633(varlistentry/term)
-+#: C/index.docbook:1635(varlistentry/term)
- msgid "/apps/gdm/simple-greeter/banner_message_text"
- msgstr "/apps/gdm/simple-greeter/banner_message_text"
- 
--#: C/index.docbook:1635(listitem/synopsis)
-+#: C/index.docbook:1637(listitem/synopsis)
- #, no-wrap
- msgid "NULL (string)"
- msgstr "NULL (cadena)"
- 
--#: C/index.docbook:1636(listitem/para)
-+#: C/index.docbook:1638(listitem/para)
- msgid "Specifies the text banner message to show on the greeter window."
- msgstr ""
- "Especifica el mensaje de texto que mostrar en la ventana de la interfaz."
- 
--#: C/index.docbook:1644(varlistentry/term)
-+#: C/index.docbook:1646(varlistentry/term)
- msgid "/apps/gdm/simple-greeter/disable_restart_buttons"
- msgstr "/apps/gdm/simple-greeter/disable_restart_buttons"
- 
--#: C/index.docbook:1647(listitem/para)
-+#: C/index.docbook:1649(listitem/para)
- msgid "Controls whether to show the restart buttons in the login window."
- msgstr ""
- "Controla si se deben mostrar los botones de reinicio en la ventana de "
- "entrada."
- 
--#: C/index.docbook:1655(varlistentry/term)
-+#: C/index.docbook:1657(varlistentry/term)
- msgid "/apps/gdm/simple-greeter/disable_user_list"
- msgstr "/apps/gdm/simple-greeter/disable_user_list"
- 
--#: C/index.docbook:1658(listitem/para)
-+#: C/index.docbook:1660(listitem/para)
- msgid ""
- "If true, then the face browser with known users is not shown in the login "
- "window."
-@@ -2627,32 +2641,32 @@ msgstr ""
- "Si está activada, entonces no se muestra el examinador de rostros con "
- "usuarios conocidos en la ventana de inicio."
- 
--#: C/index.docbook:1666(varlistentry/term)
-+#: C/index.docbook:1668(varlistentry/term)
- msgid "/apps/gdm/simple-greeter/logo_icon_name"
- msgstr "/apps/gdm/simple-greeter/logo_icon_name"
- 
--#: C/index.docbook:1668(listitem/synopsis)
-+#: C/index.docbook:1670(listitem/synopsis)
- #, no-wrap
- msgid "computer (string)"
- msgstr "computer (cadena)"
- 
--#: C/index.docbook:1669(listitem/para)
-+#: C/index.docbook:1671(listitem/para)
- msgid "Set to the themed icon name to use for the greeter logo."
- msgstr ""
- "Establecida al nombre del tema de iconos que usar para el logotipo de la "
- "interfaz."
- 
--#: C/index.docbook:1676(varlistentry/term)
-+#: C/index.docbook:1678(varlistentry/term)
- msgid "/apps/gdm/simple-greeter/recent-languages"
- msgstr "/apps/gdm/simple-greeter/recent-languages"
- 
--#: C/index.docbook:1678(listitem/synopsis)
--#: C/index.docbook:1700(listitem/synopsis)
-+#: C/index.docbook:1680(listitem/synopsis)
-+#: C/index.docbook:1702(listitem/synopsis)
- #, no-wrap
- msgid "[] (string list)"
- msgstr "[] (lista de cadenas)"
- 
--#: C/index.docbook:1679(listitem/para)
-+#: C/index.docbook:1681(listitem/para)
- msgid ""
- "Set to a list of languages to be shown by default in the login window. "
- "Default value is \"[]\". With the default setting only the system default "
-@@ -2665,7 +2679,7 @@ msgstr ""
- "«Otros...» que mostrará un diálogo emergente con una lista completa de "
- "idiomas disponibles entre los que el usuario puede seleccionar."
- 
--#: C/index.docbook:1687(listitem/para)
-+#: C/index.docbook:1689(listitem/para)
- msgid ""
- "Users are not intended to change this setting by hand. Instead GDM keeps "
- "track of any languages selected in this configuration key, and will show "
-@@ -2678,11 +2692,11 @@ msgstr ""
- "junto con la opción «Otros...». De esta forma los idiomas seleccionados son "
- "más fáciles de seleccionar."
- 
--#: C/index.docbook:1698(varlistentry/term)
-+#: C/index.docbook:1700(varlistentry/term)
- msgid "/apps/gdm/simple-greeter/recent-layouts"
- msgstr "/apps/gdm/simple-greeter/recent-layouts"
- 
--#: C/index.docbook:1701(listitem/para)
-+#: C/index.docbook:1703(listitem/para)
- msgid ""
- "Set to a list of keyboard layouts to be shown by default in the login panel. "
- "Default value is \"[]\". With the default setting only the system default "
-@@ -2697,7 +2711,7 @@ msgstr ""
- "una lista completa de distribuciones de teclado disponibles entre las que el "
- "usuario puede seleccionar."
- 
--#: C/index.docbook:1709(listitem/para)
-+#: C/index.docbook:1711(listitem/para)
- msgid ""
- "Users are not intended to change this setting by hand. Instead GDM keeps "
- "track of any keyboard layouts selected in this configuration key, and will "
-@@ -2711,21 +2725,21 @@ msgstr ""
- "esta forma las distribuciones de teclado seleccionadas son más fáciles de "
- "seleccionar."
- 
--#: C/index.docbook:1720(varlistentry/term)
-+#: C/index.docbook:1722(varlistentry/term)
- msgid "/apps/gdm/simple-greeter/wm_use_compiz"
- msgstr "/apps/gdm/simple-greeter/wm_use_compiz"
- 
--#: C/index.docbook:1723(listitem/para)
-+#: C/index.docbook:1725(listitem/para)
- msgid ""
- "Controls whether compiz is used as the window manager instead of metacity."
- msgstr ""
- "Controla si se usa compiz como gestor de ventanas en lugar de metacity."
- 
--#: C/index.docbook:1733(sect2/title)
-+#: C/index.docbook:1735(sect2/title)
- msgid "Accessibility Configuration"
- msgstr "Configuración de la accesibilidad"
- 
--#: C/index.docbook:1735(sect2/para)
-+#: C/index.docbook:1737(sect2/para)
- msgid ""
- "This section describes the accessibility configuration options available in "
- "GDM."
-@@ -2733,11 +2747,11 @@ msgstr ""
- "Esta sección describe las opciones de configuración de accesibilidad "
- "disponibles en GDM."
- 
--#: C/index.docbook:1741(sect3/title)
-+#: C/index.docbook:1743(sect3/title)
- msgid "GDM Accessibility Dialog And GConf Keys"
- msgstr "Diálogo de accesibilidad y claves de GConf de GDM"
- 
--#: C/index.docbook:1743(sect3/para)
-+#: C/index.docbook:1745(sect3/para)
- msgid ""
- "The GDM greeter panel at the login screen displays an accessibility icon. "
- "Clicking on that icon opens the GDM Accessibility Dialog. In the GDM "
-@@ -2750,7 +2764,7 @@ msgstr ""
- "lista de casillas de verificación para que el usuario pueda activar o "
- "desactivar las tecnologías de asistencia asociadas."
- 
--#: C/index.docbook:1750(sect3/para)
-+#: C/index.docbook:1752(sect3/para)
- msgid ""
- "The checkboxes that correspond to the on-screen keyboard, screen magnifier "
- "and screen reader assistive tools act on the three GConf keys that are "
-@@ -2777,7 +2791,7 @@ msgstr ""
- "estaban ejecutando en la última sesión de GDM se lanzarán automáticamente en "
- "la siguiente sesión de inicio de GDM."
- 
--#: C/index.docbook:1764(sect3/para)
-+#: C/index.docbook:1766(sect3/para)
- msgid ""
- "The other checkboxes in the GDM Accessibility Dialog do not have "
- "corresponding GConf keys because no additional program is launched to "
-@@ -2792,26 +2806,26 @@ msgstr ""
- "accesibilidad proporcionadas por el servidor X que siempre se está "
- "ejecutando durante la sesión GDM."
- 
--#: C/index.docbook:1774(sect3/title)
-+#: C/index.docbook:1776(sect3/title)
- msgid "Accessibility GConf Keys"
- msgstr "Claves de accesibilidad de GConf"
- 
--#: C/index.docbook:1776(sect3/para)
-+#: C/index.docbook:1778(sect3/para)
- msgid ""
- "GDM offers the following GConf keys to control its accessibility features:"
- msgstr ""
- "GDM ofrece las siguientes claves de GConf para controlar sus características "
- "de accesibilidad:"
- 
--#: C/index.docbook:1782(variablelist/title)
-+#: C/index.docbook:1784(variablelist/title)
- msgid "GDM Configuration Keys"
- msgstr "Claves de configuración de GDM"
- 
--#: C/index.docbook:1785(varlistentry/term)
-+#: C/index.docbook:1787(varlistentry/term)
- msgid "/desktop/gnome/interface/accessibility"
- msgstr "/desktop/gnome/interface/accessibility"
- 
--#: C/index.docbook:1788(listitem/para)
-+#: C/index.docbook:1790(listitem/para)
- msgid ""
- "Controls whether the Accessibility infrastructure will be started with the "
- "GDM GUI. This is needed for many accessibility technology programs to work."
-@@ -2819,11 +2833,11 @@ msgstr ""
- "Controla si la infraestructura de accesibilidad se iniciará con la IGU de "
- "GDM. Esto es necesario para que los programas de accesibilidad funcionen."
- 
--#: C/index.docbook:1796(varlistentry/term)
-+#: C/index.docbook:1798(varlistentry/term)
- msgid "/desktop/gnome/applications/at/screen_magnifier_enabled"
- msgstr "/desktop/gnome/applications/at/screen_magnifier_enabled"
- 
--#: C/index.docbook:1799(listitem/para)
-+#: C/index.docbook:1801(listitem/para)
- msgid ""
- "If set, then the assistive tools linked to this GConf key will be started "
- "with the GDM GUI program. By default this is a screen magnifier application."
-@@ -2832,11 +2846,11 @@ msgstr ""
- "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma "
- "predeterminada es una aplicación de  magnificación de pantalla."
- 
--#: C/index.docbook:1807(varlistentry/term)
-+#: C/index.docbook:1809(varlistentry/term)
- msgid "/desktop/gnome/applications/at/screen_keyboard_enabled"
- msgstr "/desktop/gnome/applications/at/screen_keyboard_enabled"
- 
--#: C/index.docbook:1810(listitem/para)
-+#: C/index.docbook:1812(listitem/para)
- msgid ""
- "If set, then the assistive tools linked to this GConf key will be started "
- "with the GDM GUI program. By default this is an on-screen keyboard "
-@@ -2846,11 +2860,11 @@ msgstr ""
- "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma "
- "predeterminada es una aplicación de teclado en pantalla."
- 
--#: C/index.docbook:1818(varlistentry/term)
-+#: C/index.docbook:1820(varlistentry/term)
- msgid "/desktop/gnome/applications/at/screen_reader_enabled"
- msgstr "/desktop/gnome/applications/at/screen_reader_enabled"
- 
--#: C/index.docbook:1821(listitem/para)
-+#: C/index.docbook:1823(listitem/para)
- msgid ""
- "If set, then the assistive tools linked to this GConf key will be started "
- "with the GDM GUI program. By default this is a screen reader application."
-@@ -2859,11 +2873,11 @@ msgstr ""
- "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma "
- "predeterminada es una aplicación de lectura de pantalla."
- 
--#: C/index.docbook:1832(sect3/title)
-+#: C/index.docbook:1834(sect3/title)
- msgid "Linking GConf Keys to Accessbility Tools"
- msgstr "Enlazar las claves de GConf con herramientas de accesibilidad"
- 
--#: C/index.docbook:1834(sect3/para)
-+#: C/index.docbook:1836(sect3/para)
- msgid ""
- "For the screen_magnifier_enabled, the screen_keyboard_enabled, and the "
- "screen_reader_enabled GConf keys, the assistive tool which gets launched "
-@@ -2884,7 +2898,7 @@ msgstr ""
- "esa clave de GConf en el valor AutostartCondition en el archivo de "
- "escritorio. Por ejemplo, el valor podría ser uno de los siguientes:"
- 
--#: C/index.docbook:1846(sect3/screen)
-+#: C/index.docbook:1848(sect3/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -2897,7 +2911,7 @@ msgstr ""
- "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_magnifier_enabled\n"
- "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_reader_enabled\n"
- 
--#: C/index.docbook:1852(sect3/para)
-+#: C/index.docbook:1854(sect3/para)
- msgid ""
- "When an accessibility key is true, then any program which is linked to that "
- "key in a GDM autostart desktop file will be launched (unless the Hidden key "
-@@ -2912,13 +2926,13 @@ msgstr ""
- "herramientas de asistencia si existen archivos de escritorio múltiples con "
- "esta condición AutostartCondition en la carpeta de inicio automático del GDM."
- 
--#: C/index.docbook:1862(sect3/title)
-+#: C/index.docbook:1864(sect3/title)
- msgid "Example Of Modifying Accessibility Tool Configuration"
- msgstr ""
- "Ejemplo de modificación de la configuración de la herramienta de "
- "accesibilidad"
- 
--#: C/index.docbook:1864(sect3/para)
-+#: C/index.docbook:1866(sect3/para)
- msgid ""
- "For example, if GNOME is distributed with GOK as the default on-screen "
- "keyboard, then this could be replaced with a different program if desired. "
-@@ -2933,7 +2947,7 @@ msgstr ""
- "«mousetweaks» (ajustes finos del ratón) para soporte de pulsación al "
- "posarse, entonces se necesita la siguiente configuración."
- 
--#: C/index.docbook:1872(sect3/para)
-+#: C/index.docbook:1874(sect3/para)
- msgid ""
- "Create a desktop file for onboard and a second one for mousetweaks; for "
- "example, onboard.desktop and mousetweaks.desktop. These files must be placed "
-@@ -2946,12 +2960,12 @@ msgstr ""
- "automático del GDM y estar en el formato explicado en la sección "
- "«Configuración automática al inicio» de este documento."
- 
--#: C/index.docbook:1880(sect3/para)
-+#: C/index.docbook:1882(sect3/para)
- msgid "The following is an example <filename>onboard.desktop</filename> file:"
- msgstr ""
- "Lo siguiente es un ejemplo del archivo <filename>onboard.desktop</filename>:"
- 
--#: C/index.docbook:1884(sect3/screen)
-+#: C/index.docbook:1886(sect3/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -2980,14 +2994,14 @@ msgstr ""
- "Categories=GNOME;GTK;Accessibility;\n"
- "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled\n"
- 
--#: C/index.docbook:1898(sect3/para)
-+#: C/index.docbook:1900(sect3/para)
- msgid ""
- "The following is an example <filename>mousetweaks.desktop</filename> file:"
- msgstr ""
- "Lo siguiente es un ejemplo del archivo <filename>mousetweaks.desktop</"
- "filename>:"
- 
--#: C/index.docbook:1903(sect3/screen)
-+#: C/index.docbook:1905(sect3/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -3016,7 +3030,7 @@ msgstr ""
- "Categories=GNOME;GTK;Accessibility;\n"
- "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled\n"
- 
--#: C/index.docbook:1917(sect3/para)
-+#: C/index.docbook:1919(sect3/para)
- msgid ""
- "Note the line with the AutostartCondition that links both desktop files to "
- "the GConf key for the on-screen keyboard."
-@@ -3024,7 +3038,7 @@ msgstr ""
- "Note la línea con AutostartCondition que enlaza tanto los archivos de "
- "escritorio con las claves de GConf para el teclado en pantalla."
- 
--#: C/index.docbook:1922(sect3/para)
-+#: C/index.docbook:1924(sect3/para)
- msgid ""
- "To disable GOK from starting, the desktop file for the GOK on-screen "
- "keyboard must be removed or deactivated. Otherwise onboard and GOK would "
-@@ -3039,7 +3053,7 @@ msgstr ""
- "automático del GDM o añadiendo la clave de ajuste «Hidden=true» al archivo "
- "gok.desktop."
- 
--#: C/index.docbook:1930(sect3/para)
-+#: C/index.docbook:1932(sect3/para)
- msgid ""
- "After making these changes, GOK will no longer be started when the user "
- "activates the on-screen keyboard in the GDM session; but onboard and "
-@@ -3049,11 +3063,11 @@ msgstr ""
- "usuario inicie el teclado en pantalla en la sesión de GDM; en su lugar se "
- "lanzarán el teclado en pantalla «onboard» y los ajustes finos del ratón."
- 
--#: C/index.docbook:1939(sect2/title)
-+#: C/index.docbook:1941(sect2/title)
- msgid "General Session Settings"
- msgstr "Ajustes generales de sesión"
- 
--#: C/index.docbook:1948(sect2/para)
-+#: C/index.docbook:1950(sect2/para)
- msgid ""
- "The GDM Greeter uses some of the same framework that your desktop session "
- "will use. And so, it is influenced by a number of the same GConf settings. "
-@@ -3070,11 +3084,11 @@ msgstr ""
- "política obligatoria del sistema. GDM instala su propia política obligatoria "
- "para bloquear algunos ajustes por seguridad."
- 
--#: C/index.docbook:1959(sect2/title)
-+#: C/index.docbook:1961(sect2/title)
- msgid "GNOME Settings Daemon"
- msgstr "Administrador de preferencias de GNOME"
- 
--#: C/index.docbook:1972(sect2/para)
-+#: C/index.docbook:1974(sect2/para)
- msgid ""
- "GDM enables the following gnome-settings-daemon plugins: a11y-keyboard, "
- "background, sound, xsettings."
-@@ -3082,7 +3096,7 @@ msgstr ""
- "GDM activa los siguientes complementos de gnome-settings-daemon: a11y-"
- "keyboard, background, sound, xsettings."
- 
--#: C/index.docbook:1977(sect2/para)
-+#: C/index.docbook:1979(sect2/para)
- msgid ""
- "These are responsible for things like the background image, font and theme "
- "settings, sound events, etc."
-@@ -3090,7 +3104,7 @@ msgstr ""
- "Éstos son responsables de cosas como la imagen de fondo, los ajustes de "
- "tipografía y tema, eventos de sonido, etc."
- 
--#: C/index.docbook:1982(sect2/para)
-+#: C/index.docbook:1984(sect2/para)
- msgid ""
- "Plugins can also be disabled using GConf. For example, if you want to "
- "disable the sound plugin then unset the following key: <filename>/apps/gdm/"
-@@ -3101,11 +3115,11 @@ msgstr ""
- "<filename>/apps/gdm/simple-greeter/settings-manager-plugins/sound/active</"
- "filename>."
- 
--#: C/index.docbook:1990(sect2/title)
-+#: C/index.docbook:1992(sect2/title)
- msgid "GDM Session Configuration"
- msgstr "Configuración de sesión de GDM"
- 
--#: C/index.docbook:1992(sect2/para)
-+#: C/index.docbook:1994(sect2/para)
- msgid ""
- "GDM sessions are specified using the FreeDesktop.org Desktop Entry "
- "Specification, which can be referenced at the following URL: <ulink url="
-@@ -3118,7 +3132,7 @@ msgstr ""
- "spec\"> http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec</"
- "ulink>."
- 
--#: C/index.docbook:1999(sect2/para)
-+#: C/index.docbook:2001(sect2/para)
- msgid ""
- "By default, GDM will install desktop files in the <filename>&lt;share&gt;/"
- "xsessions</filename> directory. GDM will search the following directories in "
-@@ -3139,7 +3153,7 @@ msgstr ""
- "etc&gt;/dm/</filename> a no ser que GDM se configure para usar una carpeta "
- "diferente a través de la opción «--with-dmconfdir»."
- 
--#: C/index.docbook:2012(sect2/para)
-+#: C/index.docbook:2014(sect2/para)
- msgid ""
- "A session can be disabled by editing the desktop file and adding a line as "
- "follows: <filename>Hidden=true</filename>."
-@@ -3147,7 +3161,7 @@ msgstr ""
- "Se puede desactivar una sesión editando el archivo de escritorio y añadiendo "
- "una como la siguiente <filename>Hidden=true</filename>."
- 
--#: C/index.docbook:2017(sect2/para)
-+#: C/index.docbook:2019(sect2/para)
- msgid ""
- "GDM desktop files support a GDM-specific extension, a key named \"X-GDM-"
- "BypassXsession\". If the key is not specified in a desktop file, the value "
-@@ -3175,11 +3189,11 @@ msgstr ""
- "en el sistema o en scripts de usuario que puedan impedir que un usuario "
- "pueda iniciar una sesión."
- 
--#: C/index.docbook:2036(sect2/title)
-+#: C/index.docbook:2038(sect2/title)
- msgid "GDM User Session and Language Configuration"
- msgstr "Sesión de usuario de GDM y configuración de idioma"
- 
--#: C/index.docbook:2037(sect2/para)
-+#: C/index.docbook:2039(sect2/para)
- msgid ""
- "The user's default session and language choices are stored in the "
- "<filename>~/.dmrc</filename> file. When a user logs in for the first time, "
-@@ -3194,7 +3208,7 @@ msgstr ""
- "valor diferente al iniciar sesión. GDM recordará estos cambios para inicios "
- "posteriores."
- 
--#: C/index.docbook:2045(sect2/para)
-+#: C/index.docbook:2047(sect2/para)
- msgid ""
- "The <filename>~/.dmrc</filename> file is in the standard <filename>INI</"
- "filename> format. It has one section called <filename>[Desktop]</filename> "
-@@ -3206,7 +3220,7 @@ msgstr ""
- "que tiene dos claves: <filename>Session</filename> y <filename>Language</"
- "filename>."
- 
--#: C/index.docbook:2052(sect2/para)
-+#: C/index.docbook:2054(sect2/para)
- msgid ""
- "The <filename>Session</filename> key specifies the basename of the session "
- "<filename>.desktop</filename> file that the user wishes to normally use "
-@@ -3223,7 +3237,7 @@ msgstr ""
- "usa el predeterminado del sistema. El archivo normalmente tiene la siguiente "
- "apariencia:"
- 
--#: C/index.docbook:2061(sect2/screen)
-+#: C/index.docbook:2063(sect2/screen)
- #, no-wrap
- msgid ""
- "\n"
-@@ -3236,15 +3250,15 @@ msgstr ""
- "Session=gnome\n"
- "Language=es_ES.UTF-8\n"
- 
--#: C/index.docbook:2073(sect1/title)
-+#: C/index.docbook:2075(sect1/title)
- msgid "GDM Commands"
- msgstr "Comandos de GDM"
- 
--#: C/index.docbook:2076(sect2/title)
-+#: C/index.docbook:2078(sect2/title)
- msgid "GDM Root User Commands"
- msgstr "Comandos del administrador de GDM"
- 
--#: C/index.docbook:2078(sect2/para)
-+#: C/index.docbook:2080(sect2/para)
- msgid ""
- "The GDM package provides the following commands in <filename>sbindir</"
- "filename> intended to be run by the root user:"
-@@ -3252,14 +3266,14 @@ msgstr ""
- "El paquete GDM proporciona los siguientes comandos en <filename>sbindir</"
- "filename> con la intención de que los use el usario root:"
- 
--#: C/index.docbook:2084(sect3/title) C/index.docbook:2099(variablelist/title)
-+#: C/index.docbook:2086(sect3/title) C/index.docbook:2101(variablelist/title)
- msgid ""
- "<command>gdm</command> and <command>gdm-binary</command> Command Line Options"
- msgstr ""
- "Opciones de línea de comandos de <command>gdm</command> y <command>gdm-"
- "binary</command>"
- 
--#: C/index.docbook:2087(sect3/para)
-+#: C/index.docbook:2089(sect3/para)
- msgid ""
- "The <command>gdm</command> command is really just a script which runs the "
- "<command>gdm-binary</command>, passing along any options. Before launching "
-@@ -3279,43 +3293,43 @@ msgstr ""
- "si cualquiera de LC_MESSAGES o LC_ALL está establecida. <command>gdm-binary</"
- "command> es el demonio actual de GDM."
- 
--#: C/index.docbook:2103(varlistentry/term)
-+#: C/index.docbook:2105(varlistentry/term)
- msgid "-?, --help"
- msgstr "-?, --help"
- 
--#: C/index.docbook:2105(listitem/para)
-+#: C/index.docbook:2107(listitem/para)
- msgid "Gives a brief overview of the command line options."
- msgstr "Da un breve resumen de las opciones de línea de comandos."
- 
--#: C/index.docbook:2112(varlistentry/term)
-+#: C/index.docbook:2114(varlistentry/term)
- msgid "--fatal-warnings"
- msgstr "--fatal-warnings"
- 
--#: C/index.docbook:2114(listitem/para)
-+#: C/index.docbook:2116(listitem/para)
- msgid "Make all warnings cause GDM to exit."
- msgstr "Causa que todas las advertencias hagan que GDM salga."
- 
--#: C/index.docbook:2121(varlistentry/term)
-+#: C/index.docbook:2123(varlistentry/term)
- msgid "--timed-exit"
- msgstr "--timed-exit"
- 
--#: C/index.docbook:2123(listitem/para)
-+#: C/index.docbook:2125(listitem/para)
- msgid "Exit after 30 seconds. Useful for debugging."
- msgstr "Sale después de 30 segundos. Útil para depuración."
- 
--#: C/index.docbook:2130(varlistentry/term)
-+#: C/index.docbook:2132(varlistentry/term)
- msgid "--version"
- msgstr "--version"
- 
--#: C/index.docbook:2132(listitem/para)
-+#: C/index.docbook:2134(listitem/para)
- msgid "Print the version of the GDM daemon."
- msgstr "Imprime la versión del demonio GDM."
- 
--#: C/index.docbook:2141(sect3/title)
-+#: C/index.docbook:2143(sect3/title)
- msgid "<command>gdm-restart</command> Command Line Options"
- msgstr "Opciones de línea de comandos de <command>gdm-restart</command>"
- 
--#: C/index.docbook:2143(sect3/para)
-+#: C/index.docbook:2145(sect3/para)
- msgid ""
- "<command>gdm-restart</command> stops and restarts GDM by sending the GDM "
- "daemon a HUP signal. This command will immediately terminate all sessions "
-@@ -3325,11 +3339,11 @@ msgstr ""
- "GDM una señal HUP. Este comando inmediatamente terminará todas las sesiones "
- "y echará fuera a los usuarios que hayan entrado con GDM."
- 
--#: C/index.docbook:2151(sect3/title)
-+#: C/index.docbook:2153(sect3/title)
- msgid "<command>gdm-safe-restart</command> Command Line Options"
- msgstr "Opciones de línea de comandos de <command>gdm-safe-restart</command>"
- 
--#: C/index.docbook:2153(sect3/para)
-+#: C/index.docbook:2155(sect3/para)
- msgid ""
- "<command>gdm-safe-restart</command> stops and restarts GDM by sending the "
- "GDM daemon a USR1 signal. GDM will be restarted as soon as all users log out."
-@@ -3338,22 +3352,22 @@ msgstr ""
- "GDM una señal USR1. GDM re reiniciará tan pronto como todos los usuarios "
- "salgan."
- 
--#: C/index.docbook:2161(sect3/title)
-+#: C/index.docbook:2163(sect3/title)
- msgid "<command>gdm-stop</command> Command Line Options"
- msgstr "Opciones de línea de comandos de <command>gdm-stop</command>"
- 
--#: C/index.docbook:2163(sect3/para)
-+#: C/index.docbook:2165(sect3/para)
- msgid ""
- "<command>gdm-stop</command> stops GDM by sending the GDM daemon a TERM "
- "signal."
- msgstr ""
- "<command>gdm-stop</command> para GDM enviando al demonio GDM una señal TERM."
- 
--#: C/index.docbook:2174(sect1/title)
-+#: C/index.docbook:2176(sect1/title)
- msgid "Troubleshooting"
- msgstr "Resolución de problemas"
- 
--#: C/index.docbook:2182(sect1/para)
-+#: C/index.docbook:2184(sect1/para)
- msgid ""
- "This section discusses helpful tips for getting GDM working. In general, if "
- "you have a problem using GDM, you can submit a bug or send an email to the "
-@@ -3365,7 +3379,7 @@ msgstr ""
- "a la lista de correo. En la sección de introducción del documento se "
- "proporciona información sobre esto."
- 
--#: C/index.docbook:2189(sect1/para)
-+#: C/index.docbook:2191(sect1/para)
- msgid ""
- "If GDM is failing to work properly, it is always a good idea to include "
- "debug information. To enable debugging, set the debug/Enable key to \"true\" "
-@@ -3393,11 +3407,11 @@ msgstr ""
- "(consulte la página man de <ulink type=\"help\" url=\"man:syslog\">syslog</"
- "ulink>)."
- 
--#: C/index.docbook:2205(sect2/title)
-+#: C/index.docbook:2207(sect2/title)
- msgid "GDM Will Not Start"
- msgstr "GDM no se inicia"
- 
--#: C/index.docbook:2207(sect2/para)
-+#: C/index.docbook:2209(sect2/para)
- msgid ""
- "There are a many problems that can cause GDM to fail to start, but this "
- "section will discuss a few common problems and how to approach tracking down "
-@@ -3411,7 +3425,7 @@ msgstr ""
- "de error o un diálogo cuando intenta iniciarse, pero puede ser difícil "
- "seguir un problema cuando GDM falla de forma silenciosa."
- 
--#: C/index.docbook:2216(sect2/para)
-+#: C/index.docbook:2218(sect2/para)
- msgid ""
- "First make sure that the Xserver is configured properly. The GDM "
- "configuration file contains a command in the [server-Standard] section that "
-@@ -3434,7 +3448,7 @@ msgstr ""
- "de comandos. Si es así, modifique el comando del servidor X en el archivo de "
- "configuración de GDM para que sea correcto para su sistema."
- 
--#: C/index.docbook:2229(sect2/para)
-+#: C/index.docbook:2231(sect2/para)
- msgid ""
- "Also make sure that the <filename>/tmp</filename> directory has reasonable "
- "ownership and permissions, and that the machine's file system is not full. "
-@@ -3444,11 +3458,11 @@ msgstr ""
- "propiedad razonables, y que el sistema de archivos de la máquina no está "
- "lleno. Estos problemas harán que GDM falle al iniciar."
- 
--#: C/index.docbook:2240(sect1/title)
-+#: C/index.docbook:2242(sect1/title)
- msgid "License"
- msgstr "Licencia"
- 
--#: C/index.docbook:2241(sect1/para)
-+#: C/index.docbook:2243(sect1/para)
- msgid ""
- "This program is free software; you can redistribute it and/or modify it "
- "under the terms of the <ulink type=\"help\" url=\"gnome-help:gpl\"> "
-@@ -3462,7 +3476,7 @@ msgstr ""
- "publica por la Free Software Foundation; ya sea la versión 2 de la Licencia, "
- "o (a su elección) cualquier versión posterior."
- 
--#: C/index.docbook:2249(sect1/para)
-+#: C/index.docbook:2251(sect1/para)
- msgid ""
- "This program is distributed in the hope that it will be useful, but WITHOUT "
- "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-@@ -3474,7 +3488,7 @@ msgstr ""
- "IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la <citetitle>Licencia Pública "
- "General GNU</citetitle> para más detalles."
- 
--#: C/index.docbook:2263(para/address)
-+#: C/index.docbook:2265(para/address)
- #, no-wrap
- msgid ""
- "\n"
-@@ -3491,7 +3505,7 @@ msgstr ""
- "      <country>USA</country>\n"
- "      "
- 
--#: C/index.docbook:2255(sect1/para)
-+#: C/index.docbook:2257(sect1/para)
- msgid ""
- "A copy of the <citetitle>GNU General Public License</citetitle> is included "
- "as an appendix to the <citetitle>GNOME Users Guide</citetitle>. You may also "
-diff --git a/gui/libgdm/gdm-user-switching.c b/gui/libgdm/gdm-user-switching.c
-index 507dd27..c4342f2 100644
---- a/gui/libgdm/gdm-user-switching.c
-+++ b/gui/libgdm/gdm-user-switching.c
-@@ -475,11 +475,13 @@ get_login_window_session_id_for_systemd (const char  *seat_id,
-         ret = TRUE;
- 
- out:
--        for (i = 0; sessions[i]; i ++) {
--                free (sessions[i]);
--        }
-+        if (sessions) {
-+                for (i = 0; sessions[i]; i ++) {
-+                        free (sessions[i]);
-+                }
- 
--        free (sessions);
-+                free (sessions);
-+        }
- 
-         return ret;
- }
-diff --git a/po/fur.po b/po/fur.po
-index bb89eac..8ec4a14 100644
---- a/po/fur.po
-+++ b/po/fur.po
-@@ -6,116 +6,121 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: gdm2\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-03-11 13:14+0100\n"
--"PO-Revision-Date: 2008-03-08 15:53+0100\n"
--"Last-Translator: Massimo Furlani <massimo.furlani@libero.it>\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-+"product=gdm&keywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2013-01-04 07:24+0000\n"
-+"PO-Revision-Date: 2013-01-10 00:33+0100\n"
-+"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
- "Language-Team: FRIULIAN <massimo.furlani@libero.it>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "X-Poedit-Language: Friulian\n"
- "X-Poedit-Country: ITALY\n"
- 
--#: ../common/gdm-common.c:395
-+#: ../common/gdm-common.c:492
- #, c-format
- msgid "/dev/urandom is not a character device"
- msgstr "/dev/urandom nol è un caratar device"
- 
--#: ../daemon/factory-slave-main.c:156 ../daemon/product-slave-main.c:156
--#: ../daemon/simple-slave-main.c:158 ../daemon/xdmcp-chooser-slave-main.c:156
--msgid "Display ID"
--msgstr "Mostre ID"
--
--#: ../daemon/factory-slave-main.c:156 ../daemon/product-slave-main.c:156
--#: ../daemon/simple-slave-main.c:158 ../daemon/xdmcp-chooser-slave-main.c:156
--msgid "id"
--msgstr "id"
--
--#: ../daemon/factory-slave-main.c:168 ../daemon/product-slave-main.c:168
--#: ../daemon/simple-slave-main.c:170 ../daemon/xdmcp-chooser-slave-main.c:168
--msgid "GNOME Display Manager Slave"
--msgstr ""
--
--#: ../daemon/gdm-display-access-file.c:246
-+#: ../daemon/gdm-display-access-file.c:300
- #, c-format
- msgid "could not find user \"%s\" on system"
- msgstr "Impussibil cjatâ l'utent \"%s\" tal sisteme"
- 
--#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:172
--msgid "Unable to initialize login system"
--msgstr ""
--
--#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:204
--msgid "Unable to authenticate user"
--msgstr "Impussibil autenticâ l'utent"
-+#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354
-+#, fuzzy, c-format
-+#| msgid "no user account available"
-+msgid "No session available yet"
-+msgstr "nol è pussibil doprâ nissun account user"
- 
--#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:233
--msgid "Unable to authorize user"
-+#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384
-+#, fuzzy, c-format
-+#| msgid "Unable to authorize user"
-+msgid "Unable to look up UID of user %s"
- msgstr "Impussibil autorizâ l'utent"
- 
--#: ../daemon/gdm-factory-slave.c:281
--msgid "Unable to establish credentials"
--msgstr ""
-+#: ../daemon/gdm-manager.c:291
-+#, fuzzy
-+#| msgid "no user account available"
-+msgid "no sessions available"
-+msgstr "nol è pussibil doprâ nissun account user"
- 
--#: ../daemon/gdm-factory-slave.c:650 ../daemon/gdm-product-slave.c:394
--#: ../daemon/gdm-simple-slave.c:951
--msgid ""
--"Could not start the X server (your graphical environment) due to some "
--"internal error. Please contact your system administrator or check your "
--"syslog to diagnose. In the meantime this display will be disabled.  Please "
--"restart GDM when the problem is corrected."
--msgstr ""
-+#: ../daemon/gdm-manager.c:352
-+#, c-format
-+msgid "No sessions for %s available for reauthentication"
-+msgstr "Nissune session di ri-autenticazion disponibil par %s"
-+
-+#: ../daemon/gdm-manager.c:406
-+#, fuzzy, c-format
-+#| msgid "unable to log session"
-+msgid "Unable to find session for user %s"
-+msgstr "impussibil loggasi ta session"
- 
--#: ../daemon/gdm-server.c:244
-+#: ../daemon/gdm-manager.c:476
-+#, c-format
-+msgid "Unable to find appropriate session for user %s"
-+msgstr "Impussibil cjatâ la session juste par l'utent %s"
-+
-+#: ../daemon/gdm-manager.c:671
-+#, fuzzy
-+#| msgid "User %s doesn't exist"
-+msgid "User doesn't own session"
-+msgstr "L'utent %s nol esist"
-+
-+#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768
-+#, fuzzy
-+#| msgid "no user account available"
-+msgid "No session available"
-+msgstr "nol è pussibil doprâ nissun account user"
-+
-+#: ../daemon/gdm-server.c:273
- #, c-format
- msgid "%s: failed to connect to parent display '%s'"
--msgstr ""
-+msgstr "%s: Falît tal conetisi al visôr pari '%s'"
- 
--#: ../daemon/gdm-server.c:362
-+#: ../daemon/gdm-server.c:452
- #, c-format
- msgid "Server was to be spawned by user %s but that user doesn't exist"
- msgstr ""
-+"Il server al veve di sedi inviât dal'utent %s ma chest utent a no'l esist"
- 
--#: ../daemon/gdm-server.c:373 ../daemon/gdm-welcome-session.c:406
-+#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483
- #, c-format
- msgid "Couldn't set groupid to %d"
--msgstr ""
-+msgstr "Impussibil impostâ il grupid a %d"
- 
--#: ../daemon/gdm-server.c:379 ../daemon/gdm-welcome-session.c:412
-+#: ../daemon/gdm-server.c:469
- #, c-format
- msgid "initgroups () failed for %s"
--msgstr ""
-+msgstr "initgroups () falît par %s"
- 
--#: ../daemon/gdm-server.c:385 ../daemon/gdm-welcome-session.c:418
-+#: ../daemon/gdm-server.c:475
- #, c-format
- msgid "Couldn't set userid to %d"
--msgstr ""
-+msgstr "No puès impostâ il ID utent a %d"
- 
--#: ../daemon/gdm-server.c:393 ../daemon/gdm-welcome-session.c:426
--msgid "Couldn't set groupid to 0"
--msgstr ""
--
--#: ../daemon/gdm-server.c:428
-+#: ../daemon/gdm-server.c:522
- #, c-format
--msgid "%s: Could not open logfile for display %s!"
--msgstr ""
-+msgid "%s: Could not open log file for display %s!"
-+msgstr "%s: no puès vierzi il file çoc par il visôr %s!"
- 
--#: ../daemon/gdm-server.c:439 ../daemon/gdm-server.c:445
--#: ../daemon/gdm-server.c:451
-+#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539
-+#: ../daemon/gdm-server.c:545
- #, c-format
- msgid "%s: Error setting %s to %s"
--msgstr ""
-+msgstr "%s: Erôr configurant %s a %s"
- 
--#: ../daemon/gdm-server.c:466
-+#: ../daemon/gdm-server.c:565
- #, c-format
- msgid "%s: Server priority couldn't be set to %d: %s"
--msgstr ""
-+msgstr "%s: La prioritât dal server a no puès sedi impostade a %d: %s"
- 
--#: ../daemon/gdm-server.c:618
-+#: ../daemon/gdm-server.c:722
- #, c-format
- msgid "%s: Empty server command for display %s"
--msgstr ""
-+msgstr "%s: Al mancje il comant dal server par il visôr %s"
- 
- #: ../daemon/gdm-session-auditor.c:90
- #, fuzzy
-@@ -129,11 +134,11 @@ msgstr "Non utent:"
- 
- #: ../daemon/gdm-session-auditor.c:95
- msgid "Hostname"
--msgstr ""
-+msgstr "Non Host"
- 
- #: ../daemon/gdm-session-auditor.c:96
- msgid "The hostname"
--msgstr ""
-+msgstr "Il non dal Host"
- 
- #: ../daemon/gdm-session-auditor.c:101
- #, fuzzy
-@@ -142,921 +147,834 @@ msgstr "Mostre ID"
- 
- #: ../daemon/gdm-session-auditor.c:102
- msgid "The display device"
--msgstr ""
-+msgstr "L'argagn dal visôr"
- 
--#: ../daemon/gdm-session-direct.c:1446 ../daemon/gdm-session-direct.c:1464
--#, c-format
--msgid "worker exited with status %d"
--msgstr ""
-+#: ../daemon/gdm-session.c:1183
-+msgid "Could not create authentication helper process"
-+msgstr "Impussibil creâ il procès di jutori par l'autenticazion"
- 
--#: ../daemon/gdm-session-worker.c:954
-+#: ../daemon/gdm-session-worker.c:1029
- #, c-format
- msgid "error initiating conversation with authentication system - %s"
--msgstr ""
-+msgstr "Erôr tal tacâ la conversazion cul sisteme di autenticazion: %s"
- 
--#: ../daemon/gdm-session-worker.c:955
-+#: ../daemon/gdm-session-worker.c:1030
- msgid "general failure"
- msgstr "erôr gjenerâl"
- 
--#: ../daemon/gdm-session-worker.c:956
-+#: ../daemon/gdm-session-worker.c:1031
- msgid "out of memory"
- msgstr "fûr da memorie"
- 
--#: ../daemon/gdm-session-worker.c:957
-+#: ../daemon/gdm-session-worker.c:1032
- msgid "application programmer error"
--msgstr ""
-+msgstr "erôr dal programatôr"
- 
--#: ../daemon/gdm-session-worker.c:958
-+#: ../daemon/gdm-session-worker.c:1033
- msgid "unknown error"
--msgstr ""
-+msgstr "Erôr no cognossût"
- 
--#: ../daemon/gdm-session-worker.c:965
-+#: ../daemon/gdm-session-worker.c:1040
- msgid "Username:"
- msgstr "Non utent:"
- 
--#: ../daemon/gdm-session-worker.c:971
--#, c-format
--msgid "error informing authentication system of preferred username prompt - %s"
--msgstr ""
--
--#: ../daemon/gdm-session-worker.c:985
--#, c-format
--msgid "error informing authentication system of user's hostname - %s"
--msgstr ""
--
--#: ../daemon/gdm-session-worker.c:1000
--#, c-format
--msgid "error informing authentication system of user's console - %s"
--msgstr ""
--
--#: ../daemon/gdm-session-worker.c:1163
-+#: ../daemon/gdm-session-worker.c:1046
- #, c-format
--msgid "no user account available"
--msgstr "nol è pussibil doprâ nissun account user"
--
--#: ../daemon/gdm-session-worker.c:1212
--#, c-format
--msgid "user account not available on system"
--msgstr ""
--
--#: ../daemon/gdm-simple-slave.c:323
--msgid "Unable establish credentials"
--msgstr ""
--
--#: ../daemon/gdm-welcome-session.c:388
--#, c-format
--msgid "User %s doesn't exist"
--msgstr "L'utent %s nol esist"
--
--#: ../daemon/gdm-welcome-session.c:395
--#, c-format
--msgid "Group %s doesn't exist"
--msgstr "Il grop %s nol esist"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:590
--msgid "Could not create socket!"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:856
--#, c-format
--msgid "Denied XDMCP query from host %s"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1013
--#: ../daemon/gdm-xdmcp-display-factory.c:1234
--msgid "Could not extract authlist from packet"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1026
--#: ../daemon/gdm-xdmcp-display-factory.c:1249
--msgid "Error in checksum"
--msgstr "Erôr tal checksum"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1500
--msgid "Bad address"
--msgstr "Indiriz sbagliât"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1581
--#, c-format
--msgid "%s: Could not read display address"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1589
--#, c-format
--msgid "%s: Could not read display port number"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1598
--#, c-format
--msgid "%s: Could not extract authlist from packet"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1618
--#, c-format
--msgid "%s: Error in checksum"
--msgstr "%s: Erôr tal checksum"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2120
--#, c-format
--msgid "%s: Got REQUEST from banned host %s"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2130
--#: ../daemon/gdm-xdmcp-display-factory.c:2485
--#: ../daemon/gdm-xdmcp-display-factory.c:2737
--#, c-format
--msgid "%s: Could not read Display Number"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2137
--#, c-format
--msgid "%s: Could not read Connection Type"
-+msgid "error informing authentication system of preferred username prompt: %s"
- msgstr ""
-+"erôr tal informâ il sisteme di autenticazion cuâl ch'al è il prompt preferît "
-+"dal'utent: %s"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2144
-+#: ../daemon/gdm-session-worker.c:1060
- #, c-format
--msgid "%s: Could not read Client Address"
-+msgid "error informing authentication system of user's hostname: %s"
- msgstr ""
-+"erôr tal informâ il sisteme di autenticazion cuâl ch'al è il non dal host "
-+"dal'utent: %s"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2152
-+#: ../daemon/gdm-session-worker.c:1077
- #, c-format
--msgid "%s: Could not read Authentication Names"
-+msgid "error informing authentication system of user's console: %s"
- msgstr ""
-+"erôr tal informâ il sisteme di autenticazion cuale che jè la console "
-+"dal'utent: %s"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2161
-+#: ../daemon/gdm-session-worker.c:1101
- #, c-format
--msgid "%s: Could not read Authentication Data"
-+msgid "error informing authentication system of display string: %s"
- msgstr ""
-+"erôr tal informâ il sisteme di autenticazion cuale che jè la stringe dal "
-+"visôr: %s"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2171
-+#: ../daemon/gdm-session-worker.c:1116
- #, c-format
--msgid "%s: Could not read Authorization List"
-+msgid "error informing authentication system of display xauth credentials: %s"
- msgstr ""
-+"erôr tal informâ il sisteme di autenticazion cualis che son lis credenziâls "
-+"xauth dal visôr: %s"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2190
-+#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471
- #, c-format
--msgid "%s: Could not read Manufacturer ID"
--msgstr ""
-+msgid "no user account available"
-+msgstr "nol è pussibil doprâ nissun account user"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2217
--#, c-format
--msgid "%s: Failed checksum from %s"
--msgstr ""
-+#: ../daemon/gdm-session-worker.c:1498
-+#, fuzzy
-+#| msgid "Unable to authorize user"
-+msgid "Unable to change to user"
-+msgstr "Impussibil autorizâ l'utent"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2469
--#, c-format
--msgid "%s: Got Manage from banned host %s"
-+#: ../daemon/gdm-simple-slave.c:1426
-+msgid ""
-+"Could not start the X server (your graphical environment) due to an internal "
-+"error. Please contact your system administrator or check your syslog to "
-+"diagnose. In the meantime this display will be disabled.  Please restart GDM "
-+"when the problem is corrected."
- msgstr ""
-+"Impussibil fâ partî il server X (l'ambient grafic) par cause di un erôr "
-+"interni. Par plasê scrîf al to aministradôr di sisteme o controle il "
-+"regjistri di sisteme (çoc di sisteme - syslog) par capî il probleme: pal "
-+"moment il visôr al vignarà disabilitât. Une volte justât il probleme, "
-+"reinvie GDM."
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2478
--#: ../daemon/gdm-xdmcp-display-factory.c:2744
-+#: ../daemon/gdm-simple-slave.c:1467
- #, c-format
--msgid "%s: Could not read Session ID"
--msgstr ""
-+msgid "Can only be called before user is logged in"
-+msgstr "Al puès sedi clamât nome prime che l'utent al vedi fat l'acès."
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2492
-+#: ../daemon/gdm-simple-slave.c:1477
- #, c-format
--msgid "%s: Could not read Display Class"
--msgstr ""
-+msgid "Caller not GDM"
-+msgstr "Clamadôr no GDM"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2597
--#: ../daemon/gdm-xdmcp-display-factory.c:2647
--#: ../daemon/gdm-xdmcp-display-factory.c:2653
--#, c-format
--msgid "%s: Could not read address"
--msgstr ""
-+#: ../daemon/gdm-simple-slave.c:1530
-+msgid "User not logged in"
-+msgstr "L'utent no'l à eseguît l'acès"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2727
-+#: ../daemon/gdm-xdmcp-chooser-slave.c:370
- #, c-format
--msgid "%s: Got KEEPALIVE from banned host %s"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2816
--msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
--msgstr "GdmXdmcpDisplayFactory: No si rive a lei l'header di XDMCP!"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2822
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226
--msgid "XMDCP: Incorrect XDMCP version!"
--msgstr "XMDCP: la version di XDMCP so je chê juste!"
-+msgid "Currently, only one client can be connected at once"
-+msgstr "Par cumò nome un client ae volte al puès sedi tacât"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2828
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232
--msgid "XMDCP: Unable to parse address"
--msgstr ""
--
--#: ../daemon/gdm-xdmcp-display-factory.c:3226
--#, c-format
--msgid "Could not get server hostname: %s!"
--msgstr ""
-+#: ../daemon/gdm-xdmcp-display-factory.c:604
-+msgid "Could not create socket!"
-+msgstr "No puès creâ socket!"
- 
--#: ../daemon/main.c:230 ../daemon/main.c:243
-+#: ../daemon/main.c:126 ../daemon/main.c:139
- #, c-format
--msgid "Cannot write PID file %s: possibly out of diskspace: %s"
--msgstr ""
-+msgid "Cannot write PID file %s: possibly out of disk space: %s"
-+msgstr "No puès scrivi il file PID %s: forsit al è finît il spazi su disc: %s"
- 
--#: ../daemon/main.c:263
-+#: ../daemon/main.c:166
- #, c-format
- msgid "Logdir %s does not exist or isn't a directory."
- msgstr "Logdir %s no esist opûr no je une directory."
- 
--#: ../daemon/main.c:276
-+#: ../daemon/main.c:183
- #, c-format
- msgid "Authdir %s does not exist. Aborting."
- msgstr "Authdir %s nol esist. O voi fûr."
- 
--#: ../daemon/main.c:280
-+#: ../daemon/main.c:187
- #, c-format
- msgid "Authdir %s is not a directory. Aborting."
- msgstr "Authdir %s no je une directory. O voi fûr."
- 
--#: ../daemon/main.c:354
-+#: ../daemon/main.c:261
- #, c-format
- msgid "Authdir %s is not owned by user %d, group %d. Aborting."
--msgstr ""
-+msgstr "Authdir %s a no jè di proprietât dal'utent %d, grup %d. O voi fûr."
- 
--#: ../daemon/main.c:361
-+#: ../daemon/main.c:268
- #, c-format
- msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting."
--msgstr ""
-+msgstr "Authdir %s a ja permès sbagliâts %o. A varessin di sedi %o. O voi fûr."
- 
--#: ../daemon/main.c:398
-+#: ../daemon/main.c:305
- #, c-format
- msgid "Can't find the GDM user '%s'. Aborting!"
- msgstr "No rivi a cjatâ l'utent '%s' di GDM. O voi fûr!"
- 
--#: ../daemon/main.c:404
-+#: ../daemon/main.c:311
- msgid "The GDM user should not be root. Aborting!"
- msgstr "L'user di GDM nol scugne jessi root. O voi fûr!"
- 
--#: ../daemon/main.c:410
-+#: ../daemon/main.c:317
- #, c-format
- msgid "Can't find the GDM group '%s'. Aborting!"
- msgstr "No rivi a cjatâ il grop '%s' di GDM. O voi fûr!"
- 
--#: ../daemon/main.c:416
-+#: ../daemon/main.c:323
- msgid "The GDM group should not be root. Aborting!"
- msgstr "Il grop di GDM nol scugne jessi root. O voi fûr!"
- 
--#: ../daemon/main.c:510
--msgid "Enable debugging code"
--msgstr ""
--
--#: ../daemon/main.c:511
-+#: ../daemon/main.c:434
- msgid "Make all warnings fatal"
--msgstr ""
-+msgstr "Fâs diventâ dutis lis avertencis fatai."
- 
--#: ../daemon/main.c:512
--msgid "Exit after a time - for debugging"
--msgstr ""
-+#: ../daemon/main.c:435
-+msgid "Exit after a time (for debugging)"
-+msgstr "Jes dopo un pôc (par il debug)"
- 
--#: ../daemon/main.c:513
-+#: ../daemon/main.c:436
- msgid "Print GDM version"
- msgstr "Stampe la version di GDM"
- 
--#: ../daemon/main.c:528
-+#: ../daemon/main.c:449
- msgid "GNOME Display Manager"
- msgstr "GNOME Display Manager"
- 
- #. make sure the pid file doesn't get wiped
--#: ../daemon/main.c:589
--msgid "Only root wants to run GDM"
-+#: ../daemon/main.c:503
-+#, fuzzy
-+#| msgid "Only root wants to run GDM"
-+msgid "Only the root user can run GDM"
- msgstr "Dome root al pos inviâ GDM"
- 
--#: ../daemon/session-worker-main.c:134
-+#. Translators: worker is a helper process that does the work
-+#. of starting up a session
-+#: ../daemon/session-worker-main.c:150
- msgid "GNOME Display Manager Session Worker"
--msgstr ""
-+msgstr "Cjamadôr di session dal Gjestôr di visôr di GNOME"
- 
--#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148
--msgid "Select System"
--msgstr ""
-+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178
-+msgid "Display ID"
-+msgstr "Mostre ID"
- 
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:214
--msgid "XMCP: Could not create XDMCP buffer!"
--msgstr ""
-+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178
-+msgid "ID"
-+msgstr "ID"
- 
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220
--msgid "XDMCP: Could not read XDMCP header!"
--msgstr ""
-+#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188
-+msgid "GNOME Display Manager Slave"
-+msgstr "Sclâf dal gjestôr di visôr di GNOME"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.c:808
--msgid "Accessibility Preferences"
--msgstr ""
-+#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566
-+msgid "Login Window"
-+msgstr "Barcon di acès"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:1
--msgid "<b>Enable features that make your computer easier to use:</b>"
--msgstr ""
-+#: ../data/applications/gnome-mag.desktop.in.h:1
-+msgid "GNOME Screen Magnifier"
-+msgstr "Lint di ingrandiment dal visôr GNOME"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:2
--msgid "Assistive Technology Preferences"
--msgstr ""
-+#: ../data/applications/gnome-mag.desktop.in.h:2
-+msgid "Magnify parts of the screen"
-+msgstr "Ingrandìs zonis dal visôr"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:3
--msgid "_Hear text read aloud (Reader)"
--msgstr ""
-+#: ../data/applications/gnome-shell.desktop.in.h:1
-+msgid "GNOME Shell"
-+msgstr "GNOME Shell"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:4
--msgid "_Ignore duplicate keypresses (Bounce Keys)"
--msgstr ""
-+#: ../data/applications/gnome-shell.desktop.in.h:2
-+msgid "Window management and compositing"
-+msgstr "Ministre e cumbine i barcons"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:5
--msgid "_Make items larger (Magnifier)"
--msgstr ""
-+#: ../data/applications/gok.desktop.in.h:1
-+msgid "GNOME On-Screen Keyboard"
-+msgstr "Tastiere a visôr di GNOME"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:6
--msgid "_Only accept long held keypresses (Slow Keys)"
--msgstr ""
-+#: ../data/applications/gok.desktop.in.h:2
-+msgid "Use an on-screen keyboard"
-+msgstr "Dopre une tastiere a visôr"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:7
--msgid "_Press keyboard shortcuts one key at a time (Sticky Keys)"
--msgstr ""
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:1
-+msgid "Whether or not to allow fingerprint readers for login"
-+msgstr "Specifiche se permeti o no l'acès cun i letôrs di improntis digitai"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:8
--msgid "_See more contrast in colors (High Contrast)"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2
-+msgid ""
-+"The login screen can optionally allow users who have enrolled their "
-+"fingerprints to log in using those prints."
- msgstr ""
-+"La schermade di acès a puès permeti, ai utents che a j an regjistrât lis "
-+"improntis, di dopralis par eseguî l'acès."
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:9
--msgid "_Type without the keyboard (On-screen Keyboard)"
--msgstr ""
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:3
-+msgid "Whether or not to allow smartcard readers for login"
-+msgstr "Specifiche se permeti o no l'acès cun i letôrs di smartcard"
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:10
--msgid "_Use a larger font size (Large Print)"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4
-+msgid ""
-+"The login screen can optionally allow users who have smartcards to log in "
-+"using those smartcards."
- msgstr ""
-+"La schermade di acès a puès permeti, ai utents che a j an une smartcard, di "
-+"doprale par eseguî l'acès."
- 
--#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:11
--#, fuzzy
--msgid "gtk-close"
--msgstr "gtk-cancel"
--
--#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:220
--msgid "Value"
--msgstr ""
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:5
-+msgid "Path to small image at top of user list"
-+msgstr "Percors di une piçule figure insomp a le liste dai utents"
- 
--#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:221
--msgid "percentage of time complete"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6
-+msgid ""
-+"The login screen can optionally show a small image at the top of its user "
-+"list to provide site administrators and distributions a way to provide "
-+"branding."
- msgstr ""
-+"La schermade di acès a puès permeti di viodi une piçule figure insomp a le "
-+"liste dai utents par dâ ai ministradôrs e âs distribuzions un mût par aplicâ "
-+"il lôr brand."
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1156
--msgid "Inactive Text"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7
-+msgid ""
-+"The fallback login screen can optionally show a small image at the top of "
-+"its user list to provide site administrators and distributions a way to "
-+"provide branding."
- msgstr ""
-+"La schermade di login di rapeç a puès permeti di viodi une piçule figure "
-+"insomp a le liste dai utents par dâ ai ministradôrs e âs distribuzions un "
-+"mût par aplicâ il lôr brand."
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1157
--msgid "The text to use in the label if the user hasn't picked an item yet"
--msgstr ""
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:8
-+msgid "Avoid showing user list"
-+msgstr "Evite di mostrâ la liste dai utents"
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1165
--msgid "Active Text"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9
-+msgid ""
-+"The login screen normally shows a list of available users to log in as. This "
-+"setting can be toggled to disable showing the user list."
- msgstr ""
-+"La schermade di acès di norme a mostre une liste dai utents disponibii par "
-+"eseguî l'acès. Cheste impostazion a puès sedi cambiade par no mostrâ la "
-+"liste dai utents."
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1166
--msgid "The text to use in the label if the user has picked an item"
--msgstr ""
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:10
-+msgid "Enable showing the banner message"
-+msgstr "Abilite la vision de insegne"
- 
--#: ../gui/simple-greeter/gdm-clock-widget.c:66
--msgid "%l:%M:%S %p"
--msgstr "%l:%M:%S %p"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:11
-+msgid "Set to true to show the banner message text."
-+msgstr "Imposte a VÊR par viodi il test de insegne."
- 
--#: ../gui/simple-greeter/gdm-clock-widget.c:66
--msgid "%l:%M %p"
--msgstr "%l:%M %p"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:12
-+msgid "Banner message text"
-+msgstr "Test de insegne"
- 
--#. translators: replace %e with %d if, when the day of the
--#. *              month as a decimal number is a single digit, it
--#. *              should begin with a 0 in your locale (e.g. "May
--#. *              01" instead of "May  1").
--#.
--#: ../gui/simple-greeter/gdm-clock-widget.c:72
--msgid "%a %b %e"
--msgstr "%a %b %e"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:13
-+msgid "Text banner message to show in the login window."
-+msgstr "Test de insegne di mostrâ in tal barcon di acès."
- 
--#. translators: reverse the order of these arguments
--#. *              if the time should come before the
--#. *              date on a clock in your locale.
--#.
--#: ../gui/simple-greeter/gdm-clock-widget.c:77
--#, c-format
--msgid "%1$s, %2$s"
--msgstr "%1$s, %2$s"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:14
-+msgid "Disable showing the restart buttons"
-+msgstr "Tapone il pipul di reinviament"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:174
--msgid "You have the Caps Lock key on."
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:15
-+msgid "Set to true to disable showing the restart buttons in the login window."
- msgstr ""
-+"Imposte a VÊR par taponâ il pipul di reinviament in tal barcon di acès."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:278
--msgid "Automatically logging in..."
--msgstr ""
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16
-+msgid "Number of allowed authentication failures"
-+msgstr "Numar massim di faliments di autenticazion"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1121
--msgid "Select language and click Log In"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17
-+msgid ""
-+"The number of times a user is allowed to attempt authentication, before "
-+"giving up and going back to user selection."
- msgstr ""
-+"Il numar di voltis che un utent al puès cirî di autenticasi, prime di "
-+"rindisi e tornâ ae selezion dal'utent."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1715
--msgid "Login Window"
--msgstr ""
-+#: ../gui/libgdm/gdm-user-switching.c:72
-+msgid "Unable to create transient display: "
-+msgstr "Impussibil creâ il visôr transitori:"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:1
--msgid "Authentication Dialog"
--msgstr "Dialogo di autenticazion"
-+#: ../gui/libgdm/gdm-user-switching.c:183
-+#: ../gui/libgdm/gdm-user-switching.c:395
-+#, fuzzy
-+#| msgid "unable to log session"
-+msgid "Unable to activate session: "
-+msgstr "impussibil loggasi ta session"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:2
--msgid "Computer Name"
--msgstr "Nom dal computer"
-+#: ../gui/libgdm/gdm-user-switching.c:344
-+#: ../gui/libgdm/gdm-user-switching.c:514
-+#, c-format
-+msgid "Could not identify the current session."
-+msgstr "Impussibil identificâ la session atuâl."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:3
--msgid "Log In"
--msgstr "Log In"
-+#: ../gui/libgdm/gdm-user-switching.c:351
-+#, fuzzy, c-format
-+#| msgid "unable to log session"
-+msgid "User unable to switch sessions."
-+msgstr "impussibil loggasi ta session"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:4
--msgid "Restart"
--msgstr "Torne a inviâ"
-+#: ../gui/libgdm/gdm-user-switching.c:523
-+#, c-format
-+msgid "Could not identify the current seat."
-+msgstr "Impussibil identificâ la postazion atuâl."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:5
--msgid "Shut Down"
--msgstr "Stude"
-+#: ../gui/libgdm/gdm-user-switching.c:533
-+#, c-format
-+msgid ""
-+"The system is unable to determine whether to switch to an existing login "
-+"screen or start up a new login screen."
-+msgstr ""
-+"Il sisteme nol rive a capî se passâ a une schermadi di acès esistent o creâ "
-+"une gnove."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:6
--msgid "Suspend"
--msgstr "Sospent"
-+#: ../gui/libgdm/gdm-user-switching.c:541
-+#, c-format
-+msgid "The system is unable to start up a new login screen."
-+msgstr "Il sisteme a nol rive a fâ partî une gnove schermade di acès."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:7
--msgid "Version"
--msgstr "Version"
-+#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147
-+msgid "Select System"
-+msgstr "Selezione sisteme"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:8
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215
- #, fuzzy
--msgid "gtk-disconnect"
--msgstr "Disconet"
-+#| msgid "XMDCP: Incorrect XDMCP version!"
-+msgid "XDMCP: Could not create XDMCP buffer!"
-+msgstr "XMDCP: la version di XDMCP so je chê juste!"
-+
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221
-+msgid "XDMCP: Could not read XDMCP header!"
-+msgstr "XDMCP: Impussibil lei l'intestazion XDMCP."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:9
--msgid "page 5"
--msgstr "pagjine 5"
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
-+msgid "XMDCP: Incorrect XDMCP version!"
-+msgstr "XMDCP: la version di XDMCP so je chê juste!"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:503
--msgid "Panel"
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
-+msgid "XMDCP: Unable to parse address"
- msgstr ""
- 
--#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:153
--#, fuzzy
--msgid "Languages"
--msgstr "Manager"
-+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287
-+msgid "Fingerprint Authentication"
-+msgstr "Autenticazion cun impronte digitâl"
- 
--#: ../gui/simple-greeter/gdm-language-chooser-widget.c:187
--msgid "_Languages:"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293
-+msgid "Log into session with fingerprint"
-+msgstr "Acedi al sisteme cun il letôr di improntis"
- 
--#: ../gui/simple-greeter/gdm-language-chooser-widget.c:188
--#: ../gui/simple-greeter/gdm-language-option-widget.c:212
--msgid "_Language:"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287
-+#, fuzzy
-+#| msgid "Authentication Dialog"
-+msgid "Password Authentication"
-+msgstr "Dialogo di autenticazion"
- 
--#: ../gui/simple-greeter/gdm-language-option-widget.c:180
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:80
--#: ../gui/user-switch-applet/applet.c:1139
--msgid "Other..."
--msgstr "Altri..."
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293
-+msgid "Log into session with username and password"
-+msgstr "Acedi al sisteme cun non utent e password"
- 
--#: ../gui/simple-greeter/gdm-language-option-widget.c:181
--msgid "Choose a language from the full list of available languages."
--msgstr ""
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408
-+msgid "Log In"
-+msgstr "Acès"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:476
--msgid "Label Text"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155
-+msgid "Slot ID"
-+msgstr "ID dal slot"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:477
--msgid "The text to use as a label"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156
-+msgid "The slot the card is in"
-+msgstr "Il slot dulà che a jè inseride la cjarte"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:484
--msgid "Icon name"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162
-+msgid "Slot Series"
-+msgstr "Serie dal slot"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:485
--msgid "The icon to use with the label"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163
-+msgid "per-slot card identifier"
-+msgstr "identificatôr de cjarte par slot"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:493
--msgid "Default Item"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170
-+#, fuzzy
-+msgid "name"
-+msgstr "Non utent:"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:494
--msgid "The id of the default item"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174
-+msgid "Module"
-+msgstr "Modul"
- 
--#: ../gui/simple-greeter/gdm-recent-option-widget.c:298
--msgid "Max Item Count"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175
-+msgid "smartcard driver"
-+msgstr "driver smartcard"
- 
--#: ../gui/simple-greeter/gdm-recent-option-widget.c:299
--msgid "The maximum number of items to keep around in the list"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408
-+#, fuzzy
-+#| msgid "Authentication Dialog"
-+msgid "Smartcard Authentication"
-+msgstr "Dialogo di autenticazion"
- 
--#: ../gui/simple-greeter/gdm-remote-login-window.c:243
--#, c-format
--msgid "Remote Login (Connecting to %s...)"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414
-+msgid "Log into session with smartcard"
-+msgstr "Acedi al sisteme cun la smartcard"
- 
--#: ../gui/simple-greeter/gdm-remote-login-window.c:257
--#, c-format
--msgid "Remote Login (Connected to %s)"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186
-+msgid "Module Path"
-+msgstr "Percors dal modul"
- 
--#: ../gui/simple-greeter/gdm-remote-login-window.c:336
--msgid "Remote Login"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187
-+msgid "path to smartcard PKCS #11 driver"
-+msgstr "percors dal driver de smartcard PKCS #11"
- 
--#: ../gui/simple-greeter/gdm-session-option-widget.c:162
--msgid "_Sessions:"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527
-+#, fuzzy
-+msgid "received error or hang up from event source"
-+msgstr "ricevût erôr o siaradure de sorgint dal'event"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1
--msgid "Banner message text"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661
-+#, fuzzy, c-format
-+msgid "NSS security system could not be initialized"
-+msgstr "il sisteme di sigurece NSS nol puès sedi fat partî"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2
--msgid "Disable showing the accessibility button"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789
-+#, c-format
-+msgid "no suitable smartcard driver could be found"
-+msgstr "nol è stât cjatât nissun driver util pe smartcard"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3
--msgid "Disable showing the restart buttons"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803
-+#, c-format
-+msgid "smartcard driver '%s' could not be loaded"
-+msgstr "il driver de smartcard '%s' a nol puès sedi cjamât"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4
--msgid "Enable accessibility keyboard plugin"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875
-+#, c-format
-+msgid "could not watch for incoming card events - %s"
- msgstr ""
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5
--msgid "Enable on-screen keyboard"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242
-+#, c-format
-+msgid "encountered unexpected error while waiting for smartcard events"
- msgstr ""
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6
--msgid "Enable screen magnifier"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287
-+#, fuzzy
-+#| msgid "Authentication Dialog"
-+msgid "Authentication"
-+msgstr "Dialogo di autenticazion"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7
--msgid "Enable screen reader"
--msgstr ""
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293
-+msgid "Log into session"
-+msgstr "Acedi al sisteme"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8
--msgid "Enable showing the banner message"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239
-+msgid "Value"
-+msgstr "Valôr"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9
--msgid "Icon name to use for greeter logo"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240
-+msgid "percentage of time complete"
-+msgstr "Percentuâl di timp completade"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10
--msgid ""
--"Set to TRUE to disable showing the accessibility button in the login window."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1465
-+msgid "Inactive Text"
-+msgstr "Test inatîf"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11
--msgid "Set to TRUE to disable showing the restart buttons in the login window."
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1466
-+msgid "The text to use in the label if the user hasn't picked an item yet"
- msgstr ""
-+"Test di doprâ in te etichete se l'utent nol à ancjemò sielzût un element"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12
--msgid "Set to True to enable the background settings manager plugin."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1474
-+msgid "Active Text"
-+msgstr "Test atîf"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
--msgid "Set to True to enable the on-screen keyboard."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1475
-+msgid "The text to use in the label if the user has picked an item"
-+msgstr "Test di doprâ in te etichete se l'utent al à sielzût un element"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
--msgid ""
--"Set to True to enable the plugin to manage the accessibility keyboard "
--"settings."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1484
-+msgid "List Visible"
-+msgstr "Liste visibile"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
--msgid "Set to True to enable the screen magnifier."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1485
-+msgid "Whether the chooser list is visible"
-+msgstr "Indiche se la liste dal seletôr a jè visibile"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16
--msgid "Set to True to enable the screen reader."
--msgstr ""
-+#. translators: This is the time format to use when both
-+#. * the date and time with seconds are being shown together.
-+#.
-+#: ../gui/simple-greeter/gdm-clock-widget.c:70
-+#, fuzzy
-+#| msgid "%l:%M:%S %p"
-+msgid "%a %b %e, %l:%M:%S %p"
-+msgstr "%l:%M:%S %p"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17
--msgid "Set to True to enable the xsettings settings manager plugin."
--msgstr ""
-+#. translators: This is the time format to use when both
-+#. * the date and time without seconds are being shown together.
-+#.
-+#: ../gui/simple-greeter/gdm-clock-widget.c:76
-+#, fuzzy
-+#| msgid "%l:%M %p"
-+msgid "%a %b %e, %l:%M %p"
-+msgstr "%l:%M %p"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
--msgid "Set to the themed icon name to use for the greeter logo."
--msgstr ""
-+#. translators: This is the time format to use when there is
-+#. * no date, just weekday and time with seconds.
-+#.
-+#: ../gui/simple-greeter/gdm-clock-widget.c:83
-+#, fuzzy
-+#| msgid "%l:%M:%S %p"
-+msgid "%a %l:%M:%S %p"
-+msgstr "%l:%M:%S %p"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
--msgid "Set to true to show the banner message text."
--msgstr ""
-+#. translators: This is the time format to use when there is
-+#. * no date, just weekday and time without seconds.
-+#.
-+#: ../gui/simple-greeter/gdm-clock-widget.c:92
-+#, fuzzy
-+#| msgid "%l:%M %p"
-+msgid "%a %l:%M %p"
-+msgstr "%l:%M %p"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
--msgid "Text banner message to show on the login window."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:314
-+msgid "Automatically logging in…"
-+msgstr "Acès automatic..."
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
--msgid "True if the background settings manager plugin is enabled."
--msgstr ""
-+#. need to wait for response from backend
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:930
-+msgid "Cancelling…"
-+msgstr "Anulament..."
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
--msgid "True if the xsettings settings manager plugin is enabled."
--msgstr ""
-+#. just wait for the user to select language and stuff
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486
-+msgid "Select language and click Log In"
-+msgstr "Selezione la lenghe e sclice Acêt"
- 
--#: ../gui/simple-greeter/gdm-user.c:239
--msgid "Manager"
--msgstr "Manager"
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622
-+msgctxt "customsession"
-+msgid "Custom"
-+msgstr "Personalizade"
- 
--#: ../gui/simple-greeter/gdm-user.c:240
--msgid "The user manager object this user is controlled by."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623
-+#, fuzzy
-+#| msgid "unable to log session"
-+msgid "Custom session"
-+msgstr "impussibil loggasi ta session"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:81
--msgid "Choose a different account"
--msgstr "Sielz un account diferent"
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
-+msgid "Computer Name"
-+msgstr "Non dal computer"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:93
--msgid "Guest"
--msgstr "Ospit"
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
-+msgid "Version"
-+msgstr "Version"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:94
--msgid "Login as a temporary guest"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
-+msgid "Cancel"
-+msgstr "Anule"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:106
--msgid "Automatic Login"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4
-+msgid "Unlock"
-+msgstr "Sbloche"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:107
--msgid "Automatically login to the system after selecting options"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5
-+msgid "Login"
-+msgstr "Acès"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:403
--#, c-format
--msgid "Log in as %s"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:953
-+msgid "Suspend"
-+msgstr "Sospent"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:487
--msgid "Currently logged in"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:958
-+msgid "Restart"
-+msgstr "Torne a inviâ"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:531
--#, fuzzy
--msgid "_Users:"
--msgstr "Non utent:"
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:962
-+msgid "Shut Down"
-+msgstr "Stude"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:532
--#, fuzzy
--msgid "_User:"
--msgstr "Non utent:"
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:1011
-+msgid "Unknown time remaining"
-+msgstr "Timp mancjant no cognossût"
- 
--#: ../gui/user-switch-applet/applet.c:121
--msgid "Missing Required File"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:1033
-+msgid "Panel"
-+msgstr "Panel"
- 
--#: ../gui/user-switch-applet/applet.c:123
--#, c-format
--msgid ""
--"The User Selector's interfaces file, `%s', could not be opened. It is likely "
--"that this application was not properly installed or configured."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-option-widget.c:505
-+msgid "Label Text"
-+msgstr "Test etichete"
- 
--#: ../gui/user-switch-applet/applet.c:184
--msgid ""
--"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."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-option-widget.c:506
-+msgid "The text to use as a label"
-+msgstr "Il test di doprâ come etichete"
- 
--#: ../gui/user-switch-applet/applet.c:188
--msgid ""
--"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."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-option-widget.c:513
-+msgid "Icon name"
-+msgstr "Non icone"
- 
--#: ../gui/user-switch-applet/applet.c:192
--msgid ""
--"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 "
--msgstr ""
-+#: ../gui/simple-greeter/gdm-option-widget.c:514
-+msgid "The icon to use with the label"
-+msgstr "L'icone di doprâ cun l'etichete"
- 
--#: ../gui/user-switch-applet/applet.c:206
--msgid "A menu to quickly switch between users."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-option-widget.c:522
-+msgid "Default Item"
-+msgstr "Element predefinît"
- 
--#: ../gui/user-switch-applet/applet.c:210
--msgid "translator-credits"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-option-widget.c:523
-+msgid "The ID of the default item"
-+msgstr "Il ID dal element predefinît"
- 
--#: ../gui/user-switch-applet/applet.c:780
-+#: ../gui/simple-greeter/gdm-remote-login-window.c:188
- #, c-format
--msgid "Can't lock screen: %s"
--msgstr ""
-+msgid "Remote Login (Connecting to %s…)"
-+msgstr "Acès a distance (Conession a %s…)"
- 
--#: ../gui/user-switch-applet/applet.c:802
-+#: ../gui/simple-greeter/gdm-remote-login-window.c:202
- #, c-format
--msgid "Can't temporarily set screensaver to blank screen: %s"
--msgstr ""
--
--#: ../gui/user-switch-applet/applet.c:974
--msgid "User Switch Applet"
--msgstr ""
--
--#: ../gui/user-switch-applet/applet.c:995
--#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2
--msgid "User Switcher"
--msgstr ""
-+msgid "Remote Login (Connected to %s)"
-+msgstr "Acès a distance (Conettût a %s…)"
- 
--#: ../gui/user-switch-applet/applet.c:1092
--msgid "Unknown"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-remote-login-window.c:281
-+msgid "Remote Login"
-+msgstr "Acès a distance"
- 
--#: ../gui/user-switch-applet/gdm-user-menu-item.c:336
-+#: ../gui/simple-greeter/gdm-session-option-widget.c:162
- #, fuzzy
--msgid "User"
--msgstr "Non utent:"
--
--#: ../gui/user-switch-applet/gdm-user-menu-item.c:337
--msgid "The user this menu item represents."
--msgstr ""
--
--#: ../gui/user-switch-applet/gdm-user-menu-item.c:344
--msgid "Icon Size"
--msgstr ""
--
--#: ../gui/user-switch-applet/gdm-user-menu-item.c:345
--msgid "The size of the icon to use."
--msgstr ""
--
--#: ../gui/user-switch-applet/gdm-user-menu-item.c:351
--msgid "Indicator Size"
--msgstr ""
--
--#: ../gui/user-switch-applet/gdm-user-menu-item.c:352
--msgid "Size of check indicator"
--msgstr ""
-+#| msgid "Version"
-+msgid "Session"
-+msgstr "Version"
- 
--#: ../gui/user-switch-applet/gdm-user-menu-item.c:357
--msgid "Indicator Spacing"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-timer.c:147
-+msgid "Duration"
-+msgstr "Durade"
- 
--#: ../gui/user-switch-applet/gdm-user-menu-item.c:358
--msgid "Space between the username and the indicator"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-timer.c:148
-+msgid "Number of seconds until timer stops"
-+msgstr "Numar di seconts prime che il timer al finissi"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:1
--msgid "<span weight=\"bold\" size=\"larger\">Multiple Logins Found</span>"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-timer.c:155
-+msgid "Start time"
-+msgstr "Moment di inviament"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:2
--msgid "Appearance"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-timer.c:156
-+msgid "Time the timer was started"
-+msgstr "Moment che il tilmer al è stât inviât"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:3
--msgid "Continue"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-timer.c:163
-+msgid "Is it Running?"
-+msgstr "Isal in esecuzion?"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:4
--msgid "Create new logins in _nested windows"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-timer.c:164
-+msgid "Whether the timer is currently ticking"
-+msgstr "Indiche se il timer cumò al stâ lant indenant "
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:5
--msgid "Details"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800
-+#, c-format
-+msgid "Log in as %s"
-+msgstr "Acès come %s"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:6
--msgid "Multiple Logins Found - User Switcher"
--msgstr ""
-+#. translators: This option prompts
-+#. * the user to type in a username
-+#. * manually instead of choosing from
-+#. * a list.
-+#.
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544
-+#, fuzzy
-+msgctxt "user"
-+msgid "Other…"
-+msgstr "Altri..."
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:7
--msgid "Options"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545
-+msgid "Choose a different account"
-+msgstr "Sielz un account diferent"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:8
--msgid "Some preferences have been locked by the system adminstrator."
--msgstr ""
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559
-+msgid "Guest"
-+msgstr "Ospit"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:9
--msgid ""
--"The user you want to switch to is logged in multiple times on this computer. "
--"Which login do you want to switch to?"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560
-+msgid "Log in as a temporary guest"
-+msgstr "Acêt come ospit provisori"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:10
--msgid "Use the `people' icon for the menu title"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575
-+msgid "Automatic Login"
-+msgstr "Acès automatic"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:11
--msgid "Use the current user's name for the menu title"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576
-+msgid "Automatically log into the system after selecting options"
-+msgstr "Acedi automaticamentri al sisteme dopo vê selezionât lis opzions"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:12
--msgid "Use the word `Users' as the menu title"
--msgstr ""
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332
-+msgid "Currently logged in"
-+msgstr "Acès bielza eseguît"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:13
--msgid "User Switcher Error"
--msgstr ""
-+#: ../utils/gdm-screenshot.c:43
-+msgid "Debugging output"
-+msgstr "Debugging output"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:14
--msgid "User Switcher Preferences"
--msgstr ""
-+#: ../utils/gdm-screenshot.c:212
-+msgid "Screenshot taken"
-+msgstr "Screenshot fat"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:15
--msgid "Users"
--msgstr ""
-+#. Option parsing
-+#: ../utils/gdm-screenshot.c:279
-+msgid "Take a picture of the screen"
-+msgstr "Fâs une figure dal visôr"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:16
--msgid ""
--"When a new login must be created to switch users, create it in a window "
--"instead of on a new screen"
--msgstr ""
-+#~ msgid "id"
-+#~ msgstr "id"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:17
--msgid ""
--"When changing to a different display, activate the screensaver for this "
--"display."
--msgstr ""
-+#~ msgid "Unable to authenticate user"
-+#~ msgstr "Impussibil autenticâ l'utent"
- 
--#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:18
--msgid "_Lock the screen after switching users"
--msgstr ""
-+#~ msgid "Group %s doesn't exist"
-+#~ msgstr "Il grop %s nol esist"
- 
--#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1
--msgid "A menu to quickly switch between users"
--msgstr ""
-+#~ msgid "Error in checksum"
-+#~ msgstr "Erôr tal checksum"
- 
--#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3
--msgid "User Switcher Applet Factory"
--msgstr ""
-+#~ msgid "Bad address"
-+#~ msgstr "Indiriz sbagliât"
- 
--#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1
--msgid "Edit Personal _Information"
--msgstr ""
-+#~ msgid "%s: Error in checksum"
-+#~ msgstr "%s: Erôr tal checksum"
- 
--#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2
--msgid "_About"
--msgstr ""
-+#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
-+#~ msgstr "GdmXdmcpDisplayFactory: No si rive a lei l'header di XDMCP!"
- 
--#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3
--msgid "_Edit Users and Groups"
--msgstr ""
-+#, fuzzy
-+#~ msgid "gtk-close"
-+#~ msgstr "gtk-cancel"
- 
--#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:4
--msgid "_Help"
--msgstr ""
-+#~ msgid "%a %b %e"
-+#~ msgstr "%a %b %e"
- 
--#: ../utils/gdmflexiserver.c:59
--msgid "Send the specified protocol command to GDM"
--msgstr ""
-+#~ msgid "%1$s, %2$s"
-+#~ msgstr "%1$s, %2$s"
- 
--#: ../utils/gdmflexiserver.c:59
--msgid "COMMAND"
--msgstr ""
-+#, fuzzy
-+#~ msgid "gtk-disconnect"
-+#~ msgstr "Disconet"
- 
--#: ../utils/gdmflexiserver.c:60
--msgid "Xnest mode"
--msgstr ""
-+#~ msgid "page 5"
-+#~ msgstr "pagjine 5"
- 
--#: ../utils/gdmflexiserver.c:61
--msgid "Do not lock current screen"
--msgstr ""
-+#, fuzzy
-+#~ msgid "Languages"
-+#~ msgstr "Manager"
- 
--#: ../utils/gdmflexiserver.c:62
--msgid "Debugging output"
--msgstr ""
-+#~ msgid "Other..."
-+#~ msgstr "Altri..."
- 
--#: ../utils/gdmflexiserver.c:63
--msgid "Authenticate before running --command"
--msgstr ""
-+#~ msgid "Manager"
-+#~ msgstr "Manager"
- 
--#: ../utils/gdmflexiserver.c:64
--msgid "Start new flexible session; do not show popup"
--msgstr ""
-+#, fuzzy
-+#~ msgid "_Users:"
-+#~ msgstr "Non utent:"
- 
--#: ../utils/gdmflexiserver.c:648
--msgid "Main Options"
--msgstr ""
-+#, fuzzy
-+#~ msgid "_User:"
-+#~ msgstr "Non utent:"
- 
--#: ../utils/gdmflexiserver.c:691
--msgid "Unable to start new display"
--msgstr ""
-+#, fuzzy
-+#~ msgid "User"
-+#~ msgstr "Non utent:"
- 
- #~ msgid "CONFIGFILE"
- #~ msgstr "CONFIGFILE"
- 
- #, fuzzy
--#~ msgid "Other"
--#~ msgstr "Altri..."
--
--#, fuzzy
- #~ msgid "Display Style"
- #~ msgstr "Mostre ID"
- 
--#~ msgid "unable to log session"
--#~ msgstr "impussibil loggasi ta session"
--
- #~ msgid "Manager X Settings"
- #~ msgstr "Manager dai setagjos di X"
- 
-diff --git a/po/ml.po b/po/ml.po
-index ecad3a6..57b262b 100644
---- a/po/ml.po
-+++ b/po/ml.po
-@@ -9,18 +9,18 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: gdm.master.ml\n"
--"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
--"cgi?product=gdm&keywords=I18N+L10N&component=general\n"
--"POT-Creation-Date: 2012-09-15 14:28+0000\n"
--"PO-Revision-Date: 2012-09-19 00:51+0000\n"
--"Last-Translator: Ani Peter <apeter@redhat.com>\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-+"product=gdm&keywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2012-10-02 17:33+0000\n"
-+"PO-Revision-Date: 2012-11-27 12:11+0530\n"
-+"Last-Translator: Ani Peter <peter.ani@gmail.com>\n"
- "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
- "Language: ml\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=2; plural=(n != 1);\n"
--"X-Generator: Lokalize 1.0\n"
-+"X-Generator: Lokalize 1.5\n"
- "X-DamnedLies-Scope: partial\n"
- 
- #: ../common/gdm-common.c:492
-@@ -35,18 +35,15 @@ msgstr "സിസ്റ്റത്തില്‍ \"%s\" എന്ന ഉപയ
- 
- #: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349
- #, c-format
--#| msgid "no user account available"
- msgid "No session available yet"
- msgstr "സെഷന്‍ ലഭ്യമല്ല"
- 
- #: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384
- #, c-format
--#| msgid "Unable to authorize user"
- msgid "Unable to look up UID of user %s"
- msgstr "ഉപയോക്താവു് %s-ന്റെ യുഐഡി തെരയുവാന്‍ സാധ്യമല്ല"
- 
- #: ../daemon/gdm-manager.c:291
--#| msgid "no user account available"
- msgid "no sessions available"
- msgstr "സെഷനുകള്‍ ലഭ്യമല്ല"
- 
-@@ -57,23 +54,19 @@ msgstr "വീണ്ടും ആധികാരികത ഉറപ്പാക
- 
- #: ../daemon/gdm-manager.c:406
- #, c-format
--#| msgid "Unable to open session"
- msgid "Unable to find session for user %s"
- msgstr "%s ഉപയോക്താവിനുള്ള സെഷന്‍ കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല"
- 
- #: ../daemon/gdm-manager.c:476
- #, c-format
--#| msgid "Unable to open session"
- msgid "Unable to find appropriate session for user %s"
- msgstr "ഉപയോക്താവു് %s-നു് ഉചിതമായ സെഷന്‍ കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല"
- 
- #: ../daemon/gdm-manager.c:671
--#| msgid "User %s doesn't exist"
- msgid "User doesn't own session"
- msgstr "ഉപയോക്താവിനു് സെഷന്‍ ലഭ്യമല്ല"
- 
- #: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768
--#| msgid "no user account available"
- msgid "No session available"
- msgstr "സെഷനുകള്‍ ലഭ്യമല്ല"
- 
-@@ -85,7 +78,8 @@ msgstr "%s: പേരന്റ് ഡിസ്പ്ളെ '%s'-മായി ക
- #: ../daemon/gdm-server.c:452
- #, c-format
- msgid "Server was to be spawned by user %s but that user doesn't exist"
--msgstr "സെര്‍വര്‍ തുടങ്ങേണ്ട ഉപയോക്താവു് %s ആയിരുന്നെങ്കിലും ആ ഉപയോക്താവു് നിലവിലില്ല"
-+msgstr ""
-+"സെര്‍വര്‍ തുടങ്ങേണ്ട ഉപയോക്താവു് %s ആയിരുന്നെങ്കിലും ആ ഉപയോക്താവു് നിലവിലില്ല"
- 
- #: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483
- #, c-format
-@@ -147,7 +141,7 @@ msgstr "ഡിസ്പ്ലെ ഡിവൈസ്"
- msgid "The display device"
- msgstr "ഡിസ്പ്ലെ ഡിവൈസ്"
- 
--#: ../daemon/gdm-session.c:1177
-+#: ../daemon/gdm-session.c:1184
- msgid "Could not create authentication helper process"
- msgstr "ആധികാരികതയ്ക്കുള്ള സഹായ പ്രക്രിയ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല"
- 
-@@ -210,37 +204,40 @@ msgstr "ഉപയോക്താവിനുള്ള അക്കൌണ്ട
- msgid "Unable to change to user"
- msgstr "ഉപയോക്താവായി മാറുവാന്‍ സാധ്യമല്ല"
- 
--#: ../daemon/gdm-simple-slave.c:1370
-+#: ../daemon/gdm-simple-slave.c:1381
- msgid ""
- "Could not start the X server (your graphical environment) due to an internal "
- "error. Please contact your system administrator or check your syslog to "
- "diagnose. In the meantime this display will be disabled.  Please restart GDM "
- "when the problem is corrected."
- msgstr ""
--"ഒരു ആന്തരിക പിശക് കാരണം X സര്‍വര്‍ (നിങ്ങളുടെ ഗ്രാഫിക്കല്‍ എന്‍വയോണ്‍മെന്റ്) ആരംഭിക്കുവാനായില്ല. "
--"നിങ്ങളുടെ syslog പരിശോധിക്കുന്നതിനായി ദയവായി സിസ്റ്റം  അഡ്മിനിസ്ട്രേറ്ററിനെ സമീപിക്കുക. "
--"ഇപ്പോള്‍ ഈ ഡിസ്പ്ലെ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതായിരിക്കും. പ്രശ്നം പരിഹരിച്ച ശേഷം ജിഡിഎം വീണ്ടും "
-+"ഒരു ആന്തരിക പിശക് കാരണം X സര്‍വര്‍ (നിങ്ങളുടെ ഗ്രാഫിക്കല്‍ എന്‍വയോണ്‍മെന്റ്) "
-+"ആരംഭിക്കുവാനായില്ല. "
-+"നിങ്ങളുടെ syslog പരിശോധിക്കുന്നതിനായി ദയവായി സിസ്റ്റം  അഡ്മിനിസ്ട്രേറ്ററിനെ "
-+"സമീപിക്കുക. "
-+"ഇപ്പോള്‍ ഈ ഡിസ്പ്ലെ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതായിരിക്കും. പ്രശ്നം പരിഹരിച്ച "
-+"ശേഷം ജിഡിഎം വീണ്ടും "
- "ആരംഭിക്കുക."
- 
--#: ../daemon/gdm-simple-slave.c:1411
-+#: ../daemon/gdm-simple-slave.c:1422
- #, c-format
- msgid "Can only be called before user is logged in"
- msgstr "ഉപയോക്താവു് പ്രവേശിയ്ക്കുന്നതിനു് മുമ്പു് മാത്രമേ ലഭ്യമാകുള്ളൂ"
- 
--#: ../daemon/gdm-simple-slave.c:1421
-+#: ../daemon/gdm-simple-slave.c:1432
- #, c-format
- msgid "Caller not GDM"
- msgstr "കോളര്‍ ജിഡിഎം അല്ല"
- 
--#: ../daemon/gdm-simple-slave.c:1474
--#| msgid "Currently logged in"
-+#: ../daemon/gdm-simple-slave.c:1485
- msgid "User not logged in"
- msgstr "ഉപയോക്താവു് പ്രവേശിച്ചിട്ടില്ല"
- 
- #: ../daemon/gdm-xdmcp-chooser-slave.c:370
- #, c-format
- msgid "Currently, only one client can be connected at once"
--msgstr "നിലവില്‍, ഒരു സമയത്തു് ഒരു ക്ലയന്റ് മാത്രമേ കണക്ട് ചെയ്യുവാന്‍ സാധ്യമാകൂ"
-+msgstr ""
-+"നിലവില്‍, ഒരു സമയത്തു് ഒരു ക്ലയന്റ് മാത്രമേ കണക്ട് ചെയ്യുവാന്‍ സാധ്യമാകൂ"
- 
- #: ../daemon/gdm-xdmcp-display-factory.c:604
- msgid "Could not create socket!"
-@@ -249,7 +246,8 @@ msgstr "സോക്കറ്റ് നിര്‍മ്മിക്കുവ
- #: ../daemon/main.c:126 ../daemon/main.c:139
- #, c-format
- msgid "Cannot write PID file %s: possibly out of disk space: %s"
--msgstr "%s PID ഫയല്‍ എഴുതുവാന്‍ സാധ്യമായില്ല: ഡിസ്ക്കില്‍ മതിയായ സ്ഥലം ഉണ്ടാവില്ല: %s"
-+msgstr ""
-+"%s PID ഫയല്‍ എഴുതുവാന്‍ സാധ്യമായില്ല: ഡിസ്ക്കില്‍ മതിയായ സ്ഥലം ഉണ്ടാവില്ല: %s"
- 
- #: ../daemon/main.c:160
- #, c-format
-@@ -269,7 +267,9 @@ msgstr "Authdir %s ഒരു ഡയറക്ടറി അല്ല. നിര്
- #: ../daemon/main.c:254
- #, c-format
- msgid "Authdir %s is not owned by user %d, group %d. Aborting."
--msgstr "Authdir %s-യുടെ ഉടമസ്ഥന്‍ ഉപയോക്താവ് %d-ഉം, ഗ്രൂപ്പ് %d-ഉം അല്ല. നിര്‍ത്തുന്നു."
-+msgstr ""
-+"Authdir %s-യുടെ ഉടമസ്ഥന്‍ ഉപയോക്താവ് %d-ഉം, ഗ്രൂപ്പ് %d-ഉം അല്ല. "
-+"നിര്‍ത്തുന്നു."
- 
- #: ../daemon/main.c:261
- #, c-format
-@@ -362,30 +362,70 @@ msgstr "ഗ്നോം ഓണ്‍-സ്ക്രീന്‍ കീബോര
- msgid "Use an on-screen keyboard"
- msgstr "ഒരു ഓണ്‍-സ്ക്രീന്‍ കീബോര്‍ഡ് ഉപയോഗിക്കുക"
- 
--#: ../data/applications/orca-screen-reader.desktop.in.h:1
--msgid "Orca Screen Reader"
--msgstr "ഓര്‍കാ സ്ക്രീന്‍ റീഡര്‍"
--
--#: ../data/applications/orca-screen-reader.desktop.in.h:2
--msgid "Present on-screen information as speech or braille"
--msgstr "ഓണ്‍ സ്ക്രീന്‍ വിവരങ്ങള്‍ ഒരു സംഭാഷണം അല്ലെങ്കില്‍ ബ്രെയിലി ആയി ലഭ്യമാക്കുക"
--
- #: ../data/org.gnome.login-screen.gschema.xml.in.h:1
- msgid "Whether or not to allow fingerprint readers for login"
- msgstr "വിരളടയാളം പരിശോദിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്"
- 
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2
-+msgid ""
-+"The login screen can optionally allow users who have enrolled their "
-+"fingerprints to log in using those prints."
-+msgstr ""
-+"വിരളടയാളം ഉപയോഗിച്ചു് പ്രവേശിയ്ക്കുവാന്‍ അനുവാദമുള്ള ഉപയോക്താക്കളെ "
-+"പ്രവേശന സ്ക്രീന്‍ അനുവദിയ്ക്കുന്നു."
-+
- #: ../data/org.gnome.login-screen.gschema.xml.in.h:3
- msgid "Whether or not to allow smartcard readers for login"
--msgstr "സ്മാര്‍ട്ട്കാര്‍ഡ് ഉപയോഗിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്"
-+msgstr ""
-+"സ്മാര്‍ട്ട്കാര്‍ഡ് ഉപയോഗിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4
-+msgid ""
-+"The login screen can optionally allow users who have smartcards to log in "
-+"using those smartcards."
-+msgstr ""
-+"സ്മാര്‍ട്ട് കാര്‍ഡുള്ളവരെ അതുപയോഗിച്ചു് പ്രവേശിയ്ക്കുവാന്‍ പ്രവേശന സ്ക്രീന്‍ "
-+"അനുവദിയ്ക്കുന്നു."
- 
- #: ../data/org.gnome.login-screen.gschema.xml.in.h:5
- msgid "Path to small image at top of user list"
--msgstr "ഉപയോക്താക്കളുടെ പട്ടികയ്ക്കു് മുകളില്‍ കാണിയ്ക്കുന്ന ചെറിയ ചിത്രത്തിനുള്ള വഴി"
-+msgstr ""
-+"ഉപയോക്താക്കളുടെ പട്ടികയ്ക്കു് മുകളില്‍ കാണിയ്ക്കുന്ന ചെറിയ ചിത്രത്തിനുള്ള വഴി"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6
-+msgid ""
-+"The login screen can optionally show a small image at the top of its user "
-+"list to provide site administrators and distributions a way to provide "
-+"branding."
-+msgstr ""
-+"സൈറ്റ് അഡ്മിനിസ്ട്രേറ്ററുകളേയും വിതരണക്കാരെയും ബ്രാണ്ടിങ് നല്‍കുന്നതിനായി "
-+"പ്രവേശന സ്ക്രീനില്‍ ഉപയോക്താക്കളുടെ പട്ടികയുടെ മുകളില്‍ ഒരു ചെറിയ ചിത്രം "
-+"കാണിയ്ക്കാം."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7
-+msgid ""
-+"The fallback login screen can optionally show a small image at the top of "
-+"its user list to provide site administrators and distributions a way to "
-+"provide branding."
-+msgstr ""
-+"സൈറ്റ് അഡ്മിനിസ്ട്രേറ്ററുകളേയും വിതരണക്കാരെയും ബ്രാണ്ടിങ് നല്‍കുന്നതിനായി "
-+"ഫോള്‍ബാക്ക് പ്രവേശന സ്ക്രീനില്‍ ഉപയോക്താക്കളുടെ പട്ടികയുടെ മുകളില്‍ ഒരു ചെറിയ "
-+"ചിത്രം "
-+"കാണിയ്ക്കാം."
- 
- #: ../data/org.gnome.login-screen.gschema.xml.in.h:8
- msgid "Avoid showing user list"
- msgstr "ഉപയോക്താക്കളുടെ പട്ടിക കാണിയ്ക്കുന്നതൊഴിവാക്കുക"
- 
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9
-+msgid ""
-+"The login screen normally shows a list of available users to log in as. This "
-+"setting can be toggled to disable showing the user list."
-+msgstr ""
-+"പ്രവേശന സ്ക്രീനില്‍ സാധാരണ പ്രവേശിയ്ക്കുവാന്‍ സാധ്യമായ ഉപയോക്താക്കളെ "
-+"കാണിയ്ക്കുന്നു. "
-+"ഈ പട്ടിക പ്രവര്‍ത്തന രഹിതമാക്കണമെങ്കില്‍ ഈ സജ്ജീകരണം ടൊഗ്ഗിള്‍ ചെയ്യാം."
-+
- #: ../data/org.gnome.login-screen.gschema.xml.in.h:10
- msgid "Enable showing the banner message"
- msgstr "ബാനര്‍ സന്ദേശം കാണിക്കുന്നതു് സജ്ജമാക്കുക"
-@@ -404,27 +444,39 @@ msgstr "ലോഗിന്‍ ജാലകത്തില്‍ കാണിക
- 
- #: ../data/org.gnome.login-screen.gschema.xml.in.h:14
- msgid "Disable showing the restart buttons"
--msgstr "വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക"
-+msgstr ""
-+"വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക"
- 
- #: ../data/org.gnome.login-screen.gschema.xml.in.h:15
- msgid "Set to true to disable showing the restart buttons in the login window."
- msgstr ""
--"ലോഗില്‍ ജാലകത്തില്‍ വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനു് "
-+"ലോഗില്‍ ജാലകത്തില്‍ വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് "
-+"പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനു് "
- "true ആയി സജ്ജമാക്കുക."
- 
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16
-+msgid "Number of allowed authentication failures"
-+msgstr "എത്ര തവണ ആധികാരികത ഉറപ്പാക്കുവാന്‍ ശ്രമിയ്ക്കാം"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17
-+msgid ""
-+"The number of times a user is allowed to attempt authentication, before "
-+"giving up and going back to user selection."
-+msgstr ""
-+"ഉപയോക്താവിനുള്ളതു് തെരഞ്ഞെടുക്കുന്നതിലേക്കു് പോകുന്നതിനു് മുമ്പായി, "
-+"ആധികാരികത ഉറപ്പാക്കുവാന്‍ എത്ര തവണ ഉപയോക്താവു് ശ്രമിയ്ക്കുന്നു."
-+
- #: ../gui/libgdm/gdm-user-switching.c:72
--#| msgid "Unable to start new display"
- msgid "Unable to create transient display: "
- msgstr "ട്രാന്‍സിയന്റ് പ്രദര്‍ശനം തയ്യാറാക്കുവാന്‍ സാധ്യമായില്ല:"
- 
- #: ../gui/libgdm/gdm-user-switching.c:183
- #: ../gui/libgdm/gdm-user-switching.c:395
--#| msgid "Unable to open session"
- msgid "Unable to activate session: "
- msgstr "സെഷന്‍ സജീവമാക്കുവാന്‍ സാധ്യമല്ല:"
- 
- #: ../gui/libgdm/gdm-user-switching.c:344
--#: ../gui/libgdm/gdm-user-switching.c:483
-+#: ../gui/libgdm/gdm-user-switching.c:512
- #, c-format
- msgid "Could not identify the current session."
- msgstr "നിലവിലുള്ള സെഷന്‍ തിരിച്ചറിയുവാന്‍ സാധ്യമായില്ല."
-@@ -434,21 +486,22 @@ msgstr "നിലവിലുള്ള സെഷന്‍ തിരിച്ച
- msgid "User unable to switch sessions."
- msgstr "സെഷനുകള്‍ തമ്മില്‍ മാറ്റുവാന്‍ ഉപയോക്താവിനു് സാധ്യമല്ല."
- 
--#: ../gui/libgdm/gdm-user-switching.c:492
-+#: ../gui/libgdm/gdm-user-switching.c:521
- #, c-format
- msgid "Could not identify the current seat."
- msgstr "നിലവിലുള്ള സീറ്റ് തിരിച്ചറിയുവാന്‍ സാധ്യമായില്ല."
- 
--#: ../gui/libgdm/gdm-user-switching.c:502
-+#: ../gui/libgdm/gdm-user-switching.c:531
- #, c-format
- msgid ""
- "The system is unable to determine whether to switch to an existing login "
- "screen or start up a new login screen."
- msgstr ""
--"നിലവിലുള്ളൊരു പ്രവേശന സ്ക്രീന്‍ അല്ലെങ്കില്‍ ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ - ഏതിലേക്കു് മാറണമെന്നു് "
-+"നിലവിലുള്ളൊരു പ്രവേശന സ്ക്രീന്‍ അല്ലെങ്കില്‍ ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ - "
-+"ഏതിലേക്കു് മാറണമെന്നു് "
- "സിസ്റ്റത്തിനു് നിശ്ചയിയ്ക്കുവാന്‍ സാധ്യമല്ല."
- 
--#: ../gui/libgdm/gdm-user-switching.c:510
-+#: ../gui/libgdm/gdm-user-switching.c:539
- #, c-format
- msgid "The system is unable to start up a new login screen."
- msgstr "ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ ആരംഭിയ്ക്കുവാന്‍ സിസ്റ്റത്തിനു് സാധ്യമല്ല."
-@@ -567,7 +620,9 @@ msgstr "വരുന്ന കാര്‍ഡ് ഇവന്റുകള്‍
- #: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242
- #, c-format
- msgid "encountered unexpected error while waiting for smartcard events"
--msgstr "സ്മാര്‍ട്ട് കാര്‍ഡുകള്‍ക്കായി കാത്തിരിയ്ക്കുമ്പോള്‍ അപ്രതീക്ഷിതമായ പിശകുണ്ടായിരിയ്ക്കുന്നു"
-+msgstr ""
-+"സ്മാര്‍ട്ട് കാര്‍ഡുകള്‍ക്കായി കാത്തിരിയ്ക്കുമ്പോള്‍ അപ്രതീക്ഷിതമായ "
-+"പിശകുണ്ടായിരിയ്ക്കുന്നു"
- 
- #: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287
- msgid "Authentication"
-@@ -591,7 +646,8 @@ msgstr "സജീവമല്ലാത്ത വാചകം"
- 
- #: ../gui/simple-greeter/gdm-chooser-widget.c:1466
- msgid "The text to use in the label if the user hasn't picked an item yet"
--msgstr "ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടില്ല എങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം"
-+msgstr ""
-+"ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടില്ല എങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം"
- 
- #: ../gui/simple-greeter/gdm-chooser-widget.c:1474
- msgid "Active Text"
-@@ -599,7 +655,8 @@ msgstr "സജീവമായ വാചകം"
- 
- #: ../gui/simple-greeter/gdm-chooser-widget.c:1475
- msgid "The text to use in the label if the user has picked an item"
--msgstr "ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടുണ്ടെങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം"
-+msgstr ""
-+"ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടുണ്ടെങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം"
- 
- #: ../gui/simple-greeter/gdm-chooser-widget.c:1484
- msgid "List Visible"
-@@ -732,7 +789,8 @@ msgstr "മറ്റൊരു കമ്പ്യൂട്ടറില്‍ ന
- #: ../gui/simple-greeter/gdm-remote-login-window.c:202
- #, c-format
- msgid "Remote Login (Connected to %s)"
--msgstr "മറ്റൊരു കമ്പ്യൂട്ടറില്‍ നിന്നുള്ള പ്രവേശനം (%s ആയി ബന്ധപ്പെട്ടിരിക്കുന്നു)"
-+msgstr ""
-+"മറ്റൊരു കമ്പ്യൂട്ടറില്‍ നിന്നുള്ള പ്രവേശനം (%s ആയി ബന്ധപ്പെട്ടിരിക്കുന്നു)"
- 
- #: ../gui/simple-greeter/gdm-remote-login-window.c:281
- msgid "Remote Login"
-@@ -819,6 +877,12 @@ msgstr "സ്ക്രീന്‍ഷോട്ട് എടുത്തിര
- msgid "Take a picture of the screen"
- msgstr "ഇപ്പോള്‍ കാണുന്ന സ്ക്രീനിന്റെ ഒരു സ്ക്രീന്‍ഷോട്ട് എടുക്കുക."
- 
-+#~ msgid "Orca Screen Reader"
-+#~ msgstr "ഓര്‍കാ സ്ക്രീന്‍ റീഡര്‍"
-+
-+#~ msgid "Present on-screen information as speech or braille"
-+#~ msgstr "ഓണ്‍ സ്ക്രീന്‍ വിവരങ്ങള്‍ ഒരു സംഭാഷണം അല്ലെങ്കില്‍ ബ്രെയിലി ആയി ലഭ്യമാക്കുക"
-+
- #~ msgid "Unable to initialize login system"
- #~ msgstr "അകത്തുകയറാനുള്ള സംവിധാനം ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല"
- 
-diff --git a/po/nl.po b/po/nl.po
-index 3ca6818..dd9b68f 100644
---- a/po/nl.po
-+++ b/po/nl.po
-@@ -16,15 +16,15 @@
- # Tino Meinen <a.t.meinen@chello.nl>, 2004–2006, 2008.
- # Vincent van Adrighem <adrighem@gnome.org>, 2004, 2006.
- # Michiel Sikkes <michiel.sikkes@gmail.com>, 2006.
--# Wouter Bolsterlee <wbolster@gnome.org>, 2006–2011.
-+# Wouter Bolsterlee <wbolster@gnome.org>, 2006–2012.
- # Hannie Dumoleyn <hannie@ubuntu-nl.org>, 2010–2011.
- msgid ""
- msgstr ""
- "Project-Id-Version: gdm\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2011-08-18 21:36+0200\n"
-+"POT-Creation-Date: 2012-11-22 12:25+0100\n"
- "PO-Revision-Date: 2011-08-18 17:27+0200\n"
--"Last-Translator: Hannie Dumoleyn <hannie@ubuntu-nl.org>\n"
-+"Last-Translator: Wouter Bolsterlee <wbolster@gnome.org>\n"
- "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
- "Language: nl\n"
- "MIME-Version: 1.0\n"
-@@ -33,109 +33,96 @@ msgstr ""
- "Plural-Forms: nplurals=2; plural=(n != 1);\n"
- "X-Generator: Lokalize 1.2\n"
- 
--#: ../common/gdm-common.c:489
-+#: ../common/gdm-common.c:492
- #, c-format
- msgid "/dev/urandom is not a character device"
- msgstr "Het bestand /dev/urandom is geen tekenbestand"
- 
--# Beeldscherm?
--#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
--#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
--msgid "Display ID"
--msgstr "Scherm-ID"
--
--#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
--#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
--msgid "ID"
--msgstr "ID"
--
--#: ../daemon/factory-slave-main.c:188 ../daemon/product-slave-main.c:192
--#: ../daemon/simple-slave-main.c:192 ../daemon/xdmcp-chooser-slave-main.c:194
--msgid "GNOME Display Manager Slave"
--msgstr "GDM (Gnome aanmeldbeheer) Slave"
--
- #: ../daemon/gdm-display-access-file.c:300
- #, c-format
- msgid "could not find user \"%s\" on system"
- msgstr "kan de gebruiker '%s' niet vinden op het systeem"
- 
--#: ../daemon/gdm-factory-slave.c:207 ../daemon/gdm-simple-slave.c:309
--msgid "Unable to initialize login system"
--msgstr "kan aanmeldsysteem niet initialiseren"
-+#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354
-+#, c-format
-+msgid "No session available yet"
-+msgstr "Nog geen sessie beschikbaar"
- 
--#: ../daemon/gdm-factory-slave.c:241 ../daemon/gdm-simple-slave.c:347
--msgid "Unable to authenticate user"
--msgstr "Kan gebruiker niet authenticeren"
-+#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384
-+#, c-format
-+msgid "Unable to look up UID of user %s"
-+msgstr "Opzoeken UID van gebruiker ‘%s’ mislukt"
- 
--#: ../daemon/gdm-factory-slave.c:265 ../daemon/gdm-simple-slave.c:399
--msgid "Unable to authorize user"
--msgstr "Kan gebruiker niet autoriseren"
-+#: ../daemon/gdm-manager.c:291
-+msgid "no sessions available"
-+msgstr "geen sessies beschikbaar"
- 
--#: ../daemon/gdm-factory-slave.c:289 ../daemon/gdm-simple-slave.c:537
--msgid "Unable to establish credentials"
--msgstr "Kan aanmeldgegevens niet vaststellen"
-+#: ../daemon/gdm-manager.c:352
-+#, c-format
-+msgid "No sessions for %s available for reauthentication"
-+msgstr "Er zijn geen sessies voor ‘%s’ beschikbaar voor opnieuw aanmelden"
- 
--#: ../daemon/gdm-factory-slave.c:314 ../daemon/gdm-simple-slave.c:575
--msgid "Unable to open session"
--msgstr "Kan sessie niet openen"
-+#: ../daemon/gdm-manager.c:406
-+#, c-format
-+msgid "Unable to find session for user %s"
-+msgstr "Kan geen sessie vinden voor gebruiker ‘%s’"
- 
--#: ../daemon/gdm-factory-slave.c:704 ../daemon/gdm-product-slave.c:511
--#: ../daemon/gdm-simple-slave.c:1447
--msgid ""
--"Could not start the X server (your graphical environment) due to an internal "
--"error. Please contact your system administrator or check your syslog to "
--"diagnose. In the meantime this display will be disabled.  Please restart GDM "
--"when the problem is corrected."
--msgstr ""
--"Kan de X-server (grafische omgeving) niet starten vanwege een interne fout. "
--"Neem contact op met de systeembeheerder of bekijk het systeemlogboek om een "
--"diagnose te maken. Dit scherm wordt in de tussentijd uitgeschakeld. Herstart "
--"GDM wanneer het probleem is opgelost."
-+#: ../daemon/gdm-manager.c:476
-+#, c-format
-+msgid "Unable to find appropriate session for user %s"
-+msgstr "Kan juiste sessie voor gebruiker ‘%s’ niet vinden"
-+
-+#: ../daemon/gdm-manager.c:671
-+msgid "User doesn't own session"
-+msgstr "Gebruiker is geen eigenaar van sessie"
- 
--#: ../daemon/gdm-server.c:250
-+#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768
-+msgid "No session available"
-+msgstr "Geen sessie beschikbaar"
-+
-+#: ../daemon/gdm-server.c:272
- #, c-format
- msgid "%s: failed to connect to parent display '%s'"
- msgstr "%s: kan geen verbinding maken met moederscherm '%s'"
- 
--#: ../daemon/gdm-server.c:365
-+#: ../daemon/gdm-server.c:451
- #, c-format
- msgid "Server was to be spawned by user %s but that user doesn't exist"
- msgstr ""
- "Server moest gestart worden als %s, maar die gebruiker bestaat helemaal niet"
- 
--#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396
--#: ../daemon/gdm-welcome-session.c:603 ../daemon/gdm-welcome-session.c:623
-+#: ../daemon/gdm-server.c:462 ../daemon/gdm-server.c:482
- #, c-format
- msgid "Couldn't set groupid to %d"
- msgstr "Kan groeps-ID niet instellen op %d"
- 
--#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:609
-+#: ../daemon/gdm-server.c:468
- #, c-format
- msgid "initgroups () failed for %s"
- msgstr "initgroups() mislukt voor %s"
- 
--#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:615
-+#: ../daemon/gdm-server.c:474
- #, c-format
- msgid "Couldn't set userid to %d"
- msgstr "Kan gebruikers-ID niet instellen op %d"
- 
--#: ../daemon/gdm-server.c:435
-+#: ../daemon/gdm-server.c:521
- #, c-format
- msgid "%s: Could not open log file for display %s!"
- msgstr "%s: Kan het logboek voor scherm %s niet openen!"
- 
--#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452
--#: ../daemon/gdm-server.c:458
-+#: ../daemon/gdm-server.c:532 ../daemon/gdm-server.c:538
-+#: ../daemon/gdm-server.c:544
- #, c-format
- msgid "%s: Error setting %s to %s"
- msgstr "%s: Fout bij instellen van %s naar %s"
- 
--#: ../daemon/gdm-server.c:478
-+#: ../daemon/gdm-server.c:564
- #, c-format
- msgid "%s: Server priority couldn't be set to %d: %s"
- msgstr "%s: Serverprioriteit kon niet worden ingesteld op %d: %s"
- 
--#: ../daemon/gdm-server.c:631
-+#: ../daemon/gdm-server.c:720
- #, c-format
- msgid "%s: Empty server command for display %s"
- msgstr "%s: Lege serveropdracht voor scherm %s"
-@@ -168,683 +155,670 @@ msgstr "Beeldscherm"
- msgid "The display device"
- msgstr "Het beeldscherm"
- 
--#: ../daemon/gdm-session-worker.c:1070
-+#: ../daemon/gdm-session.c:1183
-+msgid "Could not create authentication helper process"
-+msgstr "Aanmaken hulpproces voor authenticatie mislukt"
-+
-+#: ../daemon/gdm-session-worker.c:1029
- #, c-format
- msgid "error initiating conversation with authentication system - %s"
- msgstr "fout bij initialisatie van communicatie met authenticatiesysteem: %s"
- 
--#: ../daemon/gdm-session-worker.c:1071
-+#: ../daemon/gdm-session-worker.c:1030
- msgid "general failure"
- msgstr "algemene fout"
- 
--#: ../daemon/gdm-session-worker.c:1072
-+#: ../daemon/gdm-session-worker.c:1031
- msgid "out of memory"
- msgstr "onvoldoende geheugen beschikbaar"
- 
--#: ../daemon/gdm-session-worker.c:1073
-+#: ../daemon/gdm-session-worker.c:1032
- msgid "application programmer error"
- msgstr "programmafout"
- 
--#: ../daemon/gdm-session-worker.c:1074
-+#: ../daemon/gdm-session-worker.c:1033
- msgid "unknown error"
- msgstr "onbekende fout"
- 
--#: ../daemon/gdm-session-worker.c:1081
-+#: ../daemon/gdm-session-worker.c:1040
- msgid "Username:"
- msgstr "Gebruikersnaam:"
- 
--#: ../daemon/gdm-session-worker.c:1087
-+#: ../daemon/gdm-session-worker.c:1046
- #, c-format
- msgid "error informing authentication system of preferred username prompt: %s"
- msgstr ""
- "fout bij doorgeven gewenste tekst bij het naamveld aan authenticatiesysteem: "
- "%s"
- 
--#: ../daemon/gdm-session-worker.c:1101
-+#: ../daemon/gdm-session-worker.c:1060
- #, c-format
- msgid "error informing authentication system of user's hostname: %s"
- msgstr "fout bij doorgeven computernaam aan authenticatiesysteem: %s"
- 
--#: ../daemon/gdm-session-worker.c:1116
-+#: ../daemon/gdm-session-worker.c:1077
- #, c-format
- msgid "error informing authentication system of user's console: %s"
- msgstr "fout bij doorgeven van gebruikersconsole aan authenticatiesysteem: %s"
- 
--#: ../daemon/gdm-session-worker.c:1129
-+#: ../daemon/gdm-session-worker.c:1101
- #, c-format
- msgid "error informing authentication system of display string: %s"
- msgstr "fout bij doorgeven schermnaam aan authenticatiesysteem: %s"
- 
--#: ../daemon/gdm-session-worker.c:1144
-+#: ../daemon/gdm-session-worker.c:1116
- #, c-format
- msgid "error informing authentication system of display xauth credentials: %s"
- msgstr "fout bij doorgeven van xauth-gegevens aan authenticatiesysteem: %s"
- 
--#: ../daemon/gdm-session-worker.c:1464 ../daemon/gdm-session-worker.c:1481
-+#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471
- #, c-format
- msgid "no user account available"
- msgstr "geen gebruikersaccount beschikbaar"
- 
--#: ../daemon/gdm-session-worker.c:1508
-+#: ../daemon/gdm-session-worker.c:1498
- msgid "Unable to change to user"
- msgstr "Kan gebruiker niet wisselen"
- 
--#: ../daemon/gdm-welcome-session.c:553
--#, c-format
--msgid "User %s doesn't exist"
--msgstr "Gebruiker %s bestaat niet"
--
--#: ../daemon/gdm-welcome-session.c:560
--#, c-format
--msgid "Group %s doesn't exist"
--msgstr "Groep %s bestaat niet"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:604
--msgid "Could not create socket!"
--msgstr "Kan geen socket aanmaken!"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:873
--#, c-format
--msgid "Denied XDMCP query from host %s"
--msgstr "XDMCP verzoek van host %s geweigerd"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1031
--#: ../daemon/gdm-xdmcp-display-factory.c:1255
--msgid "Could not extract authlist from packet"
--msgstr "Kan authlijst niet uit pakket halen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1044
--#: ../daemon/gdm-xdmcp-display-factory.c:1270
--msgid "Error in checksum"
--msgstr "Fout in checksum"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1523
--msgid "Bad address"
--msgstr "Foutief adres"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1607
--#, c-format
--msgid "%s: Could not read display address"
--msgstr "%s: Kan schermadres niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1615
--#, c-format
--msgid "%s: Could not read display port number"
--msgstr "%s: Kan poortnummer van scherm niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1624
--#, c-format
--msgid "%s: Could not extract authlist from packet"
--msgstr "%s: Kan geen authlijst uit pakket halen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1644
--#, c-format
--msgid "%s: Error in checksum"
--msgstr "%s: Fout in checksum"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2200
--#, c-format
--msgid "%s: Got REQUEST from banned host %s"
--msgstr "%s: REQUEST ontvangen van verboden host %s"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2210
--#: ../daemon/gdm-xdmcp-display-factory.c:2568
--#: ../daemon/gdm-xdmcp-display-factory.c:2822
--#, c-format
--msgid "%s: Could not read Display Number"
--msgstr "%s: Kan het schermnummer niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2217
--#, c-format
--msgid "%s: Could not read Connection Type"
--msgstr "%s: Kan het verbindingstype niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2224
--#, c-format
--msgid "%s: Could not read Client Address"
--msgstr "%s: Kan clientadres niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2232
--#, c-format
--msgid "%s: Could not read Authentication Names"
--msgstr "%s: Kan de identificatienamen niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2241
--#, c-format
--msgid "%s: Could not read Authentication Data"
--msgstr "%s: Kan de identificatiedata niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2251
--#, c-format
--msgid "%s: Could not read Authorization List"
--msgstr "%s: Kan de identificatielijst niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2270
--#, c-format
--msgid "%s: Could not read Manufacturer ID"
--msgstr "%s: Kan Producent-ID niet lezen"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2297
--#, c-format
--msgid "%s: Failed checksum from %s"
--msgstr "%s: Fout in checksum van %s"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2552
--#, c-format
--msgid "%s: Got Manage from banned host %s"
--msgstr "%s: 'Manage' ontvangen van verboden host %s"
-+#: ../daemon/gdm-simple-slave.c:1330
-+msgid ""
-+"Could not start the X server (your graphical environment) due to an internal "
-+"error. Please contact your system administrator or check your syslog to "
-+"diagnose. In the meantime this display will be disabled.  Please restart GDM "
-+"when the problem is corrected."
-+msgstr ""
-+"Kan de X-server (grafische omgeving) niet starten vanwege een interne fout. "
-+"Neem contact op met de systeembeheerder of bekijk het systeemlogboek om een "
-+"diagnose te maken. Dit scherm wordt in de tussentijd uitgeschakeld. Herstart "
-+"GDM wanneer het probleem is opgelost."
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2561
--#: ../daemon/gdm-xdmcp-display-factory.c:2829
-+#: ../daemon/gdm-simple-slave.c:1371
- #, c-format
--msgid "%s: Could not read Session ID"
--msgstr "%s: Kan sessie-ID niet lezen"
-+msgid "Can only be called before user is logged in"
-+msgstr "Kan alleen aangeroepen worden voordat de gebruiker aangemeld is"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2575
-+#: ../daemon/gdm-simple-slave.c:1381
- #, c-format
--msgid "%s: Could not read Display Class"
--msgstr "%s: Kan schermklasse niet lezen"
-+msgid "Caller not GDM"
-+msgstr "Aanroep niet door GDM"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2681
--#: ../daemon/gdm-xdmcp-display-factory.c:2731
--#: ../daemon/gdm-xdmcp-display-factory.c:2737
--#, c-format
--msgid "%s: Could not read address"
--msgstr "%s: Kan adres niet lezen"
-+#: ../daemon/gdm-simple-slave.c:1434
-+msgid "User not logged in"
-+msgstr "Gebruiker niet aangemeld"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2812
-+#: ../daemon/gdm-xdmcp-chooser-slave.c:368
- #, c-format
--msgid "%s: Got KEEPALIVE from banned host %s"
--msgstr "%s: KEEPALIVE ontvangen van verboden host %s"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2902
--msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
--msgstr "GdmXdmcpDisplayFactory: Kan XDMCP-header niet lezen!"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2908
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
--msgid "XMDCP: Incorrect XDMCP version!"
--msgstr "XDMCP: Versie van XDMCP niet goed!"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2914
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
--msgid "XMDCP: Unable to parse address"
--msgstr "XDMCP: Kan adres niet analyseren"
-+msgid "Currently, only one client can be connected at once"
-+msgstr "Momenteel kan slechts een gebruiker tegelijkertijd verbonden zijn"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:3363
--#, c-format
--msgid "Could not get server hostname: %s!"
--msgstr "Kan de naam van de server niet vinden: %s!"
-+#: ../daemon/gdm-xdmcp-display-factory.c:604
-+msgid "Could not create socket!"
-+msgstr "Kan geen socket aanmaken!"
- 
--#: ../daemon/main.c:237 ../daemon/main.c:250
-+#: ../daemon/main.c:126 ../daemon/main.c:139
- #, c-format
- msgid "Cannot write PID file %s: possibly out of disk space: %s"
- msgstr ""
- "Kan PID-bestand %s niet beschrijven. Mogelijkerwijs is er geen vrije "
- "schijfruimte meer: %s"
- 
--#: ../daemon/main.c:271
--#, c-format
--msgid "Logdir %s does not exist or isn't a directory."
--msgstr "Logmap %s bestaat niet of is geen map."
--
--#: ../daemon/main.c:287
--#, c-format
--msgid "Authdir %s does not exist. Aborting."
--msgstr "Authdir %s bestaat niet. Gestopt."
--
--#: ../daemon/main.c:291
-+#: ../daemon/main.c:189
- #, c-format
--msgid "Authdir %s is not a directory. Aborting."
--msgstr "Authdir %s niet herkend. Gestopt."
-+msgid "Failed to create ran once marker dir %s: %s"
-+msgstr "Aanmaken map ‘%s’ (voor ‘ran once’-markering) mislukt: %s"
- 
--#: ../daemon/main.c:365
-+#: ../daemon/main.c:195
- #, c-format
--msgid "Authdir %s is not owned by user %d, group %d. Aborting."
--msgstr "Authdir %s is geen eigendom van gebruiker %d, groep %d. Gestopt."
-+msgid "Failed to create AuthDir %s: %s"
-+msgstr "Aanmaken AuthDir ‘%s’ mislukt: %s"
- 
--#: ../daemon/main.c:372
-+#: ../daemon/main.c:201
- #, c-format
--msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting."
--msgstr "Authdir %s heeft verkeerde rechten %o. Moet %o zijn. Gestopt."
-+msgid "Failed to create LogDir %s: %s"
-+msgstr "Aanmaken LogDir ‘%s’ mislukt: %s"
- 
--#: ../daemon/main.c:409
-+#: ../daemon/main.c:236
- #, c-format
- msgid "Can't find the GDM user '%s'. Aborting!"
- msgstr "Kan de GDM-gebruiker ‘%s’ niet vinden. Gestopt!"
- 
--#: ../daemon/main.c:415
-+#: ../daemon/main.c:242
- msgid "The GDM user should not be root. Aborting!"
- msgstr "De GDM-gebruiker mag geen root zijn. Gestopt!"
- 
--#: ../daemon/main.c:421
-+#: ../daemon/main.c:248
- #, c-format
- msgid "Can't find the GDM group '%s'. Aborting!"
- msgstr "Kan GDM-groep ‘%s’ niet vinden. Gestopt!"
- 
--#: ../daemon/main.c:427
-+#: ../daemon/main.c:254
- msgid "The GDM group should not be root. Aborting!"
- msgstr "De GDM-groep mag geen root zijn. Gestopt!"
- 
--#: ../daemon/main.c:533
-+#: ../daemon/main.c:362
- msgid "Make all warnings fatal"
- msgstr "Ook stoppen bij waarschuwingen"
- 
--#: ../daemon/main.c:534
-+#: ../daemon/main.c:363
- msgid "Exit after a time (for debugging)"
- msgstr "Afsluiten na een tijdje (voor debuggen)"
- 
--#: ../daemon/main.c:535
-+#: ../daemon/main.c:364
- msgid "Print GDM version"
- msgstr "GDM-versie weergeven"
- 
--#: ../daemon/main.c:548
-+#: ../daemon/main.c:377
- msgid "GNOME Display Manager"
- msgstr "Gnome Aanmeldbeheer"
- 
- # wil -> mag
- #. make sure the pid file doesn't get wiped
--#: ../daemon/main.c:614
-+#: ../daemon/main.c:425
- msgid "Only the root user can run GDM"
- msgstr "Alleen root mag GDM starten"
- 
- #. Translators: worker is a helper process that does the work
- #. of starting up a session
--#: ../daemon/session-worker-main.c:156
-+#: ../daemon/session-worker-main.c:150
- msgid "GNOME Display Manager Session Worker"
- msgstr "GDM (Gnome aanmeldbeheer) Session worker"
- 
--# hostsysteem/hostcomputer/computer/systeem
--# het/een/.
--#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147
--msgid "Select System"
--msgstr "Selecteer computer"
-+# Beeldscherm?
-+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178
-+msgid "Display ID"
-+msgstr "Scherm-ID"
- 
--# BUG: XMCP aan het begin moet zijn: XDMCP
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215
--msgid "XDMCP: Could not create XDMCP buffer!"
--msgstr "XDMCP: Kan geen XDMCP-buffer aanmaken!"
-+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178
-+msgid "ID"
-+msgstr "ID"
- 
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221
--msgid "XDMCP: Could not read XDMCP header!"
--msgstr "XDMCP: Kan XDMCP-header niet lezen!"
-+#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188
-+msgid "GNOME Display Manager Slave"
-+msgstr "GDM (Gnome aanmeldbeheer) Slave"
- 
--#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239
--msgid "Value"
--msgstr "Waarde"
-+#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566
-+msgid "Login Window"
-+msgstr "Aanmeldvenster"
- 
--#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240
--msgid "percentage of time complete"
--msgstr "percentage voltooide tijd"
-+#: ../data/applications/gnome-shell.desktop.in.h:1
-+msgid "GNOME Shell"
-+msgstr "Gnome Shell"
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1465
--msgid "Inactive Text"
--msgstr "Inactieve tekst"
-+#: ../data/applications/gnome-shell.desktop.in.h:2
-+msgid "Window management and compositing"
-+msgstr "Vensterbeheer en compositing"
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1466
--msgid "The text to use in the label if the user hasn't picked an item yet"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:1
-+msgid "Whether or not to allow fingerprint readers for login"
-+msgstr "Al dan niet vingerafdruklezers toestaan voor inloggen"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2
-+msgid ""
-+"The login screen can optionally allow users who have enrolled their "
-+"fingerprints to log in using those prints."
- msgstr ""
--"De te gebruiken tekst in het label als de gebruiker nog geen item heeft "
--"gekozen"
-+"Het aanmeldvenster kan optioneel gebruikers laten inloggen middels "
-+"vingerafdrukken."
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1474
--msgid "Active Text"
--msgstr "Actieve tekst"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:3
-+msgid "Whether or not to allow smartcard readers for login"
-+msgstr "Al dan niet smartcard-lezers toestaan voor inloggen"
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1475
--msgid "The text to use in the label if the user has picked an item"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4
-+msgid ""
-+"The login screen can optionally allow users who have smartcards to log in "
-+"using those smartcards."
- msgstr ""
--"De te gebruiken tekst in het label als de gebruiker een item heeft gekozen"
-+"Het aanmeldvenster kan optioneel gebruikers laten inloggen middels "
-+"smartcards."
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1484
--msgid "List Visible"
--msgstr "Lijst zichtbaar"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:5
-+msgid "Path to small image at top of user list"
-+msgstr "Pad naar een kleine afbeelding boven de lijst met gebruikers"
- 
--#: ../gui/simple-greeter/gdm-chooser-widget.c:1485
--msgid "Whether the chooser list is visible"
--msgstr "Of de kieslijst zichtbaar is"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6
-+msgid ""
-+"The login screen can optionally show a small image at the top of its user "
-+"list to provide site administrators and distributions a way to provide "
-+"branding."
-+msgstr ""
-+"Het aanmeldscherm kan optioneel een kleine afbeelding tonen boven de lijst "
-+"met gebruikers. Dit maakt het voor beheerders en distributies mogelijk om "
-+"‘branding’ toe te voegen."
- 
--# a=verkorte weekdag
--# b=verkorte maand
--# d=dag van de maand (01)
--# e=dag van de maand (1)
--# l=uur (1-12)
--# p=lokaal equivalent van AM/PM
--# H=uur (0-23)
--# M=minuut
--#. translators: This is the time format to use when both
--#. * the date and time with seconds are being shown together.
--#.
--#: ../gui/simple-greeter/gdm-clock-widget.c:70
--msgid "%a %b %e, %l:%M:%S %p"
--msgstr "%a %e %b, %H:%M:%S"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7
-+msgid ""
-+"The fallback login screen can optionally show a small image at the top of "
-+"its user list to provide site administrators and distributions a way to "
-+"provide branding."
-+msgstr ""
-+"Het aanmeldscherm in terugvalmodus kan optioneel een kleine afbeelding tonen "
-+"boven de lijst met gebruikers. Dit maakt het voor beheerders en distributies "
-+"mogelijk om ‘branding’ toe te voegen."
- 
--# a=verkorte weekdag
--# b=verkorte maand
--# d=dag van de maand (01)
--# e=dag van de maand (1)
--# l=uur (1-12)
--# p=lokaal equivalent van AM/PM
--# H=uur (0-23)
--# M=minuut
--#. translators: This is the time format to use when both
--#. * the date and time without seconds are being shown together.
--#.
--#: ../gui/simple-greeter/gdm-clock-widget.c:76
--msgid "%a %b %e, %l:%M %p"
--msgstr "%a %e %b, %H:%M"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:8
-+msgid "Avoid showing user list"
-+msgstr "Tonen van lijst met gebruikers vermijden"
- 
--# a=verkorte weekdag
--# b=verkorte maand
--# d=dag van de maand (01)
--# e=dag van de maand (1)
--# l=uur (1-12)
--# p=lokaal equivalent van AM/PM
--# H=uur (0-23)
--# M=minuut
--#. translators: This is the time format to use when there is
--#. * no date, just weekday and time with seconds.
--#.
--#: ../gui/simple-greeter/gdm-clock-widget.c:83
--msgid "%a %l:%M:%S %p"
--msgstr "%a %H:%M%S"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9
-+msgid ""
-+"The login screen normally shows a list of available users to log in as. This "
-+"setting can be toggled to disable showing the user list."
-+msgstr ""
-+"Het aanmeldscherm toont normaal gesproken een lijst met beschikbare "
-+"gebruikers. Deze instelling maakt het mogelijk deze lijst niet te tonen."
- 
--# a=verkorte weekdag
--# b=verkorte maand
--# d=dag van de maand (01)
--# e=dag van de maand (1)
--# l=uur (1-12)
--# p=lokaal equivalent van AM/PM
--# H=uur (0-23)
--# M=minuut
--#. translators: This is the time format to use when there is
--#. * no date, just weekday and time without seconds.
--#.
--#: ../gui/simple-greeter/gdm-clock-widget.c:92
--msgid "%a %l:%M %p"
--msgstr "%a %H:%M"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:10
-+msgid "Enable showing the banner message"
-+msgstr "Het welkomstbericht tonen"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:319
--msgid "Automatically logging in…"
--msgstr "Automatische aanmelding…"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:11
-+msgid "Set to true to show the banner message text."
-+msgstr "Inschakelen om het welkomstbericht te tonen."
- 
--#. need to wait for response from backend
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:935
--msgid "Cancelling…"
--msgstr "Afbreken…"
-+# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:12
-+msgid "Banner message text"
-+msgstr "Welkomstbericht"
- 
--#. just wait for the user to select language and stuff
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1491
--msgid "Select language and click Log In"
--msgstr "Selecteer de taal en klik op ‘Aanmelden’"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:13
-+msgid "Text banner message to show in the login window."
-+msgstr "Tekst van het welkomstbericht in het aanmeldvenster."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1627
--msgctxt "customsession"
--msgid "Custom"
--msgstr "Aangepast"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:14
-+msgid "Disable showing the restart buttons"
-+msgstr "De herstartknoppen niet tonen"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1628
--msgid "Custom session"
--msgstr "Aangepaste sessie"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:15
-+msgid "Set to true to disable showing the restart buttons in the login window."
-+msgstr ""
-+"Inschakelen om de herstartknoppen van het aanmeldvenster niet te tonen."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:2605
--msgid "Login Window"
--msgstr "Aanmeldvenster"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16
-+msgid "Number of allowed authentication failures"
-+msgstr "Aantal toegestane mislukte inlogpogingen"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
--msgid "Cancel"
--msgstr "Afbreken"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17
-+msgid ""
-+"The number of times a user is allowed to attempt authentication, before "
-+"giving up and going back to user selection."
-+msgstr ""
-+"Aantal keer dat een gebruiker kan proberen in te loggen voordat teruggegaan "
-+"wordt naar het kiezen van een gebruiker."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
--msgid "Computer Name"
--msgstr "Computernaam"
-+#: ../gui/libgdm/gdm-user-switching.c:72
-+msgid "Unable to create transient display: "
-+msgstr "Aanmaken nieuw ‘transient display’ mislukt: "
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
--msgid "Login"
--msgstr "Aanmelden"
-+#: ../gui/libgdm/gdm-user-switching.c:183
-+#: ../gui/libgdm/gdm-user-switching.c:395
-+msgid "Unable to activate session: "
-+msgstr "Activeren sessie mislukt: "
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4
--msgid "Unlock"
--msgstr "Ontgrendelen"
-+# huh?
-+#: ../gui/libgdm/gdm-user-switching.c:344
-+#: ../gui/libgdm/gdm-user-switching.c:512 ../utils/gdmflexiserver.c:446
-+#: ../utils/gdmflexiserver.c:613
-+#, c-format
-+msgid "Could not identify the current session."
-+msgstr "Kon de huidige sessie niet identificeren."
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5
--msgid "Version"
--msgstr "Versie"
-+#: ../gui/libgdm/gdm-user-switching.c:351 ../utils/gdmflexiserver.c:453
-+#, c-format
-+msgid "User unable to switch sessions."
-+msgstr "Gebruiker kan niet van sessie wisselen."
- 
--# pauzestand/pauzeren
--#: ../gui/simple-greeter/gdm-greeter-panel.c:907
--msgid "Suspend"
--msgstr "Pauzeren"
-+# huh?
-+#: ../gui/libgdm/gdm-user-switching.c:521 ../utils/gdmflexiserver.c:622
-+#, c-format
-+msgid "Could not identify the current seat."
-+msgstr "Kon de huidige zitplaats niet identificeren."
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:912
--msgid "Restart"
--msgstr "Herstarten"
-+#: ../gui/libgdm/gdm-user-switching.c:531 ../utils/gdmflexiserver.c:632
-+#, c-format
-+msgid ""
-+"The system is unable to determine whether to switch to an existing login "
-+"screen or start up a new login screen."
-+msgstr ""
-+"Het systeem kon niet bepalen of naar een bestaand aanmeldscherm geschakeld "
-+"moest worden of dat er een nieuw aanmeldscherm gestart moet worden."
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:916
--msgid "Shut Down"
--msgstr "Uitschakelen"
-+#: ../gui/libgdm/gdm-user-switching.c:539 ../utils/gdmflexiserver.c:640
-+#, c-format
-+msgid "The system is unable to start up a new login screen."
-+msgstr "Het systeem kan geen nieuw aanmeldscherm tonen."
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:965
--msgid "Unknown time remaining"
--msgstr "Resterende tijd onbekend"
-+# hostsysteem/hostcomputer/computer/systeem
-+# het/een/.
-+#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147
-+msgid "Select System"
-+msgstr "Selecteer computer"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:987
--msgid "Panel"
--msgstr "Paneel"
-+# BUG: XMCP aan het begin moet zijn: XDMCP
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215
-+msgid "XDMCP: Could not create XDMCP buffer!"
-+msgstr "XDMCP: Kan geen XDMCP-buffer aanmaken!"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:505
--msgid "Label Text"
--msgstr "Labeltekst"
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221
-+msgid "XDMCP: Could not read XDMCP header!"
-+msgstr "XDMCP: Kan XDMCP-header niet lezen!"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:506
--msgid "The text to use as a label"
--msgstr "De te gebruiken tekst voor het label"
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
-+msgid "XDMCP: Incorrect XDMCP version!"
-+msgstr "XDMCP: Onjuiste XDMCP-versie!"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:513
--msgid "Icon name"
--msgstr "Pictogramnaam"
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
-+msgid "XDMCP: Unable to parse address"
-+msgstr "XDMCP: Kan adres niet verwerken"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:514
--msgid "The icon to use with the label"
--msgstr "Het te gebruiken pictogram voor het label"
-+# aanmeldingscontrole
-+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287
-+msgid "Fingerprint Authentication"
-+msgstr "Vingerafdruk-authenticatie"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:522
--msgid "Default Item"
--msgstr "Standaard-item"
-+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293
-+msgid "Log into session with fingerprint"
-+msgstr "Bij sessie aanmelden met vingerafdruk"
- 
--#: ../gui/simple-greeter/gdm-option-widget.c:523
--msgid "The ID of the default item"
--msgstr "Het ID van het standaard-item"
-+# aanmeldingscontrole
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287
-+msgid "Password Authentication"
-+msgstr "Wachtwoordauthenticatie"
- 
--#: ../gui/simple-greeter/gdm-recent-option-widget.c:310
--msgid "Max Item Count"
--msgstr "Maximum aantal items"
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293
-+msgid "Log into session with username and password"
-+msgstr "Bij sessie aanmelden met gebruikersnaam en wachtwoord"
- 
--#: ../gui/simple-greeter/gdm-recent-option-widget.c:311
--msgid "The maximum number of items to keep around in the list"
--msgstr "Het maximum aantal items in de lijst"
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408
-+msgid "Log In"
-+msgstr "Aanmelden"
- 
--#: ../gui/simple-greeter/gdm-remote-login-window.c:188
--#, c-format
--msgid "Remote Login (Connecting to %s…)"
--msgstr "Aanmelding op afstand (Verbinden met %s...)"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155
-+msgid "Slot ID"
-+msgstr "Slot-ID"
- 
--#: ../gui/simple-greeter/gdm-remote-login-window.c:202
--#, c-format
--msgid "Remote Login (Connected to %s)"
--msgstr "Aanmelding op afstand (Verbonden met %s)"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156
-+msgid "The slot the card is in"
-+msgstr "Het slot waar de kaart in zit"
- 
--#: ../gui/simple-greeter/gdm-remote-login-window.c:281
--msgid "Remote Login"
--msgstr "Aanmelding op afstand"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162
-+msgid "Slot Series"
-+msgstr "Slot Series"
- 
--#: ../gui/simple-greeter/gdm-session-option-widget.c:162
--msgid "Session"
--msgstr "Sessies"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163
-+msgid "per-slot card identifier"
-+msgstr "per-slot kaartidentifier"
- 
--# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1
--msgid "Banner message text"
--msgstr "Welkomstbericht"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170
-+msgid "name"
-+msgstr "naam"
- 
--# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2
--msgid "Banner message text when chooser is empty"
--msgstr "Welkomstbericht bij lege kieslijst"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174
-+msgid "Module"
-+msgstr "Module"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3
--msgid "Disable showing the restart buttons"
--msgstr "De herstartknoppen niet tonen"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175
-+msgid "smartcard driver"
-+msgstr "smartcard-stuurprogramma"
- 
--# bekende/legale
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4
--msgid "Do not show known users in the login window"
--msgstr "Legale gebruikers niet tonen in het aanmeldvenster"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408
-+msgid "Smartcard Authentication"
-+msgstr "Smartcard-authenticatie"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5
--msgid "Enable accessibility keyboard plugin"
--msgstr "Toetsenbordtoegankelijkheidsplug-in activeren"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414
-+msgid "Log into session with smartcard"
-+msgstr "Bij sessie aanmelden met smartcard"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6
--msgid "Enable on-screen keyboard"
--msgstr "Schermtoetsenbord inschakelen"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186
-+msgid "Module Path"
-+msgstr "Modulepad"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187
-+msgid "path to smartcard PKCS #11 driver"
-+msgstr "pad naar stuurprogramma smartcard PKCS #11"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7
--msgid "Enable screen magnifier"
--msgstr "Vergrootglad inschakelen"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527
-+msgid "received error or hang up from event source"
-+msgstr "fout ontvangen van, of opgehangen door activiteitenbron"
- 
--# klaar voor gebruik/gereed
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8
--msgid "Enable screen reader"
--msgstr "Schermlezer inschakelen"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661
-+#, c-format
-+msgid "NSS security system could not be initialized"
-+msgstr "NSS-beveiligingssysteem kon niet worden geïnitialiseerd"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9
--msgid "Enable showing the banner message"
--msgstr "Het welkomstbericht tonen"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789
-+#, c-format
-+msgid "no suitable smartcard driver could be found"
-+msgstr "er is geen geschikt smartcard-stuurprogramma aangetroffen"
- 
--# welkomstlogo/aanmeldlogo
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10
--msgid "Icon name to use for greeter logo"
--msgstr "Pictogramnaam voor het aanmeldlogo"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803
-+#, c-format
-+msgid "smartcard driver '%s' could not be loaded"
-+msgstr "smartcard-stuurprogramma ‘%s’ kon niet worden geladen"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11
--msgid "Recently selected languages"
--msgstr "Recent gebruikte talen"
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875
-+#, c-format
-+msgid "could not watch for incoming card events - %s"
-+msgstr "kon inkomende kaartactiviteit niet nagaan - %s"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12
--msgid "Set to a list of languages to be shown by default in the login window."
--msgstr "Instellen op een lijst van standaard weer te geven talen."
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242
-+#, c-format
-+msgid "encountered unexpected error while waiting for smartcard events"
-+msgstr "onverwachte fout tegengekomen bij het wachten op smartcardactiviteiten"
- 
--# thema van pictogramnaam/naam van het themapictogram
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
--msgid "Set to the themed icon name to use for the greeter logo."
--msgstr ""
--"Ingesteld op de naam van het themapictogram dat gebruikt wordt voor het "
--"aanmeldlogo."
-+# aanmeldingscontrole
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287
-+msgid "Authentication"
-+msgstr "Authenticatie"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
--msgid "Set to true to disable showing known users in the login window."
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293
-+msgid "Log into session"
-+msgstr "Bij sessie aanmelden"
-+
-+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239
-+msgid "Value"
-+msgstr "Waarde"
-+
-+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240
-+msgid "percentage of time complete"
-+msgstr "percentage voltooide tijd"
-+
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1465
-+msgid "Inactive Text"
-+msgstr "Inactieve tekst"
-+
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1466
-+msgid "The text to use in the label if the user hasn't picked an item yet"
- msgstr ""
--"Inschakelen om de gebruikers van het systeem niet te tonen in het "
--"aanmeldvenster."
-+"De te gebruiken tekst in het label als de gebruiker nog geen item heeft "
-+"gekozen"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
--msgid "Set to true to disable showing the restart buttons in the login window."
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1474
-+msgid "Active Text"
-+msgstr "Actieve tekst"
-+
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1475
-+msgid "The text to use in the label if the user has picked an item"
- msgstr ""
--"Inschakelen om de herstartknoppen van het aanmeldvenster niet te tonen."
-+"De te gebruiken tekst in het label als de gebruiker een item heeft gekozen"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16
--msgid "Set to true to enable the XRandR settings manager plugin."
--msgstr "Inschakelen om de plug-in voor xrandr te gebruiken."
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1484
-+msgid "List Visible"
-+msgstr "Lijst zichtbaar"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17
--msgid "Set to true to enable the background settings manager plugin."
--msgstr "Inschakelen om achtergrondinstellingenbeheer te gebruiken."
-+#: ../gui/simple-greeter/gdm-chooser-widget.c:1485
-+msgid "Whether the chooser list is visible"
-+msgstr "Of de kieslijst zichtbaar is"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
--msgid "Set to true to enable the media-keys settings manager plugin."
--msgstr ""
--"Inschakelen om de plug-in voor het beheer van de media-toetsen te gebruiken."
-+# a=verkorte weekdag
-+# b=verkorte maand
-+# d=dag van de maand (01)
-+# e=dag van de maand (1)
-+# l=uur (1-12)
-+# p=lokaal equivalent van AM/PM
-+# H=uur (0-23)
-+# M=minuut
-+#. translators: This is the time format to use when both
-+#. * the date and time with seconds are being shown together.
-+#.
-+#: ../gui/simple-greeter/gdm-clock-widget.c:70
-+msgid "%a %b %e, %l:%M:%S %p"
-+msgstr "%a %e %b, %H:%M:%S"
-+
-+# a=verkorte weekdag
-+# b=verkorte maand
-+# d=dag van de maand (01)
-+# e=dag van de maand (1)
-+# l=uur (1-12)
-+# p=lokaal equivalent van AM/PM
-+# H=uur (0-23)
-+# M=minuut
-+#. translators: This is the time format to use when both
-+#. * the date and time without seconds are being shown together.
-+#.
-+#: ../gui/simple-greeter/gdm-clock-widget.c:76
-+msgid "%a %b %e, %l:%M %p"
-+msgstr "%a %e %b, %H:%M"
-+
-+# a=verkorte weekdag
-+# b=verkorte maand
-+# d=dag van de maand (01)
-+# e=dag van de maand (1)
-+# l=uur (1-12)
-+# p=lokaal equivalent van AM/PM
-+# H=uur (0-23)
-+# M=minuut
-+#. translators: This is the time format to use when there is
-+#. * no date, just weekday and time with seconds.
-+#.
-+#: ../gui/simple-greeter/gdm-clock-widget.c:83
-+msgid "%a %l:%M:%S %p"
-+msgstr "%a %H:%M%S"
-+
-+# a=verkorte weekdag
-+# b=verkorte maand
-+# d=dag van de maand (01)
-+# e=dag van de maand (1)
-+# l=uur (1-12)
-+# p=lokaal equivalent van AM/PM
-+# H=uur (0-23)
-+# M=minuut
-+#. translators: This is the time format to use when there is
-+#. * no date, just weekday and time without seconds.
-+#.
-+#: ../gui/simple-greeter/gdm-clock-widget.c:92
-+msgid "%a %l:%M %p"
-+msgstr "%a %H:%M"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:314
-+msgid "Automatically logging in…"
-+msgstr "Automatische aanmelding…"
-+
-+#. need to wait for response from backend
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:930
-+msgid "Cancelling…"
-+msgstr "Afbreken…"
-+
-+#. just wait for the user to select language and stuff
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486
-+msgid "Select language and click Log In"
-+msgstr "Selecteer de taal en klik op ‘Aanmelden’"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622
-+msgctxt "customsession"
-+msgid "Custom"
-+msgstr "Aangepast"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623
-+msgid "Custom session"
-+msgstr "Aangepaste sessie"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
-+msgid "Computer Name"
-+msgstr "Computernaam"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
-+msgid "Version"
-+msgstr "Versie"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
-+msgid "Cancel"
-+msgstr "Afbreken"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4
-+msgid "Unlock"
-+msgstr "Ontgrendelen"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
--msgid "Set to true to enable the on-screen keyboard."
--msgstr "Inschakelen om het schermtoetsenbord te gebruiken."
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5
-+msgid "Login"
-+msgstr "Aanmelden"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
--msgid ""
--"Set to true to enable the plugin to manage the accessibility keyboard "
--"settings."
--msgstr "Inschakelen om de toetsenbordtoegankelijkheidsplug-in te gebruiken."
-+# pauzestand/pauzeren
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:955
-+msgid "Suspend"
-+msgstr "Pauzeren"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
--msgid "Set to true to enable the screen magnifier."
--msgstr "Inschakelen om het vergrootglas te gebruiken."
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:960
-+msgid "Restart"
-+msgstr "Herstarten"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
--msgid "Set to true to enable the screen reader."
--msgstr "Inschakelen om de schermlezer te gebruiken."
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:964
-+msgid "Shut Down"
-+msgstr "Uitschakelen"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
--msgid "Set to true to enable the sound settings manager plugin."
--msgstr ""
--"Inschakelen om de plug-in voor het beheer van de geluidsinstellingen te "
--"gebruiken."
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:1013
-+msgid "Unknown time remaining"
-+msgstr "Resterende tijd onbekend"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
--msgid "Set to true to enable the xsettings settings manager plugin."
--msgstr ""
--"Inschakelen om de plug-in voor het beheer van de xsettings-instellingen te "
--"gebruiken."
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:1035
-+msgid "Panel"
-+msgstr "Paneel"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
--msgid "Set to true to show the banner message text."
--msgstr "Inschakelen om het welkomstbericht te tonen."
-+#: ../gui/simple-greeter/gdm-option-widget.c:505
-+msgid "Label Text"
-+msgstr "Labeltekst"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
--msgid "Set to true to use Compiz as the window manager."
--msgstr "Inschakelen om compiz voor het vensterbeheer te gebruiken."
-+#: ../gui/simple-greeter/gdm-option-widget.c:506
-+msgid "The text to use as a label"
-+msgstr "De te gebruiken tekst voor het label"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27
--msgid ""
--"Text banner message to show in the login window when the user chooser is "
--"empty, instead of banner_message_text."
--msgstr ""
--"Tekst van het welkomstbericht in het aanmeldvenster wanneer de kieslijst "
--"leeg is, in plaats van banner_message_text."
-+#: ../gui/simple-greeter/gdm-option-widget.c:513
-+msgid "Icon name"
-+msgstr "Pictogramnaam"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28
--msgid "Text banner message to show in the login window."
--msgstr "Tekst van het welkomstbericht in het aanmeldvenster."
-+#: ../gui/simple-greeter/gdm-option-widget.c:514
-+msgid "The icon to use with the label"
-+msgstr "Het te gebruiken pictogram voor het label"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
--msgid "True if the XRandR settings manager plugin is enabled."
--msgstr "Ingeschakeld als de xrandr-plug-in gebruikt wordt."
-+#: ../gui/simple-greeter/gdm-option-widget.c:522
-+msgid "Default Item"
-+msgstr "Standaard-item"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30
--msgid "True if the background settings manager plugin is enabled."
--msgstr ""
--"Ingeschakeld als de plug-in voor achtergrondinstellingen gebruikt wordt."
-+#: ../gui/simple-greeter/gdm-option-widget.c:523
-+msgid "The ID of the default item"
-+msgstr "Het ID van het standaard-item"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31
--msgid "True if the media-keys settings manager plugin is enabled."
--msgstr ""
--"Ingeschakeld als de plug-in voor het beheer van de media-toetsen gebruikt "
--"wordt."
-+#: ../gui/simple-greeter/gdm-remote-login-window.c:188
-+#, c-format
-+msgid "Remote Login (Connecting to %s…)"
-+msgstr "Aanmelding op afstand (Verbinden met %s...)"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
--msgid "True if the sound settings manager plugin is enabled."
--msgstr ""
--"Ingeschakeld als de plug-in voor het beheer van de geluidsinstellingen "
--"gebruikt wordt."
-+#: ../gui/simple-greeter/gdm-remote-login-window.c:202
-+#, c-format
-+msgid "Remote Login (Connected to %s)"
-+msgstr "Aanmelding op afstand (Verbonden met %s)"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
--msgid "True if the xsettings settings manager plugin is enabled."
--msgstr ""
--"Ingeschakeld als de plug-in voor xsettings-instellingen gebruikt wordt."
-+#: ../gui/simple-greeter/gdm-remote-login-window.c:281
-+msgid "Remote Login"
-+msgstr "Aanmelding op afstand"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
--msgid "Use Compiz as the window manager"
--msgstr "Compiz gebruiken voor het vensterbeheer"
-+#: ../gui/simple-greeter/gdm-session-option-widget.c:162
-+msgid "Session"
-+msgstr "Sessies"
- 
- #: ../gui/simple-greeter/gdm-timer.c:147
- msgid "Duration"
-@@ -873,8 +847,8 @@ msgstr "Is het actief?"
- msgid "Whether the timer is currently ticking"
- msgstr "Of de teller momenteel aan het aftellen is"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:802
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800
- #, c-format
- msgid "Log in as %s"
- msgstr "Aanmelden als %s"
-@@ -884,201 +858,293 @@ msgstr "Aanmelden als %s"
- #. * manually instead of choosing from
- #. * a list.
- #.
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544
- msgctxt "user"
- msgid "Other…"
- msgstr "Anderen…"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545
- msgid "Choose a different account"
- msgstr "Kies een ander account"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559
- msgid "Guest"
- msgstr "Gast"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560
- msgid "Log in as a temporary guest"
- msgstr "Aanmelden als tijdelijke gast"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575
- msgid "Automatic Login"
- msgstr "Automatische aanmelding"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576
- msgid "Automatically log into the system after selecting options"
- msgstr "Automatisch aanmelden na het selecteren van de opties"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1358
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332
- msgid "Currently logged in"
- msgstr "Al aangemeld"
- 
--# aanmeldingscontrole
--#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287
--msgid "Password Authentication"
--msgstr "Wachtwoordauthenticatie"
-+#: ../utils/gdmflexiserver.c:64
-+msgid "Only the VERSION command is supported"
-+msgstr "Alleen VERSION wordt ondersteund"
- 
--#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293
--msgid "Log into session with username and password"
--msgstr "Bij sessie aanmelden met gebruikersnaam en wachtwoord"
-+#: ../utils/gdmflexiserver.c:64
-+msgid "COMMAND"
-+msgstr "OPDRACHT"
- 
--#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565
--#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408
--msgid "Log In"
--msgstr "Aanmelden"
-+#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
-+#: ../utils/gdmflexiserver.c:68 ../utils/gdmflexiserver.c:69
-+msgid "Ignored — retained for compatibility"
-+msgstr "Genegeerd - aanwezig om compatibiliteitsredenen"
- 
--# aanmeldingscontrole
--#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287
--msgid "Fingerprint Authentication"
--msgstr "Vingerafdruk-authenticatie"
-+#: ../utils/gdmflexiserver.c:67 ../utils/gdm-screenshot.c:43
-+msgid "Debugging output"
-+msgstr "Debug-uitvoer"
- 
--#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293
--msgid "Log into session with fingerprint"
--msgstr "Bij sessie aanmelden met vingerafdruk"
-+#: ../utils/gdmflexiserver.c:71
-+msgid "Version of this application"
-+msgstr "De versie van deze toepassing"
- 
--#: ../gui/simple-greeter/extensions/fingerprint/org.gnome.display-manager.extensions.fingerprint.gschema.xml.in.h:1
--#: ../gui/simple-greeter/extensions/smartcard/org.gnome.display-manager.extensions.smartcard.gschema.xml.in.h:1
--msgid "Activation of this plugin"
--msgstr "Activering van deze plug-in"
-+#. Option parsing
-+#: ../utils/gdmflexiserver.c:706
-+msgid "- New GDM login"
-+msgstr "— Nieuwe GDM-login"
- 
--#: ../gui/simple-greeter/extensions/fingerprint/org.gnome.display-manager.extensions.fingerprint.gschema.xml.in.h:2
--#: ../gui/simple-greeter/extensions/smartcard/org.gnome.display-manager.extensions.smartcard.gschema.xml.in.h:2
--msgid "Whether this plugin would be activated or not"
--msgstr "Of deze plug-in wel of niet geactiveerd moet zijn"
-+#: ../utils/gdmflexiserver.c:762
-+msgid "Unable to start new display"
-+msgstr "Kan geen nieuw scherm starten"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408
--msgid "Smartcard Authentication"
--msgstr "Smartcard-authenticatie"
-+#: ../utils/gdm-screenshot.c:212
-+msgid "Screenshot taken"
-+msgstr "Schermafdruk gemaakt"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414
--msgid "Log into session with smartcard"
--msgstr "Bij sessie aanmelden met smartcard"
-+#. Option parsing
-+#: ../utils/gdm-screenshot.c:279
-+msgid "Take a picture of the screen"
-+msgstr "Een schermafdruk maken"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186
--msgid "Module Path"
--msgstr "Modulepad"
-+#~ msgid "Unable to initialize login system"
-+#~ msgstr "kan aanmeldsysteem niet initialiseren"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187
--msgid "path to smartcard PKCS #11 driver"
--msgstr "pad naar stuurprogramma smartcard PKCS #11"
-+#~ msgid "Unable to authenticate user"
-+#~ msgstr "Kan gebruiker niet authenticeren"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527
--msgid "received error or hang up from event source"
--msgstr "fout ontvangen van, of opgehangen door activiteitenbron"
-+#~ msgid "Unable to establish credentials"
-+#~ msgstr "Kan aanmeldgegevens niet vaststellen"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661
--#, c-format
--msgid "NSS security system could not be initialized"
--msgstr "NSS-beveiligingssysteem kon niet worden geïnitialiseerd"
-+#~ msgid "Group %s doesn't exist"
-+#~ msgstr "Groep %s bestaat niet"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789
--#, c-format
--msgid "no suitable smartcard driver could be found"
--msgstr "er is geen geschikt smartcard-stuurprogramma aangetroffen"
-+#~ msgid "Denied XDMCP query from host %s"
-+#~ msgstr "XDMCP verzoek van host %s geweigerd"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803
--#, c-format
--msgid "smartcard driver '%s' could not be loaded"
--msgstr "smartcard-stuurprogramma ‘%s’ kon niet worden geladen"
-+#~ msgid "Could not extract authlist from packet"
-+#~ msgstr "Kan authlijst niet uit pakket halen"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875
--#, c-format
--msgid "could not watch for incoming card events - %s"
--msgstr "kon inkomende kaartactiviteit niet nagaan - %s"
-+#~ msgid "Error in checksum"
-+#~ msgstr "Fout in checksum"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242
--#, c-format
--msgid "encountered unexpected error while waiting for smartcard events"
--msgstr "onverwachte fout tegengekomen bij het wachten op smartcardactiviteiten"
-+#~ msgid "Bad address"
-+#~ msgstr "Foutief adres"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155
--msgid "Slot ID"
--msgstr "Slot-ID"
-+#~ msgid "%s: Could not read display address"
-+#~ msgstr "%s: Kan schermadres niet lezen"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156
--msgid "The slot the card is in"
--msgstr "Het slot waar de kaart in zit"
-+#~ msgid "%s: Could not read display port number"
-+#~ msgstr "%s: Kan poortnummer van scherm niet lezen"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162
--msgid "Slot Series"
--msgstr "Slot Series"
-+#~ msgid "%s: Could not extract authlist from packet"
-+#~ msgstr "%s: Kan geen authlijst uit pakket halen"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163
--msgid "per-slot card identifier"
--msgstr "per-slot kaartidentifier"
-+#~ msgid "%s: Error in checksum"
-+#~ msgstr "%s: Fout in checksum"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170
--msgid "name"
--msgstr "naam"
-+#~ msgid "%s: Got REQUEST from banned host %s"
-+#~ msgstr "%s: REQUEST ontvangen van verboden host %s"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174
--msgid "Module"
--msgstr "Module"
-+#~ msgid "%s: Could not read Display Number"
-+#~ msgstr "%s: Kan het schermnummer niet lezen"
- 
--#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175
--msgid "smartcard driver"
--msgstr "smartcard-stuurprogramma"
-+#~ msgid "%s: Could not read Connection Type"
-+#~ msgstr "%s: Kan het verbindingstype niet lezen"
- 
--# aanmeldingscontrole
--#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287
--msgid "Authentication"
--msgstr "Authenticatie"
-+#~ msgid "%s: Could not read Client Address"
-+#~ msgstr "%s: Kan clientadres niet lezen"
- 
--#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293
--msgid "Log into session"
--msgstr "Bij sessie aanmelden"
-+#~ msgid "%s: Could not read Authentication Data"
-+#~ msgstr "%s: Kan de identificatiedata niet lezen"
- 
--#: ../utils/gdmflexiserver.c:61
--msgid "Only the VERSION command is supported"
--msgstr "Alleen VERSION wordt ondersteund"
-+#~ msgid "%s: Could not read Authorization List"
-+#~ msgstr "%s: Kan de identificatielijst niet lezen"
- 
--#: ../utils/gdmflexiserver.c:61
--msgid "COMMAND"
--msgstr "OPDRACHT"
-+#~ msgid "%s: Could not read Manufacturer ID"
-+#~ msgstr "%s: Kan Producent-ID niet lezen"
- 
--#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63
--#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
--msgid "Ignored — retained for compatibility"
--msgstr "Genegeerd - aanwezig om compatibiliteitsredenen"
-+#~ msgid "%s: Failed checksum from %s"
-+#~ msgstr "%s: Fout in checksum van %s"
- 
--#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43
--msgid "Debugging output"
--msgstr "Debug-uitvoer"
-+#~ msgid "%s: Got Manage from banned host %s"
-+#~ msgstr "%s: 'Manage' ontvangen van verboden host %s"
- 
--#: ../utils/gdmflexiserver.c:68
--msgid "Version of this application"
--msgstr "De versie van deze toepassing"
-+#~ msgid "%s: Could not read Session ID"
-+#~ msgstr "%s: Kan sessie-ID niet lezen"
- 
--# huh?
--#: ../utils/gdmflexiserver.c:674
--#, c-format
--msgid "Could not identify the current session."
--msgstr "Kon de huidige sessie niet identificeren."
-+#~ msgid "%s: Could not read Display Class"
-+#~ msgstr "%s: Kan schermklasse niet lezen"
- 
--#: ../utils/gdmflexiserver.c:682
--#, c-format
--msgid "User unable to switch sessions."
--msgstr "Gebruiker kan niet van sessie wisselen."
-+#~ msgid "%s: Could not read address"
-+#~ msgstr "%s: Kan adres niet lezen"
- 
--#. Option parsing
--#: ../utils/gdmflexiserver.c:716
--msgid "- New GDM login"
--msgstr "— Nieuwe GDM-login"
-+#~ msgid "%s: Got KEEPALIVE from banned host %s"
-+#~ msgstr "%s: KEEPALIVE ontvangen van verboden host %s"
- 
--#: ../utils/gdmflexiserver.c:772
--msgid "Unable to start new display"
--msgstr "Kan geen nieuw scherm starten"
-+#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
-+#~ msgstr "GdmXdmcpDisplayFactory: Kan XDMCP-header niet lezen!"
- 
--#: ../utils/gdm-screenshot.c:212
--msgid "Screenshot taken"
--msgstr "Schermafdruk gemaakt"
-+#~ msgid "Could not get server hostname: %s!"
-+#~ msgstr "Kan de naam van de server niet vinden: %s!"
- 
--#. Option parsing
--#: ../utils/gdm-screenshot.c:279
--msgid "Take a picture of the screen"
--msgstr "Een schermafdruk maken"
-+#~ msgid "Logdir %s does not exist or isn't a directory."
-+#~ msgstr "Logmap %s bestaat niet of is geen map."
-+
-+#~ msgid "Authdir %s does not exist. Aborting."
-+#~ msgstr "Authdir %s bestaat niet. Gestopt."
-+
-+#~ msgid "Authdir %s is not a directory. Aborting."
-+#~ msgstr "Authdir %s niet herkend. Gestopt."
-+
-+#~ msgid "Authdir %s is not owned by user %d, group %d. Aborting."
-+#~ msgstr "Authdir %s is geen eigendom van gebruiker %d, groep %d. Gestopt."
-+
-+#~ msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting."
-+#~ msgstr "Authdir %s heeft verkeerde rechten %o. Moet %o zijn. Gestopt."
-+
-+#~ msgid "Max Item Count"
-+#~ msgstr "Maximum aantal items"
-+
-+#~ msgid "The maximum number of items to keep around in the list"
-+#~ msgstr "Het maximum aantal items in de lijst"
-+
-+# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst
-+#~ msgid "Banner message text when chooser is empty"
-+#~ msgstr "Welkomstbericht bij lege kieslijst"
-+
-+# bekende/legale
-+#~ msgid "Do not show known users in the login window"
-+#~ msgstr "Legale gebruikers niet tonen in het aanmeldvenster"
-+
-+#~ msgid "Enable accessibility keyboard plugin"
-+#~ msgstr "Toetsenbordtoegankelijkheidsplug-in activeren"
-+
-+#~ msgid "Enable on-screen keyboard"
-+#~ msgstr "Schermtoetsenbord inschakelen"
-+
-+#~ msgid "Enable screen magnifier"
-+#~ msgstr "Vergrootglad inschakelen"
-+
-+# klaar voor gebruik/gereed
-+#~ msgid "Enable screen reader"
-+#~ msgstr "Schermlezer inschakelen"
-+
-+# welkomstlogo/aanmeldlogo
-+#~ msgid "Icon name to use for greeter logo"
-+#~ msgstr "Pictogramnaam voor het aanmeldlogo"
-+
-+#~ msgid "Recently selected languages"
-+#~ msgstr "Recent gebruikte talen"
-+
-+#~ msgid ""
-+#~ "Set to a list of languages to be shown by default in the login window."
-+#~ msgstr "Instellen op een lijst van standaard weer te geven talen."
-+
-+# thema van pictogramnaam/naam van het themapictogram
-+#~ msgid "Set to the themed icon name to use for the greeter logo."
-+#~ msgstr ""
-+#~ "Ingesteld op de naam van het themapictogram dat gebruikt wordt voor het "
-+#~ "aanmeldlogo."
-+
-+#~ msgid "Set to true to disable showing known users in the login window."
-+#~ msgstr ""
-+#~ "Inschakelen om de gebruikers van het systeem niet te tonen in het "
-+#~ "aanmeldvenster."
-+
-+#~ msgid "Set to true to enable the XRandR settings manager plugin."
-+#~ msgstr "Inschakelen om de plug-in voor xrandr te gebruiken."
-+
-+#~ msgid "Set to true to enable the background settings manager plugin."
-+#~ msgstr "Inschakelen om achtergrondinstellingenbeheer te gebruiken."
-+
-+#~ msgid "Set to true to enable the media-keys settings manager plugin."
-+#~ msgstr ""
-+#~ "Inschakelen om de plug-in voor het beheer van de media-toetsen te "
-+#~ "gebruiken."
-+
-+#~ msgid "Set to true to enable the on-screen keyboard."
-+#~ msgstr "Inschakelen om het schermtoetsenbord te gebruiken."
-+
-+#~ msgid ""
-+#~ "Set to true to enable the plugin to manage the accessibility keyboard "
-+#~ "settings."
-+#~ msgstr "Inschakelen om de toetsenbordtoegankelijkheidsplug-in te gebruiken."
-+
-+#~ msgid "Set to true to enable the screen magnifier."
-+#~ msgstr "Inschakelen om het vergrootglas te gebruiken."
-+
-+#~ msgid "Set to true to enable the screen reader."
-+#~ msgstr "Inschakelen om de schermlezer te gebruiken."
-+
-+#~ msgid "Set to true to enable the sound settings manager plugin."
-+#~ msgstr ""
-+#~ "Inschakelen om de plug-in voor het beheer van de geluidsinstellingen te "
-+#~ "gebruiken."
-+
-+#~ msgid "Set to true to enable the xsettings settings manager plugin."
-+#~ msgstr ""
-+#~ "Inschakelen om de plug-in voor het beheer van de xsettings-instellingen "
-+#~ "te gebruiken."
-+
-+#~ msgid "Set to true to use Compiz as the window manager."
-+#~ msgstr "Inschakelen om compiz voor het vensterbeheer te gebruiken."
-+
-+#~ msgid ""
-+#~ "Text banner message to show in the login window when the user chooser is "
-+#~ "empty, instead of banner_message_text."
-+#~ msgstr ""
-+#~ "Tekst van het welkomstbericht in het aanmeldvenster wanneer de kieslijst "
-+#~ "leeg is, in plaats van banner_message_text."
-+
-+#~ msgid "True if the XRandR settings manager plugin is enabled."
-+#~ msgstr "Ingeschakeld als de xrandr-plug-in gebruikt wordt."
-+
-+#~ msgid "True if the background settings manager plugin is enabled."
-+#~ msgstr ""
-+#~ "Ingeschakeld als de plug-in voor achtergrondinstellingen gebruikt wordt."
-+
-+#~ msgid "True if the media-keys settings manager plugin is enabled."
-+#~ msgstr ""
-+#~ "Ingeschakeld als de plug-in voor het beheer van de media-toetsen gebruikt "
-+#~ "wordt."
-+
-+#~ msgid "True if the sound settings manager plugin is enabled."
-+#~ msgstr ""
-+#~ "Ingeschakeld als de plug-in voor het beheer van de geluidsinstellingen "
-+#~ "gebruikt wordt."
-+
-+#~ msgid "True if the xsettings settings manager plugin is enabled."
-+#~ msgstr ""
-+#~ "Ingeschakeld als de plug-in voor xsettings-instellingen gebruikt wordt."
-+
-+#~ msgid "Use Compiz as the window manager"
-+#~ msgstr "Compiz gebruiken voor het vensterbeheer"
-+
-+#~ msgid "Activation of this plugin"
-+#~ msgstr "Activering van deze plug-in"
-+
-+#~ msgid "Whether this plugin would be activated or not"
-+#~ msgstr "Of deze plug-in wel of niet geactiveerd moet zijn"
- 
- #~ msgid "AT-SPI Registry Wrapper"
- #~ msgstr "AT SPI Registry Wrapper"
-@@ -1086,9 +1152,6 @@ msgstr "Een schermafdruk maken"
- #~ msgid "Power Manager"
- #~ msgstr "Energiebeheer"
- 
--#~ msgid "Power management daemon"
--#~ msgstr "Energiebeheer-service"
--
- #~ msgid "GNOME Session Acceleration Checker"
- #~ msgstr "Controle van hardwareversnelling voor de Gnome-sessie"
- 
-diff --git a/po/or.po b/po/or.po
-index 9385520..0578c97 100644
---- a/po/or.po
-+++ b/po/or.po
-@@ -3,15 +3,17 @@
- # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
- #
- # Subhransu Behera <arya_subhransu@yahoo.co.in>, 2006.
--# Manoj Kumar Giri <mgiri@redhat.com>, 2008, 2009, 2010, 2011.
-+# Manoj Kumar Giri <mgiri@redhat.com>, 2008, 2009, 2010, 2011, 2012.
- msgid ""
- msgstr ""
- "Project-Id-Version: or\n"
--"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n"
--"POT-Creation-Date: 2011-02-17 16:55+0000\n"
--"PO-Revision-Date: 2011-03-04 15:08+0530\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-+"product=gdm&keywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2012-10-02 17:33+0000\n"
-+"PO-Revision-Date: 2012-11-20 19:07+0530\n"
- "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
--"Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
-+"Language-Team: Oriya <oriya-it@googlegroups.com>\n"
-+"Language: or\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -22,109 +24,105 @@ msgstr ""
- "\n"
- "\n"
- "\n"
--"X-Generator: Lokalize 1.1\n"
-+"X-Generator: Lokalize 1.5\n"
- 
--#: ../common/gdm-common.c:456
-+#: ../common/gdm-common.c:492
- #, c-format
- msgid "/dev/urandom is not a character device"
- msgstr "/dev/urandom ଟି ଗୋଟିଏ ସମ୍ପ୍ରତିକ ଉପକରଣ ନୁହଁ"
- 
--#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
--#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
--msgid "Display ID"
--msgstr "ID ପ୍ରଦର୍ଶନକରନ୍ତୁ"
--
--#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
--#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
--msgid "ID"
--msgstr "ID"
--
--#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194
--#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196
--msgid "GNOME Display Manager Slave"
--msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧୀନ"
--
- #: ../daemon/gdm-display-access-file.c:300
- #, c-format
- msgid "could not find user \"%s\" on system"
- msgstr "ତନ୍ତ୍ରରେ ଚାଳକ \"%s\" କୁ ଖୋଜି ପାଉନାହିଁ"
- 
--#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325
--msgid "Unable to initialize login system"
--msgstr "ଲଗଇନ ତନ୍ତ୍ରକୁ ଆରମ୍ଭକରିବାରେ ଅସମର୍ଥ"
-+#: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349
-+#, c-format
-+#| msgid "no user account available"
-+msgid "No session available yet"
-+msgstr "ଏପର୍ଯ୍ୟନ୍ତ କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ"
-+
-+#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384
-+#, c-format
-+#| msgid "Unable to authorize user"
-+msgid "Unable to look up UID of user %s"
-+msgstr "ବ୍ୟବହାରକାରୀ %s ର UID କୁ ଦେଖିବାରେ ଅସମର୍ଥ"
-+
-+#: ../daemon/gdm-manager.c:291
-+#| msgid "no user account available"
-+msgid "no sessions available"
-+msgstr "କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ"
- 
--#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361
--msgid "Unable to authenticate user"
--msgstr "ଚାଳକକୁ ବୈଧିକ୍ରୁତ କରିବାରେ ଅସମର୍ଥ"
-+#: ../daemon/gdm-manager.c:352
-+#, c-format
-+msgid "No sessions for %s available for reauthentication"
-+msgstr "ପୁନଃ ବୈଧିକରଣ କରିବାକୁ %s ପାଇଁ କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ"
- 
--#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418
--msgid "Unable to authorize user"
--msgstr "ଚାଳକକୁ ପ୍ରାଧିକୃତ କରିବାରେ ଅସମର୍ଥ"
-+#: ../daemon/gdm-manager.c:406
-+#, c-format
-+#| msgid "Unable to open session"
-+msgid "Unable to find session for user %s"
-+msgstr "%s ପାଇଁ ଅଧିବେଶନ ଖୋଜିବାରେ ଅସମର୍ଥ"
- 
--#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547
--msgid "Unable to establish credentials"
--msgstr "ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ପ୍ରତିସ୍ଥାପନ କରିବାରେ ଅସମର୍ଥ"
-+#: ../daemon/gdm-manager.c:476
-+#, c-format
-+#| msgid "Unable to open session"
-+msgid "Unable to find appropriate session for user %s"
-+msgstr "ବ୍ୟବହାରକାରୀ %s ପାଇଁ ସଠିକ ଅଧିବେଶନ ଖୋଜିବାରେ ଅସମର୍ଥ"
- 
--#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581
--msgid "Unable to open session"
--msgstr "ଅଧିବେଶନ ଖୋଲିବାରେ ଅସମର୍ଥ"
-+#: ../daemon/gdm-manager.c:671
-+#| msgid "User %s doesn't exist"
-+msgid "User doesn't own session"
-+msgstr "ବ୍ୟବହାରକାରୀଙ୍କର ଅଧିବେଶନ ନଥାଏ"
- 
--#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449
--#: ../daemon/gdm-simple-slave.c:1259
--msgid ""
--"Could not start the X server (your graphical environment) due to an internal "
--"error. Please contact your system administrator or check your syslog to "
--"diagnose. In the meantime this display will be disabled.  Please restart GDM "
--"when the problem is corrected."
--msgstr ""
--"କିଛି ଅନ୍ତର୍ନିହିତ କାରଣ ବଶତଃ X ସର୍ଭର (ଆପଣଙ୍କ ଆଲେଖୀକ ପରିବେଶ) କୁ ପ୍ରାରମ୍ଭ କରିପାରିଲା ନାହିଁ. ଦୟାକରି "
--"ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁକିମ୍ବା ଆପଣଙ୍କ ସମସ୍ଯାର କାରଣକୁ ନିରୂପଣ କରିବା ପାଇଁ "
--"ତନ୍ତ୍ରର ଲଗକୁ ଯାଞ୍ଚ କରନ୍ତୁ.ସେହି ସମୟରେ ଏହି ପ୍ରଦର୍ଶନଟି ନିଷ୍କ୍ରିୟ ହୋଇଯିବ.  ଯେତେବେଳେ ସମସ୍ଯାଟି ସମଧାନ "
--"ହୋଇଯିବସେତେବେଳେ ଦୟାକରି GDM କୁ ପୁନଃ ପ୍ରାରମ୍ଭ କରିବେ."
-+#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768
-+#| msgid "no user account available"
-+msgid "No session available"
-+msgstr "କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ"
- 
--#: ../daemon/gdm-server.c:250
-+#: ../daemon/gdm-server.c:273
- #, c-format
- msgid "%s: failed to connect to parent display '%s'"
- msgstr "%s: ମୂଳ ପ୍ରଦର୍ଶନ '%s' ସହିତ ସଂଯୋଗ କରିବାରେ ଅସମର୍ଥ"
- 
--#: ../daemon/gdm-server.c:365
-+#: ../daemon/gdm-server.c:452
- #, c-format
- msgid "Server was to be spawned by user %s but that user doesn't exist"
--msgstr "ଚାଳକ %s ଦ୍ୱାରା ସର୍ଭର ସୃଷ୍ଟି ହେବାର ଥିଲା କିନ୍ତୁ ସେହି ଚାଳକଟି ଅବସ୍ଥିତ ନାହିଁ"
-+msgstr ""
-+"ଚାଳକ %s ଦ୍ୱାରା ସର୍ଭର ସୃଷ୍ଟି ହେବାର ଥିଲା କିନ୍ତୁ ସେହି ଚାଳକଟି ଅବସ୍ଥିତ ନାହିଁ"
- 
--#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396
--#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619
-+#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483
- #, c-format
- msgid "Couldn't set groupid to %d"
- msgstr "ସମୂହ ପରିଚୟକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ"
- 
--#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605
-+#: ../daemon/gdm-server.c:469
- #, c-format
- msgid "initgroups () failed for %s"
- msgstr "%s ପାଇଁ initgroups () ବିଫଳ ହେଲା"
- 
--#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611
-+#: ../daemon/gdm-server.c:475
- #, c-format
- msgid "Couldn't set userid to %d"
- msgstr "ଚାଳକ ପରିଚୟକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ"
- 
--#: ../daemon/gdm-server.c:435
-+#: ../daemon/gdm-server.c:522
- #, c-format
- msgid "%s: Could not open log file for display %s!"
- msgstr "%s: %s ପ୍ରଦର୍ଶନ ପାଇଁ ଲଗ ଫାଇଲକୁ ଖୋଲି ପାରିଲା ନାହିଁ!"
- 
--#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452
--#: ../daemon/gdm-server.c:458
-+#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539
-+#: ../daemon/gdm-server.c:545
- #, c-format
- msgid "%s: Error setting %s to %s"
- msgstr "%s: %s କୁ %s ରେ ବିନ୍ଯାସ କରିବା ସମୟରେ ତ୍ରୁଟି"
- 
--#: ../daemon/gdm-server.c:478
-+#: ../daemon/gdm-server.c:565
- #, c-format
- msgid "%s: Server priority couldn't be set to %d: %s"
- msgstr "%s: ସେବକ ଅଗ୍ରଧିକାରକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ: %s"
- 
--#: ../daemon/gdm-server.c:631
-+#: ../daemon/gdm-server.c:722
- #, c-format
- msgid "%s: Empty server command for display %s"
- msgstr "%s: %s ପ୍ରଦର୍ଶନ ପାଇଁ ଗୋଟିଏ ଖାଲି ସେବକ ନିର୍ଦ୍ଦେଶ"
-@@ -153,339 +151,374 @@ msgstr "ଯନ୍ତ୍ର ପ୍ରଦର୍ଶନକରନ୍ତୁ"
- msgid "The display device"
- msgstr "ପ୍ରଦର୍ଶନ ଉପକରଣ"
- 
--#: ../daemon/gdm-session-worker.c:1289
-+#: ../daemon/gdm-session.c:1184
-+#| msgid "%s: Could not read Authentication Names"
-+msgid "Could not create authentication helper process"
-+msgstr "ବୈଧିକରଣ ସହାୟକ ପ୍ରକ୍ରିୟା ପ୍ରସ୍ତୁତ କରିପାରିଲା ନାହିଁ"
-+
-+#: ../daemon/gdm-session-worker.c:1029
- #, c-format
--msgid "error initiating conversation with authentication system: %s"
--msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ର ସହିତ ତ୍ରୁଟି ଆରମ୍ଭ କରୁଥିବା ବାର୍ତ୍ତାଳାପ: %s"
-+#| msgid "error initiating conversation with authentication system: %s"
-+msgid "error initiating conversation with authentication system - %s"
-+msgstr "ବୈଧିକରଣ ତନ୍ତ୍ର ସହିତ ତ୍ରୁଟି ଆରମ୍ଭ କରୁଥିବା ବାର୍ତ୍ତାଳାପ - %s"
- 
--#: ../daemon/gdm-session-worker.c:1290
-+#: ../daemon/gdm-session-worker.c:1030
- msgid "general failure"
- msgstr "ସାଧାରଣ ବିଫଳତା"
- 
--#: ../daemon/gdm-session-worker.c:1291
-+#: ../daemon/gdm-session-worker.c:1031
- msgid "out of memory"
- msgstr "ସ୍ମୃତି ସ୍ଥାନର ଅଭାବ"
- 
--#: ../daemon/gdm-session-worker.c:1292
-+#: ../daemon/gdm-session-worker.c:1032
- msgid "application programmer error"
- msgstr "ପ୍ରୟୋଗ ପ୍ରଗ୍ରାମ ତ୍ରୁଟି"
- 
--#: ../daemon/gdm-session-worker.c:1293
-+#: ../daemon/gdm-session-worker.c:1033
- msgid "unknown error"
- msgstr "ଅଜଣା ତ୍ରୁଟି"
- 
--#: ../daemon/gdm-session-worker.c:1300
-+#: ../daemon/gdm-session-worker.c:1040
- msgid "Username:"
- msgstr "ଚାଳକ ନାମ:"
- 
--#: ../daemon/gdm-session-worker.c:1306
-+#: ../daemon/gdm-session-worker.c:1046
- #, c-format
- msgid "error informing authentication system of preferred username prompt: %s"
--msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଚାଳକନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s"
-+msgstr ""
-+"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଚାଳକନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s"
- 
--#: ../daemon/gdm-session-worker.c:1320
-+#: ../daemon/gdm-session-worker.c:1060
- #, c-format
- msgid "error informing authentication system of user's hostname: %s"
--msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଆଧାରନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s"
-+msgstr ""
-+"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଆଧାରନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s"
- 
--#: ../daemon/gdm-session-worker.c:1335
-+#: ../daemon/gdm-session-worker.c:1077
- #, c-format
- msgid "error informing authentication system of user's console: %s"
- msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ଚାଳକର କୋନସୋଲର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s"
- 
--#: ../daemon/gdm-session-worker.c:1348
-+#: ../daemon/gdm-session-worker.c:1101
- #, c-format
- msgid "error informing authentication system of display string: %s"
- msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ବାକ୍ୟଖଣ୍ଡ ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s"
- 
--#: ../daemon/gdm-session-worker.c:1363
-+#: ../daemon/gdm-session-worker.c:1116
- #, c-format
- msgid "error informing authentication system of display xauth credentials: %s"
--msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ xauth ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକର ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s"
-+msgstr ""
-+"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ xauth ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକର ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s"
- 
--#: ../daemon/gdm-session-worker.c:1660 ../daemon/gdm-session-worker.c:1677
-+#: ../daemon/gdm-session-worker.c:1446 ../daemon/gdm-session-worker.c:1463
- #, c-format
- msgid "no user account available"
- msgstr "କୌଣସି ଚାଳକ ଖାତା ଉପଲବ୍ଧ ନାହିଁ"
- 
--#: ../daemon/gdm-session-worker.c:1704
-+#: ../daemon/gdm-session-worker.c:1490
- msgid "Unable to change to user"
- msgstr "ଚାଳକକୁ ପରିବର୍ତ୍ତନ ହେବାରେ ଅସମର୍ଥ"
- 
--#: ../daemon/gdm-welcome-session.c:549
--#, c-format
--msgid "User %s doesn't exist"
--msgstr "ଚାଳକ %s ଅବସ୍ଥିତ ନାହିଁ"
--
--#: ../daemon/gdm-welcome-session.c:556
--#, c-format
--msgid "Group %s doesn't exist"
--msgstr "ସମୂହ %s ଅବସ୍ଥିତ ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:604
--msgid "Could not create socket!"
--msgstr "ସକେଟ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ!"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:873
--#, c-format
--msgid "Denied XDMCP query from host %s"
--msgstr "%s ଆଧାରରୁ XDMCP ପ୍ରଶ୍ନ ପଚାରିବାରୁ ମନା କରାଗଲା"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1031
--#: ../daemon/gdm-xdmcp-display-factory.c:1255
--msgid "Could not extract authlist from packet"
--msgstr "ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1044
--#: ../daemon/gdm-xdmcp-display-factory.c:1270
--msgid "Error in checksum"
--msgstr "ଯାଞ୍ଚ ସମଷ୍ଟିରେ ତ୍ରୁଟି"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1523
--msgid "Bad address"
--msgstr "ଖରାପ ଠିକଣା"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1607
--#, c-format
--msgid "%s: Could not read display address"
--msgstr "%s: ପ୍ରଦର୍ଶନ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1615
--#, c-format
--msgid "%s: Could not read display port number"
--msgstr "%s: ପ୍ରଦର୍ଶନ ସଂଯୋଗିକୀ ସଂଖ୍ଯା ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1624
--#, c-format
--msgid "%s: Could not extract authlist from packet"
--msgstr "%s: ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1644
--#, c-format
--msgid "%s: Error in checksum"
--msgstr "%s: ଚେକ-ଶମରେ ତ୍ରୁଟି"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2200
--#, c-format
--msgid "%s: Got REQUEST from banned host %s"
--msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ ନିବେଦନ ମିଳିଲା"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2210
--#: ../daemon/gdm-xdmcp-display-factory.c:2568
--#: ../daemon/gdm-xdmcp-display-factory.c:2822
--#, c-format
--msgid "%s: Could not read Display Number"
--msgstr "%s: ପ୍ରତର୍ଶନ ସଂଖ୍ଯାକୁ ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2217
--#, c-format
--msgid "%s: Could not read Connection Type"
--msgstr "%s: ସଂଯୋଗ ପ୍ରକାରକୁ ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2224
--#, c-format
--msgid "%s: Could not read Client Address"
--msgstr "%s: ଗ୍ରାହକ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2232
--#, c-format
--msgid "%s: Could not read Authentication Names"
--msgstr "%s: ବୈଧିକରଣ ନାମ ମାନଙ୍କୁ ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2241
--#, c-format
--msgid "%s: Could not read Authentication Data"
--msgstr "%s: ବୈଧିକରଣ ତଥ୍ଯକୁ ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2251
--#, c-format
--msgid "%s: Could not read Authorization List"
--msgstr "%s: ବୈଧିକରଣ ତାଲିକାକୁ ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2270
--#, c-format
--msgid "%s: Could not read Manufacturer ID"
--msgstr "%s: ନିର୍ମାତା ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2297
--#, c-format
--msgid "%s: Failed checksum from %s"
--msgstr "%s: %s ରୁ ଚେକ-ଶମ ଅସଫଳ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2552
--#, c-format
--msgid "%s: Got Manage from banned host %s"
--msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ Manage ପାଇଲା"
-+#: ../daemon/gdm-simple-slave.c:1381
-+msgid ""
-+"Could not start the X server (your graphical environment) due to an internal "
-+"error. Please contact your system administrator or check your syslog to "
-+"diagnose. In the meantime this display will be disabled.  Please restart GDM "
-+"when the problem is corrected."
-+msgstr ""
-+"କିଛି ଅନ୍ତର୍ନିହିତ କାରଣ ବଶତଃ X ସର୍ଭର (ଆପଣଙ୍କ ଆଲେଖୀକ ପରିବେଶ) କୁ ପ୍ରାରମ୍ଭ "
-+"କରିପାରିଲା ନାହିଁ. ଦୟାକରି "
-+"ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁକିମ୍ବା ଆପଣଙ୍କ ସମସ୍ଯାର କାରଣକୁ "
-+"ନିରୂପଣ କରିବା ପାଇଁ "
-+"ତନ୍ତ୍ରର ଲଗକୁ ଯାଞ୍ଚ କରନ୍ତୁ.ସେହି ସମୟରେ ଏହି ପ୍ରଦର୍ଶନଟି ନିଷ୍କ୍ରିୟ ହୋଇଯିବ.  "
-+"ଯେତେବେଳେ ସମସ୍ଯାଟି ସମଧାନ "
-+"ହୋଇଯିବସେତେବେଳେ ଦୟାକରି GDM କୁ ପୁନଃ ପ୍ରାରମ୍ଭ କରିବେ."
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2561
--#: ../daemon/gdm-xdmcp-display-factory.c:2829
-+#: ../daemon/gdm-simple-slave.c:1422
- #, c-format
--msgid "%s: Could not read Session ID"
--msgstr "%s: ଅଧିବେଶନ ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ"
-+msgid "Can only be called before user is logged in"
-+msgstr "କେବଳ ବ୍ୟବହାରକାରୀ ଲଗଇନ ପୂର୍ବରୁ ଡ଼ାକି ପାରିବେ"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2575
-+#: ../daemon/gdm-simple-slave.c:1432
- #, c-format
--msgid "%s: Could not read Display Class"
--msgstr "%s: ପ୍ରଦର୍ଶନ ଶ୍ରେଣୀକୁ ପଢି ପାରିଲା ନାହିଁ"
-+msgid "Caller not GDM"
-+msgstr "କଲର GDM ନୁହଁ"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2681
--#: ../daemon/gdm-xdmcp-display-factory.c:2731
--#: ../daemon/gdm-xdmcp-display-factory.c:2737
--#, c-format
--msgid "%s: Could not read address"
--msgstr "%s: ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ"
-+#: ../daemon/gdm-simple-slave.c:1485
-+#| msgid "Currently logged in"
-+msgid "User not logged in"
-+msgstr "ବ୍ୟବହାରକାରୀ ଲଗଇନ ହୋଇ ନାହିଁ"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2812
-+#: ../daemon/gdm-xdmcp-chooser-slave.c:370
- #, c-format
--msgid "%s: Got KEEPALIVE from banned host %s"
--msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ KEEPALIVE ପାଇଲା"
-+msgid "Currently, only one client can be connected at once"
-+msgstr "ବର୍ତ୍ତମାନ, ଏକ ସମୟରେ କେବଳ ଗୋଟିଏ କ୍ଲାଏଣ୍ଟ ସଂଯୁକ୍ତ ହୋଇପାରିବ"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2902
--msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
--msgstr "GdmXdmcpDisplayFactory: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2908
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
--msgid "XMDCP: Incorrect XDMCP version!"
--msgstr "XMDCP: ଭୂଲ XDMCP ସଂସ୍କରଣ!"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2914
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
--msgid "XMDCP: Unable to parse address"
--msgstr "XMDCP: ଠିକଣା ବିଶ୍ଳେଷଣ କରିବାରେ ଅସମର୍ଥ"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:3359
--#, c-format
--msgid "Could not get server hostname: %s!"
--msgstr "ସର୍ଭର ଆଧାର ନାମକୁ ପାଇ ପାରିଲା ନାହିଁ: %s!"
-+#: ../daemon/gdm-xdmcp-display-factory.c:604
-+msgid "Could not create socket!"
-+msgstr "ସକେଟ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ!"
- 
--#: ../daemon/main.c:237 ../daemon/main.c:250
-+#: ../daemon/main.c:126 ../daemon/main.c:139
- #, c-format
- msgid "Cannot write PID file %s: possibly out of disk space: %s"
- msgstr "PID ଫାଇଲ %s କୁ ଲେଖି ପାରିବ ନାହିଁ: ସମ୍ଭବତଃ ଡିସ୍କରେ ଖାଲି ସ୍ଥାନ ନାହିଁ: %s"
- 
--#: ../daemon/main.c:271
-+#: ../daemon/main.c:160
- #, c-format
- msgid "Logdir %s does not exist or isn't a directory."
- msgstr "Logdir %s ଅବସ୍ଥିତ ନୁହେଁ କିମ୍ବା ଏହା ଗୋଟିଏ ଡିରେକ୍ଟେରି ନୁହେଁ"
- 
--#: ../daemon/main.c:287
-+#: ../daemon/main.c:176
- #, c-format
- msgid "Authdir %s does not exist. Aborting."
- msgstr "Authdir %s ଅବସ୍ଥିତ ନୁହେଁ. ତେଣୁ ଏହାକୁ ପରିତ୍ଯାଗ କରୁଅଛି."
- 
--#: ../daemon/main.c:291
-+#: ../daemon/main.c:180
- #, c-format
- msgid "Authdir %s is not a directory. Aborting."
- msgstr "Authdir %s ଗୋଟିଏ ଡିରେକ୍ଟୋରି ନୁହେଁ. ପରିତ୍ଯାଗ କରୁଅଛି."
- 
--#: ../daemon/main.c:365
-+#: ../daemon/main.c:254
- #, c-format
- msgid "Authdir %s is not owned by user %d, group %d. Aborting."
--msgstr "Authdir %s ଟି ଚାଳକ %d, ସମୂହ %d ଦ୍ବାରା ଅଧିକ୍ରୁତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି."
-+msgstr ""
-+"Authdir %s ଟି ଚାଳକ %d, ସମୂହ %d ଦ୍ବାରା ଅଧିକ୍ରୁତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି."
- 
--#: ../daemon/main.c:372
-+#: ../daemon/main.c:261
- #, c-format
- msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting."
--msgstr "Authdir %s ନିକଟରେ ଭୂଲ ପ୍ରବେଶାନୁମତି %o ଅଛି. ଏହା %o ହେବା ଉଚିତ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି."
-+msgstr ""
-+"Authdir %s ନିକଟରେ ଭୂଲ ପ୍ରବେଶାନୁମତି %o ଅଛି. ଏହା %o ହେବା ଉଚିତ. ତେଣୁ ପରିତ୍ଯାଗ "
-+"କରୁଅଛି."
- 
--#: ../daemon/main.c:409
-+#: ../daemon/main.c:298
- #, c-format
- msgid "Can't find the GDM user '%s'. Aborting!"
- msgstr "'%s' GDM ଚାଳକକୁ ପାଇ ପାରିବ ନାହିଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!"
- 
--#: ../daemon/main.c:415
-+#: ../daemon/main.c:304
- msgid "The GDM user should not be root. Aborting!"
- msgstr "GDM ଚାଳକ ପ୍ରମୂଖ ଚାଳକ ହେବା ଉଚିତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!"
- 
--#: ../daemon/main.c:421
-+#: ../daemon/main.c:310
- #, c-format
- msgid "Can't find the GDM group '%s'. Aborting!"
- msgstr "'%s' GDM ସମୂହକୁ ପାଇ ପାରିବ ନାହିଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!"
- 
--#: ../daemon/main.c:427
-+#: ../daemon/main.c:316
- msgid "The GDM group should not be root. Aborting!"
- msgstr "GDM ସମୂହ ପ୍ରମୂଖ ଚାଳକ ହେବା ଉଚିତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!"
- 
--#: ../daemon/main.c:533
-+#: ../daemon/main.c:427
- msgid "Make all warnings fatal"
- msgstr "ସବୁ ଚେତାବନୀଗୁଡିକୁ ମାରାତ୍ମକ କରନ୍ତୁ"
- 
--#: ../daemon/main.c:534
-+#: ../daemon/main.c:428
- msgid "Exit after a time (for debugging)"
- msgstr "ଗୋଟିଏ ସମୟ ପରେ ପ୍ରସ୍ଥାନକରନ୍ତୁ (ତ୍ରୁଟି ନିବାରଣ ପାଇଁ)"
- 
--#: ../daemon/main.c:535
-+#: ../daemon/main.c:429
- msgid "Print GDM version"
- msgstr "ଜି.ଡି.ଏମ. ସଂସ୍କରଣକୁ ମୂଦ୍ରଣ କରନ୍ତୁ"
- 
--#: ../daemon/main.c:550
-+#: ../daemon/main.c:442
- msgid "GNOME Display Manager"
- msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ"
- 
- #. make sure the pid file doesn't get wiped
--#: ../daemon/main.c:616
-+#: ../daemon/main.c:492
- msgid "Only the root user can run GDM"
- msgstr "କେବଳ ପ୍ରମୂଖ ଚାଳକ GDM କୁ ଚଳାଇ ପାରିବେ"
- 
- #. Translators: worker is a helper process that does the work
- #. of starting up a session
--#: ../daemon/session-worker-main.c:158
-+#: ../daemon/session-worker-main.c:150
- msgid "GNOME Display Manager Session Worker"
- msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧିବେଶନ କାର୍ଯ୍ୟକର୍ତ୍ତା"
- 
--#: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1
--msgid "AT-SPI Registry Wrapper"
--msgstr "AT-SPI ପଞ୍ଜିକରଣ ଆବରଣ"
--
--#: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1753
--msgid "Login Window"
--msgstr "ଲଗଇନ ୱିଣ୍ଡୋ"
-+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178
-+msgid "Display ID"
-+msgstr "ID ପ୍ରଦର୍ଶନକରନ୍ତୁ"
- 
--#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1
--msgid "Power Manager"
--msgstr "ଶକ୍ତି ପରିଚାଳକ"
-+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178
-+msgid "ID"
-+msgstr "ID"
- 
--#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2
--msgid "Power management daemon"
--msgstr "ଶକ୍ତି ପରିଚାଳନ ଡେମନ"
-+#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188
-+msgid "GNOME Display Manager Slave"
-+msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧୀନ"
- 
--#: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1
--msgid "GNOME Settings Daemon"
--msgstr "GNOME ବିନ୍ୟାସ ଡେମନ"
-+#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566
-+msgid "Login Window"
-+msgstr "ଲଗଇନ ୱିଣ୍ଡୋ"
- 
--#: ../data/greeter-autostart/gnome-mag.desktop.in.h:1
-+#: ../data/applications/gnome-mag.desktop.in.h:1
- msgid "GNOME Screen Magnifier"
- msgstr "GNOME ପରଦା ଆକାର ବର୍ଦ୍ଧନକର୍ତ୍ତା"
- 
--#: ../data/greeter-autostart/gnome-mag.desktop.in.h:2
-+#: ../data/applications/gnome-mag.desktop.in.h:2
- msgid "Magnify parts of the screen"
- msgstr "ପରଦାର ବର୍ଦ୍ଧିତ ଅଂଶ"
- 
--#: ../data/greeter-autostart/gok.desktop.in.h:1
-+#: ../data/applications/gnome-shell.desktop.in.h:1
-+msgid "GNOME Shell"
-+msgstr "GNOME ସେଲ"
-+
-+#: ../data/applications/gnome-shell.desktop.in.h:2
-+#| msgid "Power management daemon"
-+msgid "Window management and compositing"
-+msgstr "ୱିଣ୍ଡୋ ପରିଚାଳନ ଏବଂ ମିଶ୍ରିତ"
-+
-+#: ../data/applications/gok.desktop.in.h:1
- msgid "GNOME On-Screen Keyboard"
- msgstr "GNOME ଅନସ୍କ୍ରିନ କି ବୋର୍ଡ"
- 
--#: ../data/greeter-autostart/gok.desktop.in.h:2
-+#: ../data/applications/gok.desktop.in.h:2
- msgid "Use an on-screen keyboard"
- msgstr "ଗୋଟିଏ ଅନସ୍କ୍ରିନ କି ବୋର୍ଡ ବ୍ୟବହାର କରନ୍ତୁ"
- 
--#: ../data/greeter-autostart/metacity.desktop.in.h:1
--msgid "Metacity"
--msgstr "Metacity"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:1
-+msgid "Whether or not to allow fingerprint readers for login"
-+msgstr "ଅଙ୍ଗୁଳିଚିହ୍ନ ପାଠକକୁ ଲଗଇନ ପାଇଁ ଅନୁମତି ଦେବା ଉଚିତ କି ନୁହଁ"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2
-+msgid ""
-+"The login screen can optionally allow users who have enrolled their "
-+"fingerprints to log in using those prints."
-+msgstr ""
-+"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ଅଙ୍ଗୁଳିଚିହ୍ନ ଦାଖଲ କରିଥିବା ବ୍ୟବହାରକାରୀମାନଙ୍କୁ ସେହି "
-+"ଚିହ୍ନ ବ୍ୟବହାର କରି "
-+"ଲଗଇନ କରିବାକୁ ଅନୁମତି ଦେଇଥାଏ।"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:3
-+msgid "Whether or not to allow smartcard readers for login"
-+msgstr "ଲଗଇନ ପାଇଁ ସ୍ମାର୍ଟକାର୍ଡ ପାଠକକୁ ଅନୁମତି ଦେବା ଉଚିତ କି ନୁହଁ"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4
-+msgid ""
-+"The login screen can optionally allow users who have smartcards to log in "
-+"using those smartcards."
-+msgstr ""
-+"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ବ୍ୟବହାରକାରୀମାନଙ୍କୁ ଅନୁମତି ଦେଇଥାଏ ଯାହା ପାଖରେ "
-+"ଲଗଇନ ପାଇଁ ସ୍ମାର୍ଟକାର୍ଡ ଥାଏ।"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:5
-+msgid "Path to small image at top of user list"
-+msgstr "ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ ଛୋଟ ପ୍ରତିଛବି ପାଇଁ ପଥ"
- 
--#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1
--msgid "Orca Screen Reader"
--msgstr "Orca ପରଦା ପାଠକ"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6
-+msgid ""
-+"The login screen can optionally show a small image at the top of its user "
-+"list to provide site administrators and distributions a way to provide "
-+"branding."
-+msgstr ""
-+"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ ସାଇଟ ପ୍ରଶାସକ ଏବଂ "
-+"ବଣ୍ଟନକାରୀମାନଙ୍କୁ "
-+"ପ୍ରଦାନ କରିବା ପାଇଁ ଏକ ଛୋଟ ପ୍ରତିଛବି ଦର୍ଶାଇଥାଏ।"
- 
--#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2
--msgid "Present on-screen information as speech or braille"
--msgstr "ଅନ-ସ୍କ୍ରିନ ସୂଚନାକୁ ବାର୍ତ୍ତାଳାପ ଅଥବା ବ୍ରେଲି ଲିପିରେ ଉପସ୍ଥାପନ କରନ୍ତୁ"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7
-+msgid ""
-+"The fallback login screen can optionally show a small image at the top of "
-+"its user list to provide site administrators and distributions a way to "
-+"provide branding."
-+msgstr ""
-+"ଫଲବ୍ୟାକ ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ଏକ ଛୋଟ ପ୍ରତିଛବିକୁ ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ "
-+"ସାଇଟ ପ୍ରଶାସକ ଏବଂ ବଣ୍ଟନକାରୀମାନଙ୍କୁ ପ୍ରଦାନ କରିବା ପାଇଁଦର୍ଶାଇପାରିବ।"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:8
-+msgid "Avoid showing user list"
-+msgstr "ବ୍ୟବହାରକାରୀ ତାଲିକା ଦର୍ଶାନ୍ତୁ ନାହିଁ"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9
-+msgid ""
-+"The login screen normally shows a list of available users to log in as. This "
-+"setting can be toggled to disable showing the user list."
-+msgstr ""
-+"ଲଗଇନ ପରଦା ସାଧାରଣତଃ ଉପଲବ୍ଧ ବ୍ୟବହାରକାରୀ ତାଲିକାକୁ ଲଗଇନ ପାଇଁ ଦର୍ଶାଇଥାଏ। "
-+"ଏହି ସଂରଚନାକୁ ବ୍ୟବହାରକାରୀ ତାଲିକା ଦର୍ଶାଇ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଆଗପଛ କରିହେବ।"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:10
-+msgid "Enable showing the banner message"
-+msgstr "ପତାକା ସନ୍ଦେଶ ଦର୍ଶାଇବାକୁ ସକ୍ରିୟ କରନ୍ତୁ"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:11
-+msgid "Set to true to show the banner message text."
-+msgstr "ପତାକା ସଂଦେଶ ଦର୍ଶାଇବା ପାଇଁ true ସେଟକରନ୍ତୁ."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:12
-+msgid "Banner message text"
-+msgstr "ପତାକା ସନ୍ଦେଶ ପାଠ୍ୟ"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:13
-+msgid "Text banner message to show in the login window."
-+msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ।"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:14
-+msgid "Disable showing the restart buttons"
-+msgstr "ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:15
-+msgid "Set to true to disable showing the restart buttons in the login window."
-+msgstr ""
-+"ଲଗଇନ ୱିଣ୍ଡୋରେ ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ true "
-+"ସେଟକରନ୍ତୁ।"
- 
--#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1
--msgid "PolicyKit Authentication Agent"
--msgstr "PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16
-+#| msgid "%s: Could not read Authentication Names"
-+msgid "Number of allowed authentication failures"
-+msgstr "ଅନୁମତିପ୍ରାପ୍ତ ବୈଧିକରଣ ବିଫଳତା ସଂଖ୍ୟା"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17
-+msgid ""
-+"The number of times a user is allowed to attempt authentication, before "
-+"giving up and going back to user selection."
-+msgstr ""
-+"ତ୍ୟାଗକରିବା ପୂର୍ବରୁ ଏବଂ ବ୍ୟବହାରକାରୀ ଚୟନ କରିବା ପୂର୍ବରୁ "
-+"ବ୍ୟବହାରକାରୀଙ୍କୁ ଅନୁମତି ପ୍ରାପ୍ତ ପ୍ରୟାସ ସଂଖ୍ୟା।"
-+
-+#: ../gui/libgdm/gdm-user-switching.c:72
-+#| msgid "Unable to start new display"
-+msgid "Unable to create transient display: "
-+msgstr "ଅସ୍ଥାୟୀ ପ୍ରଦର୍ଶନୀ ନିର୍ମାଣ କରିବାରେ ଅସମର୍ଥ:"
-+
-+#: ../gui/libgdm/gdm-user-switching.c:183
-+#: ../gui/libgdm/gdm-user-switching.c:395
-+#| msgid "Unable to open session"
-+msgid "Unable to activate session: "
-+msgstr "ଅଧିବେଶନ ସକ୍ରିୟ କରିବାରେ ଅସମର୍ଥ:"
-+
-+#: ../gui/libgdm/gdm-user-switching.c:344
-+#: ../gui/libgdm/gdm-user-switching.c:512
-+#, c-format
-+msgid "Could not identify the current session."
-+msgstr "ପ୍ରଚଳିତ ଅଧିବେଶନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ."
-+
-+#: ../gui/libgdm/gdm-user-switching.c:351
-+#, c-format
-+#| msgid "Unable to open session"
-+msgid "User unable to switch sessions."
-+msgstr "ଅଧିବେଶନ ବଦଳାଇବାରେ ବ୍ୟବହାରକାରୀ ଅସମର୍ଥ।"
-+
-+#: ../gui/libgdm/gdm-user-switching.c:521
-+#, c-format
-+#| msgid "Could not identify the current session."
-+msgid "Could not identify the current seat."
-+msgstr "ପ୍ରଚଳିତ ସ୍ଥାନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ।"
-+
-+#: ../gui/libgdm/gdm-user-switching.c:531
-+#, c-format
-+msgid ""
-+"The system is unable to determine whether to switch to an existing login "
-+"screen or start up a new login screen."
-+msgstr ""
-+"ତନ୍ତ୍ର ଏକ ସ୍ଥିତବାନ ଲଗଇନ ପରଦା କିମ୍ବା ନୂତନ ଲଗଇନ ପରଦା ଆରମ୍ଭ କରିବାକୁ "
-+"ନିର୍ଦ୍ଧାରଣ କରିବାରେ ଅସମର୍ଥ।"
-+
-+#: ../gui/libgdm/gdm-user-switching.c:539
-+#, c-format
-+msgid "The system is unable to start up a new login screen."
-+msgstr "ତନ୍ତ୍ର ଏକ ନୂତନ ଲଗଇନ ପରଦା ଆରମ୍ଭ କରିବାରେ ଅସମର୍ଥ।"
- 
- #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147
- msgid "Select System"
-@@ -499,6 +532,125 @@ msgstr "XDMCP: XDMCP ବଫର ସୃଷ୍ଟି କରିପାରିଲା 
- msgid "XDMCP: Could not read XDMCP header!"
- msgstr "XDMCP: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!"
- 
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
-+msgid "XMDCP: Incorrect XDMCP version!"
-+msgstr "XMDCP: ଭୂଲ XDMCP ସଂସ୍କରଣ!"
-+
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
-+msgid "XMDCP: Unable to parse address"
-+msgstr "XMDCP: ଠିକଣା ବିଶ୍ଳେଷଣ କରିବାରେ ଅସମର୍ଥ"
-+
-+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287
-+#| msgid "PolicyKit Authentication Agent"
-+msgid "Fingerprint Authentication"
-+msgstr "ଅଙ୍ଗୁଳି ଚିହ୍ନ ବୈଧିକରଣ"
-+
-+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293
-+msgid "Log into session with fingerprint"
-+msgstr "ଅଙ୍ଗୁଳିଚିହ୍ନ ସହାୟତାରେ ଲଗଇନ କରନ୍ତୁ"
-+
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287
-+#| msgid "PolicyKit Authentication Agent"
-+msgid "Password Authentication"
-+msgstr "ପ୍ରବେଶ ସଂକେତ ବୈଧିକରଣ"
-+
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293
-+msgid "Log into session with username and password"
-+msgstr "ବ୍ୟବହାରକାରୀ ନାମ ଏବଂ ପ୍ରବେଶ ସଂକେତ ସହାୟତାରେ ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ"
-+
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408
-+msgid "Log In"
-+msgstr "ଲଗଇନ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155
-+msgid "Slot ID"
-+msgstr "ସ୍ଲଟ ID"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156
-+msgid "The slot the card is in"
-+msgstr "ଯେଉଁ ସ୍ଲଟରେ କାର୍ଡ ଅଛି"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162
-+msgid "Slot Series"
-+msgstr "ସ୍ଲଟ କ୍ରମ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163
-+msgid "per-slot card identifier"
-+msgstr "ସ୍ଲଟ ପ୍ରତି କାର୍ଡ ପରିଚାୟକ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170
-+#| msgid "Username"
-+msgid "name"
-+msgstr "ନାମ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174
-+msgid "Module"
-+msgstr "ମଡ୍ଯୁଲ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175
-+msgid "smartcard driver"
-+msgstr "ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408
-+msgid "Smartcard Authentication"
-+msgstr "ସ୍ମାର୍ଟକାର୍ଡ ବୈଧିକରଣ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414
-+msgid "Log into session with smartcard"
-+msgstr "ସ୍ମାର୍ଟକାର୍ଡ ସହାୟତାରେ ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186
-+msgid "Module Path"
-+msgstr "ମଡ୍ଯୁଲ ପଥ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187
-+msgid "path to smartcard PKCS #11 driver"
-+msgstr "ସ୍ମାର୍ଟକାର୍ଡ PKCS #11 ଡ୍ରାଇଭର ପାଇଁ ପଥ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527
-+msgid "received error or hang up from event source"
-+msgstr "ତ୍ରୁଟି ଗ୍ରହଣ କରିଛି ଅଥବା ଘଟଣା ଉତ୍ସରୁ ବାହାରିଯାଇଛି"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661
-+#, c-format
-+msgid "NSS security system could not be initialized"
-+msgstr "NSS ସୁରକ୍ଷା ତନ୍ତ୍ରକୁ ଆରମ୍ଭ କରିହେଲା ନାହିଁ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789
-+#, c-format
-+msgid "no suitable smartcard driver could be found"
-+msgstr "ଉପଯୁକ୍ତ ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର ମିଳିଲା ନାହିଁ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803
-+#, c-format
-+msgid "smartcard driver '%s' could not be loaded"
-+msgstr "ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର '%s' କୁ ଧାରଣ କରିହେଲା ନାହିଁ"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875
-+#, c-format
-+msgid "could not watch for incoming card events - %s"
-+msgstr "ଆସୁଥିବା କାର୍ଡ ଘଟଣାଗୁଡ଼ିକୁ ଦେଖିପାରିଲା ନାହିଁ - %s"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242
-+#, c-format
-+msgid "encountered unexpected error while waiting for smartcard events"
-+msgstr ""
-+"ସ୍ମାର୍ଟକାର୍ଡ ଘଟଣାଗୁଡ଼ିକ ପାଇଁ ଅପେକ୍ଷା କରିଥିବା ସମୟରେ ଅପ୍ରତ୍ୟାଶିତ ତ୍ରୁଟିର "
-+"ସମ୍ମୁଖିନ ହୋଇଥିଲା"
-+
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287
-+#| msgid "PolicyKit Authentication Agent"
-+msgid "Authentication"
-+msgstr "ବୈଧିକରଣ"
-+
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293
-+#| msgid "Custom session"
-+msgid "Log into session"
-+msgstr "ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ"
-+
- #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239
- msgid "Value"
- msgstr "ମୂଲ୍ଯ"
-@@ -559,101 +711,69 @@ msgstr "%a %l:%M:%S %p"
- msgid "%a %l:%M %p"
- msgstr "%a %l:%M %p"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:293
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:314
- msgid "Automatically logging in…"
- msgstr "ସ୍ବୟଂଚାଳିତ ଭାବରେ ଲଗଇନ କରୁଅଛି…"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:582
--msgid "Select language and click Log In"
--msgstr "ଭାଷା ଚୟନକରନ୍ତୁ ଏବଂ ଲଗଇନ ଦବାନ୍ତୁ"
--
- #. need to wait for response from backend
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:699
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:930
- msgid "Cancelling…"
- msgstr "ବାତିଲ କରୁଅଛି…"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1087
-+#. just wait for the user to select language and stuff
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486
-+msgid "Select language and click Log In"
-+msgstr "ଭାଷା ଚୟନକରନ୍ତୁ ଏବଂ ଲଗଇନ ଦବାନ୍ତୁ"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622
- msgctxt "customsession"
- msgid "Custom"
- msgstr "ଇଚ୍ଛାମୁତାବକ"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1088
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623
- msgid "Custom session"
- msgstr "ଇଚ୍ଛାମୁତାବକ ଅଧିବେଶନ"
- 
- #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
--#| msgid "Panel"
--msgid "Cancel"
--msgstr "ବାତିଲ କରନ୍ତୁ"
--
--#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
- msgid "Computer Name"
- msgstr "କମ୍ପୁଟର ନାମ"
- 
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
-+msgid "Version"
-+msgstr "ସଂସ୍କରଣ"
-+
- #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
--msgid "Login"
--msgstr "ଲଗଇନ"
-+msgid "Cancel"
-+msgstr "ବାତିଲ କରନ୍ତୁ"
- 
- #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4
- msgid "Unlock"
- msgstr "ଖୋଲନ୍ତୁ"
- 
- #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5
--msgid "Version"
--msgstr "ସଂସ୍କରଣ"
-+msgid "Login"
-+msgstr "ଲଗଇନ"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:907
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:953
- msgid "Suspend"
- msgstr "ନିଲମ୍ବନ କରନ୍ତୁ"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:912
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:958
- msgid "Restart"
- msgstr "ପୂନଃପ୍ରାରମ୍ଭ କରନ୍ତୁ"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:916
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:962
- msgid "Shut Down"
- msgstr "ବନ୍ଦ କରନ୍ତୁ"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:965
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:1011
- msgid "Unknown time remaining"
- msgstr "କେତେ ସମୟ ବଳିଛି ଜଣାନାହିଁ"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:987
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:1033
- msgid "Panel"
- msgstr "ଫଳକ"
- 
--#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252
--msgid "Languages"
--msgstr "ଭାଷା"
--
--#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276
--msgid "_Languages:"
--msgstr "ଭାଷା (_L):"
--
--#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277
--msgid "_Language:"
--msgstr "ଭାଷା (_L):"
--
--#. translators: This brings up a dialog
--#. * with a list of languages to choose from
--#.
--#: ../gui/simple-greeter/gdm-language-option-widget.c:231
--msgctxt "language"
--msgid "Other…"
--msgstr "ଅନ୍ଯାନ୍ଯ…"
--
--#: ../gui/simple-greeter/gdm-language-option-widget.c:232
--msgid "Choose a language from the full list of available languages."
--msgstr "ଉପଲବ୍ଧ ଭାଷାଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ ଭାଷା ଚୟନ କରନ୍ତୁ."
--
--#: ../gui/simple-greeter/gdm-language-option-widget.c:262
--msgid "Language"
--msgstr "ଭାଷା"
--
--#: ../gui/simple-greeter/gdm-languages.c:709
--msgid "Unspecified"
--msgstr "ଅନିର୍ଦ୍ଦିଷ୍ଟ"
--
- #: ../gui/simple-greeter/gdm-option-widget.c:505
- msgid "Label Text"
- msgstr "ପାଠ୍ୟକୁ ଚିହ୍ନଟ କରନ୍ତୁ"
-@@ -678,14 +798,6 @@ msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ବସ୍ତୁ"
- msgid "The ID of the default item"
- msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ବସ୍ତୁର ID"
- 
--#: ../gui/simple-greeter/gdm-recent-option-widget.c:310
--msgid "Max Item Count"
--msgstr "ସର୍ବାଧିକ ବସ୍ତୁ ସଂଖ୍ୟା"
--
--#: ../gui/simple-greeter/gdm-recent-option-widget.c:311
--msgid "The maximum number of items to keep around in the list"
--msgstr "ତାଲିକାରେ ରଖିବାକୁ ଥିବା ସର୍ବାଧିକ ସଂଖ୍ୟକ ବସ୍ତୁ"
--
- #: ../gui/simple-greeter/gdm-remote-login-window.c:188
- #, c-format
- msgid "Remote Login (Connecting to %s…)"
-@@ -704,175 +816,32 @@ msgstr "ସୁଦୂର ଲଗଇନ"
- msgid "Session"
- msgstr "ଅଧିବେଶନ"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1
--msgid "Banner message text"
--msgstr "ପତାକା ସନ୍ଦେଶ ପାଠ୍ୟ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2
--msgid "Banner message text when chooser is empty"
--msgstr "ଚୟନକର୍ତ୍ତା ଖାଲିଥିବା ସମୟରେ ପତାକାର ସନ୍ଦେଶ ପାଠ୍ୟ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3
--msgid "Disable showing the restart buttons"
--msgstr "ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4
--msgid "Do not show known users in the login window"
--msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଜଣା ଚାଳକମାନଙ୍କୁ ଦର୍ଶାନ୍ତୁ ନାହିଁ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5
--msgid "Enable accessibility keyboard plugin"
--msgstr "ଅଭିଗମ୍ଯ କି ବୋର୍ଡ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରନ୍ତୁ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6
--msgid "Enable on-screen keyboard"
--msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7
--msgid "Enable screen magnifier"
--msgstr "ପରଦା ବର୍ଦ୍ଧନକାରୀକୁ ସକ୍ରିୟ କରନ୍ତୁ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8
--msgid "Enable screen reader"
--msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରନ୍ତୁ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9
--msgid "Enable showing the banner message"
--msgstr "ପତାକା ସନ୍ଦେଶ ଦର୍ଶାଇବାକୁ ସକ୍ରିୟ କରନ୍ତୁ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10
--msgid "Icon name to use for greeter logo"
--msgstr "ଧନ୍ୟବାଦ ଦାତା ପ୍ରତୀକ ବ୍ୟବହାର ହେଉଥିବା ଚିତ୍ରସଂକେତ ନାମ ପାଇଁ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11
--msgid "Recently selected languages"
--msgstr "ନିକଟରେ ବଛାଯାଇଥିବା ଭାଷାଗୁଡ଼ିକ"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12
--msgid "Set to a list of languages to be shown by default in the login window."
--msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ ଭାଷା ତାଲିକାରେ ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
--msgid "Set to the themed icon name to use for the greeter logo."
--msgstr ""
--"ସତ୍କାରକରିବା ପ୍ରତୀକ ଚିହ୍ନ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ବିଷୟ ବସ୍ତୁ ଲିଖିତ ଚିତ୍ର ସଂକେତ ନାମକୁ ସେଟକରନ୍ତୁ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
--msgid "Set to true to disable showing known users in the login window."
--msgstr "ଜଣାଥିବା ଚାଳକମାନଙ୍କୁ ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବା ପାଇଁ ନିଷ୍କ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
--msgid "Set to true to disable showing the restart buttons in the login window."
--msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16
--msgid "Set to true to enable the XRandR settings manager plugin."
--msgstr "XRandR ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17
--msgid "Set to true to enable the background settings manager plugin."
--msgstr "ପୃଷ୍ଠଭୂମି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
--msgid "Set to true to enable the media-keys settings manager plugin."
--msgstr "ସଞ୍ଚାର ମାଧ୍ଯମ-କି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
--msgid "Set to true to enable the on-screen keyboard."
--msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
--msgid ""
--"Set to true to enable the plugin to manage the accessibility keyboard "
--"settings."
--msgstr "ଅଭିଗମ୍ୟତା କି ବୋର୍ଡ ବିନ୍ୟାସକୁ ପରିଚାଳନା କରିବା ପାଇଁ ପ୍ଲଗଇନ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
--msgid "Set to true to enable the screen magnifier."
--msgstr "ପରଦା ଆକାର ବର୍ଦ୍ଧକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
--msgid "Set to true to enable the screen reader."
--msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
--msgid "Set to true to enable the sound settings manager plugin."
--msgstr "ଧ୍ୱନୀ ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
--msgid "Set to true to enable the xsettings settings manager plugin."
--msgstr "xsettings ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
--msgid "Set to true to show the banner message text."
--msgstr "ପତାକା ସଂଦେଶ ଦର୍ଶାଇବା ପାଇଁ true ସେଟକରନ୍ତୁ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
--msgid "Set to true to use Compiz as the window manager."
--msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27
--msgid ""
--"Text banner message to show in the login window when the user chooser is "
--"empty, instead of banner_message_text."
--msgstr ""
--"banner_message_text ବ୍ୟତିତ, ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ ଯେତେବେଳେ "
--"ଚାଳକ ଚୟନକର୍ତ୍ତା ଖାଲି ଥାଏ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28
--msgid "Text banner message to show in the login window."
--msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
--msgid "True if the XRandR settings manager plugin is enabled."
--msgstr "True ଯଦି XRandR ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି।"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30
--msgid "True if the background settings manager plugin is enabled."
--msgstr "True ଯଦି ପୃଷ୍ଠଭୂମି ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31
--msgid "True if the media-keys settings manager plugin is enabled."
--msgstr "True ଯଦି ସଞ୍ଚାର ମାଧ୍ଯମ-କି ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି. "
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
--msgid "True if the sound settings manager plugin is enabled."
--msgstr "True ଯଦି ଧ୍ୱନୀ ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
--msgid "True if the xsettings settings manager plugin is enabled."
--msgstr "True ଯଦି xsettings ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
--msgid "Use Compiz as the window manager"
--msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ"
--
--#: ../gui/simple-greeter/gdm-timer.c:149
-+#: ../gui/simple-greeter/gdm-timer.c:147
- msgid "Duration"
- msgstr "ଅବଧି"
- 
--#: ../gui/simple-greeter/gdm-timer.c:150
-+#: ../gui/simple-greeter/gdm-timer.c:148
- msgid "Number of seconds until timer stops"
- msgstr "ସମୟ ମାପକ ବନ୍ଦ ହେବା ପର୍ଯ୍ୟନ୍ତ ସମୟ ସେକଣ୍ଡରେ"
- 
--#: ../gui/simple-greeter/gdm-timer.c:157
-+#: ../gui/simple-greeter/gdm-timer.c:155
- msgid "Start time"
- msgstr "ପ୍ରାରମ୍ଭିକ ସମୟ"
- 
--#: ../gui/simple-greeter/gdm-timer.c:158
-+#: ../gui/simple-greeter/gdm-timer.c:156
- msgid "Time the timer was started"
- msgstr "ସମୟ ମାପକ ଆରମ୍ଭ ହୋଇଥିବା ସମୟ"
- 
--#: ../gui/simple-greeter/gdm-timer.c:165
-+#: ../gui/simple-greeter/gdm-timer.c:163
- msgid "Is it Running?"
- msgstr "ଏହା ଚାଲୁଅଛି କି?"
- 
--#: ../gui/simple-greeter/gdm-timer.c:166
-+#: ../gui/simple-greeter/gdm-timer.c:164
- msgid "Whether the timer is currently ticking"
- msgstr "ସମୟ ମାପକଟି ବର୍ତ୍ତମାନ ଟିକଟିକ କରୁଛି କି ନାହିଁ"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:488
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800
- #, c-format
- msgid "Log in as %s"
- msgstr "%s ଆକାରରେ ଲଗଇନ କରନ୍ତୁ"
-@@ -882,70 +851,39 @@ msgstr "%s ଆକାରରେ ଲଗଇନ କରନ୍ତୁ"
- #. * manually instead of choosing from
- #. * a list.
- #.
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544
- msgctxt "user"
- msgid "Other…"
- msgstr "ଅନ୍ଯାନ୍ଯ…"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545
- msgid "Choose a different account"
- msgstr "ଗୋଟିଏ ପୃଥକ ଖାତା ଚୟନ କରନ୍ତୁ"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559
- msgid "Guest"
- msgstr "ଅତିଥି"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560
- msgid "Log in as a temporary guest"
- msgstr "ଅସ୍ଥାୟୀ ଅତିଥି ଭାବରେ ଲଗଇନ କରନ୍ତୁ"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575
- msgid "Automatic Login"
- msgstr "ସ୍ବୟଂଚାଳିତ ଲଗଇନ"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576
- msgid "Automatically log into the system after selecting options"
- msgstr "ବିକଳ୍ପଗୁଡ଼ିକୁ ବାଛିସାରିବା ପରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ତନ୍ତ୍ରରେ ଲଗଇନ ହେବା"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1038
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332
- msgid "Currently logged in"
- msgstr "ବର୍ତ୍ତମାନ ଲଗଇନ ହୋଇ ସାରିଛି"
- 
--#: ../utils/gdmflexiserver.c:61
--msgid "Only the VERSION command is supported"
--msgstr "କେବଳ VERSION ନିର୍ଦ୍ଦେଶ ସମର୍ଥିତ"
--
--#: ../utils/gdmflexiserver.c:61
--msgid "COMMAND"
--msgstr "ନିର୍ଦ୍ଦେଶ"
--
--#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63
--#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
--msgid "Ignored — retained for compatibility"
--msgstr "ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି — ସୁସଂଗତି ପାଇଁ ରଖାଯାଇଛି"
--
--#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43
-+#: ../utils/gdm-screenshot.c:43
- msgid "Debugging output"
- msgstr "ନିର୍ଗମକୁ ତ୍ରୁଟିମୁକ୍ତ କରୁଅଛି"
- 
--#: ../utils/gdmflexiserver.c:68
--msgid "Version of this application"
--msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ"
--
--#: ../utils/gdmflexiserver.c:675
--#, c-format
--msgid "Could not identify the current session."
--msgstr "ପ୍ରଚଳିତ ଅଧିବେଶନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ."
--
--#. Option parsing
--#: ../utils/gdmflexiserver.c:711
--msgid "- New GDM login"
--msgstr "- ନୂତନ GDM ଲଗଇନ"
--
--#: ../utils/gdmflexiserver.c:767
--msgid "Unable to start new display"
--msgstr "ନୂତନ ପ୍ରଦର୍ଶନକୁ ପ୍ରାରମ୍ଭ କରିପାରିବ ନାହିଁ"
--
- #: ../utils/gdm-screenshot.c:212
- msgid "Screenshot taken"
- msgstr "ପରଦା ପ୍ରତିଛବି ଗ୍ରହଣ କରାଯାଇଛି"
-@@ -955,6 +893,241 @@ msgstr "ପରଦା ପ୍ରତିଛବି ଗ୍ରହଣ କରାଯାଇ
- msgid "Take a picture of the screen"
- msgstr "ପରଦାର ଗୋଟିଏ ପ୍ରତିଛବି ନିଅନ୍ତୁ"
- 
-+#~ msgid "Unable to initialize login system"
-+#~ msgstr "ଲଗଇନ ତନ୍ତ୍ରକୁ ଆରମ୍ଭକରିବାରେ ଅସମର୍ଥ"
-+
-+#~ msgid "Unable to authenticate user"
-+#~ msgstr "ଚାଳକକୁ ବୈଧିକ୍ରୁତ କରିବାରେ ଅସମର୍ଥ"
-+
-+#~ msgid "Unable to establish credentials"
-+#~ msgstr "ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ପ୍ରତିସ୍ଥାପନ କରିବାରେ ଅସମର୍ଥ"
-+
-+#~ msgid "Group %s doesn't exist"
-+#~ msgstr "ସମୂହ %s ଅବସ୍ଥିତ ନାହିଁ"
-+
-+#~ msgid "Denied XDMCP query from host %s"
-+#~ msgstr "%s ଆଧାରରୁ XDMCP ପ୍ରଶ୍ନ ପଚାରିବାରୁ ମନା କରାଗଲା"
-+
-+#~ msgid "Could not extract authlist from packet"
-+#~ msgstr "ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ"
-+
-+#~ msgid "Error in checksum"
-+#~ msgstr "ଯାଞ୍ଚ ସମଷ୍ଟିରେ ତ୍ରୁଟି"
-+
-+#~ msgid "Bad address"
-+#~ msgstr "ଖରାପ ଠିକଣା"
-+
-+#~ msgid "%s: Could not read display address"
-+#~ msgstr "%s: ପ୍ରଦର୍ଶନ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not read display port number"
-+#~ msgstr "%s: ପ୍ରଦର୍ଶନ ସଂଯୋଗିକୀ ସଂଖ୍ଯା ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not extract authlist from packet"
-+#~ msgstr "%s: ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Error in checksum"
-+#~ msgstr "%s: ଚେକ-ଶମରେ ତ୍ରୁଟି"
-+
-+#~ msgid "%s: Got REQUEST from banned host %s"
-+#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ ନିବେଦନ ମିଳିଲା"
-+
-+#~ msgid "%s: Could not read Display Number"
-+#~ msgstr "%s: ପ୍ରତର୍ଶନ ସଂଖ୍ଯାକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not read Connection Type"
-+#~ msgstr "%s: ସଂଯୋଗ ପ୍ରକାରକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not read Client Address"
-+#~ msgstr "%s: ଗ୍ରାହକ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not read Authentication Data"
-+#~ msgstr "%s: ବୈଧିକରଣ ତଥ୍ଯକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not read Authorization List"
-+#~ msgstr "%s: ବୈଧିକରଣ ତାଲିକାକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not read Manufacturer ID"
-+#~ msgstr "%s: ନିର୍ମାତା ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Failed checksum from %s"
-+#~ msgstr "%s: %s ରୁ ଚେକ-ଶମ ଅସଫଳ"
-+
-+#~ msgid "%s: Got Manage from banned host %s"
-+#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ Manage ପାଇଲା"
-+
-+#~ msgid "%s: Could not read Session ID"
-+#~ msgstr "%s: ଅଧିବେଶନ ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not read Display Class"
-+#~ msgstr "%s: ପ୍ରଦର୍ଶନ ଶ୍ରେଣୀକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Could not read address"
-+#~ msgstr "%s: ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ"
-+
-+#~ msgid "%s: Got KEEPALIVE from banned host %s"
-+#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ KEEPALIVE ପାଇଲା"
-+
-+#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
-+#~ msgstr "GdmXdmcpDisplayFactory: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!"
-+
-+#~ msgid "Could not get server hostname: %s!"
-+#~ msgstr "ସର୍ଭର ଆଧାର ନାମକୁ ପାଇ ପାରିଲା ନାହିଁ: %s!"
-+
-+#~ msgid "AT-SPI Registry Wrapper"
-+#~ msgstr "AT-SPI ପଞ୍ଜିକରଣ ଆବରଣ"
-+
-+#~ msgid "Power Manager"
-+#~ msgstr "ଶକ୍ତି ପରିଚାଳକ"
-+
-+#~ msgid "GNOME Settings Daemon"
-+#~ msgstr "GNOME ବିନ୍ୟାସ ଡେମନ"
-+
-+#~ msgid "Metacity"
-+#~ msgstr "Metacity"
-+
-+#~ msgid "Orca Screen Reader"
-+#~ msgstr "Orca ପରଦା ପାଠକ"
-+
-+#~ msgid "Present on-screen information as speech or braille"
-+#~ msgstr "ଅନ-ସ୍କ୍ରିନ ସୂଚନାକୁ ବାର୍ତ୍ତାଳାପ ଅଥବା ବ୍ରେଲି ଲିପିରେ ଉପସ୍ଥାପନ କରନ୍ତୁ"
-+
-+#~ msgid "Languages"
-+#~ msgstr "ଭାଷା"
-+
-+#~ msgid "_Languages:"
-+#~ msgstr "ଭାଷା (_L):"
-+
-+#~ msgid "_Language:"
-+#~ msgstr "ଭାଷା (_L):"
-+
-+#~ msgctxt "language"
-+#~ msgid "Other…"
-+#~ msgstr "ଅନ୍ଯାନ୍ଯ…"
-+
-+#~ msgid "Choose a language from the full list of available languages."
-+#~ msgstr "ଉପଲବ୍ଧ ଭାଷାଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ ଭାଷା ଚୟନ କରନ୍ତୁ."
-+
-+#~ msgid "Language"
-+#~ msgstr "ଭାଷା"
-+
-+#~ msgid "Unspecified"
-+#~ msgstr "ଅନିର୍ଦ୍ଦିଷ୍ଟ"
-+
-+#~ msgid "Max Item Count"
-+#~ msgstr "ସର୍ବାଧିକ ବସ୍ତୁ ସଂଖ୍ୟା"
-+
-+#~ msgid "The maximum number of items to keep around in the list"
-+#~ msgstr "ତାଲିକାରେ ରଖିବାକୁ ଥିବା ସର୍ବାଧିକ ସଂଖ୍ୟକ ବସ୍ତୁ"
-+
-+#~ msgid "Banner message text when chooser is empty"
-+#~ msgstr "ଚୟନକର୍ତ୍ତା ଖାଲିଥିବା ସମୟରେ ପତାକାର ସନ୍ଦେଶ ପାଠ୍ୟ"
-+
-+#~ msgid "Do not show known users in the login window"
-+#~ msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଜଣା ଚାଳକମାନଙ୍କୁ ଦର୍ଶାନ୍ତୁ ନାହିଁ"
-+
-+#~ msgid "Enable accessibility keyboard plugin"
-+#~ msgstr "ଅଭିଗମ୍ଯ କି ବୋର୍ଡ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରନ୍ତୁ"
-+
-+#~ msgid "Enable on-screen keyboard"
-+#~ msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ"
-+
-+#~ msgid "Enable screen magnifier"
-+#~ msgstr "ପରଦା ବର୍ଦ୍ଧନକାରୀକୁ ସକ୍ରିୟ କରନ୍ତୁ"
-+
-+#~ msgid "Enable screen reader"
-+#~ msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରନ୍ତୁ"
-+
-+#~ msgid "Icon name to use for greeter logo"
-+#~ msgstr "ଧନ୍ୟବାଦ ଦାତା ପ୍ରତୀକ ବ୍ୟବହାର ହେଉଥିବା ଚିତ୍ରସଂକେତ ନାମ ପାଇଁ"
-+
-+#~ msgid "Recently selected languages"
-+#~ msgstr "ନିକଟରେ ବଛାଯାଇଥିବା ଭାଷାଗୁଡ଼ିକ"
-+
-+#~ msgid ""
-+#~ "Set to a list of languages to be shown by default in the login window."
-+#~ msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ ଭାଷା ତାଲିକାରେ ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to the themed icon name to use for the greeter logo."
-+#~ msgstr ""
-+#~ "ସତ୍କାରକରିବା ପ୍ରତୀକ ଚିହ୍ନ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ବିଷୟ ବସ୍ତୁ ଲିଖିତ ଚିତ୍ର ସଂକେତ ନାମକୁ ସେଟକରନ୍ତୁ."
-+
-+#~ msgid "Set to true to disable showing known users in the login window."
-+#~ msgstr "ଜଣାଥିବା ଚାଳକମାନଙ୍କୁ ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବା ପାଇଁ ନିଷ୍କ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to enable the XRandR settings manager plugin."
-+#~ msgstr "XRandR ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to enable the background settings manager plugin."
-+#~ msgstr "ପୃଷ୍ଠଭୂମି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to enable the media-keys settings manager plugin."
-+#~ msgstr "ସଞ୍ଚାର ମାଧ୍ଯମ-କି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to enable the on-screen keyboard."
-+#~ msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid ""
-+#~ "Set to true to enable the plugin to manage the accessibility keyboard "
-+#~ "settings."
-+#~ msgstr ""
-+#~ "ଅଭିଗମ୍ୟତା କି ବୋର୍ଡ ବିନ୍ୟାସକୁ ପରିଚାଳନା କରିବା ପାଇଁ ପ୍ଲଗଇନ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to enable the screen magnifier."
-+#~ msgstr "ପରଦା ଆକାର ବର୍ଦ୍ଧକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to enable the screen reader."
-+#~ msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to enable the sound settings manager plugin."
-+#~ msgstr "ଧ୍ୱନୀ ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to enable the xsettings settings manager plugin."
-+#~ msgstr "xsettings ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid "Set to true to use Compiz as the window manager."
-+#~ msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।"
-+
-+#~ msgid ""
-+#~ "Text banner message to show in the login window when the user chooser is "
-+#~ "empty, instead of banner_message_text."
-+#~ msgstr ""
-+#~ "banner_message_text ବ୍ୟତିତ, ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ "
-+#~ "ଯେତେବେଳେ ଚାଳକ ଚୟନକର୍ତ୍ତା ଖାଲି ଥାଏ।"
-+
-+#~ msgid "True if the XRandR settings manager plugin is enabled."
-+#~ msgstr "True ଯଦି XRandR ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି।"
-+
-+#~ msgid "True if the background settings manager plugin is enabled."
-+#~ msgstr "True ଯଦି ପୃଷ୍ଠଭୂମି ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି."
-+
-+#~ msgid "True if the media-keys settings manager plugin is enabled."
-+#~ msgstr "True ଯଦି ସଞ୍ଚାର ମାଧ୍ଯମ-କି ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି. "
-+
-+#~ msgid "True if the sound settings manager plugin is enabled."
-+#~ msgstr "True ଯଦି ଧ୍ୱନୀ ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି."
-+
-+#~ msgid "True if the xsettings settings manager plugin is enabled."
-+#~ msgstr "True ଯଦି xsettings ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି."
-+
-+#~ msgid "Use Compiz as the window manager"
-+#~ msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ"
-+
-+#~ msgid "Only the VERSION command is supported"
-+#~ msgstr "କେବଳ VERSION ନିର୍ଦ୍ଦେଶ ସମର୍ଥିତ"
-+
-+#~ msgid "COMMAND"
-+#~ msgstr "ନିର୍ଦ୍ଦେଶ"
-+
-+#~ msgid "Ignored — retained for compatibility"
-+#~ msgstr "ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି — ସୁସଂଗତି ପାଇଁ ରଖାଯାଇଛି"
-+
-+#~ msgid "Version of this application"
-+#~ msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ"
-+
-+#~ msgid "- New GDM login"
-+#~ msgstr "- ନୂତନ GDM ଲଗଇନ"
-+
- #~| msgid "Shutdown Options..."
- #~ msgid "Shutdown Options…"
- #~ msgstr "ବନ୍ଦ କରିବା ବିକଳ୍ପଗୁଡ଼ିକ…"
-diff --git a/po/ug.po b/po/ug.po
-index 8745201..01c6f0e 100644
---- a/po/ug.po
-+++ b/po/ug.po
-@@ -1,118 +1,110 @@
--# Uighur translation for gdm.
--# Copyright (C) 2010 gdm's COPYRIGHT HOLDER
--# This file is distributed under the same license as the gdm package.
--# Gheyret Kenji <gheyret@yahoo.com>, 2010.
--# Sahran <sahran@live.com>, 2010.
-+# Uyghur translation for gdm.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the PACKAGE package.
-+# Gheyret Kenji <gheyret@gmail.com>, 2013.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: gdm gnome-2-32\n"
-+"Project-Id-Version: gdm\n"
- "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n"
--"POT-Creation-Date: 2011-03-17 13:45+0000\n"
--"PO-Revision-Date: 2010-07-30 07:44+0000\n"
--"Last-Translator: Sahran <sahran@live.com>\n"
-+"POT-Creation-Date: 2013-01-04 07:15+0000\n"
-+"PO-Revision-Date: 2011-11-09 16:10+0900\n"
-+"Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
- "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../common/gdm-common.c:456
-+#: ../common/gdm-common.c:492
- #, c-format
- msgid "/dev/urandom is not a character device"
- msgstr "/dev/urandom ھەرپ ئۈسكۈنىسى ئەمەس"
- 
--#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
--#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
--msgid "Display ID"
--msgstr "ئېكران ID سى"
--
--#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
--#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
--msgid "ID"
--msgstr "ID"
--
--#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194
--#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196
--msgid "GNOME Display Manager Slave"
--msgstr "GNOME ئېكران باشقۇرغۇ(ئەگەشكۈچى)"
--
- #: ../daemon/gdm-display-access-file.c:300
- #, c-format
- msgid "could not find user \"%s\" on system"
--msgstr "سىستېمىدىن ئىشلەتكۈچى \"%s\" تېپىلمىدى"
-+msgstr "سىستېمىدىن ئىشلەتكۈچى «%s» تېپىلمىدى"
- 
--#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316
--msgid "Unable to initialize login system"
--msgstr "كىرىش سىستېمىسىنى دەسلەپلەشتۈرگىلى بولمىدى"
-+#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354
-+#, c-format
-+msgid "No session available yet"
-+msgstr "تېخى ئەڭگىمە يوق"
- 
--#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352
--msgid "Unable to authenticate user"
--msgstr "ئىشلەتكۈچىنى تونۇيالمىدى"
-+#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384
-+#, c-format
-+msgid "Unable to look up UID of user %s"
-+msgstr "ئىشلەتكۈچى %s نىڭ كىملىكىنى تاپقىلى بولمىدى"
- 
--#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409
--msgid "Unable to authorize user"
--msgstr "مۇۋاپىق ئىشلەتكۈچى دەپ ھۆكۈم قىلغىلى بولمىدى"
-+#: ../daemon/gdm-manager.c:291
-+msgid "no sessions available"
-+msgstr "ئەڭگىمەلەر يوق"
- 
--#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538
--msgid "Unable to establish credentials"
--msgstr "ئىشەنچلىك ئىشلەتكۈچى دەپ قاراشقا بولمىدى"
-+#: ../daemon/gdm-manager.c:352
-+#, c-format
-+msgid "No sessions for %s available for reauthentication"
-+msgstr "قايتا كىملىك دەلىللەش ئۈچۈن %s نىڭ ئەڭگىمەسى يوق"
- 
--#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572
--msgid "Unable to open session"
--msgstr "ئەڭگىمەنى باشلىغىلى بولمىدى"
-+#: ../daemon/gdm-manager.c:406
-+#, c-format
-+msgid "Unable to find session for user %s"
-+msgstr "ئىشلەتكۈچى %s ئۈچۈن ئەڭگىمە تاپقىلى بولمىدى"
- 
--#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449
--#: ../daemon/gdm-simple-slave.c:1366
--msgid ""
--"Could not start the X server (your graphical environment) due to an internal "
--"error. Please contact your system administrator or check your syslog to "
--"diagnose. In the meantime this display will be disabled.  Please restart GDM "
--"when the problem is corrected."
--msgstr "ئىچكى خاتالىق تۈپەيلى X مۇلازىمېتىرى(گرافىكىلىق مەشغۇلات مۇھىتى)نى باشلىغىلى بولمىدى. سىستېما باشقۇرغۇچىسى بىلەن ئالاقە قىلىڭ ياكى سىستېما خاتىرىسى(syslog) نى ئېچىپ تەكشۈرۈپ كۆرۈڭ. ھازىرچە مەزكۇر ئېكران چەكلىنىدۇ. مەسىلىنى ھەل قىلغاندا GDM نى قايتا قوزغاتسىڭىز بولىدۇ."
-+#: ../daemon/gdm-manager.c:476
-+#, c-format
-+msgid "Unable to find appropriate session for user %s"
-+msgstr "ئىشلەتكۈچى %s ئۈچۈن مۇۋاپىق ئەڭگىمە تاپقىلى بولمىدى"
-+
-+#: ../daemon/gdm-manager.c:671
-+msgid "User doesn't own session"
-+msgstr "ئىشلەتكۈچىنىڭ ئەڭگىمەسى يوق"
- 
--#: ../daemon/gdm-server.c:250
-+#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768
-+msgid "No session available"
-+msgstr "ئەڭگىمە يوق"
-+
-+#: ../daemon/gdm-server.c:273
- #, c-format
- msgid "%s: failed to connect to parent display '%s'"
--msgstr "%s: ئاتا ئېكران '%s' نىڭغا باغلىنىش مەغلۇپ بولدى"
-+msgstr "%s: ئاتا ئېكران ‹%s› نىڭغا باغلىنىش مەغلۇپ بولدى"
- 
--#: ../daemon/gdm-server.c:365
-+#: ../daemon/gdm-server.c:452
- #, c-format
- msgid "Server was to be spawned by user %s but that user doesn't exist"
- msgstr "مۇلازىمېتىرنى ئىشلەتكۈچى %s قوزغىتىپتۇ. بىراق بۇنداق ئىشلەتكۈچى مەۋجۇت ئەمەس"
- 
--#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396
--#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619
-+#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483
- #, c-format
- msgid "Couldn't set groupid to %d"
- msgstr "گۇرۇپپا ID  سىنى %d غا تەڭشىگىلى بولمىدى"
- 
--#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605
-+#: ../daemon/gdm-server.c:469
- #, c-format
- msgid "initgroups () failed for %s"
- msgstr "%s نى ئىجرا قىلىۋاتقاندا initgroups () مەغلۇپ بولدى"
- 
--#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611
-+#: ../daemon/gdm-server.c:475
- #, c-format
- msgid "Couldn't set userid to %d"
- msgstr "ئىشلەتكۈچى ID سىنى %d غا تەڭشىگىلى بولمىدى"
- 
--#: ../daemon/gdm-server.c:435
-+#: ../daemon/gdm-server.c:522
- #, c-format
- msgid "%s: Could not open log file for display %s!"
- msgstr "%s: ئېكران %s نىڭ خاتىرە ھۆججىتى(logfile) نى ئاچقىلى بولمىدى!"
- 
--#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452
--#: ../daemon/gdm-server.c:458
-+#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539
-+#: ../daemon/gdm-server.c:545
- #, c-format
- msgid "%s: Error setting %s to %s"
- msgstr "%s: %s نى %s قا تەڭشىگىلى بولمىدى"
- 
--#: ../daemon/gdm-server.c:478
-+#: ../daemon/gdm-server.c:565
- #, c-format
- msgid "%s: Server priority couldn't be set to %d: %s"
--msgstr "%s: مۇلازىمېتىر ئالدىنلىقىنى %d غا تەڭشىگىلى بولمىدى: %s"
-+msgstr "%s: مۇلازىمېتىرنىڭ مەرتىۋىسىنى %d غا تەڭشىگىلى بولمىدى: %s"
- 
--#: ../daemon/gdm-server.c:631
-+#: ../daemon/gdm-server.c:722
- #, c-format
- msgid "%s: Empty server command for display %s"
- msgstr "%s: ئېكران %s نىڭ مۇلازىمېتىر بۇيرۇقى قۇرۇق ئىكەن"
-@@ -141,344 +133,334 @@ msgstr "كۆرسىتىش ئۈسكۈنىسى"
- msgid "The display device"
- msgstr "كۆرسىتىش ئۈسكۈنىسى"
- 
--#: ../daemon/gdm-session-worker.c:1066
-+#: ../daemon/gdm-session.c:1183
-+msgid "Could not create authentication helper process"
-+msgstr "كىملىك دەلىللەش ياردەمچى ئىجراسىنى قۇرغىلى بولمىدى"
-+
-+#: ../daemon/gdm-session-worker.c:1029
- #, c-format
--#| msgid "error initiating conversation with authentication system: %s"
- msgid "error initiating conversation with authentication system - %s"
- msgstr "دەلىللەش سىستېمىسى بىلەن كۆرۈشۈشتە دەسلەپلەشتۈرۈش خاتالىقى يۈز بەردى - %s"
- 
--#: ../daemon/gdm-session-worker.c:1067
-+#: ../daemon/gdm-session-worker.c:1030
- msgid "general failure"
- msgstr "ئادەتتىكى مەغلۇبىيەت"
- 
--#: ../daemon/gdm-session-worker.c:1068
-+#: ../daemon/gdm-session-worker.c:1031
- msgid "out of memory"
- msgstr "ئەسلەك يېتىشمىدى"
- 
--#: ../daemon/gdm-session-worker.c:1069
-+#: ../daemon/gdm-session-worker.c:1032
- msgid "application programmer error"
- msgstr "پروگراممىدىكى كەمتۈك"
- 
--#: ../daemon/gdm-session-worker.c:1070
-+#: ../daemon/gdm-session-worker.c:1033
- msgid "unknown error"
- msgstr "نامەلۇم خاتالىق"
- 
--#: ../daemon/gdm-session-worker.c:1077
-+#: ../daemon/gdm-session-worker.c:1040
- msgid "Username:"
- msgstr "ئىشلەتكۈچى ئاتى:"
- 
--#: ../daemon/gdm-session-worker.c:1083
-+#: ../daemon/gdm-session-worker.c:1046
- #, c-format
- msgid "error informing authentication system of preferred username prompt: %s"
- msgstr "دەلىللەش سىستېمىسىدا ئىشلەتكۈچى ئاتىنى بىر تەرەپ قىلىشتا خاتالىق كۆرۈلدى: %s"
- 
--#: ../daemon/gdm-session-worker.c:1097
-+#: ../daemon/gdm-session-worker.c:1060
- #, c-format
- msgid "error informing authentication system of user's hostname: %s"
- msgstr "دەلىللەش سىستېمىسىدا كومپيۇتېر ئاتىنى بىر تەرەپ قىلىشتا خاتالىق كۆرۈلدى: %s"
- 
--#: ../daemon/gdm-session-worker.c:1112
-+#: ../daemon/gdm-session-worker.c:1077
- #, c-format
- msgid "error informing authentication system of user's console: %s"
- msgstr "ئىشلەتكۈچى تىزگىن سۇپىسىنى دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s"
- 
--#: ../daemon/gdm-session-worker.c:1125
-+#: ../daemon/gdm-session-worker.c:1101
- #, c-format
- msgid "error informing authentication system of display string: %s"
- msgstr "ھەرپ تىزمىسىنى كۆرسىتىپ دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s"
- 
--#: ../daemon/gdm-session-worker.c:1140
-+#: ../daemon/gdm-session-worker.c:1116
- #, c-format
- msgid "error informing authentication system of display xauth credentials: %s"
- msgstr "xauth گۇۋاھنامىنى كۆرسىتىپ دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s"
- 
--#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479
-+#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471
- #, c-format
- msgid "no user account available"
- msgstr "ئىشلەتكۈچى ھېسابى يوق"
- 
--#: ../daemon/gdm-session-worker.c:1506
-+#: ../daemon/gdm-session-worker.c:1498
- msgid "Unable to change to user"
- msgstr "ئىشلەتكۈچى ئالماشتۇرغىلى بولمىدى"
- 
--#: ../daemon/gdm-welcome-session.c:549
--#, c-format
--msgid "User %s doesn't exist"
--msgstr "ئىشلەتكۈچى %s مەۋجۇت ئەمەس"
--
--#: ../daemon/gdm-welcome-session.c:556
--#, c-format
--msgid "Group %s doesn't exist"
--msgstr "گۇرۇپپا %s مەۋجۇت ئەمەس"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:604
--msgid "Could not create socket!"
--msgstr "socket نى قۇرغىلى بولمىدى!"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:873
--#, c-format
--msgid "Denied XDMCP query from host %s"
--msgstr "كومپيۇتېر %s دىن كەلگەن XDMCP سۈرۈشتۈرۈش تەلىپى رەت قىلىندى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1031
--#: ../daemon/gdm-xdmcp-display-factory.c:1255
--msgid "Could not extract authlist from packet"
--msgstr "بوغچىدىن دەلىللەش تىزىملىكىنى يېيىپ چىقارغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1044
--#: ../daemon/gdm-xdmcp-display-factory.c:1270
--msgid "Error in checksum"
--msgstr "تەكشۈرۈش خاتالىقى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1523
--msgid "Bad address"
--msgstr "ئادرېس توغرا ئەمەس"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1607
--#, c-format
--msgid "%s: Could not read display address"
--msgstr "%s: ئېكران ئادرېسىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1615
--#, c-format
--msgid "%s: Could not read display port number"
--msgstr "%s: ئېكران ئېغىزىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1624
--#, c-format
--msgid "%s: Could not extract authlist from packet"
--msgstr "%s: بوغچىدىن دەلىللەش تىزىملىكىنى يېيىپ چىقارغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:1644
--#, c-format
--msgid "%s: Error in checksum"
--msgstr "%s: تەكشۈرۈشتە خاتالىق كۆرۈلدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2200
--#, c-format
--msgid "%s: Got REQUEST from banned host %s"
--msgstr "%s: چەكلەنگەن باش ئاپپارات %s دىن ئىلتىماس تاپشۇرۇۋالدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2210
--#: ../daemon/gdm-xdmcp-display-factory.c:2568
--#: ../daemon/gdm-xdmcp-display-factory.c:2822
--#, c-format
--msgid "%s: Could not read Display Number"
--msgstr "%s: ئېكران نومۇرىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2217
--#, c-format
--msgid "%s: Could not read Connection Type"
--msgstr "%s: باغلىنىش تىپىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2224
--#, c-format
--msgid "%s: Could not read Client Address"
--msgstr "%s: خېرىدار ئادرېسىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2232
--#, c-format
--msgid "%s: Could not read Authentication Names"
--msgstr "%s: دەلىللەش ئاتىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2241
--#, c-format
--msgid "%s: Could not read Authentication Data"
--msgstr "%s: دەلىللەش سانلىق-ئاساسلىرىنى ئوقۇپ چىققىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2251
--#, c-format
--msgid "%s: Could not read Authorization List"
--msgstr "%s: دەلىللەش تىزىملىكىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2270
--#, c-format
--msgid "%s: Could not read Manufacturer ID"
--msgstr "%s: ئىشلەپچىقارغۇچى ID سىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2297
--#, c-format
--msgid "%s: Failed checksum from %s"
--msgstr "%s: %s نى تەكشۈرۈش مەغلۇپ بولدى."
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2552
--#, c-format
--msgid "%s: Got Manage from banned host %s"
--msgstr "%s: چەكلەنگەن باش ئاپپارات %s دىن Manage تاپشۇرۇۋالدى"
-+#: ../daemon/gdm-simple-slave.c:1426
-+msgid ""
-+"Could not start the X server (your graphical environment) due to an internal "
-+"error. Please contact your system administrator or check your syslog to "
-+"diagnose. In the meantime this display will be disabled.  Please restart GDM "
-+"when the problem is corrected."
-+msgstr "ئىچكى خاتالىق تۈپەيلى X مۇلازىمېتىرى(گرافىكىلىق مەشغۇلات مۇھىتى)نى باشلىغىلى بولمىدى. سىستېما باشقۇرغۇچىسى بىلەن ئالاقە قىلىڭ ياكى سىستېما خاتىرىسى(syslog) نى ئېچىپ تەكشۈرۈپ كۆرۈڭ. ھازىرچە مەزكۇر ئېكران چەكلىنىدۇ. مەسىلىنى ھەل قىلغاندا GDM نى قايتا قوزغاتسىڭىز بولىدۇ."
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2561
--#: ../daemon/gdm-xdmcp-display-factory.c:2829
-+#: ../daemon/gdm-simple-slave.c:1467
- #, c-format
--msgid "%s: Could not read Session ID"
--msgstr "%s: ئەڭگىمە ID سىنى ئوقۇغىلى بولمىدى"
-+msgid "Can only be called before user is logged in"
-+msgstr "ئىشلەتكۈچى تىزىمغا كىرگەندىن كېيىن ئاندىن چاقىرغىلى بولىدۇ"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2575
-+#: ../daemon/gdm-simple-slave.c:1477
- #, c-format
--msgid "%s: Could not read Display Class"
--msgstr "%s: كۆرسىتىش دەرىجىسىنى ئوقۇغىلى بولمىدى"
-+msgid "Caller not GDM"
-+msgstr "چاقىرغۇچى GDM ئەمەس"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2681
--#: ../daemon/gdm-xdmcp-display-factory.c:2731
--#: ../daemon/gdm-xdmcp-display-factory.c:2737
--#, c-format
--msgid "%s: Could not read address"
--msgstr "%s: ئادرېسنى ئوقۇغىلى بولمىدى"
-+#: ../daemon/gdm-simple-slave.c:1530
-+msgid "User not logged in"
-+msgstr "ئىشلەتكۈچى كىرمىدى"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:2812
-+#: ../daemon/gdm-xdmcp-chooser-slave.c:370
- #, c-format
--msgid "%s: Got KEEPALIVE from banned host %s"
--msgstr "%s: چەكلەنگەن كومپيۇتېر %s دىن KEEPALIVE تاپشۇرۇۋالدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2902
--msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
--msgstr "GdmXdmcpDisplayFactory: XDMCP قېشىنى ئوقۇغىلى بولمىدى"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2908
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
--msgid "XMDCP: Incorrect XDMCP version!"
--msgstr "XDMCP: XDMCP نەشرى توغرا ئەمەس"
--
--#: ../daemon/gdm-xdmcp-display-factory.c:2914
--#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
--msgid "XMDCP: Unable to parse address"
--msgstr "XDMCP: ئادرېسنى پارچىلىيالمىدى"
-+msgid "Currently, only one client can be connected at once"
-+msgstr "نۆۋەتتە، بىر قېتىمدا پەقەت بىرلا خېرىدار باغلىنالايدۇ"
- 
--#: ../daemon/gdm-xdmcp-display-factory.c:3359
--#, c-format
--msgid "Could not get server hostname: %s!"
--msgstr "مۇلازىمېتىر كومپيۇتېرىنىڭ ئاتىنى ئوقۇيالمىدى: %s!"
-+#: ../daemon/gdm-xdmcp-display-factory.c:604
-+msgid "Could not create socket!"
-+msgstr "socket نى قۇرغىلى بولمىدى!"
- 
--#: ../daemon/main.c:237 ../daemon/main.c:250
-+#: ../daemon/main.c:126 ../daemon/main.c:139
- #, c-format
- msgid "Cannot write PID file %s: possibly out of disk space: %s"
- msgstr "PID ھۆججىتىنى %s  غا يازالمىدى: دىسكا بوشلۇقى يېتىشمىگەن بولۇشى مۇمكىن:  %s"
- 
--#: ../daemon/main.c:271
-+#: ../daemon/main.c:166
- #, c-format
- msgid "Logdir %s does not exist or isn't a directory."
- msgstr "%s خاتىرە مۇندەرىجە(Logdir) مەۋجۇت ئەمەس ياكى مۇندەرىجە ئەمەس."
- 
--#: ../daemon/main.c:287
-+#: ../daemon/main.c:183
- #, c-format
- msgid "Authdir %s does not exist. Aborting."
- msgstr "%s دەلىللەش مۇندەرىجە(Authdir) مەۋجۇت ئەمەس. توختىتىۋاتىدۇ."
- 
--#: ../daemon/main.c:291
-+#: ../daemon/main.c:187
- #, c-format
- msgid "Authdir %s is not a directory. Aborting."
- msgstr "%s دەلىللەش مۇندەرىجە(Authdir) مۇندەرىجە ئەمەس. توختىتىۋاتىدۇ."
- 
--#: ../daemon/main.c:365
-+#: ../daemon/main.c:261
- #, c-format
- msgid "Authdir %s is not owned by user %d, group %d. Aborting."
- msgstr "Authdir %s نىڭ ئىگىسى ئىشلەتكۈچى %d، گۇرۇپپا %d ئەمەس. توختىتىۋاتىدۇ."
- 
--#: ../daemon/main.c:372
-+#: ../daemon/main.c:268
- #, c-format
- msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting."
- msgstr "Authdir %s نىڭ ھوقۇقى %o توغرا ئەمەس. %o بولۇشى كېرەك ئىدى. توختىتىۋاتىدۇ."
- 
--#: ../daemon/main.c:409
-+#: ../daemon/main.c:305
- #, c-format
- msgid "Can't find the GDM user '%s'. Aborting!"
--msgstr "GDM ئىشلەتكۈچىسى '%s' تېپىلمىدى. توختىتىۋاتىدۇ."
-+msgstr "GDM ئىشلەتكۈچىسى ‹%s› تېپىلمىدى. توختىتىۋاتىدۇ."
- 
--#: ../daemon/main.c:415
-+#: ../daemon/main.c:311
- msgid "The GDM user should not be root. Aborting!"
- msgstr "root نى GDM ئىشلەتكۈچىسى قىلىشقا بولمايدۇ. توختىتىۋاتىدۇ."
- 
--#: ../daemon/main.c:421
-+#: ../daemon/main.c:317
- #, c-format
- msgid "Can't find the GDM group '%s'. Aborting!"
--msgstr "GDM ئىشلەتكۈچىسى '%s' تېپىلمىدى. توختىتىۋاتىدۇ."
-+msgstr "GDM ئىشلەتكۈچىسى ‹%s› تېپىلمىدى. توختىتىۋاتىدۇ."
- 
--#: ../daemon/main.c:427
-+#: ../daemon/main.c:323
- msgid "The GDM group should not be root. Aborting!"
- msgstr "root نى GDM گۇرۇپپىسى قىلىشقا بولمايدۇ. توختىتىۋاتىدۇ."
- 
--#: ../daemon/main.c:533
-+#: ../daemon/main.c:434
- msgid "Make all warnings fatal"
- msgstr "ھەممە ئاگاھلاندۇرۇشنى ئېغىر خاتالىققا ئۆزگەرت"
- 
--#: ../daemon/main.c:534
-+#: ../daemon/main.c:435
- msgid "Exit after a time (for debugging)"
- msgstr "بىردەمدىن كېيىن چېكىن - سازلاش ئۈچۈن"
- 
--#: ../daemon/main.c:535
-+#: ../daemon/main.c:436
- msgid "Print GDM version"
- msgstr "GDM نەشرىنى بېسىپ چىقار"
- 
--#: ../daemon/main.c:550
-+#: ../daemon/main.c:449
- msgid "GNOME Display Manager"
--msgstr "GNOME ئېكران باشقۇرغۇ(GDM)"
-+msgstr "گىنوم ئېكران باشقۇرغۇ(GDM)"
- 
- #. make sure the pid file doesn't get wiped
--#: ../daemon/main.c:616
-+#: ../daemon/main.c:503
- msgid "Only the root user can run GDM"
--msgstr "root لا GDM  نى ئىجرا قىلالايدۇ"
-+msgstr "ئالىي ئىشلەتكۈچىلا GDM  نى ئىجرا قىلالايدۇ"
- 
- #. Translators: worker is a helper process that does the work
- #. of starting up a session
--#: ../daemon/session-worker-main.c:158
-+#: ../daemon/session-worker-main.c:150
- msgid "GNOME Display Manager Session Worker"
--msgstr "GNOME ئېكران باشقۇرغۇنىڭ ئىشچى ئەڭگىمەسى"
--
--#: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1
--msgid "AT-SPI Registry Wrapper"
--msgstr "AT-SPI رويخەت تۈرى"
--
--#: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756
--msgid "Login Window"
--msgstr "كىرىش كۆزنىكى"
-+msgstr "گىنوم ئېكران باشقۇرغۇنىڭ ئىشچى ئەڭگىمەسى"
- 
--#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1
--msgid "Power Manager"
--msgstr "توك مەنبە باشقۇرغۇچ"
-+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178
-+msgid "Display ID"
-+msgstr "ئېكران كىملىكى"
- 
--#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2
--msgid "Power management daemon"
--msgstr "توك مەنبە باشقۇرغۇ نازارەتچىسى"
-+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178
-+msgid "ID"
-+msgstr "ID"
- 
--#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1
--msgid "GNOME Session Acceleration Checker"
--msgstr "GNOME ئەڭگىمە تېزلەتكۈچنى تەكشۈرگۈچ"
-+#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188
-+msgid "GNOME Display Manager Slave"
-+msgstr "گىنوم ئېكران باشقۇرغۇ(ئەگەشكۈچى)"
- 
--#: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1
--msgid "GNOME Settings Daemon"
--msgstr "GNOME تەڭشەك نازارەتچىسى"
-+#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566
-+msgid "Login Window"
-+msgstr "كىرىش كۆزنىكى"
- 
--#: ../data/greeter-autostart/gnome-mag.desktop.in.h:1
-+#: ../data/applications/gnome-mag.desktop.in.h:1
- msgid "GNOME Screen Magnifier"
--msgstr "GNOME ئېكران چوڭايتقۇ"
-+msgstr "گىنوم ئېكران چوڭايتقۇ"
- 
--#: ../data/greeter-autostart/gnome-mag.desktop.in.h:2
-+#: ../data/applications/gnome-mag.desktop.in.h:2
- msgid "Magnify parts of the screen"
- msgstr "ئېكراننىڭ مەلۇم بۆلىكىنى چوڭايتىدۇ"
- 
--#: ../data/greeter-autostart/gok.desktop.in.h:1
-+#: ../data/applications/gnome-shell.desktop.in.h:1
-+msgid "GNOME Shell"
-+msgstr "گىنوم Shell"
-+
-+#: ../data/applications/gnome-shell.desktop.in.h:2
-+msgid "Window management and compositing"
-+msgstr "كۆزنەك باشقۇرۇش ۋە بىرىكتۈرۈش"
-+
-+#: ../data/applications/gok.desktop.in.h:1
- msgid "GNOME On-Screen Keyboard"
--msgstr "GNOME ئېكران ھەرپتاختا"
-+msgstr "گىنوم ئېكران ھەرپتاختىسى"
- 
--#: ../data/greeter-autostart/gok.desktop.in.h:2
-+#: ../data/applications/gok.desktop.in.h:2
- msgid "Use an on-screen keyboard"
- msgstr "ئېكران ھەرپتاختىسىنى ئىشلىتىدۇ"
- 
--#: ../data/greeter-autostart/metacity.desktop.in.h:1
--msgid "Metacity"
--msgstr "Metacity"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:1
-+msgid "Whether or not to allow fingerprint readers for login"
-+msgstr "كىرىشتە بارماق ئىزى ئوقۇغۇچقا ئىجازەتمۇ"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2
-+msgid ""
-+"The login screen can optionally allow users who have enrolled their "
-+"fingerprints to log in using those prints."
-+msgstr "كىرىش ئېكرانىدا، بارماق ئىزىنى خەتلەتكەن ئىشلەتكۈچىگە بارماق ئىزىنى ئىشلىتىپ كىرىشكە رۇخسەت قىلىشقىمۇ بولىدۇ."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:3
-+msgid "Whether or not to allow smartcard readers for login"
-+msgstr "كىرىشتە smartcard ئوقۇغۇچقا ئىجازەتمۇ"
- 
--#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1
--msgid "Orca Screen Reader"
--msgstr "Orca ئېكران ئوقۇغۇ"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4
-+msgid ""
-+"The login screen can optionally allow users who have smartcards to log in "
-+"using those smartcards."
-+msgstr "كىرىش ئېكرانىدا، smartcards  بار ئىشلەتكۈچىگە smartcards ئىشلىتىپ كىرىشكە رۇخسەت قىلىشقىمۇ بولىدۇ."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:5
-+msgid "Path to small image at top of user list"
-+msgstr "ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدىكى كىچىك سۈرەتنىڭ يولى"
- 
--#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2
--msgid "Present on-screen information as speech or braille"
--msgstr "ئېكراندىكى ئۇچۇرلارنى ئۇن ياكى ئەمالار يېزىقى شەكلىدە كۆرسىتىدۇ"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6
-+msgid ""
-+"The login screen can optionally show a small image at the top of its user "
-+"list to provide site administrators and distributions a way to provide "
-+"branding."
-+msgstr "كىرىش ئېكرانىدا ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدە كىچىك سۈرەتنى كۆرسىتىشكىمۇ بولىدۇ. بۇ ئارقىلىق باشقۇرغۇچىنىڭ ئالاھىدە تۇغنى كۆرسىتىشىگە ئىمكانىيەت يارىتىدۇ."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7
-+msgid ""
-+"The fallback login screen can optionally show a small image at the top of "
-+"its user list to provide site administrators and distributions a way to "
-+"provide branding."
-+msgstr "fallback كىرىش ئېكرانىدا ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدە كىچىك سۈرەتنى كۆرسىتىشكىمۇ بولىدۇ. بۇ ئارقىلىق باشقۇرغۇچىنىڭ ئالاھىدە تۇغنى كۆرسىتىشىگە ئىمكانىيەت يارىتىدۇ."
- 
--#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1
--msgid "PolicyKit Authentication Agent"
--msgstr "PolicyKit  دەلىللەش پروگراممىسى"
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:8
-+msgid "Avoid showing user list"
-+msgstr "ئىشلەتكۈچى تىزىمىنى كۆرسىتىشتىن ساقلانسۇن"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9
-+msgid ""
-+"The login screen normally shows a list of available users to log in as. This "
-+"setting can be toggled to disable showing the user list."
-+msgstr "ئادەتتە كىرىش ئېكرانىدا مەۋجۇت ئىشلەتكۈچىلەرنىڭ تىزىمى كۆرۈنۈپ تۇرىدۇ. بۇ ئارقىلىق ئىشلەتكۈچىلەر تىزىمىنى كۆرسىتىش ياكى كۆرسەتمەسلىكنى بەلگىلىگىلى بولىدۇ."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:10
-+msgid "Enable showing the banner message"
-+msgstr "لەۋھە ئۇچۇرىنى كۆرسەتسۇن"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:11
-+msgid "Set to true to show the banner message text."
-+msgstr "لەۋھە ئۇچۇرى تېكىستىنى كۆرسىتىش ئۈچۈن  true قىلىپ تەڭشىلىدۇ."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:12
-+msgid "Banner message text"
-+msgstr "لەۋھە ئۇچۇرىنىڭ تېكىستى"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:13
-+msgid "Text banner message to show in the login window."
-+msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان لەۋھە تېكىستى."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:14
-+msgid "Disable showing the restart buttons"
-+msgstr "قايتا قوزغات توپچىلىرىنى چەكلە"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:15
-+msgid "Set to true to disable showing the restart buttons in the login window."
-+msgstr "تىزىمغا كىرىش كۆزنىكىدە قايتا قوزغات توپچىسىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ."
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16
-+msgid "Number of allowed authentication failures"
-+msgstr "كىملىك دەلىللەشتە رۇخسەت قىلىنغان خاتالىق قېتىم سانى"
-+
-+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17
-+msgid ""
-+"The number of times a user is allowed to attempt authentication, before "
-+"giving up and going back to user selection."
-+msgstr "كىملىك دەلىللەشتە خاتالىشىشقا رۇخسەت قىلىنغان قېتىم سانى. خاتالاشقان سانى بۇنىڭدىن ئېشىپ كەتسە، ئىشلەتكۈچى تاللاش كۆزنىكىگە قايتىدۇ."
-+
-+#: ../gui/libgdm/gdm-user-switching.c:72
-+msgid "Unable to create transient display: "
-+msgstr "ۋاقىتلىق كۆرسەتكۈچ قۇرغىلى بولمىدى "
-+
-+#: ../gui/libgdm/gdm-user-switching.c:183
-+#: ../gui/libgdm/gdm-user-switching.c:395
-+msgid "Unable to activate session: "
-+msgstr "ئەڭگىمەنى ئاكتىپلىغىلى بولمىدى: "
-+
-+#: ../gui/libgdm/gdm-user-switching.c:344
-+#: ../gui/libgdm/gdm-user-switching.c:514
-+#, c-format
-+msgid "Could not identify the current session."
-+msgstr "ھازىرقى ئەڭگىمەنى بىلگىلى بولمىدى."
-+
-+#: ../gui/libgdm/gdm-user-switching.c:351
-+#, c-format
-+msgid "User unable to switch sessions."
-+msgstr "ئىشلەتكۈچى ئەڭگىمەنى ئالماشتۇرالمىدى."
-+
-+#: ../gui/libgdm/gdm-user-switching.c:523
-+#, c-format
-+msgid "Could not identify the current seat."
-+msgstr "ھازىرقى ئورۇننى بىلگىلى بولمىدى."
-+
-+#: ../gui/libgdm/gdm-user-switching.c:533
-+#, c-format
-+msgid ""
-+"The system is unable to determine whether to switch to an existing login "
-+"screen or start up a new login screen."
-+msgstr "سىستېما نۆۋەتتىكى كىرىش ئېكرانىنى ئالماشتۇرۇش ياكى يېڭى كىرىش ئېكرانىنى قوزغىتىشنى بىلەلمىدى."
-+
-+#: ../gui/libgdm/gdm-user-switching.c:541
-+#, c-format
-+msgid "The system is unable to start up a new login screen."
-+msgstr "سىستېما يېڭى كىرىش ئېكرانىنى باشلىيالمىدى."
- 
- #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147
- msgid "Select System"
-@@ -492,9 +474,121 @@ msgstr "XDMCP: XDMCP يىغلەكىنى قۇرغىلى بولمىدى!"
- msgid "XDMCP: Could not read XDMCP header!"
- msgstr "XDMCP: XDMCP قېشىنى ئوقۇغىلى بولمىدى!"
- 
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
-+msgid "XMDCP: Incorrect XDMCP version!"
-+msgstr "XDMCP: XDMCP نەشرى توغرا ئەمەس"
-+
-+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
-+msgid "XMDCP: Unable to parse address"
-+msgstr "XDMCP: ئادرېسنى پارچىلىيالمىدى"
-+
-+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287
-+msgid "Fingerprint Authentication"
-+msgstr "بارماق ئىزى بىلەن كىملىك دەلىللەش"
-+
-+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293
-+msgid "Log into session with fingerprint"
-+msgstr "ئەڭگىمەگە بارماق ئىزى بىلەن كىر"
-+
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287
-+msgid "Password Authentication"
-+msgstr "ئىم بىلەن كىملىك دەلىللەش"
-+
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293
-+msgid "Log into session with username and password"
-+msgstr "ئەڭگىمەگە ئىشلەتكۈچى ئاتى ۋە ئىم بىلەن كىر"
-+
-+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408
-+msgid "Log In"
-+msgstr "تىزىمغا كىر"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155
-+msgid "Slot ID"
-+msgstr "ئوقۇر ID"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156
-+msgid "The slot the card is in"
-+msgstr "كارتا بار ئوقۇر"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162
-+msgid "Slot Series"
-+msgstr "ئوقۇر قاتارى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163
-+msgid "per-slot card identifier"
-+msgstr "ھەر بىر ئوقۇردىكى كارتىنىڭ پەرقلەندۈرگۈچىسى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170
-+msgid "name"
-+msgstr "ئاتى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174
-+msgid "Module"
-+msgstr "بۆلەك"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175
-+msgid "smartcard driver"
-+msgstr "smartcard قوزغاتقۇسى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408
-+msgid "Smartcard Authentication"
-+msgstr "smartcard بىلەن كىملىك دەلىللەش"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414
-+msgid "Log into session with smartcard"
-+msgstr "ئەڭگىمەگە smartcard بىلەن كىر"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186
-+msgid "Module Path"
-+msgstr "بۆلەك يولى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187
-+msgid "path to smartcard PKCS #11 driver"
-+msgstr "smartcard PKCS #11 قوزغاتقۇسىنىڭ يولى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527
-+msgid "received error or hang up from event source"
-+msgstr "ھادىسە مەنبەسىدىن خاتالىق ياكى ئېسىپ قويۇشنى تاپشۇرۇۋالدى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661
-+#, c-format
-+msgid "NSS security system could not be initialized"
-+msgstr "NSS بىخەتەرلىك سىستېمىسىنى دەسلەپلەشتۈرگىلى بولمىدى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789
-+#, c-format
-+msgid "no suitable smartcard driver could be found"
-+msgstr "مۇۋاپىق smartcard قوزغاتقۇسى تېپىلمىدى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803
-+#, c-format
-+msgid "smartcard driver '%s' could not be loaded"
-+msgstr "smartcard قوزغاتقۇسى «%s» نى ئوقۇغىلى بولمىدى"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875
-+#, c-format
-+msgid "could not watch for incoming card events - %s"
-+msgstr "كىرگەن كارتا ھادىسىسىنى كۆزىتەلمەيدۇ - %s"
-+
-+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242
-+#, c-format
-+msgid "encountered unexpected error while waiting for smartcard events"
-+msgstr "ئىدراكلىق كارتا ھادىسىسىنى كۈتۈۋاتقاندا تاسادىپىي خاتالىققا يولۇقتى"
-+
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287
-+msgid "Authentication"
-+msgstr "سالاھىيەت دەلىللەش"
-+
-+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293
-+msgid "Log into session"
-+msgstr "ئەڭگىمەگە كىر"
-+
- #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239
- msgid "Value"
--msgstr "قىممىتى"
-+msgstr "قىممەت"
- 
- #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240
- msgid "percentage of time complete"
-@@ -502,7 +596,7 @@ msgstr "تاماملانغان ۋاقىتنىڭ پىرسەنتى"
- 
- #: ../gui/simple-greeter/gdm-chooser-widget.c:1465
- msgid "Inactive Text"
--msgstr "بىئاكتىپ تېكىست"
-+msgstr "پاسسىپ تېكىست"
- 
- #: ../gui/simple-greeter/gdm-chooser-widget.c:1466
- msgid "The text to use in the label if the user hasn't picked an item yet"
-@@ -552,101 +646,69 @@ msgstr "%a %l:%M:%S %p"
- msgid "%a %l:%M %p"
- msgstr "%p%l:%M (%a)"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:293
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:314
- msgid "Automatically logging in…"
- msgstr "ئۆزلۈكىدىن كىرىۋاتىدۇ…"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:585
--msgid "Select language and click Log In"
--msgstr "تىل تاللاپ «تىزىمغا كىر» نى چېكىڭ"
--
- #. need to wait for response from backend
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:701
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:930
- msgid "Cancelling…"
- msgstr "ۋاز كېچىۋاتىدۇ…"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091
-+#. just wait for the user to select language and stuff
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486
-+msgid "Select language and click Log In"
-+msgstr "تىل تاللاپ «تىزىمغا كىر» نى چېكىڭ"
-+
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622
- msgctxt "customsession"
- msgid "Custom"
- msgstr "ئىختىيارى"
- 
--#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092
-+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623
- msgid "Custom session"
- msgstr "ئىختىيارى ئەڭگىمە"
- 
- #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
--#| msgid "Panel"
--msgid "Cancel"
--msgstr "ۋاز كەچ"
--
--#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
- msgid "Computer Name"
- msgstr "كومپيۇتېر ئاتى"
- 
-+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
-+msgid "Version"
-+msgstr "نەشرى"
-+
- #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
--msgid "Login"
--msgstr "تىزىمغا كىر"
-+msgid "Cancel"
-+msgstr "ئەمەلدىن قالدۇر"
- 
- #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4
- msgid "Unlock"
--msgstr "قۇلۇپسىزلا"
-+msgstr "قۇلۇپ ئاچ"
- 
- #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5
--msgid "Version"
--msgstr "نەشرى"
-+msgid "Login"
-+msgstr "كىرىش"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:907
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:953
- msgid "Suspend"
- msgstr "توڭلات"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:912
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:958
- msgid "Restart"
- msgstr "قايتا قوزغات"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:916
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:962
- msgid "Shut Down"
- msgstr "تاقاش"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:965
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:1011
- msgid "Unknown time remaining"
- msgstr "ئېشىپ قالغان ۋاقىت نامەلۇم"
- 
--#: ../gui/simple-greeter/gdm-greeter-panel.c:987
-+#: ../gui/simple-greeter/gdm-greeter-panel.c:1033
- msgid "Panel"
- msgstr "تاختا"
- 
--#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252
--msgid "Languages"
--msgstr "تىللار"
--
--#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276
--msgid "_Languages:"
--msgstr "تىللار(_L):"
--
--#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277
--msgid "_Language:"
--msgstr "تىل(_L):"
--
--#. translators: This brings up a dialog
--#. * with a list of languages to choose from
--#.
--#: ../gui/simple-greeter/gdm-language-option-widget.c:231
--msgctxt "language"
--msgid "Other…"
--msgstr "باشقا…"
--
--#: ../gui/simple-greeter/gdm-language-option-widget.c:232
--msgid "Choose a language from the full list of available languages."
--msgstr "تىل تىزىملىكىدىن تىل تاللايدۇ."
--
--#: ../gui/simple-greeter/gdm-language-option-widget.c:262
--msgid "Language"
--msgstr "تىل"
--
--#: ../gui/simple-greeter/gdm-languages.c:709
--msgid "Unspecified"
--msgstr "بەلگىلەنمىگەن"
--
- #: ../gui/simple-greeter/gdm-option-widget.c:505
- msgid "Label Text"
- msgstr "ئەن تېكىستى"
-@@ -671,14 +733,6 @@ msgstr "كۆڭۈلدىكى تۇر"
- msgid "The ID of the default item"
- msgstr "بۇ كۆڭۈلدىكى تۇرنىڭ ID سىدۇر"
- 
--#: ../gui/simple-greeter/gdm-recent-option-widget.c:310
--msgid "Max Item Count"
--msgstr "تۇرنىڭ ئەڭ كوپ سانى"
--
--#: ../gui/simple-greeter/gdm-recent-option-widget.c:311
--msgid "The maximum number of items to keep around in the list"
--msgstr "تىزىملىكتە ساقلىنىدىغان تۈرلەرنىڭ ئەڭ كوپ سانىنى بىلدۈرىدۇ"
--
- #: ../gui/simple-greeter/gdm-remote-login-window.c:188
- #, c-format
- msgid "Remote Login (Connecting to %s…)"
-@@ -691,178 +745,38 @@ msgstr "يىراقتىن تىزىمغا كىر(%s غا باغلاندى)"
- 
- #: ../gui/simple-greeter/gdm-remote-login-window.c:281
- msgid "Remote Login"
--msgstr "يىراقتىن تىزىمغا كىر"
-+msgstr "يىراقتىن كىرىش"
- 
- #: ../gui/simple-greeter/gdm-session-option-widget.c:162
- msgid "Session"
- msgstr "ئەڭگىمە"
- 
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1
--msgid "Banner message text"
--msgstr "لەۋھە ئۇچۇرىنىڭ تېكىستى"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2
--msgid "Banner message text when chooser is empty"
--msgstr "تاللىغۇ قۇرۇق ۋاقىتتا چىقىدىغان لەۋھە ئۇچۇرىنىڭ تېكىستى"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3
--msgid "Disable showing the restart buttons"
--msgstr "قايتا قوزغات توپچىلىرىنى چەكلە"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4
--msgid "Do not show known users in the login window"
--msgstr "تىزىمغا كىرىش كۆزنىكىدە ئىشلەتكۈچىلەرنىڭ ئاتىنى كۆرسەتمە"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5
--msgid "Enable accessibility keyboard plugin"
--msgstr "ھەرپتاختا قىستۇرمىسىنىڭ ياردەمچى ئىقتىدارىنى ئىشلەت"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6
--msgid "Enable on-screen keyboard"
--msgstr "ئېكران ھەرپتاختىسىنى ئىشلەت"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7
--msgid "Enable screen magnifier"
--msgstr "ئېكران چوڭايتىشنى ئىشلەت"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8
--msgid "Enable screen reader"
--msgstr "ئېكران ئوقۇغۇنى ئىشلەت"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9
--msgid "Enable showing the banner message"
--msgstr "لەۋھە ئۇچۇرىنى كۆرسەتسۇن"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10
--msgid "Icon name to use for greeter logo"
--msgstr "سالام تۇغى ئۈچۈن ئىشلىتىلىدىغان سىنبەلگە ئاتى"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11
--msgid "Recently selected languages"
--msgstr "ئالدىنقى قېتىم تاللانغان تىل"
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12
--msgid "Set to a list of languages to be shown by default in the login window."
--msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى تىللار تەڭشىكى."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
--msgid "Set to the themed icon name to use for the greeter logo."
--msgstr "سالام تۇغى ئۈچۈن ئىشلىتىلىدىغان سىنبەلگىنىڭ ئات تەڭشىكى."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
--msgid "Set to true to disable showing known users in the login window."
--msgstr "تىزىمغا كىرىش كۆزنىكىدە ئىشلەتكۈچى ئاتىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
--msgid "Set to true to disable showing the restart buttons in the login window."
--msgstr "تىزىمغا كىرىش كۆزنىكىدە قايتا قوزغات توپچىسىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16
--msgid "Set to true to enable the XRandR settings manager plugin."
--msgstr "xrandr تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17
--msgid "Set to true to enable the background settings manager plugin."
--msgstr "تەگلىك تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
--msgid "Set to true to enable the media-keys settings manager plugin."
--msgstr "media-keys تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
--msgid "Set to true to enable the on-screen keyboard."
--msgstr "ئېكران ھەرپتاختىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
--msgid ""
--"Set to true to enable the plugin to manage the accessibility keyboard "
--"settings."
--msgstr "قوشۇمچە ئىقتىدارلىق ھەرپتاختا تەڭشەك قىستۇرمىسى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
--msgid "Set to true to enable the screen magnifier."
--msgstr "ئېكران چوڭايتقۇنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
--msgid "Set to true to enable the screen reader."
--msgstr "ئېكران ئوقۇغۇنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
--msgid "Set to true to enable the sound settings manager plugin."
--msgstr "ئۈن تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
--msgid "Set to true to enable the xsettings settings manager plugin."
--msgstr "xsettings تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
--msgid "Set to true to show the banner message text."
--msgstr "لەۋھە ئۇچۇرى تېكىستىنى كۆرسىتىش ئۈچۈن  true قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
--msgid "Set to true to use Compiz as the window manager."
--msgstr "compiz نى ئېكران باشقۇرغۇ قىلىپ ئىشلىتىش ئۈچۈن true  قىلىپ تەڭشىلىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27
--msgid ""
--"Text banner message to show in the login window when the user chooser is "
--"empty, instead of banner_message_text."
--msgstr "ئىشلەتكۈچى لەۋھە ئۇچۇرى تېكىستنى تاللىمىغاندا banner_message_text نىڭ ئورنىغا كۆرسىتىلىدىغان تېكىست."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28
--msgid "Text banner message to show in the login window."
--msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان لەۋھە تېكىستى."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
--msgid "True if the XRandR settings manager plugin is enabled."
--msgstr "xrandr تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30
--msgid "True if the background settings manager plugin is enabled."
--msgstr "تەگلىك تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31
--msgid "True if the media-keys settings manager plugin is enabled."
--msgstr "media-keys تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
--msgid "True if the sound settings manager plugin is enabled."
--msgstr "ئۈن تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
--msgid "True if the xsettings settings manager plugin is enabled."
--msgstr "xsettings تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ."
--
--#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
--msgid "Use Compiz as the window manager"
--msgstr "compiz نى كۆزنەك باشقۇرغۇ قىلىپ ئىشلەت"
--
--#: ../gui/simple-greeter/gdm-timer.c:149
-+#: ../gui/simple-greeter/gdm-timer.c:147
- msgid "Duration"
- msgstr "ۋاقتى"
- 
--#: ../gui/simple-greeter/gdm-timer.c:150
-+#: ../gui/simple-greeter/gdm-timer.c:148
- msgid "Number of seconds until timer stops"
- msgstr "ۋاقىت خاتىرىلىگۈچ توختىغۇچە بولغان سېكۇنت"
- 
--#: ../gui/simple-greeter/gdm-timer.c:157
-+#: ../gui/simple-greeter/gdm-timer.c:155
- msgid "Start time"
- msgstr "باشلاش ۋاقتى"
- 
--#: ../gui/simple-greeter/gdm-timer.c:158
-+#: ../gui/simple-greeter/gdm-timer.c:156
- msgid "Time the timer was started"
- msgstr "ۋاقىت خاتىرىلىگۈچ باشلىنىدىغان ۋاقىت"
- 
--#: ../gui/simple-greeter/gdm-timer.c:165
-+#: ../gui/simple-greeter/gdm-timer.c:163
- msgid "Is it Running?"
- msgstr "ئىجرا بولۇۋاتامدۇ؟"
- 
--#: ../gui/simple-greeter/gdm-timer.c:166
-+#: ../gui/simple-greeter/gdm-timer.c:164
- msgid "Whether the timer is currently ticking"
- msgstr "ۋاقىت خاتىرىلىگۈچ ئۆزگىرىۋاتامدۇ يوق"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800
- #, c-format
- msgid "Log in as %s"
- msgstr "%s ئىشلەتكۈچى سۈپىتىدە كىرىدۇ"
-@@ -872,261 +786,44 @@ msgstr "%s ئىشلەتكۈچى سۈپىتىدە كىرىدۇ"
- #. * manually instead of choosing from
- #. * a list.
- #.
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544
- msgctxt "user"
- msgid "Other…"
- msgstr "باشقا…"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545
- msgid "Choose a different account"
- msgstr "باشقا ھېساب تاللاڭ"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559
- msgid "Guest"
- msgstr "مېھمان"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560
- msgid "Log in as a temporary guest"
- msgstr "ۋاقىتلىق مېھمان سۈپىتىدە كىرىدۇ"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575
- msgid "Automatic Login"
- msgstr "ئۆزلۈكىدىن تىزىمغا كىر"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576
- msgid "Automatically log into the system after selecting options"
- msgstr "تاللانمىلار تاللانغاندىن كېيىن سىستېمىغا ئۆزلۈكىدىن كىرىدۇ"
- 
--#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321
-+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332
- msgid "Currently logged in"
- msgstr "كىرىپ بولغان"
- 
--#: ../utils/gdmflexiserver.c:61
--msgid "Only the VERSION command is supported"
--msgstr "پەقەت VERSION نىڭ بۇيرۇقىنىلا ئىشلەتكىلى بولىدۇ"
--
--#: ../utils/gdmflexiserver.c:61
--msgid "COMMAND"
--msgstr "بۇيرۇق"
--
--#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63
--#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
--msgid "Ignored — retained for compatibility"
--msgstr "پەرۋا قىلمىدى - بىردەكلىكنى ساقلاش ئۈچۈن"
--
--#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43
-+#: ../utils/gdm-screenshot.c:43
- msgid "Debugging output"
- msgstr "سازلاشنىڭ چىقىرىلمىسى"
- 
--#: ../utils/gdmflexiserver.c:68
--msgid "Version of this application"
--msgstr "بۇ پروگراممىنىڭ نەشرى"
--
--#: ../utils/gdmflexiserver.c:675
--#, c-format
--msgid "Could not identify the current session."
--msgstr "ھازىرقى ئەڭگىمەنى بىلگىلى بولمىدى."
--
--#. Option parsing
--#: ../utils/gdmflexiserver.c:711
--msgid "- New GDM login"
--msgstr "- يېڭى GDM كىرىش"
--
--#: ../utils/gdmflexiserver.c:767
--msgid "Unable to start new display"
--msgstr "يېڭى ئېكراننى باشلىغىلى بولمىدى"
--
- #: ../utils/gdm-screenshot.c:212
- msgid "Screenshot taken"
--msgstr "ئېكران كەسمىسى تۇتۇلدى"
-+msgstr "ئېكران كۆرۈنۈشى تۇتۇلدى"
- 
- #. Option parsing
- #: ../utils/gdm-screenshot.c:279
- msgid "Take a picture of the screen"
- msgstr "ئېكراننى رەسىمگە تۇت"
--
--#~ msgid "Shutdown Options…"
--#~ msgstr "تاقاش تاللانما…"
--
--#~ msgid "Keyboard layouts"
--#~ msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى"
--
--#~ msgid "_Keyboard:"
--#~ msgstr "ھەرپتاختا(_K):"
--
--#~ msgctxt "keyboard"
--#~ msgid "Other…"
--#~ msgstr "باشقا…"
--
--#~ msgid "Choose a keyboard layout from the full list of available layouts."
--#~ msgstr "ھەرپتاختا تىزىملىكىدىن ھەرپتاختا تاللاڭ."
--
--#~ msgid "Keyboard"
--#~ msgstr "ھەرپتاختا"
--
--#~ msgid "Recently selected keyboard layouts"
--#~ msgstr "ئالدىنقى قېتىم تاللانغان ھەرپتاختا ئورۇنلاشتۇرۇلۇشى"
--
--#~ msgid ""
--#~ "Set to a list of keyboard layouts to be shown by default in the login "
--#~ "window."
--#~ msgstr ""
--#~ "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى ھەرپتاختا ئورۇنلاشتۇرۇش "
--#~ "تەڭشىكى."
--
--#~ msgid ""
--#~ "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."
--#~ msgstr ""
--#~ "مەزكۇر ئىشلەتكۈچى ئالماشتۇرۇش قوللانچىقى ھەقسىز دېتالدۇر. سىز ئەركىن "
--#~ "يۇمشاق دېتال ۋەخپىسى تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامە بويىچە "
--#~ "ئۇنى قايتا تارقىتىپ ياكى ئۆزگەرتەلەيسىز؛ سىز شۇ ئىجازەت كېلىشىمىنىڭ "
--#~ "ئىككىنچى نەشرى ياكى يۇقىرى نەشرىنى ئىشلەتسىڭىز بولىدۇ."
--
--#~ msgid ""
--#~ "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."
--#~ msgstr ""
--#~ "بۇ پروگراممىنى تارقىتىشتىكى مەقسەت سىزگە قۇلايلىق ئېلىپ كېلىش، ئەمما سودا "
--#~ "ياكى باشقا ئالاھىدە قوللىنىشقا نىسبەتەن ھېچقانداق كاپالەت يوق.  GNU "
--#~ "ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىنى كۆرۈپ تېخىمۇ كۆپ تەپسىلاتقا ئېرىشىڭ."
--
--#~ msgid ""
--#~ "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 "
--#~ msgstr ""
--#~ "مەزكۇر پروگرامما بىلەن بىرگە GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىدىن "
--#~ "بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئۇنداق بولمىسا Free Software Foundation, Inc., "
--#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA  بىلەن ئالاقە "
--#~ "قىلىڭ. "
--
--#~ msgid "A menu to quickly switch between users."
--#~ msgstr "ئىشلەتكۈچىلەرنى تېز ئالماشتۇرۇش ئۈچۈن ئىشلىتىلىدىغان تىزىملىك."
--
--#~ msgid "translator-credits"
--#~ msgstr ""
--#~ "Gheyret Kenji <gheyret@gmail.com>\n"
--#~ "Sahran<sahran@live.com>"
--
--#~ msgid "Can't lock screen: %s"
--#~ msgstr "ئېكراننى قۇلۇپلىغىلى بولمىدى:  %s"
--
--#~ msgid "Can't temporarily set screensaver to blank screen: %s"
--#~ msgstr ""
--#~ "ئېكران قوغدىغۇچنى ۋاقىتلىق قۇرۇق ئېكران قىلىپ تەڭشىگىلى بولمىدى:  %s"
--
--#~ msgid "Can't log out: %s"
--#~ msgstr "تىزىمدىن چىقالمىدى: %s"
--
--#~ msgid "Available"
--#~ msgstr "بار"
--
--#~ msgid "Invisible"
--#~ msgstr "يوشۇرۇن"
--
--#~ msgid "Busy"
--#~ msgstr "ئالدىراش"
--
--#~ msgid "Away"
--#~ msgstr "يوق"
--
--#~ msgid "Account Information"
--#~ msgstr "ھېساب ئۇچۇرى"
--
--#~ msgid "System Preferences"
--#~ msgstr "سىستېما مايىللىقى"
--
--#~ msgid "Lock Screen"
--#~ msgstr "ئېكراننى قۇلۇپلاش"
--
--#~ msgid "Switch User"
--#~ msgstr "ئىشلەتكۈچى ئالماشتۇرۇش"
--
--#~ msgid "Quit…"
--#~ msgstr "چېكىن…"
--
--#~ msgid "User Switch Applet"
--#~ msgstr "ئىشلەتكۈچى ئالماشتۇرۇش قوللانچاق پروگراممىسى"
--
--#~ msgid "Change account settings and status"
--#~ msgstr "ھېساب تەڭشەكلىرى ۋە ھالەتنى ئۆزگەرت"
--
--#~ msgid "A menu to quickly switch between users"
--#~ msgstr "ئىشلەتكۈچىلەرنى چاپسان ئالماشتۇرۇش تىزىملىكى"
--
--#~ msgid "User Switcher"
--#~ msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ"
--
--#~ msgid "User Switcher Applet Factory"
--#~ msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ قوللانچاق زاۋۇتى"
--
--#~ msgid "Edit Personal _Information"
--#~ msgstr "شەخسىي ئۇچۇرلارنى تەھرىرلە(_I)"
--
--#~ msgid "_About"
--#~ msgstr "ھەققىدە(_A)"
--
--#~ msgid "_Edit Users and Groups"
--#~ msgstr "ئىشلەتكۈچى ۋە گۇرۇپپا تەھرىرلە(_E)"
--
--#~ msgid "Unknown"
--#~ msgstr "نامەلۇم"
--
--#~ msgid "Quit..."
--#~ msgstr "چېكىن..."
--
--#~ msgid "Couldn't set groupid to 0"
--#~ msgstr "گۇرۇپپا ID  سىنى 0 گە تەڭشىگىلى بولمىدى"
--
--#~ msgid "name"
--#~ msgstr "ئاتى"
--
--#~ msgid "Change login screen configuration"
--#~ msgstr "كىرىش ئېكرانىنىڭ تەڭشىكىنى ئۆزگەرت"
--
--#~ msgid "Privileges are required to change the login screen configuration."
--#~ msgstr "كىرىش ئېكرانىنىڭ تەڭشىكىنى ئۆزگەرتىش ئۈچۈن ئىمتىياز بولۇشى كېرەك."
--
--#~ msgid "Configure login screen behavior"
--#~ msgstr "كىرىش ئېكرانىنىڭ ئىش-ھەرىكەتلىرىنى تەڭشە"
--
--#~ msgid "Login Screen"
--#~ msgstr "كىرىش ئېكرانى"
--
--#~ msgid "Log in as %s automatically"
--#~ msgstr "ئىشلەتكۈچى %s ئۆزلۈكىدىن كىرسۇن"
--
--#~ msgid "Allow %s seconds for anyone else to log in first"
--#~ msgstr "باشقىلارنىڭ ئالدىن كىرىۋېلىشى ئۈچۈن %s سېكۇنت ساقلىسۇن"
--
--#~ msgid "Select %s as default session"
--#~ msgstr "%s كۆڭۈلدىكى ئەڭگىمە بولسۇن"
--
--#~ msgid "Login Screen Settings"
--#~ msgstr "كىرىش ئېكرانى تەڭشىكى"
--
--#~ msgid "Play login sound"
--#~ msgstr "ئۈن چالسۇن"
--
--#~ msgid "Show list of users"
--#~ msgstr "ئىشلەتكۈچى تىزىملىكىنى كۆرسەت"
--
--#~ msgid "When the computer starts up:"
--#~ msgstr "كومپيۇتېر قوزغالغاندا: "
--
--#~ msgid "_Show the screen for choosing who will log in"
--#~ msgstr "كىرىدىغان ئىشلەتكۈچىلەرنى تاللاش ئېكرانىنى كۆرسەتسۇن(_S)"
--
--#~ msgid "%x"
--#~ msgstr "%x"
--
--#~ msgid "Manager"
--#~ msgstr "باشقۇرغۇ"
--
--#~ msgid "The user manager this user is controlled by."
--#~ msgstr "بۇ ئىشلەتكۈچىنى باشقۇرۇۋاتقان ئىشلەتكۈچى باشقۇرغۇ جىسمى"
diff --git a/extra/gdm/maintain-FamilyLocal-cookie.patch b/extra/gdm/maintain-FamilyLocal-cookie.patch
deleted file mode 100644
index 446c88860..000000000
--- a/extra/gdm/maintain-FamilyLocal-cookie.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 6bc39aa208dbd8105232ae62255c42fafdec0541 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 20 Dec 2012 16:07:09 +0000
-Subject: display-access-file: maintain FamilyLocal entry for backward compatibility
-
-commit 0fccf4e0671e49f6e57d0135c97344973c042b23 swapped out the
-FamilyLocal auth cookie for a FamilyWild auth cookie, because the
-latter is more resilient to hostname changes.  Unfortunately,
-not all of the tooling accepts FamilyWild cookies (in particular the
-xauth command), so things like su broke.
-
-This commit changes the code to have a FamilyWild and FamilyLocal
-cookie.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=690562
----
-diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c
-index 02bd414..02ec0a0 100644
---- a/daemon/gdm-display-access-file.c
-+++ b/daemon/gdm-display-access-file.c
-@@ -438,8 +438,18 @@ _get_auth_info_for_display (GdmDisplayAccessFile *file,
-         gdm_display_is_local (display, &is_local, NULL);
- 
-         if (is_local) {
--                *family = FamilyWild;
--                *address = g_strdup ("localhost");
-+                /* We could just use FamilyWild here except xauth
-+                 * (and by extension su and ssh) doesn't support it yet
-+                 *
-+                 * https://bugs.freedesktop.org/show_bug.cgi?id=43425
-+                 */
-+                char localhost[HOST_NAME_MAX + 1] = "";
-+                *family = FamilyLocal;
-+                if (gethostname (localhost, HOST_NAME_MAX) == 0) {
-+                        *address = g_strdup (localhost);
-+                } else {
-+                        *address = g_strdup ("localhost");
-+                }
-         } else {
-                 *family = FamilyWild;
-                 gdm_display_get_remote_hostname (display, address, NULL);
-@@ -533,6 +543,18 @@ gdm_display_access_file_add_display_with_cookie (GdmDisplayAccessFile  *file,
-                 display_added = TRUE;
-         }
- 
-+        /* If we wrote a FamilyLocal entry, we still want a FamilyWild
-+         * entry, because it's more resiliant against hostname changes
-+         *
-+         */
-+        if (auth_entry.family == FamilyLocal) {
-+                auth_entry.family = FamilyWild;
-+
-+                if (XauWriteAuth (file->priv->fp, &auth_entry)
-+                    && fflush (file->priv->fp) != EOF) {
-+                        display_added = TRUE;
-+                }
-+        }
- 
-         g_free (auth_entry.address);
-         g_free (auth_entry.number);
-@@ -555,6 +577,7 @@ gdm_display_access_file_remove_display (GdmDisplayAccessFile  *file,
-         unsigned short  name_length;
-         char           *name;
- 
-+        gboolean        result = FALSE;
- 
-         g_return_val_if_fail (file != NULL, FALSE);
-         g_return_val_if_fail (file->priv->path != NULL, FALSE);
-@@ -579,25 +602,44 @@ gdm_display_access_file_remove_display (GdmDisplayAccessFile  *file,
-         g_free (number);
-         g_free (name);
- 
--        if (auth_entry == NULL) {
-+        if (auth_entry != NULL) {
-+                XauDisposeAuth (auth_entry);
-+                result = TRUE;
-+        }
-+
-+        /* If FamilyLocal, we also added a FamilyWild entry,
-+         * so we need to clean that up too
-+         */
-+        if (family == FamilyLocal) {
-+                auth_entry = XauGetAuthByAddr (FamilyWild,
-+                                               address_length,
-+                                               address,
-+                                               number_length,
-+                                               number,
-+                                               name_length,
-+                                               name);
-+
-+                if (auth_entry != NULL) {
-+                        XauDisposeAuth (auth_entry);
-+                        result = TRUE;
-+                }
-+        }
-+
-+
-+        if (result == FALSE) {
-                 g_set_error (error,
-                              GDM_DISPLAY_ACCESS_FILE_ERROR,
-                              GDM_DISPLAY_ACCESS_FILE_ERROR_FINDING_AUTH_ENTRY,
-                              "could not find authorization entry");
--                return FALSE;
--        }
--
--        XauDisposeAuth (auth_entry);
--
--        if (fflush (file->priv->fp) == EOF) {
-+        } else if (fflush (file->priv->fp) == EOF) {
-                 g_set_error (error,
-                              G_FILE_ERROR,
-                              g_file_error_from_errno (errno),
-                              "%s", g_strerror (errno));
--                return FALSE;
-+                result = FALSE;
-         }
- 
--        return TRUE;
-+        return result;
- }
- 
- void
---
-cgit v0.9.0.2
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 1d623fbb8..1bb570b66 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 173080 2012-12-10 11:56:21Z jgc $
+# $Id: PKGBUILD 183363 2013-04-21 22:09:19Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool' 'libzeitgeist')
-optdepends=('libzeitgeist: Zeitgeist plugin')
-groups=('gnome-extra')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gtksourceview3 gsettings-desktop-schemas libpeas enchant iso-codes libsm desktop-file-utils python-gobject dconf)
+makedepends=(yelp-tools intltool 'zeitgeist>=0.9.12')
+optdepends=('zeitgeist: Zeitgeist plugin')
+groups=(gnome-extra)
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ad4c6837a7e844e000f7cf2c248e636febdcc9b9b9559cf9e27b99392f5735c3')
+sha256sums=('9e0b8a831c6d6d2b82a8f42a0e01ab1f3398fed2cca0b65d0a105d134a5c4dce')
 
 build() {
   cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
       --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \
       --enable-python
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index 39b1636c2..4efe3c207 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 169880 2012-10-30 22:25:50Z heftig $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 183364 2013-04-21 22:09:21Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=ghex
-pkgver=3.6.1
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/Ghex"
 depends=('gtk3' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=ghex.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544')
+sha256sums=('40b08fff065575e91f161904952aaa14919ffe053f3849c47ab567ac93a4d3fc')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index 06c66a70d..198d47e91 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 169881 2012-10-30 22:25:52Z heftig $
+# $Id: PKGBUILD 183533 2013-04-22 15:40:22Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gjs
-pkgver=1.34.0
+pkgver=1.36.1
 pkgrel=1
 pkgdesc="Javascript Bindings for GNOME"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://live.gnome.org/Gjs"
-license=('GPL')
-depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
+license=(GPL)
+depends=(cairo gobject-introspection 'js>=17.0.0')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb')
+source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2)
+sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|python|python2|' scripts/make-tests
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index 449a5b84d..e8a69f53d 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 172080 2012-11-27 16:33:29Z jgc $
+# $Id: PKGBUILD 183366 2013-04-21 22:09:24Z heftig $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=glade
-pkgver=3.14.2
+pkgver=3.15.0
 pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME."
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
+makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
 optdepends=('python2: Python widgets support'
             'devhelp: help browser')
 options=('!libtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d2e6b5a20cfdbc0a5ed49122ac7b4e3a10ba140ccfcaba60082e6e2b52a62ac6')
+sha256sums=('4e64f33d8a5ad614279dc7024ed70fe57805526e82244001a33351b1cf13f95c')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index e3a528d2f..9a1545a0c 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 170891 2012-11-12 22:12:18Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 183367 2013-04-21 22:09:26Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.34.2
+pkgver=2.36.1
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
+license=(GPL2)
+depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas)
+makedepends=(intltool)
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde')
+sha256sums=('e2df2d1943a6193ca471addc58539895da1ae96fdba305dedb937ef56adb57ea')
 
 build() {
-  cd "$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libexecdir=/usr/lib/$pkgname --disable-static
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD
index 0f92ef23f..352cff1c5 100644
--- a/extra/glib-perl/PKGBUILD
+++ b/extra/glib-perl/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 160471 2012-06-02 10:25:59Z bluewind $
+# $Id: PKGBUILD 183484 2013-04-21 22:21:04Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=glib-perl
-pkgver=1.260
+pkgver=1.280
 pkgrel=1
 pkgdesc="Perl wrappers for glib 2.x, including GObject"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 options=('!emptydirs')
-depends=('glib2>=2.24.1' 'perl>=5.14')
-makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12')
+depends=('glib2' 'perl')
+makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
 source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
-md5sums=('faa052bdf6e9b87ea30b630c2806e71e')
+md5sums=('1d81a8aec5f7f1182a96cfaaf119d866')
 
 build() {
   cd "${srcdir}/Glib-${pkgver}"
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index 725d2e28c..e2ca9c3fc 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170205 2012-11-05 11:32:48Z jgc $
+# $Id: PKGBUILD 183316 2013-04-21 22:06:34Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.34.1
+pkgver=2.36.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4')
+sha256sums=('59c54996cccc527f3a257964e7226151175c423f6fb22166e81d65a652f483f3')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 3a1bb3828..052ba4a6e 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 171034 2012-11-15 17:49:18Z ibiru $
+# $Id: PKGBUILD 183369 2013-04-21 22:09:32Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.6.1
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeBluetooth"
 license=('GPL' 'LGPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify')
-makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl')
+depends=('gtk3' 'hicolor-icon-theme' 'libnotify')
+makedepends=('intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('71d72a4637916450987f69c71d374c5bc1102be6dd9d9d7f923aa924659f768a'
+sha256sums=('70f275922f10ac9f40eb7d57f89193502ee490894b5b721d0f6273432fc97f82'
             '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
 
 build() {
diff --git a/extra/gnome-bluetooth/gnome-bluetooth.install b/extra/gnome-bluetooth/gnome-bluetooth.install
index 8c991877f..d59dca6e8 100644
--- a/extra/gnome-bluetooth/gnome-bluetooth.install
+++ b/extra/gnome-bluetooth/gnome-bluetooth.install
@@ -1,5 +1,4 @@
 post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
diff --git a/extra/gcalctool/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index 7045cd6c1..91bb8f9b3 100644
--- a/extra/gcalctool/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 170921 2012-11-13 02:09:59Z heftig $
+# $Id: PKGBUILD 183370 2013-04-21 22:09:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gcalctool
-pkgver=6.6.2
+pkgname=gnome-calculator
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gtk3' 'dconf')
-makedepends=('intltool' 'yelp-tools')
-groups=('gnome-extra')
+makedepends=('intltool' 'yelp-tools' 'vala')
+groups=('gnome')
+replaces=('gcalctool')
+conflicts=('gcalctool')
 options=(!emptydirs)
 url="http://www.gnome.org"
-install=gcalctool.install
+install=gnome-calculator.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e708a16cc758c3a9fcb07e9c3e45989f7d9d64e2993f440e99707fcea3e1b76c')
+sha256sums=('24ae856c90a3df62c52dc413ceb2c9bad15e7ad146de0469b53c70681a4ad435')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/at-spi2-atk/at-spi2-atk.install b/extra/gnome-calculator/gnome-calculator.install
index 2ef26aaa9..2ef26aaa9 100644
--- a/extra/at-spi2-atk/at-spi2-atk.install
+++ b/extra/gnome-calculator/gnome-calculator.install
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
new file mode 100644
index 000000000..60ab99397
--- /dev/null
+++ b/extra/gnome-chess/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183371 2013-04-21 22:09:39Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-chess
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Play the classic two-player boardgame of chess"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'sqlite')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-chess.install
+url="https://live.gnome.org/Chess"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f8a756d0e532ee9532745257bcb3514b3e75a0e2fa7e75b7358b59cdaf3a7661')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-chess/gnome-chess.install b/extra/gnome-chess/gnome-chess.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-chess/gnome-chess.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD
new file mode 100644
index 000000000..0bbce5dfa
--- /dev/null
+++ b/extra/gnome-clocks/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 183372 2013-04-21 22:09:40Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-clocks
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Clocks applications for GNOME"
+arch=(i686 x86_64)
+url="https://www.gnome.org/"
+license=(GPL)
+depends=(gtk3 libcanberra libgweather gnome-desktop libnotify
+         hicolor-icon-theme gnome-themes-standard)
+makedepends=(intltool vala gobject-introspection)
+options=(!libtool)
+groups=(gnome-extra)
+install=gnome-clocks.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz
+        gnome-clocks.css::http://git.gnome.org/browse/gnome-clocks/plain/data/css/gnome-clocks.css?id=${pkgver}
+        button-border-go.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go.svg?id=${pkgver}
+        button-border-go-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go-active.svg?id=${pkgver}
+        button-border-stop.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop.svg?id=${pkgver}
+        button-border-stop-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop-active.svg?id=${pkgver})
+sha256sums=('6140cc1ae41460c5fc799b2a52d809ed4cf9035a72be7e878160b5e591486d31'
+            '3ce4afb848ea2a2728c53a9f4bfca5f12d9719e3935d1acd2d90056cb1c464fc'
+            'a44df652c8034ccbbc87a62f92ab6efbf6dfabead44e3316b4b9e85d851a6b24'
+            'e12ac57acaa43b25a36d9fd9b6dbe906980a5e8429840d98c604bf28515749e0'
+            'e71fa928cf5812fb1cc4ea62e55176be14716b670c37c7899368b0f8f020876c'
+            '34916c190c259788bcb561f0b4cce73b47a39e50326e1a53a2a91c2725e9d8a3')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Fix files missing from tarball
+  mkdir data/css
+  cp ../*.{css,svg} data/css
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-clocks/gnome-clocks.install b/extra/gnome-clocks/gnome-clocks.install
new file mode 100644
index 000000000..b85f1cb47
--- /dev/null
+++ b/extra/gnome-clocks/gnome-clocks.install
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/HighContrast
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 2d19242a4..65c875e02 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 175200 2013-01-16 13:44:28Z jgc $
+# $Id: PKGBUILD 183373 2013-04-21 22:09:42Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64)
 url="http://projects.gnome.org/gnome-color-manager/"
 license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk'
-         'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk' 'libexif')
-makedepends=('intltool' 'yelp-tools')
+depends=(libcanberra vte3 exiv2 hicolor-icon-theme desktop-file-utils clutter-gtk
+         mash shared-color-profiles shared-color-targets gnome-desktop colord-gtk libexif)
+makedepends=(intltool yelp-tools)
 install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c5fb0903d5570c50fbb2347db2222314bef0c57b293302e48e0b73f57f426fb7')
+sha256sums=('61851022ccfa090f21ce027c36cd440597648401aafa2c8b3d3f7787a866bb49')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index 865985478..abe4ece2e 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 170834 2012-11-12 13:27:20Z heftig $
+# $Id: PKGBUILD 183374 2013-04-21 22:09:43Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-contacts
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
 license=('GPL2')
-groups=(gnome-extra)
+groups=(gnome)
 depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
-makedepends=('intltool' 'vala')
+makedepends=('intltool' 'vala' 'gobject-introspection')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7d1b6a8e395b15bf150062f332348549cf9deb38dfa3aad9994f70e71d8449fa')
+sha256sums=('c9b2ffba754f4e1e37788195c814b12dfbf79b35042cd811b8690f890572edcb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index ffd0a2d26..1e7d79a2e 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 178089 2013-02-15 23:34:30Z heftig $
+# $Id: PKGBUILD 183375 2013-04-21 22:09:45Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.6.3
-pkgrel=4
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
-         'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
-         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
+license=(GPL)
+arch=(i686 x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
+         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
+         gnome-color-manager smbclient modemmanager)
+makedepends=(gnome-doc-utils intltool docbook-xsl)
+optdepends=('gnome-user-share: Bluetooth and WebDAV file sharing'
+            'rygel: media sharing'
+            'vino: screen sharing'
+            'openssh: remote login')
+groups=(gnome)
 url="http://www.gnome.org"
-groups=('gnome')
 install=gnome-control-center.install
-license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        pulse3.0.patch)
-sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb'
-            '27f1d518df91ad9687e3e217023d83726c0d44f65b30942e79106e4aad53c916')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('07d7d8e08af6a9ef01754814ecf2d006c58b94a096f0c6ad549c9d0051e4e57a')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../pulse3.0.patch
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb \
-      --without-cheese
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
diff --git a/extra/gnome-control-center/pulse3.0.patch b/extra/gnome-control-center/pulse3.0.patch
deleted file mode 100644
index 203547940..000000000
--- a/extra/gnome-control-center/pulse3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Fri, 07 Dec 2012 10:52:09 +0000
-Subject: sound: Fix port handling for the unknown availability case
-
-The current code assumes that port availability transitions will be
-between YES and NO, and doesn't account for the fact that it may also be
-UNKNOWN. This causes spurious entries if the port availability
-transitions between YES and UNKNOWN.
----
-diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
-index 34ddc0c..2f6cf34 100644
---- a/panels/sound/gvc-mixer-control.c
-+++ b/panels/sound/gvc-mixer-control.c
-@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl      *control,
-                 else {
-                         for (i = 0; i < info->n_ports; i++) {
-                                 if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
--                                        if (card_port->available != info->ports[i]->available) {
-+                                        if ((card_port->available == PA_PORT_AVAILABLE_NO) !=  (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
-                                                 card_port->available = info->ports[i]->available;
-                                                 g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
-                                                           gvc_mixer_card_get_index (card),
---
-cgit v0.9.0.2
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index 116b2fd1c..87ca2b332 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170920 2012-11-13 02:08:44Z heftig $
+# $Id: PKGBUILD 183376 2013-04-21 22:09:47Z heftig $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
+depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config' 'iso-codes')
+makedepends=('intltool' 'gobject-introspection' 'itstool')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef15cc0b34a8360fd48ceeb833515790db4de38e6945fb3661f178dc7df70236')
+sha256sums=('79c4790fdfc58a54ee32b2fd20f498f4d563d11fa40ab6599c757e45bee5b13f')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD
index 90267e0be..cb0b1e043 100644
--- a/extra/gnome-dictionary/PKGBUILD
+++ b/extra/gnome-dictionary/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169894 2012-10-30 22:33:54Z heftig $
+# $Id: PKGBUILD 183378 2013-04-21 22:09:49Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gnome-dictionary
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Look up words in dictionary sources"
 arch=(i686 x86_64)
 url="http://gnome.org"
@@ -11,7 +11,7 @@ depends=('dconf' 'gtk3')
 makedepends=('intltool' 'itstool' 'docbook-xsl')
 install=$pkgname.install
 options=(!libtool)
-groups=('gnome-extra')
+groups=('gnome')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9')
 
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 417a2c196..539c077fa 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 169895 2012-10-30 22:34:01Z heftig $
+# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
 pkgname=gnome-disk-utility
-pkgver=3.6.1
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="Disk Management Utility for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
+arch=(i686 x86_64)
+license=(GPL)
 url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils')
-makedepends=('intltool' 'docbook-xsl')
+groups=(gnome)
+depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hicolor-icon-theme desktop-file-utils)
+makedepends=(intltool docbook-xsl gnome-settings-daemon)
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32')
+sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e')
 
 build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index 5094c3c34..0fd9877fe 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 170912 2012-11-12 22:48:08Z heftig $
+# $Id: PKGBUILD 183380 2013-04-21 22:09:52Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
-license=('GPL')
-groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata'
-         'tracker' 'libzapojit')
-makedepends=('intltool')
+license=(GPL)
+groups=(gnome-extra)
+depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata
+         tracker libzapojit webkitgtk3)
+makedepends=(intltool gobject-introspection itstool)
 optdepends=('unoconv: Support for Libreoffice document types')
 options=('!libtool')
 install=gnome-documents.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b2b548685c1074cf222a21d747e6daa8f339815219616b12bb4d2e447e2a34c2')
+sha256sums=('7cd05f5f2482ddae797300b233f499cbe410cb22d358bef37a387aff232d4e9f')
 
 build() {
   cd $pkgname-$pkgver
@@ -24,10 +24,16 @@ build() {
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --libexecdir=/usr/lib/gnome-documents
+    --libexecdir=/usr/lib/$pkgname
   make
 }
 
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD
index 1ff633fd0..82392d280 100644
--- a/extra/gnome-font-viewer/PKGBUILD
+++ b/extra/gnome-font-viewer/PKGBUILD
@@ -1,8 +1,8 @@
-#  $Id: PKGBUILD 172919 2012-12-06 20:22:06Z heftig $
+#  $Id: PKGBUILD 183381 2013-04-21 22:09:54Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-font-viewer
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="GNOME font viewer and thumbnailer"
 arch=(i686 x86_64)
@@ -11,10 +11,10 @@ depends=('gtk3' 'desktop-file-utils' 'gnome-desktop')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-groups=('gnome-extra')
+groups=('gnome')
 install=gnome-font-viewer.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('216a1f1a54cf662533b7a793b250bb01bafb98319bfdbe814f66be54fbefe145')
+sha256sums=('d34f17f026b7c41d8de5c255070c79c938ce69030b3429444e7fb8f2275ff819')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
deleted file mode 100644
index 05f251d49..000000000
--- a/extra/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169898 2012-10-30 22:34:10Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
-options=('!emptydirs' '!libtool')
-install=gnome-games.install
-url="http://www.gnome.org"
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static --disable-schemas-compile \
-      --with-scores-user=root --with-scores-group=games \
-      --enable-introspection=yes
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Remove all scores, we generate them from postinstall
-  rm -rf "$pkgdir/var"
-
-  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
-}
diff --git a/extra/gnome-games/gnome-games.install b/extra/gnome-games/gnome-games.install
deleted file mode 100644
index 2fad5db0b..000000000
--- a/extra/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,122 +0,0 @@
-_scores=(glines.Small.scores
-	glines.Medium.scores
-	glines.Large.scores
-	gnibbles.4.0.scores
-	gnibbles.3.0.scores
-	gnibbles.2.0.scores
-	gnibbles.1.0.scores
-	gnibbles.4.1.scores
-	gnibbles.3.1.scores
-	gnibbles.2.1.scores
-	gnibbles.1.1.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnomine.Small.scores
-	gnomine.Medium.scores
-	gnomine.Large.scores
-	gnomine.Custom.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gnotski.1.scores
-	gnotski.2.scores
-	gnotski.3.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.scores
-	gnotski.10.scores
-	gnotski.11.scores
-	gnotski.12.scores
-	gnotski.13.scores
-	gnotski.14.scores
-	gnotski.15.scores
-	gnotski.16.scores
-	gnotski.17.scores
-	gnotski.18.scores
-	gnotski.19.scores
-	gnotski.20.scores
-	gnotski.21.scores
-	gnotski.22.scores
-	gnotski.23.scores
-	gnotski.24.scores
-	gnotski.25.scores
-	gnotski.26.scores
-	gnotski.27.scores
-	gnotski.28.scores
-	gnotski.29.scores
-	gnotski.30.scores
-	gnotski.31.scores
-	gnotski.32.scores
-	gnotski.33.scores
-	gnotski.34.scores
-	gnotski.35.scores
-	gnotski.36.scores
-	gnotski.37.scores
-	gtali.Regular.scores
-	gtali.Colors.scores
-	gnome-mahjongg.easy.scores
-	gnome-mahjongg.difficult.scores
-	gnome-mahjongg.confounding.scores
-	gnome-mahjongg.pyramid.scores
-	gnome-mahjongg.tictactoe.scores
-	gnome-mahjongg.cloud.scores
-	gnome-mahjongg.dragon.scores
-	gnome-mahjongg.bridges.scores
-	gnome-mahjongg.ziggurat.scores
-	quadrapassel.scores
-	swell-foop.small.scores
-	swell-foop.normal.scores
-	swell-foop.large.scores)
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    if [ -e "var/games/$score" ]; then
-      continue
-    fi
-
-    touch "var/games/$score"
-    chown root:games "var/games/$score"
-    chmod 664 "var/games/$score"
-  done
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    rm -f "var/games/$score"
-  done
-}
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 2ddf1da9a..0a4c04796 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 178926 2013-02-28 19:25:14Z ioni $
+#$Id: PKGBUILD 183385 2013-04-21 22:10:00Z heftig $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151')
+sha256sums=('56e0a47c021fb2d2fd2c723a0e1c9e46c9a0a81ed865ac1588c19aca16ca4f37')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD
new file mode 100644
index 000000000..14a69ab5d
--- /dev/null
+++ b/extra/gnome-klotski/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183386 2013-04-21 22:10:02Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-klotski
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Slide blocks to solve the puzzle"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-klotski.install
+url="https://live.gnome.org/Klotski"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('85b2936dc9390bb09d622984b169c0d921b99d786fbd0060d39d319c38d31c71')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-klotski/gnome-klotski.install b/extra/gnome-klotski/gnome-klotski.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-klotski/gnome-klotski.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD
new file mode 100644
index 000000000..c3d79b652
--- /dev/null
+++ b/extra/gnome-mahjongg/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-mahjongg
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Disassemble a pile of tiles by removing matching pairs"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-mahjongg.install
+url="https://live.gnome.org/Mahjongg"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6995bfae4c145f07764a7825865804232e620bbdf57c0625d0a21d06561ad496')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-mahjongg/gnome-mahjongg.install b/extra/gnome-mahjongg/gnome-mahjongg.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-mahjongg/gnome-mahjongg.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 09763771a..482a14cce 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 175187 2013-01-16 10:52:05Z jgc $
+# $Id: PKGBUILD 183388 2013-04-21 22:10:05Z heftig $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.6.2
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64')
-depends=('glib2' 'python2-gobject')
+depends=('glib2')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        menus.patch)
-sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
+        calculator.patch)
+sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f'
+            'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8')
 
 build() {
   cd "$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
+  patch -Np1 -i ../calculator.patch
+  ./configure \
       --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var  --disable-static
   make
@@ -30,7 +28,4 @@ build() {
 package(){
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
 }
diff --git a/extra/gnome-menus/calculator.patch b/extra/gnome-menus/calculator.patch
new file mode 100644
index 000000000..9ff1ed261
--- /dev/null
+++ b/extra/gnome-menus/calculator.patch
@@ -0,0 +1,41 @@
+From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Thu, 28 Mar 2013 21:54:34 +0000
+Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
+
+gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
+very last minute before the 3.8.0 release.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696816
+---
+diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
+index 84d13ed..503f9ca 100644
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -38,7 +38,6 @@
+         <Not><Filename>file-roller.desktop</Filename></Not>
+         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
+-        <Not><Filename>gnome-calculator.desktop</Filename></Not>
+         <Not><Filename>gcalctool.desktop</Filename></Not>
+         <Not><Filename>gucharmap.desktop</Filename></Not>
+         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+@@ -251,7 +250,7 @@
+     <Directory>X-GNOME-Utilities.directory</Directory>
+     <Include>
+       <Filename>file-roller.desktop</Filename>
+-      <Filename>gnome-calculator.desktop</Filename>
++      <Filename>gcalctool.desktop</Filename>
+       <Filename>gnome-font-viewer.desktop</Filename>
+       <Filename>gucharmap.desktop</Filename>
+       <Filename>seahorse.desktop</Filename>
+@@ -287,7 +286,6 @@
+         <Not><Filename>gnome-eog.desktop</Filename></Not>
+         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+-        <Not><Filename>gcalctool.desktop</Filename></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
+--
+cgit v0.9.1
diff --git a/extra/gnome-menus/menus.patch b/extra/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/extra/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD
new file mode 100644
index 000000000..6c30c5076
--- /dev/null
+++ b/extra/gnome-mines/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183389 2013-04-21 22:10:07Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-mines
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Clear hidden mines from a minefield"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-mines.install
+url="https://live.gnome.org/Mines"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('81a47cf8eeb81f1d54ccd42b8eb04f5c8a1e6dcc8fd4f1bc714b147a934da633')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-mines/gnome-mines.install b/extra/gnome-mines/gnome-mines.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-mines/gnome-mines.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index 1f8343a00..bfe38c4cb 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -1,29 +1,26 @@
-# $Id: PKGBUILD 179951 2013-03-13 11:42:54Z heftig $
+# $Id: PKGBUILD 183390 2013-04-21 22:10:08Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 
 pkgname=gnome-nettool
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A Collection of GNOME3 Networking Tools."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gtk3' 'libgtop' 'ldns' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
+depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
 makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
 optdepends=('nmap: Port scanning'
             'net-tools: Network statistics')
 groups=('gnome-extra')
 url="http://www.gnome.org"
 install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        ldns.patch)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79'
-            '8bd83fe863d2945689afd753e5908a2bc033206e25f28d88783ae8d859d6bfeb')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../ldns.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-compile
   make
diff --git a/extra/gnome-nettool/ldns.patch b/extra/gnome-nettool/ldns.patch
deleted file mode 100644
index 318e89777..000000000
--- a/extra/gnome-nettool/ldns.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r gnome-nettool-3.2.0/src/lookup.c gnome-nettool-3.2.0-ldns/src/lookup.c
---- gnome-nettool-3.2.0/src/lookup.c	2012-01-03 10:38:09.000000000 +0100
-+++ gnome-nettool-3.2.0-ldns/src/lookup.c	2013-03-13 12:32:31.551213914 +0100
-@@ -98,7 +98,7 @@
- 
- 	parent = gtk_widget_get_toplevel (netinfo->output);
- 	
--	program = util_find_program_dialog ("dig", parent);
-+	program = util_find_program_dialog ("drill", parent);
- 
- 	if (program != NULL) {
- 		use_reverse_lookup = pattern_match (host, address_regular_expression);
-@@ -116,7 +116,7 @@
- 		command_line = g_new (gchar *, num_terms + 1);
- 		i = 0;
- 		command_line[i++] = g_strdup (program);
--		command_line[i++] = g_strdup ("dig");
-+		command_line[i++] = g_strdup ("drill");
- 		if (command_options != NULL) {
- 			for (j = 0; command_options[j] != NULL; j++)
- 				command_line[i++] = g_strdup (command_options[j]);
diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD
new file mode 100644
index 000000000..d10cfdc7c
--- /dev/null
+++ b/extra/gnome-nibbles/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-nibbles
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Guide a worm around a maze"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-nibbles.install
+url="https://live.gnome.org/Nibbles"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bc1e4f687f1e794ef15a4162492154970300ac682378e59f9471327e5fd0d606')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+}
diff --git a/extra/gnome-nibbles/gnome-nibbles.install b/extra/gnome-nibbles/gnome-nibbles.install
new file mode 100644
index 000000000..8106ea53c
--- /dev/null
+++ b/extra/gnome-nibbles/gnome-nibbles.install
@@ -0,0 +1,40 @@
+_scores=(
+	gnome-nibbles.1.0.scores
+	gnome-nibbles.2.0.scores
+	gnome-nibbles.3.0.scores
+	gnome-nibbles.4.0.scores
+	gnome-nibbles.1.1.scores
+	gnome-nibbles.2.1.scores
+	gnome-nibbles.3.1.scores
+	gnome-nibbles.4.1.scores
+)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index 22d2e9260..a3ac3e52c 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170937 2012-11-13 16:38:27Z ibiru $
+# $Id: PKGBUILD 183392 2013-04-21 22:10:11Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 options=(!libtool)
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('55d207d2dc5428f41b0a504aa3edd996a6167a5625d9e11d678f33f282935fa7')
+sha256sums=('26c334000ae74832042142a150e7d0c4b5ced4dc24bdb247f75cbb9e3d2e7261')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD
new file mode 100644
index 000000000..45e7aedc5
--- /dev/null
+++ b/extra/gnome-photos/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 183480 2013-04-21 22:20:19Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-photos
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Access, organize, and share your photos on GNOME"
+arch=(i686 x86_64)
+url="https://www.gnome.org/"
+license=(GPL)
+depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme)
+makedepends=(intltool)
+options=(!libtool)
+groups=(gnome-extra)
+install=gnome-photos.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d5a42a6562eb2bebd404f1b932e105572e64abb0e3160b2834c7898cf090f3de')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-photos/gnome-photos.install b/extra/gnome-photos/gnome-photos.install
new file mode 100644
index 000000000..847019792
--- /dev/null
+++ b/extra/gnome-photos/gnome-photos.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index dc1fe6d67..da938658d 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 169907 2012-10-30 22:34:30Z heftig $
+# $Id: PKGBUILD 183393 2013-04-21 22:10:14Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.6.0
+pkgver=3.8.1
 pkgrel=1
-pkgdesc="Power management tools."
+pkgdesc="System power information and statistics"
 arch=(i686 x86_64)
 url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
-makedepends=('intltool')
+license=(GPL)
+depends=(gtk3 upower dconf hicolor-icon-theme)
+makedepends=(intltool)
 options=(!emptydirs)
 install=gnome-power-manager.install
-groups=(gnome-extra)
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6')
+sha256sums=('f5b5ef2282fae3bcdcc8473af3cc5e32ad7ac7e2444fc93abf00c3d2967361bf')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
new file mode 100644
index 000000000..8f4c471d2
--- /dev/null
+++ b/extra/gnome-robots/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 183394 2013-04-21 22:10:16Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-robots
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Avoid the robots and make them crash into each other"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-robots.install
+url="https://live.gnome.org/Robots"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6faeeef5ab9b5002c7ca3cf60ea67e7a66064654ae28c68c233b2ee40459a704')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+}
diff --git a/extra/gnome-robots/gnome-robots.install b/extra/gnome-robots/gnome-robots.install
new file mode 100644
index 000000000..3422e0c8a
--- /dev/null
+++ b/extra/gnome-robots/gnome-robots.install
@@ -0,0 +1,47 @@
+_scores=(
+	gnome-robots2.robots2.scores
+	gnome-robots2.robots2-safe.scores
+	gnome-robots2.robots2-super-safe.scores
+	gnome-robots2.robots2_easy.scores
+	gnome-robots2.robots2_easy-safe.scores
+	gnome-robots2.robots2_easy-super-safe.scores
+	gnome-robots2.classic_robots.scores
+	gnome-robots2.classic_robots-safe.scores
+	gnome-robots2.classic_robots-super-safe.scores
+	gnome-robots2.robots_with_safe_teleport.scores
+	gnome-robots2.robots_with_safe_teleport-safe.scores
+	gnome-robots2.robots_with_safe_teleport-super-safe.scores
+	gnome-robots2.nightmare.scores
+	gnome-robots2.nightmare-safe.scores
+	gnome-robots2.nightmare-super-safe.scores
+)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD
index 8764d54f1..86b169622 100644
--- a/extra/gnome-screenshot/PKGBUILD
+++ b/extra/gnome-screenshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170897 2012-11-12 22:32:16Z heftig $
+# $Id: PKGBUILD 183395 2013-04-21 22:10:17Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-screenshot
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Take pictures of your screen"
 arch=(i686 x86_64)
@@ -10,10 +10,10 @@ url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3' 'libcanberra')
 makedepends=('intltool')
-groups=('gnome-extra')
+groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7954424f927c9cf5451d27e78edd10fa80d15345dfdb78bd7bc98f873617f382')
+sha256sums=('113ab0fe98080f888ff8ff15011b21e74b5582576cb5455db47cbfd9e9075a05')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-search-tool/PKGBUILD b/extra/gnome-search-tool/PKGBUILD
index d29b9fe06..d8278d917 100644
--- a/extra/gnome-search-tool/PKGBUILD
+++ b/extra/gnome-search-tool/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 169910 2012-10-30 22:34:37Z heftig $
+# $Id: PKGBUILD 183396 2013-04-21 22:10:19Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-search-tool
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Utility to search for files"
 arch=(i686 x86_64)
 url="http://gnome.org"
 license=('GPL2')
-depends=('gtk3' 'libsm')
+depends=('nautilus' 'libsm')
 makedepends=('intltool' 'yelp-tools')
 install=$pkgname.install
 options=('!emptydirs')
-groups=('gnome-extra')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42')
 
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index ad1cb24b4..04b381bc3 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,32 +1,27 @@
-# $Id: PKGBUILD 170916 2012-11-12 23:48:19Z heftig $
+# $Id: PKGBUILD 183397 2013-04-21 22:10:21Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-session
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
-         'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome'
-         'upower')
-makedepends=('intltool' 'mesa' 'xtrans')
+license=(GPL LGPL)
+depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop
+         hicolor-icon-theme json-glib libgl libsm libxtst upower)
+makedepends=(intltool mesa gtk-doc)
 options=('!emptydirs')
 install=gnome-session.install
 url="http://www.gnome.org"
-groups=('gnome')
+groups=(gnome)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        gnome-session-3.3.1-llvmpipe.patch timeout.patch)
-sha256sums=('2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4'
-            '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
+        timeout.patch)
+sha256sums=('6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770'
             '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
 
 build() {
   cd $pkgname-$pkgver
 
-  # Allow software rendering
-  patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch
-
   # Increase timeout, for slow machines
   patch -Np1 -i ../timeout.patch
 
diff --git a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch
deleted file mode 100644
index 40da1c9b7..000000000
--- a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility
---- gnome-session-3.3.1/data/hardware-compatibility.jx	2011-10-21 10:35:39.000000000 -0400
-+++ gnome-session-3.3.1/data/hardware-compatibility	2011-11-03 17:53:17.156407217 -0400
-@@ -20,4 +20,4 @@
- 
- # Gallium has softpipe and llvmpipe
- -softpipe
---llvmpipe
-+#llvmpipe
diff --git a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
deleted file mode 100644
index eb77bada2..000000000
--- a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+++ /dev/null
@@ -1,1476 +0,0 @@
-From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 21 Sep 2012 11:56:53 +0100
-Subject: [PATCH] power and media-keys: Use logind for suspending and
- rebooting the system
-
-Use the new logind features to suspend and resume but making sure we opt out
-of logind handling the sleep and power keys, and also inhibiting for lid close
-auto-suspend if there is an external monitor connected.
-
-Also use a delay inihibit for logind so that we can do actions on suspend like
-blanking the screen using the screensaver and also poking the screensaver on
-resume.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680689
-
-Conflicts:
-	plugins/power/gsd-power-manager.c
----
- plugins/common/Makefile.am                  |   4 +-
- plugins/common/gsd-power-helper.c           | 203 --------
- plugins/common/gsd-power-helper.h           |  35 --
- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
- plugins/power/gsd-power-manager.c           | 697 +++++++++++++++++++---------
- 5 files changed, 594 insertions(+), 501 deletions(-)
- delete mode 100644 plugins/common/gsd-power-helper.c
- delete mode 100644 plugins/common/gsd-power-helper.h
-
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 7e50db4..b0e907c 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
- 	gsd-keygrab.c		\
- 	gsd-keygrab.h		\
- 	gsd-input-helper.c	\
--	gsd-input-helper.h	\
--	gsd-power-helper.c	\
--	gsd-power-helper.h
-+	gsd-input-helper.h
- 
- libcommon_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS)
-diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
-deleted file mode 100644
-index 27d0eda..0000000
---- a/plugins/common/gsd-power-helper.c
-+++ /dev/null
-@@ -1,203 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * 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 "gsd-power-helper.h"
--
--#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
--#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
--#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
--
--#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
--#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
--#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
--
--#ifdef HAVE_SYSTEMD
--static void
--systemd_stop (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "PowerOff",
--                                g_variant_new ("(b)", FALSE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_suspend (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Suspend",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_hibernate (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Hibernate",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--#else /* HAVE_SYSTEMD */
--
--static void
--consolekit_stop_cb (GObject *source_object,
--                    GAsyncResult *res,
--                    gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't stop using ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--consolekit_stop (void)
--{
--        GError *error = NULL;
--        GDBusProxy *proxy;
--
--        /* power down the machine in a safe way */
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                               NULL,
--                                               CONSOLEKIT_DBUS_NAME,
--                                               CONSOLEKIT_DBUS_PATH_MANAGER,
--                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
--                                               NULL, &error);
--        if (proxy == NULL) {
--                g_warning ("cannot connect to ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--        g_dbus_proxy_call (proxy,
--                           "Stop",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           consolekit_stop_cb, NULL);
--        g_object_unref (proxy);
--}
--static void
--upower_sleep_cb (GObject *source_object,
--                 GAsyncResult *res,
--                 gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't sleep using UPower: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--upower_suspend (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Suspend",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--
--static void
--upower_hibernate (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Hibernate",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--#endif /* HAVE_SYSTEMD */
--
--void
--gsd_power_suspend (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_suspend ();
--#else
--	upower_suspend (upower_proxy);
--#endif
--}
--
--void
--gsd_power_poweroff (void)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_stop ();
--#else
--	consolekit_stop ();
--#endif
--}
--
--void
--gsd_power_hibernate (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_hibernate ();
--#else
--	upower_hibernate (upower_proxy);
--#endif
--}
-diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
-deleted file mode 100644
-index e3be14f..0000000
---- a/plugins/common/gsd-power-helper.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * 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 __GSD_POWER_HELPER_H
--#define __GSD_POWER_HELPER_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--#include <gio/gio.h>
--
--void gsd_power_suspend   (GDBusProxy *upower_proxy);
--void gsd_power_hibernate (GDBusProxy *upower_proxy);
--void gsd_power_poweroff  (void);
--
--G_END_DECLS
--
--#endif /* __GSD_POWER_HELPER_H */
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 9c84d7f..a2f277e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
- 
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -51,7 +52,6 @@
- #include "shortcuts-list.h"
- #include "gsd-osd-window.h"
- #include "gsd-input-helper.h"
--#include "gsd-power-helper.h"
- #include "gsd-enums.h"
- 
- #include <canberra.h>
-@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
- #define KEY_CURRENT_INPUT_SOURCE "current"
- #define KEY_INPUT_SOURCES        "sources"
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
- 
-         /* Power stuff */
-         GSettings       *power_settings;
--        GDBusProxy      *upower_proxy;
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
- 
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
- }
- 
- static void
-+power_action_suspend (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
-+power_action_hibernate (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
- do_config_power_action (GsdMediaKeysManager *manager,
-                         const gchar *config_key)
- {
-@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                                            config_key);
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                power_action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown (manager);
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                power_action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
- 
-+        g_clear_object (&priv->logind_proxy);
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                 priv->power_keyboard_proxy = NULL;
-         }
- 
--        if (priv->upower_proxy) {
--                g_object_unref (priv->upower_proxy);
--                priv->upower_proxy = NULL;
--        }
--
-         if (priv->cancellable != NULL) {
-                 g_cancellable_cancel (priv->cancellable);
-                 g_object_unref (priv->cancellable);
-@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
- }
- 
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "GNOME handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
- 
- static void
-@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
- 
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
- 
-         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
- }
-@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
- }
- 
- static void
--upower_ready_cb (GObject             *source_object,
--                 GAsyncResult        *res,
--                 GsdMediaKeysManager *manager)
--{
--        GError *error = NULL;
--
--        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
--        if (manager->priv->upower_proxy == NULL) {
--                g_warning ("Failed to get proxy for upower: %s",
--                           error->message);
--                g_error_free (error);
--        }
--}
--
--static void
- power_screen_ready_cb (GObject             *source_object,
-                        GAsyncResult        *res,
-                        GsdMediaKeysManager *manager)
-@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
-                    manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
--
--        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--                                  G_DBUS_PROXY_FLAGS_NONE,
--                                  NULL,
--                                  "org.freedesktop.UPower",
--                                  "/org/freedesktop/UPower",
--                                  "org.freedesktop.UPower",
--                                  NULL,
--                                  (GAsyncReadyCallback) upower_ready_cb,
--                                  manager);
- }
- 
- GsdMediaKeysManager *
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 1c594d8..bb7224c 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
-  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -32,6 +32,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
- 
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
-@@ -43,7 +44,6 @@
- #include "gnome-settings-session.h"
- #include "gsd-enums.h"
- #include "gsd-power-manager.h"
--#include "gsd-power-helper.h"
- 
- #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
- #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
-@@ -78,6 +78,10 @@
- #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
- #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate
-         ca_context              *canberra_context;
-         ca_proplist             *critical_alert_loop_props;
-         guint32                  critical_alert_timeout_id;
--        GDBusProxy              *screensaver_proxy;
-         GDBusProxy              *session_proxy;
-         GDBusProxy              *session_presence_proxy;
-         GpmIdletime             *idletime;
-         GsdPowerIdleMode         current_idle_mode;
--        guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-         guint                    xscreensaver_watchdog_timer_id;
-         gboolean                 is_virtual_machine;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
-+        guint                    inhibit_lid_switch_timer_id;
- };
- 
- enum {
-@@ -218,8 +228,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
- static gchar    *engine_get_summary (GsdPowerManager *manager);
- static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
- static void      do_lid_closed_action (GsdPowerManager *manager);
--static void      lock_screensaver (GsdPowerManager *manager);
--static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
-+static void      uninhibit_lid_switch (GsdPowerManager *manager);
-+static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
- 
- G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
- 
-@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void)
- }
- 
- static void
-+action_poweroff (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "PowerOff",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_hibernate (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
- do_power_action_type (GsdPowerManager *manager,
-                       GsdPowerActionType action_type)
- {
-@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager,
- 
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 /* this is only used on critically low battery where
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
--                gsd_power_poweroff ();
-+                action_poweroff (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
-         return ret;
- }
- 
--static void
--do_lid_open_action (GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* play a sound, using sounds from the naming spec */
--        ca_context_play (manager->priv->canberra_context, 0,
--                         CA_PROP_EVENT_ID, "lid-open",
--                         /* TRANSLATORS: this is the sound description */
--                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
--                         NULL);
--
--        /* ensure we turn the panel back on after lid open */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after lid open: %s",
--                           error->message);
--                g_clear_error (&error);
--        }
--
--        /* only toggle keyboard if present and already toggled off */
--        if (manager->priv->upower_kdb_proxy != NULL &&
--            manager->priv->kbd_brightness_old != -1) {
--                ret = upower_kbd_toggle (manager, &error);
--                if (!ret) {
--                        g_warning ("failed to turn the kbd backlight on: %s",
--                                   error->message);
--                        g_error_free (error);
--                }
--        }
--
--        kill_lid_close_safety_timer (manager);
--}
--
- static gboolean
--is_on (GnomeRROutput *output)
-+inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
- {
--	GnomeRRCrtc *crtc;
--
--	crtc = gnome_rr_output_get_crtc (output);
--	if (!crtc)
--		return FALSE;
--	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
--}
--
--static gboolean
--non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
--{
--        GnomeRROutput **outputs;
--        int i;
--
--        outputs = gnome_rr_screen_list_outputs (screen);
--        for (i = 0; outputs[i] != NULL; i++) {
--                if (gnome_rr_output_is_laptop (outputs[i]))
--                        continue;
--
--                if (is_on (outputs[i]))
--                        return FALSE;
-+        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
-+            g_settings_get_boolean (manager->priv->settings,
-+                                    "lid-close-suspend-with-external-monitor")) {
-+                g_debug ("no external monitors for a while; uninhibiting lid close");
-+                uninhibit_lid_switch (manager);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                return G_SOURCE_REMOVE;
-         }
- 
--        return TRUE;
--}
--
--/* Timeout callback used to check conditions when the laptop's lid is closed but
-- * the machine is not suspended yet.  We try to suspend again, so that the laptop
-- * won't overheat if placed in a backpack.
-- */
--static gboolean
--lid_close_safety_timer_cb (GsdPowerManager *manager)
--{
--        manager->priv->lid_close_safety_timer_id = 0;
--
--        g_debug ("lid has been closed for a while; trying to suspend again");
--        do_lid_closed_action (manager);
--
--        return FALSE;
-+        g_debug ("external monitor still there; trying again later");
-+        return G_SOURCE_CONTINUE;
- }
- 
- /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
-  * again in the timeout handler to see if we can suspend then.
-  */
- static void
--setup_lid_close_safety_timer (GsdPowerManager *manager)
-+setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0)
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("lid close safety timer already set up");
-                 return;
-+        }
-+
-+        g_debug ("setting up lid close safety timer");
- 
--        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
--                                                                          (GSourceFunc) lid_close_safety_timer_cb,
-+        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
-+                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
-                                                                           manager);
--        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
-+        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
- }
- 
- static void
--kill_lid_close_safety_timer (GsdPowerManager *manager)
-+restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0) {
--                g_source_remove (manager->priv->lid_close_safety_timer_id);
--                manager->priv->lid_close_safety_timer_id = 0;
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("restarting lid close safety timer");
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                setup_inhibit_lid_switch_timer (manager);
-         }
- }
- 
- static void
--suspend_with_lid_closed (GsdPowerManager *manager)
-+do_lid_open_action (GsdPowerManager *manager)
- {
-         gboolean ret;
-         GError *error = NULL;
--        GsdPowerActionType action_type;
- 
--        /* maybe lock the screen if the lid is closed */
--        lock_screensaver (manager);
--
--        /* we have different settings depending on AC state */
--        if (up_client_get_on_battery (manager->priv->up_client)) {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-battery-action");
--        } else {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-ac-action");
--        }
--
--        /* check we won't melt when the lid is closed */
--        if (action_type != GSD_POWER_ACTION_SUSPEND &&
--            action_type != GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
--                        g_warning ("to prevent damage, now forcing suspend");
--                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
--                        return;
--                }
--        }
-+        /* play a sound, using sounds from the naming spec */
-+        ca_context_play (manager->priv->canberra_context, 0,
-+                         CA_PROP_EVENT_ID, "lid-open",
-+                         /* TRANSLATORS: this is the sound description */
-+                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
-+                         NULL);
- 
--        /* ensure we turn the panel back on after resume */
-+        /* ensure we turn the panel back on after lid open */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_OFF,
-+                                             GNOME_RR_DPMS_ON,
-                                              &error);
-         if (!ret) {
--                g_warning ("failed to turn the panel off after lid close: %s",
-+                g_warning ("failed to turn the panel on after lid open: %s",
-                            error->message);
-                 g_clear_error (&error);
-         }
- 
--        /* only toggle keyboard if present and not already toggled */
--        if (manager->priv->upower_kdb_proxy &&
--            manager->priv->kbd_brightness_old == -1) {
-+        /* only toggle keyboard if present and already toggled off */
-+        if (manager->priv->upower_kdb_proxy != NULL &&
-+            manager->priv->kbd_brightness_old != -1) {
-                 ret = upower_kbd_toggle (manager, &error);
-                 if (!ret) {
--                        g_warning ("failed to turn the kbd backlight off: %s",
-+                        g_warning ("failed to turn the kbd backlight on: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--
--        do_power_action_type (manager, action_type);
- }
- 
- static void
- do_lid_closed_action (GsdPowerManager *manager)
- {
-+        gboolean ret;
-+        GError *error = NULL;
-+
-         /* play a sound, using sounds from the naming spec */
-         ca_context_play (manager->priv->canberra_context, 0,
-                          CA_PROP_EVENT_ID, "lid-close",
-@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager)
-                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
-                          NULL);
- 
-+        /* turn the panel off if the lid is closed (mainly for Dells...) */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_OFF,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel off after lid close: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
-         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
- 
--        /* perform policy action */
--        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
--            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
--                g_debug ("lid is closed; suspending or hibernating");
--                suspend_with_lid_closed (manager);
--        } else {
--                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
--                setup_lid_close_safety_timer (manager);
--        }
-+        restart_inhibit_lid_switch_timer (manager);
- }
- 
--
- static void
- up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
- {
-@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
-         if (manager->priv->lid_is_closed == tmp)
-                 return;
-         manager->priv->lid_is_closed = tmp;
-+        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
- 
-         /* fake a keypress */
-         if (tmp)
-@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
- }
- 
- static void
--sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
--                            GAsyncResult *res,
--                            gpointer user_data)
--{
--        GError *error = NULL;
--        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
--
--        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
--        if (manager->priv->screensaver_proxy == NULL) {
--                g_warning ("Could not connect to gnome-screensaver: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Finish the upower_notify_sleep_cb() call by locking the screen */
--        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
--        g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                           "Lock",
--                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                           NULL, NULL, NULL);
--}
--
--static void
- idle_dbus_signal_cb (GDBusProxy *proxy,
-                      const gchar *sender_name,
-                      const gchar *signal_name,
-@@ -3477,75 +3442,38 @@ out:
- }
- 
- static void
--lock_screensaver (GsdPowerManager *manager)
-+lock_screensaver (GsdPowerManager *manager,
-+                  GSourceFunc      done_cb)
- {
-         gboolean do_lock;
- 
-         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
-                                           "lock-enabled");
--        if (!do_lock)
-+        if (!do_lock && done_cb) {
-+                done_cb (manager);
-                 return;
--
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_debug ("doing gnome-screensaver lock");
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "Lock",
--                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                                   NULL, NULL, NULL);
--        } else {
--                /* connect to the screensaver first */
--                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                          NULL,
--                                          GS_DBUS_NAME,
--                                          GS_DBUS_PATH,
--                                          GS_DBUS_INTERFACE,
--                                          NULL,
--                                          sleep_cb_screensaver_proxy_ready_cb,
--                                          manager);
--        }
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        GsdPowerManager *manager)
--{
--        lock_screensaver (manager);
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
-         }
- 
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
--
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "Lock",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* Wait until gnome-shell shield animation is done
-+         *
-+         * FIXME: the shell should mark the lock as active
-+         * when the shield is down, then we could wait for
-+         * that. This would also fix the problem that we wait
-+         * needlessly when the shell has already locked the
-+         * screen because it is initiating the suspend.
-+         *
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
-+         */
-+        g_timeout_add (500, done_cb, manager);
- }
- 
- static void
-@@ -3755,6 +3683,287 @@ out:
-         return ret;
- }
- 
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                g_debug ("no lid-switch inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing lid switch system inhibitor");
-+        close (manager->priv->inhibit_lid_switch_fd);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_lid_switch_taken = FALSE;
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "GNOME needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = FALSE;
-+}
-+
-+static gboolean
-+randr_output_is_on (GnomeRROutput *output)
-+{
-+	GnomeRRCrtc *crtc;
-+
-+	crtc = gnome_rr_output_get_crtc (output);
-+	if (!crtc)
-+		return FALSE;
-+	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
-+}
-+
-+static gboolean
-+external_monitor_is_connected (GnomeRRScreen *screen)
-+{
-+        GnomeRROutput **outputs;
-+        guint i;
-+
-+        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
-+                return TRUE;
-+
-+        /* see if we have more than one screen plugged in */
-+        outputs = gnome_rr_screen_list_outputs (screen);
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (randr_output_is_on (outputs[i]) &&
-+                    !gnome_rr_output_is_laptop (outputs[i]))
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+on_randr_event (GnomeRRScreen *screen, gpointer user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+
-+        /* when a second monitor is plugged in, we take the
-+         * handle-lid-switch inhibitor lock of logind to prevent
-+         * it from suspending.
-+         *
-+         * Uninhibiting is done in the inhibit_lid_switch_timer,
-+         * since we want to give users a few seconds when unplugging
-+         * and replugging an external monitor, not suspend right away.
-+         */
-+        if (external_monitor_is_connected (screen) &&
-+            !g_settings_get_boolean (manager->priv->settings,
-+                                     "lid-close-suspend-with-external-monitor")) {
-+                inhibit_lid_switch (manager);
-+                setup_inhibit_lid_switch_timer (manager);
-+        }
-+        else {
-+                restart_inhibit_lid_switch_timer (manager);
-+        }
-+}
-+
-+static gboolean
-+screen_lock_done_cb (gpointer data)
-+{
-+        GsdPowerManager *manager = data;
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        lock_screensaver (manager, screen_lock_done_cb);
-+}
-+
-+static void
-+handle_resume_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
- 
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return FALSE;
-+        }
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-         /* track the active session */
-         manager->priv->session = gnome_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
-         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-         manager->priv->up_client = up_client_new ();
--        g_signal_connect (manager->priv->up_client, "notify-sleep",
--                          G_CALLBACK (upower_notify_sleep_cb), manager);
--        g_signal_connect (manager->priv->up_client, "notify-resume",
--                          G_CALLBACK (upower_notify_resume_cb), manager);
-         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-         g_signal_connect (manager->priv->up_client, "device-added",
-                           G_CALLBACK (engine_device_added_cb), manager);
-@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (idle_idletime_reset_cb), manager);
-         g_signal_connect (manager->priv->idletime, "alarm-expired",
-                           G_CALLBACK (idle_idletime_alarm_expired_cb), manager);
-+        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
-+        /* set up initial state */
-+        on_randr_event (manager->priv->x11_screen, manager);
- 
-         /* ensure the default dpms timeouts are cleared */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
- 
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+        }
-+
-         if (manager->priv->bus_cancellable != NULL) {
-                 g_cancellable_cancel (manager->priv->bus_cancellable);
-                 g_object_unref (manager->priv->bus_cancellable);
-@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-                 manager->priv->introspection_data = NULL;
-         }
- 
--        kill_lid_close_safety_timer (manager);
--
-         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
- 
-         g_clear_object (&manager->priv->connection);
-@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-         g_clear_object (&manager->priv->settings);
-         g_clear_object (&manager->priv->settings_screensaver);
-         g_clear_object (&manager->priv->up_client);
-+
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        g_clear_object (&manager->priv->logind_proxy);
-         g_clear_object (&manager->priv->x11_screen);
- 
-         g_ptr_array_unref (manager->priv->devices_array);
-@@ -3980,6 +4223,8 @@ static void
- gsd_power_manager_init (GsdPowerManager *manager)
- {
-         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
- 
- static void
--- 
-1.8.0
-
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 4a051cd96..e964279f9 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,38 +1,27 @@
-# $Id: PKGBUILD 178088 2013-02-15 23:32:26Z heftig $
+# $Id: PKGBUILD 183398 2013-04-21 22:10:23Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.6.4
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
-         'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus')
+         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg')
 makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch)
-sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            '5572b5b3f554ce361353a8db42c26a8f789606f65acc5943a286271603fcb8eb')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee')
 
 build() {
   cd $pkgname-$pkgver
 
-  # logind key handling FS#31801, patch from Fedora
-  # rebased onto screensaver.patch
-  patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
-
-  aclocal
-  autoconf
-  automake --add-missing
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd
+      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -43,9 +32,4 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  # Plugins that aren't installed still have schema references
-  # and cause gsettings errors - remove the references we're not using
-  sed -i '/org\.gnome\.settings-daemon\.plugins\.updates/d' \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml"
 }
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 8ecc52e2e..0e64fdb22 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,34 +1,31 @@
-# $Id: PKGBUILD 179858 2013-03-10 16:33:19Z heftig $
+# $Id: PKGBUILD 183399 2013-04-21 22:10:25Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.6.3.1
-pkgrel=3
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
 url="http://live.gnome.org/GnomeShell"
 license=(GPL2)
-depends=(caribou evolution-data-server gjs gnome-bluetooth gnome-menus libcroco mutter
-         telepathy-logger telepathy-mission-control unzip gdm gnome-screensaver)
-makedepends=(intltool gnome-doc-utils docbook-xsl)
-optdepends=('gnome-control-center: System settings'
-            'gnome-themes-standard: Default theme')
+depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth gnome-menus
+         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
+         libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet
+         telepathy-logger telepathy-mission-control unzip)
+makedepends=(intltool gtk-doc gnome-control-center)
+optdepends=('gnome-control-center: System settings')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch nm-libexecdir.patch)
-sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603'
-            '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125'
+        nm-libexecdir.patch)
+sha256sums=('db0160d7c3fec3858805f218f961534d1a3f1486e005492433d4a28c40f83ac7'
             'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
 
 build() {
   cd $pkgname-$pkgver
 
-  # FS#32410
-  patch -Np1 -i ../main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
-
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
 
diff --git a/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch b/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
deleted file mode 100644
index b1471ce54..000000000
--- a/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 742587dce258adf436f360eed183a7ca0c58fa18 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Wed, 2 Jan 2013 09:05:32 -0500
-Subject: [PATCH] main: Don't mess up the modal stack when the focus actor is
- destroyed
-
-This seems to be an incorrect conversion when we moved from an array
-to an object of keys in 3a6b4f3.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=690965
----
- js/ui/main.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 12daee2..1334d58 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -553,7 +553,7 @@ function pushModal(actor, params) {
-         curFocusDestroyId = curFocus.connect('destroy', function() {
-             let index = _findModal(actor);
-             if (index >= 0)
--                modalActorFocusStack[index].actor = null;
-+                modalActorFocusStack[index].focus = null;
-         });
-     }
-     modalActorFocusStack.push({ actor: actor,
--- 
-1.8.0.2
\ No newline at end of file
diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD
index 904047d70..8b4c28ac9 100644
--- a/extra/gnome-system-log/PKGBUILD
+++ b/extra/gnome-system-log/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170903 2012-11-12 22:38:11Z heftig $
+# $Id: PKGBUILD 183402 2013-04-21 22:10:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-system-log
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="View your system logs"
 arch=(i686 x86_64)
@@ -10,10 +10,10 @@ url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3')
 makedepends=('intltool' 'itstool' 'docbook-xsl')
-groups=('gnome-extra')
+groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b20e59ca271c755400f68446f1f818d4ee3cc7e7e8fa7ba67a843a4eabdecc1')
+sha256sums=('2393d00e059212b5a1135589d11412c0639fe9e60958ccff1bac238139dd4967')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index f0f7b51a5..d98d960df 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169915 2012-10-30 22:34:53Z heftig $
+# $Id: PKGBUILD 183403 2013-04-21 22:10:31Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64)
@@ -12,14 +12,14 @@ depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd'
 makedepends=('itstool' 'docbook-xsl' 'intltool')
 options=(!emptydirs)
 url="http://www.gnome.org"
-groups=('gnome-extra')
+groups=('gnome')
 install=gnome-system-monitor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab')
+sha256sums=('2d5bdd81c19bc34f83c0ccfde998007df9ef517f5e4bfb5e36513a76c21dce86')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/gnome-system-monitor
   make
 }
 
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index c25f8186b..d06de63cb 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 179947 2013-03-13 11:01:23Z jgc $
+# $Id: PKGBUILD 183404 2013-04-21 22:10:33Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl')
-options=('!emptydirs')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(vte3 gsettings-desktop-schemas libsm dconf)
+makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils python2 gconf)
+optdepends=('gconf: settings migration when upgrading from older version')
+options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c6816f77eaae791dadeef89596df811e2fa353088241aa0613bb8e1af63304f6')
+sha256sums=('c49afab26973225f41ed35a9d5b5180d6207757e524056656146b30692f39fff')
 
 build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static
   make
 }
 
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
 
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gnome-terminal/gnome-terminal.install b/extra/gnome-terminal/gnome-terminal.install
index 1d8510f06..260d56cb2 100644
--- a/extra/gnome-terminal/gnome-terminal.install
+++ b/extra/gnome-terminal/gnome-terminal.install
@@ -1,17 +1,13 @@
-pkgname=gnome-terminal
-
 post_install() {
-  gconfpkg --install $pkgname
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if [ -f /usr/share/gconf/schemas/gnome-terminal.schemas ]; then
+    gconfpkg --uninstall gnome-terminal
+  fi
 }
 
 post_upgrade() {
   post_install $1
 }
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD
new file mode 100644
index 000000000..b07cb7346
--- /dev/null
+++ b/extra/gnome-tetravex/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183405 2013-04-21 22:10:35Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-tetravex
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Complete the puzzle by matching numbered tiles"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-tetravex.install
+url="https://live.gnome.org/Tetravex"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('30491c1e9005d8f17f6f9655c3a9b553bcaa16e353719ce1de60630a71150ea3')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-tetravex/gnome-tetravex.install b/extra/gnome-tetravex/gnome-tetravex.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-tetravex/gnome-tetravex.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 74d7d351d..06223609d 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 178299 2013-02-19 18:40:52Z heftig $
+# $Id: PKGBUILD 183406 2013-04-21 22:10:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.6.5
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=(i686 x86_64)
@@ -14,9 +14,9 @@ optdepends=('gtk-engines: HighContrast GTK2 theme')
 groups=(gnome)
 replaces=(gnome-themes)
 conflicts=(gnome-themes)
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e39129063b2edcad19370e06b46bbe7fb61fcb4a0c5901eaa9e0d08080097a3c')
+sha256sums=('5cc1b27a70ca6176343212159236332799b074885867e380ed9b3817e15dd1d1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index d888fe696..1803e181d 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 169920 2012-10-30 22:35:10Z heftig $
+# $Id: PKGBUILD 183409 2013-04-21 22:10:42Z heftig $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-user-share
-pkgver=3.0.4
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
-depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
-makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl')
+depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'dbus-glib')
+makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl')
 options=('!emptydirs' '!libtool')
+groups=('gnome')
 install=gnome-user-share.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8')
+sha256sums=('ae0638a24cf306b6615639a8706c9b48e8961ae26d7f8b5d65eb26955ca4cc3f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD
new file mode 100644
index 000000000..ad522aab2
--- /dev/null
+++ b/extra/gnome-weather/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 183410 2013-04-21 22:10:43Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-weather
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Access current weather conditions and forecasts"
+arch=(i686 x86_64)
+url="https://www.gnome.org/"
+license=(GPL)
+depends=(gtk3 gjs libgweather)
+makedepends=(intltool gobject-introspection)
+options=(!libtool)
+groups=(gnome-extra)
+install=gnome-weather.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9dbbf0aa50a940894a9ebf63001163a8fa89c3aa8febbddcd3c6c6eefbc00f3d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-weather/gnome-weather.install b/extra/gnome-weather/gnome-weather.install
new file mode 100644
index 000000000..c25dff2d3
--- /dev/null
+++ b/extra/gnome-weather/gnome-weather.install
@@ -0,0 +1,11 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index 70d51787d..124f50f3a 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170882 2012-11-12 22:03:02Z heftig $
+# $Id: PKGBUILD 183411 2013-04-21 22:10:45Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
-pkgver=1.34.2
+pkgver=1.36.0
 pkgrel=1
 pkgdesc="Introspection system for GObject-based libraries"
 url="https://live.gnome.org/GObjectIntrospection"
@@ -12,7 +12,7 @@ depends=('glib2' 'python2' 'python2-mako')
 makedepends=('cairo')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429')
+sha256sums=('e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index ce6128bf3..4fe44da7c 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 173150 2012-12-11 17:04:18Z heftig $
+# $Id: PKGBUILD 183412 2013-04-21 22:10:47Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
-pkgver=0.2.5
+pkgver=0.2.6
 pkgrel=1
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('grilo' 'sqlite' 'libgcrypt')
+arch=(i686 x86_64)
+license=(LGPL)
+depends=(grilo sqlite libgcrypt)
 makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing
              json-glib)
 optdepends=('gupnp-av: uPnP plugin'
             'libgdata: Youtube plugin'
             'libquvi: Youtube plugin, Vimeo plugin'
-            'sqlite: Podcasts plugin'
             'gmime: Podcasts plugin'
             'rest: Blip.tv plugin'
             'libtracker-sparql: Tracker plugin'
@@ -23,11 +22,10 @@ optdepends=('gupnp-av: uPnP plugin'
             'json-glib: TMDb plugin')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('32ae6c8ebf624e5662f209435d8aae6a5db23d7c52d446c9b9479c0b441a3ab3')
+sha256sums=('029ea7fdbb32ff5cc20295b9a1a943f76f39a67ed5bf08a2b33b01cf287a1227')
 
 build() {
   cd $pkgname-$pkgver
-  
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
     --enable-shoutcast
   make
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index ed541c584..37740bef3 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 169927 2012-10-30 22:45:20Z heftig $
+# $Id: PKGBUILD 183414 2013-04-21 22:10:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.12.2.1
+pkgver=0.14.2
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://gupnp.org/"
-license=('LGPL')
-depends=('libsoup')
-makedepends=('gobject-introspection' 'gtk2' 'gtk-doc')
+license=(LGPL)
+depends=(libsoup)
+makedepends=(gobject-introspection gtk2 gtk-doc vala)
 optdepends=('gtk2: gssdp-device-sniffer')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414')
+sha256sums=('a1a255ed45b45fbf0004dfc5d8e566551f4857bc16599e7f756965733f9411fc')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 6789eb952..2c6b76c64 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 169934 2012-10-30 22:45:37Z heftig $
+# $Id: PKGBUILD 183415 2013-04-21 22:10:51Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=3.1.2
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64)
-license=('GPL')
+license=(GPL)
 url="http://live.gnome.org/gthumb"
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp')
-makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
-             'brasero' 'librsvg' 'libopenraw' 'liboauth')
+depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
+         gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
+         libsoup webkitgtk3 json-glib)
+makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
 optdepends=('libopenraw: read RAW files'
             'exiv2: metadata support'
             'libchamplain: map viewer'
             'brasero: burn discs'
-            'libsoup-gnome: web albums'
             'liboauth: web albums')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e7f80b3ffa8a6e06b9f1bf0cfa869f772af4163b842a7f457c9dc68ff7e6f8f')
+sha256sums=('3eacbb9912923fb5da3e7a52be58c6e7470e598b06c1b7b51b76809fc4855b61')
 
 build() {
   cd $pkgname-$pkgver
@@ -37,6 +36,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD
index 9a87154b0..cde0800ff 100644
--- a/extra/gtk2-perl/PKGBUILD
+++ b/extra/gtk2-perl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160485 2012-06-02 10:26:22Z bluewind $
+# $Id: PKGBUILD 183485 2013-04-21 22:21:05Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=gtk2-perl
-pkgver=1.244
+pkgver=1.247
 pkgrel=1
 pkgdesc="Perl bindings for GTK+ 2.x"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('gtk2' 'pango-perl')
 checkdepends=('ttf-dejavu' 'xorg-server-xvfb')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz)
-md5sums=('191fda807f44a7c82d699838bf544bca')
+md5sums=('b65b0293cce3ac3786c37a7fa508e506')
 
 build() {
   cd "${srcdir}/Gtk2-${pkgver}"
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 94799147a..4d9153985 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 179073 2013-03-03 00:49:43Z heftig $
+# $Id: PKGBUILD 183416 2013-04-21 22:10:54Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.6.4
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk3.install
-depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi
-         libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
-makedepends=(gobject-introspection mesa)
+depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
+makedepends=(gobject-introspection)
 options=('!libtool')
 backup=(etc/gtk-3.0/settings.ini)
 license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1'
+sha256sums=('f43e7c7d7a0e2417225509e88f67799534c69abfbb6f615fc7a895bf15e31255'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 build() {
     cd "gtk+-$pkgver"
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index 9d10fd671..f0a9b4a3c 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169938 2012-10-30 22:45:55Z heftig $
+# $Id: PKGBUILD 183317 2013-04-21 22:06:35Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
@@ -12,7 +12,7 @@ license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359')
+sha256sums=('dbddb143fe671ee321d19de2dbae00c0f67e78ce90447227b23062137b1828bd')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 3ff1544fd..12719afc1 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170209 2012-11-05 11:49:55Z jgc $
+# $Id: PKGBUILD 183417 2013-04-21 22:10:55Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('a9d31df02acc6e9a9547b5ebaee19d1dc4c87b216eb561ee19da69bd1bb1bd0d')
+sha256sums=('f08005bfa5ecb71b05c4046d585ae072f084c90003b281a3ced8d882b96fe3cd')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 772316572..93211a0e7 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170906 2012-11-12 22:40:18Z heftig $
+# $Id: PKGBUILD 183418 2013-04-21 22:10:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org"
 depends=('dconf' 'gtk3' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
+makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl' 'desktop-file-utils')
 options=('!libtool' '!emptydirs')
 install=gucharmap.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c3aad2990010ab66225b748e6ac5402cad9f21e908cddf728e57d755c54cc6b2')
+sha256sums=('dc3223c7bd5dac4b979295cf7678c873046f8525f7d6f5562ab98239f563afc1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index b1e0e90e4..d4d8a0b83 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170152 2012-11-03 17:56:09Z heftig $
+# $Id: PKGBUILD 183420 2013-04-21 22:11:00Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.10.3
+pkgver=0.12.1
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://gupnp.org/"
-license=('LGPL')
-depends=('gupnp')
-makedepends=('gobject-introspection' 'gtk-doc')
+license=(LGPL)
+depends=(gupnp)
+makedepends=(gobject-introspection gtk-doc vala)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d0dbb727d87bc9f2dc834455d14a30700b16b41a57e9dcde2e822b378ca8f1e2')
+sha256sums=('7c73f3c1e1c8f552079b8db8971348acf85078c82ed4da883b218bd993fcd4c4')
 
 build() {
   cd $pkgname-$pkgver
@@ -23,6 +23,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD
index a81e59dcc..0e4a1cb98 100644
--- a/extra/gupnp-dlna/PKGBUILD
+++ b/extra/gupnp-dlna/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 180467 2013-03-21 22:39:20Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 183421 2013-04-21 22:11:02Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gupnp-dlna
-pkgver=0.6.6
+pkgver=0.10.1
 pkgrel=1
 pkgdesc="Library to ease DLNA-related bits for applications using gupnp"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://gupnp.org/"
-license=('LGPL')
-depends=('gstreamer0.10-base-plugins')
-makedepends=('gobject-introspection')
+license=(LGPL)
+depends=(gst-plugins-base-libs)
+makedepends=(gobject-introspection gtk-doc vala)
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('82a1e75c398379567a5a5db9acd19bd01334b4f0053c8a166a77bc09bf0ca047')
+sha256sums=('c514ec6edd2a427914ef79fed002f91b875fde127084f21d770401a1d2b95f7b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static
   make
 }
 
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
 
-  make DESTDIR="$pkgdir/" install
+package() {
+  cd $pkgname-$pkgver
+  make -j1 DESTDIR="$pkgdir" install
 }
diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD
index 8e08e3a17..45297def4 100644
--- a/extra/gupnp-igd/PKGBUILD
+++ b/extra/gupnp-igd/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 159125 2012-05-16 11:29:35Z eric $
+# $Id: PKGBUILD 183422 2013-04-21 22:11:03Z heftig $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: William Díaz <wdiaz [at] archlinux [dot] us>
 
 pkgname=gupnp-igd
-pkgver=0.2.1
-pkgrel=3
+pkgver=0.2.2
+pkgrel=1
 pkgdesc="A library to handle UPnP IGD port mapping"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.gupnp.org"
-license=('LGPL')
-depends=('gupnp' 'python2-gobject2')
-makedepends=('gettext')
+license=(LGPL)
+depends=(gupnp python2-gobject2)
+makedepends=(gettext)
 options=('!libtool' '!makeflags')
-source=(http://www.gupnp.org/sites/all/files/sources/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('409cb45e495dfa61c4ce4a74f8ba06f2784c39e2')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha1sums=('bd24e98b224b3a233b0ab6714638ed4c6bf64b47')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   PYTHON=python2 ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 936748aef..12b2897c2 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 169941 2012-10-30 22:46:05Z heftig $
+# $Id: PKGBUILD 183419 2013-04-21 22:10:59Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.18.4
+pkgver=0.20.2
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://gupnp.org/"
-license=('LGPL')
-depends=('gssdp' 'util-linux')
-makedepends=('gobject-introspection' 'gtk-doc')
+license=(LGPL)
+depends=(gssdp util-linux)
+makedepends=(gobject-introspection gtk-doc vala) 
 optdepends=('python2: gupnp-binding-tool')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1')
+sha256sums=('9b27b1bdd16f7f13e28e20bce85a117e577a8183f95615876a9d91f4d4a70812')
 
 build() {
   cd $pkgname-$pkgver
@@ -24,6 +24,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 71ae96a7d..e88672f00 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,23 +1,20 @@
-# $Id: PKGBUILD 179106 2013-03-03 17:28:34Z dreisner $
+# $Id: PKGBUILD 183318 2013-04-21 22:06:37Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.14.2
-pkgrel=4
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp')
+pkgver=1.16.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
+makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        fix-paranoia-include.patch)
-sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc'
-            '4385f9c5100bc0e01c59d07bef07737bb8155e60b56d3ee948e0b48ff207ff76')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('e7ec47547ff8029a2e8d81533bdfa870fe4a547c9d7c4e1e946d42d38970b0ac')
 
 build() {
   cd "$pkgbase-$pkgver"
-  patch -Np0 -i ../fix-paranoia-include.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \
@@ -27,24 +24,28 @@ build() {
 
 package_gvfs() {
   pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup-gnome' 'udisks2' 'libsecret')
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup>=2.24.0' 'udisks2' 'libsecret' 'libbluray')
   optdepends=('gvfs-afc: AFC (mobile devices) support'
               'gvfs-smb: SMB/CIFS (Windows client) support'
               'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
               'gvfs-obexftp: ObexFTP (bluetooth) support'
               'gvfs-afp: Apple Filing Protocol (AFP) support'
+              'gvfs-mtp: MTP device support'
+              'gvfs-goa: gnome-online-accounts support'
               'gtk3: Recent files support')
   install=gvfs.install
 
   cd "$pkgbase-$pkgver"
   sed -e 's/^am__append_4/#am__append_4/' \
       -e 's/^am__append_5/#am__append_5/' \
+      -e 's/^am__append_6/#am__append_6/' \
+      -e 's/^am__append_7/#am__append_7/' \
       -i monitor/Makefile
   make DESTDIR="$pkgdir" install
 
   cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount
   rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
   rm usr/share/GConf/gsettings/gvfs-smb.convert
 }
@@ -114,3 +115,25 @@ package_gvfs-afp() {
   install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
   install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
 }
+
+package_gvfs-mtp() {
+  pkgdesc="MTP backend for gvfs"
+  depends=("gvfs=$pkgver" 'libmtp')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-mtp "$pkgdir/usr/lib/gvfs/gvfsd-mtp"
+  install -Dm644 mtp.mount "$pkgdir/usr/share/gvfs/mounts/mtp.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/mtp"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-goa() {
+  pkgdesc="Gnome Online Accounts (webservices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'gnome-online-accounts')
+  install=gvfs-module.install
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/goa"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gvfs/fix-paranoia-include.patch b/extra/gvfs/fix-paranoia-include.patch
deleted file mode 100644
index 02856a06f..000000000
--- a/extra/gvfs/fix-paranoia-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/gvfsbackendcdda.c.orig	2013-01-08 11:19:52.311593338 +0000
-+++ daemon/gvfsbackendcdda.c	2013-01-08 11:20:05.778169190 +0000
-@@ -55,7 +55,7 @@
- #include "gvfsjobenumerate.h"
- 
- #define DO_NOT_WANT_PARANOIA_COMPATIBILITY
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/paranoia.h>
- #include <cdio/cdio.h>
- 
- /* TODO:
diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD
new file mode 100644
index 000000000..5b3929525
--- /dev/null
+++ b/extra/iagno/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183423 2013-04-21 22:11:05Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=iagno
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Dominate the board in a classic version of Reversi"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=iagno.install
+url="https://live.gnome.org/Iagno"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('03e96eaada69d95b709e438ccb69911fea330be8827df320c5dff02d75a59efd')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/iagno/iagno.install b/extra/iagno/iagno.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/iagno/iagno.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index e937e4b61..661a3099e 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179933 2013-03-12 17:11:40Z andyrtr $
+# $Id: PKGBUILD 183538 2013-04-22 17:24:27Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -8,17 +8,17 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
 pkgbase=java7-openjdk
 _java_ver=7
 _updatever=u17
-_icedtea_ver=2.3.8
+_icedtea_ver=2.3.9
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=516aae5f27cf
-_JAXP_CHANGESET=1fbe99283d97
-_JAXWS_CHANGESET=3c7be82314bf
-_JDK_CHANGESET=deac45dc94f0
-_LANGTOOLS_CHANGESET=41426c72b802
-_OPENJDK_CHANGESET=ed02a059ea15
+_CORBA_CHANGESET=47a6bf94ce11
+_JAXP_CHANGESET=d2142901bcb7
+_JAXWS_CHANGESET=b1877762d45c
+_JDK_CHANGESET=8e91101e36f0
+_LANGTOOLS_CHANGESET=fd956199cb82
+_OPENJDK_CHANGESET=12b96a57263c
 
-_HOTSPOT_CHANGESET=a152dced63a1 # see "${srcdir}/icedtea7"/hotspot.map
+_HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153'
-            '865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b'
-            '181ceb85a4dade1a8d8465e2d69255ee3612dbc5a50699a59a4f21e69be7a1c6'
-            'ed3a963c4309316fba654f0a60ba4bec21b2d170e64423eddfa2ba635ac76572'
-            '4abe7366900327a0de21caee8a7b0ea5494821507a02bfb07cffc980cebe90ad'
-            '00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215'
-            'cbef395a2af27673a3611ed50d84a76ae9f9539a7c42ed8e06e171bfc1ac030c'
-            'eac2313e3012653afa7549257765d56e4348c775363eee0733968d32a7c1eeae'
+sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da'
+            '651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc'
+            '7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934'
+            '8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6'
+            'b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc'
+            '349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e'
+            '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12'
+            'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
@@ -82,11 +82,6 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz"
   
 build() {
   cd "${srcdir}/icedtea-${_icedtea_ver}"
-
-#  unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-  
-#  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
-#  [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD
index 71d3ac492..7671edddf 100644
--- a/extra/js/PKGBUILD
+++ b/extra/js/PKGBUILD
@@ -1,39 +1,35 @@
-# $Id: PKGBUILD 132237 2011-07-21 21:43:04Z ibiru $
+# $Id: PKGBUILD 183424 2013-04-21 22:11:07Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=js
-pkgver=1.8.5
-pkgrel=3
+pkgver=17.0.0
+pkgrel=1
 pkgdesc="JavaScript interpreter and libraries"
 arch=(i686 x86_64)
-url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
-license=('GPL2')
-depends=('nspr' 'gcc-libs')
-makedepends=('python2' 'zip')
-replaces=('spidermonkey')
-conflicts=('spidermonkey')
-source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-        js185-destdir.patch)
-md5sums=('a4574365938222adca0a6bd33329cb32'
-         '364834a8391888642c53d78c3a949d94')
-build() {
-  cd "$srcdir/$pkgname-$pkgver/js/src"
-
-  patch -Np0 -i $srcdir/js185-destdir.patch
-
-  ./configure --prefix=/usr --with-system-nspr \
-     --enable-threadsafe
+url="https://developer.mozilla.org/En/SpiderMonkey/17"
+license=(MPL)
+depends=(nspr gcc-libs libffi readline)
+makedepends=(python2 zip)
+options=(!staticlibs)
+source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz)
+md5sums=('20b6f8f1140ef6e47daa3b16965c9202')
 
+build() {
+  cd mozjs$pkgver/js/src
+  ./configure --prefix=/usr --with-system-nspr --with-system-ffi \
+     --enable-readline --enable-threadsafe
   make
 }
 
+check() {
+  cd mozjs$pkgver/js/src
+  make check
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver/js/src"
+  cd mozjs$pkgver/js/src
   make DESTDIR="$pkgdir" install
-
-  install -m 0755 shell/js ${pkgdir}/usr/bin
-
-  #cleanup
-  rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a"
+  find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} +
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/js/js185-destdir.patch b/extra/js/js185-destdir.patch
deleted file mode 100644
index 87b7b53b3..000000000
--- a/extra/js/js185-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-#https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-
---- Makefile.in.old	2011-04-10 04:21:19.918608008 -0700
-+++ Makefile.in	2011-04-10 04:21:58.088607992 -0700
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+	ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+	ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
diff --git a/extra/js185/PKGBUILD b/extra/js185/PKGBUILD
new file mode 100644
index 000000000..94db39ed1
--- /dev/null
+++ b/extra/js185/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 183425 2013-04-21 22:11:08Z heftig $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=js185
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="JavaScript interpreter and libraries (legacy)"
+arch=(i686 x86_64)
+url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
+license=(MPL)
+depends=(nspr gcc-libs)
+makedepends=(python2 zip)
+options=(!staticlibs)
+source=(http://ftp.mozilla.org/pub/mozilla.org/js/$pkgname-$pkgver.tar.gz)
+md5sums=('a4574365938222adca0a6bd33329cb32')
+
+build() {
+  cd js-1.8.5/js/src
+
+  # _FORTIFY_SOURCE causes configure error
+  unset CPPFLAGS
+
+  ./configure --prefix=/usr --with-system-nspr \
+     --enable-threadsafe
+  make
+}
+
+package() {
+  cd js-1.8.5/js/src
+  make DESTDIR="$pkgdir" install
+  install -Dm755 shell/js "$pkgdir/usr/bin/js"
+  find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} +
+
+  # Bad symlinks (absolute, including DESTDIR!)
+  cd "$pkgdir/usr/lib"
+  ln -sf libmozjs185.so.1.0.0 libmozjs185.so.1.0
+  ln -sf libmozjs185.so.1.0 libmozjs185.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 4fb7d5577..11602403f 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181906 2013-04-05 08:54:51Z svenstaro $
+# $Id: PKGBUILD 183526 2013-04-22 11:05:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'kdepimlibs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'syslog-path.patch')
 sha1sums=('885f63b846e9e8d1485c9261544efb2ab0eea58e'
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index 52659e26a..04ef0a6a2 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 163767 2012-07-19 08:35:19Z heftig $
+# $Id: PKGBUILD 183426 2013-04-21 22:11:10Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=libchamplain
 pkgver=0.12.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
 license=('LGPL')
 arch=('i686' 'x86_64')
 options=('!libtool')
-depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite')
+depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658')
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index 7adb0bc35..d604f74e2 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 180676 2013-03-25 19:13:49Z bpiotrowski $
+# $Id: PKGBUILD 183427 2013-04-21 22:11:12Z heftig $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libgda
-pkgver=5.1.1
+pkgver=5.1.2
 pkgrel=1
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
-         'libmariadbclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
+         'libmariadbclient' 'postgresql-libs' 'python2' 'libsecret'
          'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
          'iso-codes' 'openssl' 'libgcrypt' 'libldap')
 makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala')
@@ -17,7 +17,7 @@ options=('!libtool')
 url="http://www.gnome-db.org"
 install=libgda.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('41a54e60d91758d1d239e5127c856ff0412a5709e92440e9107178af928ed5e1')
+sha256sums=('59c4416a151297a406091fcfe7af781ea88af3381d10b365ba73b1eb8e23b6c5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD
index 72b029159..d1a42f932 100644
--- a/extra/libgdata/PKGBUILD
+++ b/extra/libgdata/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 169948 2012-10-30 22:46:31Z heftig $
+# $Id: PKGBUILD 183428 2013-04-21 22:11:14Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgdata
-pkgver=0.13.2
+pkgver=0.13.3
 pkgrel=1
 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libsoup-gnome' 'liboauth' 'gcr' 'gnome-online-accounts')
+depends=('libsoup' 'liboauth' 'gcr' 'gnome-online-accounts')
 makedepends=('intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330')
+sha256sums=('4bf52706b2ab404f8b128e000509acd9937facf26916d3e907a3db8653f73637')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 4a7600bfd..cf188fed8 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,27 +1,34 @@
-# $Id: PKGBUILD 175984 2013-01-25 15:31:43Z ioni $
+# $Id: PKGBUILD 183429 2013-04-21 22:11:15Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.6.7
+pkgver=0.10.1
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('glib2')
-makedepends=('gobject-introspection')
+license=(LGPL2.1)
+arch=(i686 x86_64)
+depends=(glib2)
+makedepends=(gobject-introspection vala)
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b512bf1785fbbb6a264be5fac325c42d4e96cc560b22e3f19ea5b01b1414106d')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f50c103107314daee6dc68054e359d5169a19c562902e323ba798b380a2a2c96')
 
 build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --disable-static
-    make
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  # generates a bazillion traps - make sure systemd's core_pattern
+  # is deactivated, or you'll DoS the journal and the system
+  #make check
 }
 
 package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libgee06/PKGBUILD b/extra/libgee06/PKGBUILD
new file mode 100644
index 000000000..74d09fc53
--- /dev/null
+++ b/extra/libgee06/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 183430 2013-04-21 22:11:17Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=libgee06
+_pkgname=libgee
+pkgver=0.6.8
+pkgrel=1
+pkgdesc="GObject collection library (legacy)"
+url="http://live.gnome.org/Libgee"
+license=(LGPL2.1)
+arch=(i686 x86_64)
+depends=(glib2)
+makedepends=(gobject-introspection)
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3')
+
+build() {
+    cd $_pkgname-$pkgver
+    ./configure --prefix=/usr --disable-static
+    make
+}
+
+package() {
+    cd $_pkgname-$pkgver
+    make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 1a6ff1011..abf4e6902 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 179959 2013-03-13 13:10:14Z jgc $
+#$Id: PKGBUILD 183431 2013-04-21 22:11:18Z heftig $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.6.0
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -13,7 +13,7 @@ optdepends=('gnome-keyring: key storage service (or use any other service implem
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830')
+sha256sums=('a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 423d07163..07add01da 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 170931 2012-11-13 12:56:29Z heftig $
+# $Id: PKGBUILD 183432 2013-04-21 22:11:21Z heftig $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('libsoup-gnome' 'gnome-icon-theme' 'gtk3')
+depends=('libsoup' 'gnome-icon-theme' 'gtk3')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/"
@@ -15,7 +15,7 @@ install=libgweather.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         gettext-not-xml.patch
         no_external_gettext.patch)
-sha256sums=('0f2aeff290751590ca51e806c3d09054bf87b86b63b89f5179043a9b3fa8a0b0'
+sha256sums=('4649f51a881ec375853a782ec1cd279f242baa4b6c1b9ebe09614ac65dd6081a'
             '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533'
             'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672')
 
diff --git a/extra/liblouis/PKGBUILD b/extra/liblouis/PKGBUILD
index 6502b4d6c..462366725 100644
--- a/extra/liblouis/PKGBUILD
+++ b/extra/liblouis/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 176085 2013-01-27 11:24:27Z ioni $
+# $Id: PKGBUILD 183433 2013-04-21 22:11:25Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=liblouis
 pkgver=2.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source braille translator and back-translator"
 arch=(i686 x86_64)
 url="http://code.google.com/p/liblouis/"
 license=('GPL3')
 depends=(glibc)
-makedepends=(help2man python2)
-optdepends=('python2: for python bindings')
+makedepends=(help2man python2 python)
 options=(!libtool)
 install=liblouis.install
 source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz)
@@ -29,7 +28,6 @@ package() {
   cd python
   LD_PRELOAD+=":$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so"
   python2 setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "$pkgdir"/usr/bin/lou_harnessGenerator
+  python setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1
 }
 # vim:set ts=2 sw=2 et:
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
index 6031eb6ff..c1bee15e7 100644
--- a/extra/liboauth/PKGBUILD
+++ b/extra/liboauth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145266 2011-12-20 18:56:18Z heftig $
+# $Id: PKGBUILD 183475 2013-04-21 22:15:57Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Martin Häger <martin.haeger@gmail.com>
 
 pkgname=liboauth
-pkgver=0.9.6
+pkgver=1.0.1
 pkgrel=1
 pkgdesc='C library implementing OAuth Core RFC 5849'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('MIT')
 depends=('curl')
 options=('!libtool')
 source=("$url/pool/$pkgname-$pkgver.tar.gz")
-sha256sums=('9fa0f9d86ac4fbdd8c17d4c242ceef33096e8cf3b1834d9198ccc0cbf8b0f207')
+sha256sums=('5087d32fe1db7b588246a7de64fc0c2464c95efdebb2c7fe6f482d9b00e68d8b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index 3d722c4b9..5ab3a569a 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 169954 2012-10-30 22:46:53Z heftig $
+# $Id: PKGBUILD 183434 2013-04-21 22:11:27Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libpeas
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.8.0
+pkgrel=2
 pkgdesc="A GObject-based plugins engine"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.gtk.org/"
-license=('GPL2')
-depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
-makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade')
+license=(GPL2)
+depends=(gtk3 hicolor-icon-theme gobject-introspection)
+makedepends=(gtk-doc intltool python-gobject python2-gobject gjs seed glade)
 optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
             'seed: gobject-based plugin engine - seed runtime loader')
 options=('!libtool')
 install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz
+        js17.patch)
+sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe'
+            '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889')
 
 build() {
   cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  patch -Np1 -i ../js17.patch
+  ./configure --prefix=/usr \
     --sysconfdir=/etc --localstatedir=/var
   make
 }
diff --git a/extra/libpeas/js17.patch b/extra/libpeas/js17.patch
new file mode 100644
index 000000000..b0f7d041d
--- /dev/null
+++ b/extra/libpeas/js17.patch
@@ -0,0 +1,24 @@
+diff -u -r libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c
+--- libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c	2013-01-05 20:32:04.000000000 +0100
++++ libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c	2013-04-03 00:22:56.726029598 +0200
+@@ -362,7 +362,7 @@
+ 
+           if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval),
+                               nth_out_arg++, &js_value) ||
+-              js_value == JSVAL_VOID)
++              js_value.asBits == JSVAL_VOID.asBits)
+             {
+               g_warning ("Error failed to get out argument %i", nth_out_arg);
+               return FALSE;
+diff -u -r libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c
+--- libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c	2012-08-15 12:40:31.000000000 +0200
++++ libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c	2013-04-03 00:19:12.884403305 +0200
+@@ -279,7 +279,7 @@
+ 
+       if (!JS_GetPropertyById (js_context, ginfo->extensions,
+                                prop_name_id, &prop_extension_ctor) ||
+-          prop_extension_ctor != extension_ctor)
++          prop_extension_ctor.asBits != extension_ctor.asBits)
+         continue;
+ 
+       if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) ||
diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD
new file mode 100644
index 000000000..814032292
--- /dev/null
+++ b/extra/libqmi/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183435 2013-04-21 22:11:28Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=libqmi
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="QMI modem protocol helper library"
+arch=(i686 x86_64)
+url="http://cgit.freedesktop.org/libqmi"
+license=(GPL2)
+depends=(glib2 bash)
+makedepends=(gtk-doc python)
+options=('!libtool')
+source=($url/snapshot/$pkgname-$pkgver.tar.xz)
+sha256sums=('4c0fe5fedd33dffd60d845c571243a2f25834019c159377d8df2c7cf5ff3a515')
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 30b49bff8..62f29c27c 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169956 2012-10-30 22:47:03Z heftig $
+# $Id: PKGBUILD 183436 2013-04-21 22:11:30Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
-pkgver=2.36.4
+pkgver=2.37.0
 pkgrel=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64)
@@ -12,10 +12,10 @@ makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection')
 optdepends=('gtk3: for rsvg-view-3'
             'gtk2: gtk2 SVG engine module')
 options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
+url="https://live.gnome.org/LibRsvg"
 install=librsvg.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2')
+sha256sums=('06c57dbcb29369d147b4e6ff4257c42ae5120c504c30fb567a27034ee30fd835')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index e220c98f2..c32bc93e5 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsecret
-pkgver=0.14
+pkgver=0.15
 pkgrel=1
 pkgdesc='library for storing and retrieving passwords and other secrets.'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="https://live.gnome.org/Libsecret"
 depends=('glib2' 'libgcrypt')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('58a5b9370c093a7a2788869ed59bc56351797a775e100a9644e637851f9713b5')
+sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD
index f40723b17..bb90f4bfc 100644
--- a/extra/libsigc++/PKGBUILD
+++ b/extra/libsigc++/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 166999 2012-09-24 17:45:03Z jgc $
+# $Id: PKGBUILD 183319 2013-04-21 22:06:38Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=libsigc++
 pkgname=('libsigc++' 'libsigc++-docs')
-pkgver=2.2.11
+pkgver=2.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://libsigc.sourceforge.net/"
 makedepends=('gcc-libs')
 options=('!libtool' '!emptydirs')
-source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.xz")
-sha256sums=('9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957')
+source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.3/${pkgbase}-${pkgver}.tar.xz")
+sha256sums=('67d05852b31fdb267c9fdcecd40b046a11aa54d884435e99e3c60dd20cd60393')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD
index 74fd559f9..aaddde469 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 172299 2012-12-02 08:28:48Z ibiru $
+# $Id: PKGBUILD 183438 2013-04-21 22:11:34Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libsocialweb
 pkgver=0.25.21
-pkgrel=1
+pkgrel=2
 pkgdesc="A personal social data server"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
-         'json-glib' 'networkmanager')
-makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection')
+license=(GPL2)
+depends=(glib2 gconf 'libsoup>=2.24.0' rest dbus-glib libgnome-keyring
+         json-glib networkmanager)
+makedepends=(intltool gtk-doc vala gobject-introspection)
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
        libsocialweb-gir-fix.patch)
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 5331e37b5..7e38599ae 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,49 +1,34 @@
-# $Id: PKGBUILD 175189 2013-01-16 10:55:26Z jgc $
+# $Id: PKGBUILD 183439 2013-04-21 22:11:35Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.40.3
+pkgname=libsoup
+pkgver=2.42.1
 pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2')
+pkgdesc="GNOME HTTP Library"
+arch=(i686 x86_64)
+license=(LGPL)
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+depends=(glib2 libxml2 glib-networking sqlite)
+makedepends=(intltool gobject-introspection python2)
+provides=("libsoup-gnome=$pkgver-$pkgrel")
+conflicts=(libsoup-gnome)
+replaces=(libsoup-gnome)
 options=('!libtool' '!emptydirs')
-sha256sums=('82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('20bd5365bb3e7de70fade91ac82c9dea31636318df90b8c26bc4cde2523a8c91')
 
 build() {
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/env python/python2/' libsoup/tld-parser.py
+  cd $pkgname-$pkgver
+
+  # Python3 has UnicodeDecodeErrors
+  sed -i -e '1s/python$/&2/' libsoup/tld-parser.py
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
 }
 
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "$pkgbase-$pkgver"
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
-  pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-2.4"
-  rm -rf "$pkgdir/usr/share"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib"
 }
diff --git a/extra/libzapojit/PKGBUILD b/extra/libzapojit/PKGBUILD
index 05f5aadff..4d34116e3 100644
--- a/extra/libzapojit/PKGBUILD
+++ b/extra/libzapojit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169961 2012-10-30 22:47:17Z heftig $
+# $Id: PKGBUILD 183440 2013-04-21 22:11:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libzapojit
-pkgver=0.0.2
+pkgver=0.0.3
 pkgrel=1
 pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24')
+sha256sums=('3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD
new file mode 100644
index 000000000..3e8780c64
--- /dev/null
+++ b/extra/lightsoff/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=lightsoff
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Turn off all the lights"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=lightsoff.install
+url="https://live.gnome.org/Lightsoff"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('767f7876c6f360b0e3c18243c7e2201ea0a31523df890853a572d0325d91c24b')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/lightsoff/lightsoff.install b/extra/lightsoff/lightsoff.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/lightsoff/lightsoff.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 257230350..391a66fa4 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182366 2013-04-09 15:06:58Z giovanni $
+# $Id: PKGBUILD 183536 2013-04-22 16:39:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.04.08
+pkgver=2013.04.22
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('25ff9f7bf9e47c699878e58c7789ee13')
+md5sums=('83362b57ecfa0ed07a1f1bd93bb4cdfb')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index f6fbc9e9b..4b1dbce38 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157037 2012-04-23 09:53:25Z ibiru $
+# $Id: PKGBUILD 183442 2013-04-21 22:11:40Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=mash
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A small library for using 3D models within a Clutter scene"
 arch=('i686' 'x86_64')
 url="http://clutter-project.org/"
@@ -11,7 +11,7 @@ options=('!libtool')
 license=('LGPL')
 depends=('clutter')
 makedepends=('gtk-doc' 'gobject-introspection')
-source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+source=(https://github.com/downloads/clutter-project/mash/mash-${pkgver}.tar.xz)
 sha256sums=('fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc')
 
 build() {
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 72c2608b0..d47b9bff3 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,38 +1,36 @@
-# $Id: PKGBUILD 166517 2012-09-09 15:40:36Z heftig $
+# $Id: PKGBUILD 183443 2013-04-21 22:11:41Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.6.0.0
-pkgrel=1
+pkgver=0.7.990
+pkgrel=3
 pkgdesc="Mobile broadband modem management service"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-license=('GPL2')
-depends=('dbus-glib' 'udev' 'ppp')
-makedepends=('intltool')
+license=(GPL2)
+depends=(udev ppp libqmi polkit hicolor-icon-theme)
+makedepends=(intltool git gtk-doc)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz
-        modem-manager.service)
-sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2'
-            '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe')
+install=modemmanager.install
+#source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz)
+source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=95274bf")
+sha256sums=('SKIP')
 
 build() {
-  cd "$_realname-$pkgver"
-   ./configure --prefix=/usr \
-   	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--with-udev-base-dir=/usr/lib/udev \
-	--disable-static
+  cd $_realname
+   ./autogen.sh --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-udev-base-dir=/usr/lib/udev \
+        --disable-static \
+        --with-polkit
   make
 }
 
 package() {
-  cd "$_realname-$pkgver"
+  cd $_realname
   make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/modem-manager.service" \
-    "$pkgdir/usr/lib/systemd/system/modem-manager.service"
-  echo "SystemdService=modem-manager.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service"
 }
diff --git a/extra/modemmanager/modem-manager.service b/extra/modemmanager/modem-manager.service
deleted file mode 100644
index bad666be8..000000000
--- a/extra/modemmanager/modem-manager.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Modem Manager
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.ModemManager
-ExecStart=/usr/sbin/modem-manager
-# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog()
-# with LOG_PERROR. But systemd redirects stderr to syslog by default, which
-# results in logging each message twice.
-StandardError=null
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/modemmanager/modemmanager.install b/extra/modemmanager/modemmanager.install
new file mode 100644
index 000000000..be187f2b4
--- /dev/null
+++ b/extra/modemmanager/modemmanager.install
@@ -0,0 +1,12 @@
+post_install() {
+  type -P gtk-update-icon-cache &>/dev/null &&
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index 4dddd4cb5..c1f24c59a 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -3,19 +3,19 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mousetweaks
-pkgver=3.6.0
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
 arch=(i686 x86_64)
 license=('GPL3' 'FDL')
 depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
 makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
+groups=('gnome')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c48f655c5b53615270503fd1631e0cf7baa5872b20f75af8608983f039c5cfc')
+sha256sums=('daa9b16e98675f414d3dcf63a0222a37d6c3e518718d92155bba8781510f2e4f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 6e6a00998..69d64e95d 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178030 2013-02-13 22:13:45Z heftig $
+# $Id: PKGBUILD 183445 2013-04-21 22:11:45Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
@@ -16,14 +16,14 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('aa1d558210d58f9a835a7e718a6b6eb8318ac8fb276c43234c47b1efde755c86')
+sha256sums=('a41a992620e7e51b6a34709db26a215e86f03927e828b4db03e9111d925ef52f')
 
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/mutter \
       --localstatedir=/var --disable-static \
-      --disable-schemas-compile
+      --disable-schemas-compile --enable-compile-warnings=minimum
   make
 }
 
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index a50ccb01f..1c14ec0b2 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 169999 2012-10-30 23:01:26Z heftig $
+# $Id: PKGBUILD 183446 2013-04-21 22:11:47Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-sendto
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Nautilus context menu for sending files."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://download.gnome.org/sources/nautilus-sendto/"
-license=('GPL')
-groups=('gnome-extra')
-depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp')
+license=(GPL)
+depends=(glib2)
+makedepends=(gettext intltool gobject-introspection)
 options=('!libtool' '!emptydirs')
 install=nautilus-sendto.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e')
+sha256sums=('d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/nautilus-sendto/nautilus-sendto.install b/extra/nautilus-sendto/nautilus-sendto.install
index d33a1b261..38a63052c 100644
--- a/extra/nautilus-sendto/nautilus-sendto.install
+++ b/extra/nautilus-sendto/nautilus-sendto.install
@@ -1,11 +1,5 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
 post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
+  if (( $(vercmp $2 3.7.92) < 0 )); then
+    glib-compile-schemas usr/share/glib-2.0/schemas
+  fi
 }
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index af0b33585..970692754 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,34 +1,52 @@
-# $Id: PKGBUILD 170899 2012-11-12 22:34:25Z heftig $
+# $Id: PKGBUILD 183320 2013-04-21 22:06:39Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=nautilus
-pkgver=3.6.3
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
-makedepends=('intltool' 'gobject-introspection')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(libexif gnome-desktop exempi gvfs desktop-file-utils gnome-icon-theme dconf 
+         libtracker-sparql libnotify nautilus-sendto)
+makedepends=(intltool gobject-introspection python)
 url="http://www.gnome.org"
-groups=('gnome')
 options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d272027754ce8591959ae854fc6b5f43eee4af31e4eecf06de727acebe0ee46c')
+source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('9827e939aa0621041754379ca0227ceb82877785f013dd5935ecc4b791314892')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgbase-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/nautilus \
-      --disable-nst-extension \
       --disable-update-mimedb \
       --disable-packagekit \
       --disable-schemas-compile
   make
 }
 
-package() {
-  cd "$pkgname-$pkgver"
+package_nautilus() {
+  depends+=(libnautilus-extension)
+  groups=(gnome)
+  install=nautilus.install
+
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
+
+### Split libnautilus-extension
+  cd ..
+  mkdir -p n-e/usr/{lib,share}
+  mv "$pkgdir"/usr/include n-e/usr
+  mv "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} n-e/usr/lib
+  mv "$pkgdir"/usr/lib/libnautilus-extension.so* n-e/usr/lib
+  mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} n-e/usr/share
+}
+
+package_libnautilus-extension() {
+  pkgdesc="Library for extending the $pkgdesc"
+  depends=(gtk3)
+
+  mv n-e/* "$pkgdir"
 }
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index dfe8c8498..7ab3fe6a8 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179567 2013-03-07 11:54:25Z foutrelis $
+# $Id: PKGBUILD 183448 2013-04-21 22:11:51Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -7,14 +7,14 @@
 
 pkgname=network-manager-applet
 pkgver=0.9.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME frontends to NetWorkmanager"
-arch=('i686' 'x86_64')
-license=('GPL')
+arch=(i686 x86_64)
+license=(GPL)
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify'
-         'gnome-icon-theme' 'mobile-broadband-provider-info' 'iso-codes')
-makedepends=('intltool' 'gnome-bluetooth')
+depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify
+         gnome-icon-theme mobile-broadband-provider-info iso-codes)
+makedepends=(intltool gnome-bluetooth)
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool' '!emptydirs')
 install=network-manager-applet.install
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 6de807013..01f43b2ba 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179641 2013-03-08 23:40:46Z foutrelis $
+# $Id: PKGBUILD 183447 2013-04-21 22:11:49Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -9,20 +9,20 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
-         libsoup systemd)
-makedepends=(intltool dhcpcd iptables gobject-introspection gtk-doc)
-optdepends=('modemmanager: for modem management service'
-            'dhcpcd: alternative DHCP client; does not support DHCPv6'
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+         libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc)
+optdepends=('dhclient: DHCPv6 support'
             'iptables: Connection sharing'
             'dnsmasq: Connection sharing'
             'bluez: Bluetooth support'
-            'openresolv: resolvconf support')
+            'openresolv: resolvconf support'
+            'ppp: Dialup connection support')
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
@@ -53,6 +53,7 @@ build() {
     --with-udev-dir=/usr/lib/udev \
     --with-resolvconf=/usr/sbin/resolvconf \
     --with-session-tracking=systemd \
+    --with-modem-manager-1 \
     --disable-static \
     --enable-more-warnings=no \
     --disable-wimax \
@@ -67,6 +68,7 @@ package() {
   make DESTDIR="$pkgdir" install
 
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
 
   rm -r "$pkgdir/var/run"
 }
diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD
index 99b091e37..f7e249a87 100644
--- a/extra/notification-daemon/PKGBUILD
+++ b/extra/notification-daemon/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 166585 2012-09-12 17:37:48Z jgc $
+# $Id: PKGBUILD 183449 2013-04-21 22:11:53Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 
 pkgname=notification-daemon
 pkgver=0.7.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Notification daemon for the desktop notifications framework"
-arch=('i686' 'x86_64')
-license=('GPL')
+arch=(i686 x86_64)
+license=(GPL)
 url="http://www.galago-project.org/specs/notification/"
-depends=('gtk3' 'libcanberra')
-groups=('gnome')
-makedepends=('pkgconfig' 'intltool')
+depends=(gtk3 libcanberra)
+makedepends=(pkgconfig intltool)
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('64d0ce6fb12c94c3b73b701502c804c408cb5a94580bcae5ac37607639f7a0b3')
@@ -24,6 +23,11 @@ build() {
     make
 }
 
+check() {
+    cd ${pkgname}-${pkgver}
+    make check
+}
+
 package() {
     cd ${pkgname}-${pkgver}
     make DESTDIR=${pkgdir} install
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 160446aa5..c7e193f16 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178010 2013-02-13 13:33:05Z andrea $
+# $Id: PKGBUILD 183540 2013-04-22 20:14:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.3.2.1
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('cc33b2ac08f66d4b70f9c85303d44aad')
+md5sums=('37b24d69d386eca5b4382424002ed762')
 
 build() {
   mkdir build
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index bed5eb809..d1ae980e1 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176332 2013-01-30 13:12:57Z andrea $
+# $Id: PKGBUILD 183542 2013-04-22 20:16:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('gtk3')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2a251c52a7799e67a4af70adc4ed3c60')
+md5sums=('63ae9752dd39a3310d20d973dd6ea247')
 
 build() {
   mkdir build
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index b90323aa1..970a4d45d 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 165246 2012-08-14 15:06:21Z ibiru $
+# $Id: PKGBUILD 183529 2013-04-22 13:10:36Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=p11-kit
-pkgver=0.13
+pkgver=0.18.1
 pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
 arch=(i686 x86_64)
 url="http://p11-glue.freedesktop.org"
 license=('BSD')
-depends=(glibc)
+depends=('glibc' 'libtasn1')
 options=(!libtool)
-source=($url/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('3892bc07ff54b1b391aad4628911801d')
+source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
+md5sums=('e4ef21592dbd126b62e1a6d4ad65ce5c'
+         'SKIP')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD
index a14a34f43..dd883080c 100644
--- a/extra/pango-perl/PKGBUILD
+++ b/extra/pango-perl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160501 2012-06-02 10:26:50Z bluewind $
+# $Id: PKGBUILD 183483 2013-04-21 22:21:03Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango-perl
-pkgver=1.223
-pkgrel=2
+pkgver=1.224
+pkgrel=1
 pkgdesc="Perl bindings for Pango"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
 depends=('pango' 'glib-perl' 'cairo-perl')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Pango-${pkgver}.tar.gz)
-md5sums=('628a6de54f47b6791c6b45edfb835215')
+md5sums=('8c411f367cffb0aa16d0e3963294d32e')
 
 build() {
   cd "${srcdir}/Pango-${pkgver}"
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index c9a344b9d..470ff7daf 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174865 2013-01-08 09:21:35Z jgc $ 
+# $Id: PKGBUILD 183451 2013-04-21 22:11:56Z heftig $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.32.5
+pkgver=1.34.0
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ options=('!libtool')
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821')
+sha256sums=('105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index 412f69cbc..d7e987d38 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 180235 2013-03-18 18:19:32Z jgc $
+# $Id: PKGBUILD 183452 2013-04-21 22:11:58Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
 pkgver=0.110
-pkgrel=1
+pkgrel=2
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64)
-license=('LGPL')
+license=(LGPL)
 url="http://www.freedesktop.org/wiki/Software/polkit"
-depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
+depends=(glib2 pam expat libsystemd js185)
+makedepends=(intltool gtk-doc gobject-introspection)
 options=('!libtool')
 install=polkit.install
 source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 3ffba2d90..f7e309614 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,41 +1,39 @@
-# $Id: PKGBUILD 170844 2012-11-12 15:18:06Z heftig $
+# $Id: PKGBUILD 183322 2013-04-21 22:06:41Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.4.2
+pkgver=3.8.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
+license=(LGPL)
+makedepends=(python python2 python-cairo python2-cairo gobject-introspection)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad')
+sha256sums=('e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb')
+
+prepare() {
+  mkdir build-py2 build-py3 devel
+  cd ${pkgbase}-${pkgver}
+  sed -i '/Werror=format/d' configure # gcc 4.8
+}
 
 build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
+  cd build-py2
+  ../${pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python2
+  make
+
+  cd ../build-py3
+  ../${pkgbase}-${pkgver}/configure --prefix=/usr
+  make
 }
 
 package_python-gobject() {
   pkgdesc="Python 3 bindings for GObject"
   depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
 
-  cd "$pkgbase-$pkgver"
+  cd build-py3
   make DESTDIR="$pkgdir" install
   rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
 }
@@ -44,7 +42,7 @@ package_python2-gobject() {
   pkgdesc="Python 2 bindings for GObject"
   depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
 
-  cd "python2-build"
+  cd build-py2
   make DESTDIR="$pkgdir" install
   mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
 }
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 190c09638..2d16d44ce 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 180583 2013-03-23 23:09:38Z td123 $
+# $Id: PKGBUILD 183523 2013-04-22 10:48:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.3.0
+pkgver=2.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
@@ -16,7 +16,7 @@ source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/
         "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
         'use-python2.patch'
         'qwebview.patch')
-sha1sums=('8e0aa2f895376a0a88b55548bfadb270da3708ba'
+sha1sums=('5b71baa0c92290d00b8cc3739c298098c1ed4bcd'
           'f5880f11c139d7d8d01ecb8d874535f7d9553198'
           '315b6ff603f35e5492a036f7082f6aa075dfb607'
           'ef467fcfc9e74aa88356f27acc21792706ed1e4d')
diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD
new file mode 100644
index 000000000..ccf63c4b7
--- /dev/null
+++ b/extra/quadrapassel/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183453 2013-04-21 22:12:00Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=quadrapassel
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=quadrapassel.install
+url="https://live.gnome.org/Quadrapassel"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('18935ab737c9a690104207758ba92223e8bfe6d5f1feeeadbbca3eb543ce5284')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/quadrapassel/quadrapassel.install b/extra/quadrapassel/quadrapassel.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/quadrapassel/quadrapassel.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD
index 09fe7e183..6d27ae502 100644
--- a/extra/rest/PKGBUILD
+++ b/extra/rest/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 169985 2012-10-30 23:00:29Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 183454 2013-04-21 22:12:01Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=rest
 pkgver=0.7.90
-pkgrel=1
+pkgrel=2
 pkgdesc="A helper library for RESTful services."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libxml2' 'libsoup-gnome')
-makedepends=('gobject-introspection')
+license=(GPL2)
+depends=(glib2 libxml2 'libsoup>=2.42.0')
+makedepends=(gobject-introspection)
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
 sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc
@@ -23,8 +23,8 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch b/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
deleted file mode 100644
index dc3f3429a..000000000
--- a/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a8f5d8cec87ef1586897e94e49bdf54db64bf97b Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Thu, 11 Oct 2012 10:59:16 +0200
-Subject: [PATCH] Disable the context pane plugin when webkit isn't available
-
----
- plugins/Makefile.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index e4f6e69..3a9ea03 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -14,7 +14,6 @@ SUBDIRS =						\
- if ENABLE_PYTHON
- SUBDIRS +=						\
- 	artsearch					\
--	context						\
- 	im-status					\
- 	lyrics						\
- 	magnatune					\
-@@ -24,8 +23,12 @@ SUBDIRS +=						\
- 	sendto						\
- 	rb
- 
-+if WITH_WEBKIT
-+SUBDIRS += context
- endif
- 
-+endif # ENABLE_PYTHON
-+
- if WITH_LIRC
- SUBDIRS += lirc
- endif
--- 
-1.7.12.1
-
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 4ee0514ca..da1db9018 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,24 +1,19 @@
-# $Id: PKGBUILD 171480 2012-11-18 00:28:26Z eric $
+# $Id: PKGBUILD 183455 2013-04-21 22:12:04Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.98
-pkgrel=4
+pkgver=2.99.1
+pkgrel=1
 pkgdesc="An iTunes-like music playback and management application"
-arch=('i686' 'x86_64')
-license=('GPL')
+arch=(i686 x86_64)
+license=(GPL)
 url="http://www.rhythmbox.org"
-depends=('dconf' 'desktop-file-utils' 'gstreamer0.10-base-plugins' 
-         'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
-         'libnotify' 'libpeas' 'media-player-info' 'python2-gobject' 
-         'totem-plparser' 'tdb')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 
-             'vala' 'gnome-common' 'gtk-doc' 'grilo' 'libdmapsharing' 'lirc-utils' 
-             'libgpod' 'libmtp')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
+depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info python2-gobject totem-plparser tdb webkitgtk3)
+makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp)
+optdepends=('gst-plugins-ugly: Extra media codecs'
+            'gst-plugins-bad: Extra media codecs'
+            'gst-libav: Extra media codecs'
             'brasero: Audio CD Recorder plugin'
             'libdmapsharing: DAAP Music Sharing plugin'
             'grilo-plugins: Grilo media browser plugin'
@@ -28,23 +23,15 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
             'zeitgeist: Zeitgeist plugin')
 options=('!libtool' '!emptydirs')
 install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
-	Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
-	rhythmbox-2.98-xinitthreads.patch)
-sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5'
-            '6510214e7fe0a18d17d8c599ae065bd48c2e1f82931fe82e3d1cc684a0801cd6'
-            'cd9af451a411e5a621c385d43f5ddd3664b3d085fc12dc7d5e5cd1f5db9e73b0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ed30bb534a789e2b50f953e33eee0bb09f389fe813d433a87d504d07be5f7777')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch"
-  patch -Np1 -i "${srcdir}/rhythmbox-2.98-xinitthreads.patch"
-  autoreconf -fi
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/rhythmbox \
       --localstatedir=/var --disable-static \
-      --enable-daap --enable-python --enable-vala \
-      --with-mdns=avahi --disable-scrollkeeper --without-webkit
+      --enable-daap --enable-python --enable-vala
   make
 }
 
diff --git a/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch b/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch
deleted file mode 100644
index 6a6426038..000000000
--- a/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1780aab638aa39704be34fc214de39b4847a87b2 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 17 Oct 2012 19:02:50 +0200
-Subject: [PATCH] shell: Call XInitThreads() on X11 systems
-
-Otherwise bad things can happen with some plugins that expect
-mutexes to work, like the visualiser plugin and Clutter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686320
----
- configure.ac | 15 +++++++++++++++
- shell/main.c | 12 ++++++++++++
- 2 files changed, 27 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 009c838..8a88d72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,10 +86,25 @@ PKG_PROG_PKG_CONFIG
- 
- PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-unix-2.0 >= $GLIB_REQS)
- 
-+dnl Always require libX11 for XInitThreads() on X11 systems
-+X11_PKG=""
-+gdk_targets=`$PKG_CONFIG --variable targets gdk-3.0`
-+for target in $gdk_targets; do
-+	case "$target" in
-+		x11)
-+			X11_PKG=x11
-+			break
-+			;;
-+		*)
-+			;;
-+	esac
-+done
-+
- dnl  note: gio-unix-2.0 is here for libmediaplayerid
- PKG_CHECK_MODULES(RHYTHMBOX,				\
- 		  gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \
- 		  gtk+-3.0 >= $GTK_REQS			\
-+		  $X11_PKG				\
- 		  gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS	\
- 		  glib-2.0 >= $GLIB_REQS		\
- 		  gio-2.0 >= $GLIB_REQS			\
-diff --git a/shell/main.c b/shell/main.c
-index 3c0346d..696f3e9 100644
---- a/shell/main.c
-+++ b/shell/main.c
-@@ -34,6 +34,11 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- 
-+#ifdef GDK_WINDOWING_X11
-+/* X11 headers */
-+#include <X11/Xlib.h>
-+#endif
-+
- #include <girepository.h>
- 
- #include "rb-shell.h"
-@@ -51,6 +56,13 @@ main (int argc, char **argv)
- 	int new_argc;
- 	char **new_argv;
- 
-+#ifdef GDK_WINDOWING_X11
-+	if (XInitThreads () == 0) {
-+		g_critical ("Initialising threading support failed.");
-+		return 1;
-+	}
-+#endif
-+
- 	/* disable multidevice so clutter-gtk events work.
- 	 * this needs to be done before gtk_open, so the visualizer
- 	 * plugin can't do it.
--- 
-1.7.12.1
\ No newline at end of file
diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD
index 8ac8a19bc..f76fe91c5 100644
--- a/extra/rygel/PKGBUILD
+++ b/extra/rygel/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 180471 2013-03-21 22:40:51Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 183456 2013-04-21 22:12:05Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
-pkgver=0.16.4
+pkgver=0.18.1
 pkgrel=1
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://live.gnome.org/Rygel"
-license=('LGPL')
-depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'libunistring' 'libtracker-sparql' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('vala' 'intltool')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'            
-            'gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
+license=(LGPL)
+depends=(gupnp-av gupnp-dlna libgee gtk3 libunistring libtracker-sparql hicolor-icon-theme xdg-utils)
+makedepends=(vala intltool)
+optdepends=('gst-plugins-base: Extra media codecs'
+            'gst-plugins-good: Extra media codecs'
+            'gst-plugins-bad: Extra media codecs'            
+            'gst-plugins-ugly: Extra media codecs'
+            'gst-libav: Extra media codecs'
             'tracker: Share indexed media files')
-backup=('etc/rygel.conf')
+backup=(etc/rygel.conf)
 options=('!libtool')
-install=$pkgname.install
+install=rygel.install
+groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a')
+sha256sums=('3f71bec31be373707dd0edd88aeea49c74429f258fc5a7e01bb979563349c64d')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --enable-mediathek-plugin --enable-gst-launch-plugin
   make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index b671685ce..2fbc502d7 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170821 2012-11-12 08:38:53Z heftig $
+# $Id: PKGBUILD 183457 2013-04-21 22:12:07Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ groups=(gnome-extra)
 install=seahorse.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
         seahorse-ssh-askpass.sh)
-sha256sums=('9b712da1989725547a8093e638725ee6de74d7870661545a15374c7ebf335cc1'
+sha256sums=('c1a1d97618a37a79e19902e00f3a0de7cfb947b52eb9282ea09e5f9f73151e7a'
             '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {
diff --git a/extra/seed/GLib.js b/extra/seed/GLib.js
new file mode 100644
index 000000000..5aec39a73
--- /dev/null
+++ b/extra/seed/GLib.js
@@ -0,0 +1,282 @@
+GLib = imports.gi.GLib;
+
+(function() {
+
+/* Variant Sugar 
+ * Provide commodities methods to convert Variant from/to javascript object.
+ * variant.toJS() : returns a javascript object representing the Variant 
+ # @variant
+ * Variant.new(signature, value): returns a GVariant structure representing
+ * the javascript object @value
+ *
+ * This implementation uses json-glib's json <-> variant conversion facilities
+ * if presents and fallback to a javascript implementation otherwise.
+ * This javascript implementation is imported from gjs with modification for
+ * JSCore compatibility (Copyright 2011 Giovanni Campagna,
+ * see gjs/override/GLib.js for licence)
+ */
+
+    // Use json-glib's json <-> variant conversion if present.
+    // Defaults to javascript code imported from gjs otherwise.
+    GLib.Variant.prototype.to_js = function(signature) {
+	return _toJS(signature, this);
+    }
+    var toVariant = _toVariant;
+    
+    try {
+	JSONGLib = imports.gi.Json;
+    }
+    catch (e) {}
+
+    if (JSONGLib && JSONGLib.gvariant_serialize_data)
+    {
+	GLib.Variant.prototype.to_js = function(signature) {
+	    return _toJSNative(signature, this);
+	}
+	toVariant = _toVariantNative;
+    }
+
+    GLib.Variant.new = function (value, sig) {
+	var signature = Array.prototype.slice.call(sig);
+
+	if (signature.length != 0)
+	    throw new TypeError('Invalid GVariant signature (more than one single complete type)');
+	var variant = toVariant(signature, value);
+	return variant;
+    }
+
+    GLib.Variant.prototype.toString = function() {
+	return '[object variant of type "' + this.get_type_string() + '"]';
+    };
+
+/// End Variant Sugar ///
+}).apply();
+
+function _toVariantNative(signature, object)
+{
+    if (!object || object == '')
+	return null;
+    if (!signature || signature == '')
+	signature = null;
+
+    return JSONGLib.gvariant_deserialize_data (JSON.stringify (object),
+						       -1, signature);
+};
+
+function _toJSNative(signature, variant)
+{
+    if (!variant)
+	return;
+
+    var jsonStr = JSONGLib.gvariant_serialize_data (variant, signature);
+    if (!jsonStr)
+	return;
+
+    return JSON.parse (jsonStr);
+};
+
+// Code imported from gjs, modified for JSCore idoms.
+// Copyright 2011 Giovanni Campagna (see gjs/override/GLib.js for licence)
+
+const SIMPLE_TYPES = ['b', 'y', 'n', 'q', 'i', 'u', 'x', 't', 'h', 'd', 's', 'o', 'g'];
+
+function _read_single_type(signature, forceSimple) {
+    var char = signature.shift();
+    var isSimple = false;
+
+    if (SIMPLE_TYPES.indexOf(char) == -1) {
+	if (forceSimple)
+	    throw new TypeError('Invalid GVariant signature (a simple type was expected)');
+    } else
+	isSimple = true;
+
+    if (char == 'm' || char == 'a')
+	return [char].concat(_read_single_type(signature, false));
+    if (char == '{') {
+	var key = _read_single_type(signature, true);
+	var val = _read_single_type(signature, false);
+	var close = signature.shift();
+	if (close != '}')
+	    throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}"');
+	return [char].concat(key, val, close);
+    }
+    if (char == '(') {
+	var res = [char];
+	while (true) {
+	    if (signature.length == 0)
+		throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")');
+	    var next = signature[0];
+	    if (next == ')') {
+		signature.shift();
+		return res.concat(next);
+	    }
+	    var el = _read_single_type(signature);
+	    res = res.concat(el);
+	}
+    }
+
+    // Valid types are simple types, arrays, maybes, tuples, dictionary entries and variants
+    if (!isSimple && char != 'v')
+	throw new TypeError('Invalid GVariant signature (' + char + ' is not a valid type)');
+
+    return [char];
+}
+
+
+function _toVariant(signature, value) {
+    if (signature.length == 0)
+	    throw new TypeError('GVariant signature cannot be empty');
+
+    var char = signature.shift();
+    switch (char) {
+    case 'b':
+	return GLib.Variant.new_boolean(value);
+    case 'y':
+	return GLib.Variant.new_byte(value);
+    case 'n':
+	return GLib.Variant.new_int16(value);
+    case 'q':
+	return GLib.Variant.new_uint16(value);
+    case 'i':
+	return GLib.Variant.new_int32(value);
+    case 'u':
+	return GLib.Variant.new_uint32(value);
+    case 'x':
+	return GLib.Variant.new_int64(value);
+    case 't':
+	return GLib.Variant.new_uint64(value);
+    case 'h':
+	return GLib.Variant.new_handle(value);
+    case 'd':
+	return GLib.Variant.new_double(value);
+    case 's':
+	return GLib.Variant.new_string(value);
+    case 'o':
+	return GLib.Variant.new_object_path(value);
+    case 'g':
+	return GLib.Variant.new_signature(value);
+    case 'v':
+	return GLib.Variant.new_variant(value);
+    case 'm':
+	if (value != null)
+	    return GLib.Variant.new_maybe(null, _pack_variant(signature, value))
+	else
+	    return GLib.Variant.new_maybe(GLib.VariantType.new(_read_single_type(signature, false).join('')), null);
+    case 'a':
+	var arrayType = _read_single_type(signature, false);
+	if (arrayType[0] == 's') {
+	    // special case for array of strings
+	    return GLib.Variant.new_strv(value, value.length);
+	}
+	if (arrayType[0] == 'y') {
+	    // special case for array of bytes
+	    return GLib.Variant.new_bytestring(value);
+	}
+	if (arrayType[0] == 'a' && arrayType[1] == 'y') {
+	    // special case for array of array of bytes
+	    return GLib.Variant.new_bytestring_array(value, value.length);
+	}
+
+	var arrayValue = [];
+	if (arrayType[0] == '{') {
+	    // special case for dictionaries
+	    for (var key in value) {
+		var copy = [].concat(arrayType);
+		var child = _pack_variant(copy, [key, value[key]]);
+		arrayValue.push(child);
+	    }
+	} else {
+	    for (var i = 0; i < value.length; i++) {
+		var copy = [].concat(arrayType);
+		var child = _pack_variant(copy, value[i]);
+		arrayValue.push(child);
+	    }
+	}
+	return GLib.Variant.new_array(GLib.VariantType.new(arrayType.join('')), arrayValue, arrayValue.length);
+    case '(':
+	var children = [ ];
+	for (var i = 0; i < value.length; i++) {
+	    var next = signature[0];
+	    if (next == ')')
+		break;
+	    children.push(_pack_variant(signature, value[i]));
+	}
+
+	if (signature[0] != ')')
+	    throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")');
+	signature.shift();
+	return GLib.Variant.new_tuple(children, children.length);
+    case '{':
+	var key = _pack_variant(signature, value[0]);
+	var child = _pack_variant(signature, value[1]);
+
+	if (signature[0] != '}')
+	    throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}")');
+	signature.shift();
+
+	return GLib.Variant.new_dict_entry(key, child);
+    default:
+	throw new TypeError('Invalid GVariant signature (unexpected character ' + char + ')');
+    }
+}
+
+function _toJS(signature, variant) {
+    switch (String.fromCharCode(variant.classify())) {
+    case 'b':
+	return variant.get_boolean();
+    case 'y':
+	return variant.get_byte();
+    case 'n':
+	return variant.get_int16();
+    case 'q':
+	return variant.get_uint16();
+    case 'i':
+	return variant.get_int32();
+    case 'u':
+	return variant.get_uint32();
+    case 'x':
+	return variant.get_int64();
+    case 't':
+	return variant.get_uint64();
+    case 'h':
+	return variant.get_handle();
+    case 'd':
+	return variant.get_double();
+    case 'o':
+    case 'g':
+    case 's':
+	// g_variant_get_string has length as out argument
+	return variant.get_string();
+    case 'v':
+	return variant.get_variant();
+    case 'm':
+	var val = variant.get_maybe();
+	return _toJS(val);
+    case 'a':
+	if (variant.is_container()) {
+	    // special case containers
+	    var ret = { };
+	    var nElements = variant.n_children();
+	    for (var i = 0; i < nElements; i++) {
+		// always unpack the dictionary entry, and always unpack
+		// the key (or it cannot be added as a key)
+		var val = _toJS(variant.get_child_value(i));
+		var key = val[0].classify ? _toJS(val[0]) : val[0];
+		ret[key] = val[1] && val[1].classify ? _toJS(val[1]) : val[1]
+	    }
+	    return ret;
+	}
+	// fall through
+    case '(':
+    case '{':
+	var ret = [ ];
+	var nElements = variant.n_children();
+	for (var i = 0; i < nElements; i++) {
+	    var val = variant.get_child_value(i);
+	    ret.push(_toJS(val));
+	}
+	return ret;
+    }
+
+    throw new Error('Assertion failure: this code should not be reached');
+}
diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD
index 9713fa013..4944a2207 100644
--- a/extra/seed/PKGBUILD
+++ b/extra/seed/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 157423 2012-04-28 09:27:33Z allan $
+# $Id: PKGBUILD 183482 2013-04-21 22:21:02Z heftig $
 #Maintainer : Ionut Biru <ibiru@archlinux.org>
 #Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=seed
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Seed/"
 license=('LGPL')
 options=('!libtool')
-depends=('libwebkit3' 'gobject-introspection' 'gnome-js-common')
+depends=('webkitgtk3' 'gobject-introspection' 'gnome-js-common' 'mpfr')
 makedepends=('intltool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3d1eca40834b72a5730ddaf8a5f46b8df20ddb2b3b39687d1a84ef966d3d37c0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.8/${pkgname}-${pkgver}.tar.xz
+        GLib.js)
+sha256sums=('80cb4db7fa6f6cf8d3e255fc45a81657388d458bc8bf23e4089e35f69eeaac32'
+            '2a8185df661056e12830d0a29155dc539016fc349a823f5aec09dd15bbb9239b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  install -m644 ../GLib.js extensions/
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 8ee8c3cd2..7dd7e4693 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 180919 2013-03-28 06:14:07Z andrea $
+# $Id: PKGBUILD 183493 2013-04-22 09:21:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14.5
+pkgver=4.14.6
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('51757771c204e9fbad359f372a0b8256')
+md5sums=('d6493b9f0a7911566545f694327314c4')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD
index 80c2007e6..33230d96f 100644
--- a/extra/sound-juicer/PKGBUILD
+++ b/extra/sound-juicer/PKGBUILD
@@ -1,29 +1,39 @@
-# $Id: PKGBUILD 171308 2012-11-17 04:45:56Z heftig $
+# $Id: PKGBUILD 183458 2013-04-21 22:12:09Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=sound-juicer
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cd ripper application"
 arch=(i686 x86_64)
 license=(GPL)
-depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero
-         hicolor-icon-theme gconf)
-makedepends=(intltool gnome-doc-utils)
+depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero hicolor-icon-theme gconf)
+makedepends=(intltool gnome-doc-utils gnome-common)
 options=(!emptydirs)
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-groups=(gnome-extra)
 install=sound-juicer.install
 sha256sums=('ea76703e08e67590af7b8ce5206c343eb01d77cd5023c0bc958a0c2f5a98d2e9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -e "s/AM_GST_ELEMENT_CHECK/GST_ELEMENT_CHECK/" \
+      -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in
+  autoreconf -f
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-scrollkeeper
-  make
+
+  # drop unneeded direct library deps with --as-needed
+  # libtool doesn't make this easy, so we do it the hard way
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+  # Remove RPATH
+  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+  export tagname=CC
+  make AM_CFLAGS=-export-dynamic
 }
 
 package() {
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index a1f39e933..e3da50207 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170902 2012-11-12 22:36:42Z heftig $
+# $Id: PKGBUILD 183459 2013-04-21 22:12:10Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
 license=('GPL2')
-groups=(gnome-extra)
+groups=(gnome)
 depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince')
 install=sushi.install
 makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ddcfa4fd8ad6a8a7ff2da10a5190a031df9e9debf217cb1fcdeec2a181222af8')
+sha256sums=('c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD
new file mode 100644
index 000000000..5d93838ca
--- /dev/null
+++ b/extra/swell-foop/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183460 2013-04-21 22:12:12Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=swell-foop
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Clear the screen by removing groups of colored and shaped tiles"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=swell-foop.install
+url="https://live.gnome.org/Swell%20Foop"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('50d6b53d7507c1176ade9227f04d1c260143a5ebf8cf812c359c89eaeec9ee99')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/swell-foop/swell-foop.install b/extra/swell-foop/swell-foop.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/swell-foop/swell-foop.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD
new file mode 100644
index 000000000..2558d262c
--- /dev/null
+++ b/extra/tali/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=tali
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Beat the odds in a poker-style dice game"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=tali.install
+url="https://live.gnome.org/Tali"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('77fa3a3804f51e40629799d441b34e9b01a665097be229bd94adb28d3dbc17d5')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+}
diff --git a/extra/tali/tali.install b/extra/tali/tali.install
new file mode 100644
index 000000000..8e65298ad
--- /dev/null
+++ b/extra/tali/tali.install
@@ -0,0 +1,34 @@
+_scores=(
+	gtali.Colors.scores
+	gtali.Regular.scores
+)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD
index ffda1b338..29f155d28 100644
--- a/extra/tomboy/PKGBUILD
+++ b/extra/tomboy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170922 2012-11-13 02:13:42Z heftig $
+# $Id: PKGBUILD 183462 2013-04-21 22:12:14Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=tomboy
-pkgver=1.12.2
+pkgver=1.14.0
 pkgrel=1
 pkgdesc="Desktop note-taking application for Linux and Unix"
 arch=('i686' 'x86_64')
@@ -11,10 +11,9 @@ url="http://www.gnome.org/projects/tomboy/"
 depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
 options=('!libtool' '!emptydirs' '!makeflags')
-groups=('gnome-extra')
 install=tomboy.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ebcb23efb8eedc949eb84d4b5c9919ddaacc97198384f79ed08e97092c46e55e')
+sha256sums=('14c1e7f2c7d67d8603a7de95830c3b159779909e8a74c5a6ca9e08a2508fea18')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 1ef450a5e..9e753adfc 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 179111 2013-03-03 17:28:38Z dreisner $
+# $Id: PKGBUILD 183463 2013-04-21 22:12:16Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
-pkgver=3.4.3
-pkgrel=2
+pkgver=3.4.4
+pkgrel=1
 url="http://www.gnome.org"
 pkgdesc="Totem playlist parser library"
 license=('LGPL')
 arch=(i686 x86_64)
-depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
+depends=('gmime' 'libsoup' 'libarchive' 'libquvi')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b')
+sha256sums=('b821e812da3f3e42d2f831296b4031c60a615d29857781971578ce2c0c807457')
 
 build() {
   cd totem-pl-parser-$pkgver
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 12ab179be..21e802543 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 173078 2012-12-10 11:38:58Z jgc $
+# $Id: PKGBUILD 183323 2013-04-21 22:06:42Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
 license=(GPL2 custom)
 depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
-         hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst
+         hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
          clutter-gtk python2-gobject gst-plugins-bad)
-makedepends=(intltool gnome-doc-utils nautilus lirc-utils vala grilo pylint dbus-glib libzeitgeist)
+makedepends=(intltool libnautilus-extension lirc-utils vala grilo pylint dbus-glib libzeitgeist itstool docbook-xsl)
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini)
-sha256sums=('ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60'
+sha256sums=('74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
 
 build() {
@@ -33,10 +33,10 @@ build() {
 }
 
 package_totem() {
-  groups=(gnome-extra)
+  groups=(gnome)
   install=totem.install
   optdepends=('gst-plugins-ugly: Extra media codecs'
-              'gst-ffmpeg: Extra media codecs'
+              'gst-libav: Extra media codecs'
               'lirc-utils: Infrared Remote Control plugin'
               'grilo-plugins: Browse sidebar (remote media)'
               'pyxdg: opensubtitles plugin'
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index ffc68955e..c028bc888 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,33 +1,29 @@
-# $Id: PKGBUILD 180810 2013-03-26 11:49:41Z foutrelis $
+# $Id: PKGBUILD 183324 2013-04-21 22:06:43Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.14.5
+pkgver=0.16.0
 _tver=${pkgver%.*}
-pkgrel=1
+pkgrel=4
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=(i686 x86_64)
 license=(GPL)
-makedepends=(libgnome-keyring upower libexif exempi rest
+makedepends=(libgee libsecret upower libexif exempi
              poppler-glib libgsf icu enca networkmanager gtk3
              desktop-file-utils hicolor-icon-theme gobject-introspection
-             intltool giflib gstreamer0.10-base totem-plparser
-             taglib nautilus libvorbis flac vala libgxps)
+             intltool giflib gst-plugins-base-libs totem-plparser
+             taglib libvorbis flac vala libgxps libnautilus-extension)
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8')
+sha256sums=('299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f')
 
 build() {
   cd $pkgbase-$pkgver
 
-  # HACK: uninstall libtracker-sparql to ensure a clean build,
-  # as the build system will wrongly link against it
-  #if pacman -Qq libtracker-sparql; then sudo pacman -Rdd --noconfirm libtracker-sparql; fi
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -43,18 +39,18 @@ build() {
 }
 
 package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" libgnome-keyring
-           upower libexif exempi rest poppler-glib libgsf enca
+  depends=("libtracker-sparql=$pkgver-$pkgrel" libgee libsecret
+           upower libexif exempi poppler-glib libgsf enca
            networkmanager gtk3 desktop-file-utils hicolor-icon-theme)
   optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
+              'gst-plugins-base-libs: video extractor'
               'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
               'libvorbis: Vorbis metadata extractor'
               'flac: FLAC metadata extractor'
               'taglib: writeback for audio files'
+              "nautilus: edit files' tracker tags"
               'libgxps: XPS extractor')
-  groups=('gnome-extra')
+  groups=('gnome')
   install=tracker.install
 
   cd $pkgbase-$pkgver
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 84210ec21..93c024e79 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 174775 2013-01-07 12:39:21Z jgc $
+# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
-pkgver=2.0.1
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL2')
 depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python')
 optdepends=('parted: partition management'
             'gptfdisk: GUID partition table support')
 options=(!libtool)
 source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('7a6728942d3cd1adc8cd5ee770e8865b293694e9663487861b7b8bf7b495bbbf')
+sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8')
 
 build() {
   cd "udisks-$pkgver"
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index a642378d4..7cc608b87 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170948 2012-11-14 00:15:27Z heftig $
+# $Id: PKGBUILD 183465 2013-04-21 22:12:18Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 
 pkgname=vala
-pkgver=0.18.1
+pkgver=0.20.1
 pkgrel=1
 pkgdesc="Compiler for the GObject type system"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glib2')
 makedepends=('libxslt')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32')
+sha256sums=('9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index c410dab14..ed2214867 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170889 2012-11-12 22:10:03Z heftig $
+# $Id: PKGBUILD 183466 2013-04-21 22:12:20Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dec4b24de9c372cef3efc0d3e80514c85250e01ce01325d07a4e4e956b4a8f3c')
+sha256sums=('64f9bcd08f33e5e767565909792094ad78d7b400f16dc24e0a5699c7e87da000')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index 6d8a16413..40c35c45b 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 170890 2012-11-12 22:11:14Z heftig $
+# $Id: PKGBUILD 183467 2013-04-21 22:12:21Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils')
 makedepends=('intltool' 'networkmanager' 'gnome-common')
-groups=('gnome-extra')
+groups=('gnome')
 url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c24907542c5ea086293dc852edfeb6b6d02d63e210a3ff715c18d04e130857e4')
+sha256sums=('3a82392aa479d5a4be38020ac64b3c4f0227917af6175938919dbe741995929c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 4ae0ccb14..b1f095fee 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170907 2012-11-12 22:41:40Z heftig $
+# $Id: PKGBUILD 183325 2013-04-21 22:06:44Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.34.2
+pkgver=0.34.4
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
 source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz)
-sha256sums=('f40f9fe0bcc6d65bc44b2fab5469b56a9f0631132c6b90e06053e421711159cf')
+sha256sums=('477de8f0b8473e1cb27c9488e278df44d16fc384d1753c5c3961e3f0417860bd')
 
 build() {
   cd "vte-$pkgver"
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 9065ed194..5aaac23d4 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,61 +1,43 @@
-# $Id: PKGBUILD 180811 2013-03-26 11:49:42Z foutrelis $
+# $Id: PKGBUILD 183326 2013-04-21 22:06:45Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=webkitgtk
-pkgname=('webkitgtk2' 'webkitgtk3')
-pkgver=1.10.2
-pkgrel=3
+pkgname=('webkitgtk3')
+pkgver=2.0.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/"
 license=('custom')
-makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
+makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp')
 options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
+source=(http://webkitgtk.org/releases/$pkgbase-$pkgver.tar.xz)
+sha256sums=('6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  mkdir build-gtk3
+}
 
 build() {
-  cd "$srcdir/webkitgtk-$pkgver"
-  mkdir build-gtk2 build-gtk3
+  cd $pkgbase-$pkgver/build-gtk3
 
-  cd build-gtk2
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk2 \
-    --with-gstreamer=0.10 \
-    --with-gtk=2.0 \
-    --disable-webkit2
-  make all stamp-po
-  
-  cd ../build-gtk3
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk3 \
-    --with-gstreamer=1.0
+  # Suppress a *lot* of gcc 4.8 warnings
+  export CPPFLAGS="$CPPFLAGS -Wno-unused-local-typedefs"
+
+  ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 \
+    --enable-introspection
   make all stamp-po
 }
 
 package_webkitgtk3() {
   pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs')
+  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk3' 'gst-plugins-base-libs' 'libsecret' 'libwebp')
   conflicts=('libwebkit3')
   provides=("libwebkit3=${pkgver}")
   replaces=('libwebkit3')
+  optdepends=('gtk2: Webkit2 plugin support')
   
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk3"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_webkitgtk2() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base')
-  conflicts=('libwebkit')
-  provides=("libwebkit=${pkgver}")
-  replaces=('libwebkit')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
+  cd $pkgbase-$pkgver/build-gtk3
   make -j1 DESTDIR="$pkgdir" install
   install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/webkitgtk/python3.patch b/extra/webkitgtk/python3.patch
new file mode 100644
index 000000000..efd640043
--- /dev/null
+++ b/extra/webkitgtk/python3.patch
@@ -0,0 +1,20 @@
+diff --git a/Tools/gtk/generate-feature-defines-files b/Tools/gtk/generate-feature-defines-files
+index 1a92bf50a05831655308cb62646eb05a6db4b63c..f5b2c7e61eab12bf0eb25b0f9c595f2fd83ebbe9 100755
+--- a/Tools/gtk/generate-feature-defines-files
++++ b/Tools/gtk/generate-feature-defines-files
+@@ -32,13 +32,13 @@ def write_file_if_contents_changed(filename, contents):
+ 
+ def write_feature_defines_header(feature_defines):
+     contents = ''
+-    for (feature, value) in feature_defines.iteritems():
++    for (feature, value) in feature_defines.items():
+         contents += '#define {0} {1}\n'.format(feature, value)
+     write_file_if_contents_changed("WebKitFeatures.h", contents)
+ 
+ def write_flattened_feature_defines_file(feature_defines):
+     contents = ''
+-    for (feature, value) in feature_defines.iteritems():
++    for (feature, value) in feature_defines.items():
+         contents += '{0}={1}\n'.format(feature, value)
+     write_file_if_contents_changed("WebKitFeatures.txt", contents)
+ 
diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD
new file mode 100644
index 000000000..f8ec61fe5
--- /dev/null
+++ b/extra/webkitgtk2/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 183468 2013-04-21 22:12:24Z heftig $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=webkitgtk2
+pkgver=1.10.2
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://webkitgtk.org/"
+license=('custom')
+makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
+options=('!libtool' '!emptydirs')
+source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
+sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
+
+build() {
+  cd "$srcdir/webkitgtk-$pkgver"
+  mkdir build-gtk2
+
+  cd build-gtk2
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+    --enable-introspection \
+    --disable-silent-rules \
+    --libexecdir=/usr/lib/webkitgtk2 \
+    --with-gstreamer=0.10 \
+    --with-gtk=2.0 \
+    --disable-webkit2
+  make all stamp-po
+}
+
+package() {
+  pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
+  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base')
+  conflicts=('libwebkit')
+  provides=("libwebkit=${pkgver}")
+  replaces=('libwebkit')
+  
+  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
+  make -j1 DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 3990a3ebb..b523e35f1 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170857 2012-11-12 20:06:11Z heftig $
+# $Id: PKGBUILD 183469 2013-04-21 22:12:25Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f83d10cb6dfbbaa7d3d5a9ff930edd4a0eef657de0e8aeeaaef0b187038681e1')
+sha256sums=('f4a02dad614bfc04b6a998440123633145f4011c3a1d35415492d2ff76c1707f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
index f5da6633b..50457ccbe 100644
--- a/extra/zeitgeist/PKGBUILD
+++ b/extra/zeitgeist/PKGBUILD
@@ -1,36 +1,46 @@
-# $Id: PKGBUILD 169475 2012-10-21 21:14:01Z eric $
-# Maintainer:
+# $Id: PKGBUILD 183481 2013-04-21 22:21:01Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=zeitgeist
-pkgver=0.9.5
+pkgver=0.9.12
 pkgrel=1
-pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications"
-arch=('i686' 'x86_64')
+pkgdesc="Service logging user activities and events"
+arch=(i686 x86_64)
 url="http://zeitgeist-project.com/"
-license=('GPL')
-depends=('python2-dbus' 'python2-gobject2' 'python2-xdg' 'xapian-core')
-makedepends=('intltool' 'raptor' 'python2-rdflib')
-checkdepends=('vala')
-source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2")
-md5sums=('5841e4624b07ba74866fb177f1c9aae7')
+license=(GPL2 LGPL2.1)
+depends=(sqlite json-glib telepathy-glib gtk3)
+makedepends=(intltool gobject-introspection vala raptor python2-rdflib)
+provides=(zeitgeist-datahub)
+conflicts=(zeitgeist-datahub)
+replaces=(zeitgeist-datahub)
+options=('!libtool')
+source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz")
+sha256sums=('f9b1b656dcd4da57438289316d44f8960ce0ee4773ea2fbab4bce165330f41cd')
+
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's/python -/$PYTHON -/' configure configure.ac
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/python -/$PYTHON -/' configure
-  PYTHON=/usr/bin/python2 LIBS+="-lgmodule-2.0" ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/zeitgeist --localstatedir=/var
+  cd $pkgname-$pkgver
+  export PYTHON=/usr/bin/python2
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname
   make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 check
+  cd $pkgname-$pkgver
+  # Log test fails in chroot, as we have no X and no proper dbus
+  make -k check || :
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" zeitgeistdocdir=/usr/share/doc/zeitgeist install
-  install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon"
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install #zeitgeistdocdir=/usr/share/doc/zeitgeist install
+  #install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon"
 }
diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD
index a94d7e3ae..520ab11ea 100644
--- a/extra/zenity/PKGBUILD
+++ b/extra/zenity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169963 2012-10-30 22:58:54Z heftig $
+# $Id: PKGBUILD 183472 2013-04-21 22:12:29Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=zenity
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Display graphical dialog boxes from shell scripts"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ depends=('gtk3' 'libnotify')
 makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be')
+sha256sums=('94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index cc3749800..9d771b952 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -7,8 +7,7 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=2.11.4
-_build=
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -19,7 +18,7 @@ makedepends=('opencl-headers')
 provides=(${pkgname%-$_pkgflag}=$pkgver)
 conflicts=${pkgname%-$_pkgflag}
 replaces=${pkgname%-$_pkgflag}
-source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-$pkgver.tar.bz2"
+source=(http://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v3.0.0.tar.gz
         "${pkgname%-$_pkgflag}.conf.d"
         "${pkgname%-$_pkgflag}.service")
 backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
@@ -27,22 +26,22 @@ backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
 [ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
 
 build() {
-  cd "$srcdir"
-  cd ${pkgname%-$_pkgflag}-$pkgver${_build}
+  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
 
   # Use in-tree jansson since it is not compatible with jansson 2.0
   #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
 
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
-
-  ./configure --prefix=/usr --enable-cpumining --enable-scrypt --disable-adl
+  
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-scrypt --disable-adl
   
   make
 }
 
 package() {
-  cd "$srcdir"/${pkgname%-$_pkgflag}-$pkgver${_build}
+  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
@@ -52,6 +51,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-md5sums=('535ca85b504bd408d1eeddf4962ed685'
+md5sums=('63551fdb16086d57bfa4d39cd40d74cd'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD
deleted file mode 100644
index 24b667a67..000000000
--- a/libre/django-countries/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=django-countries
-pkgver=1.5
-pkgdesc="Provides a country field for Django models"
-license=('custom:MIT')
-url="http://bitbucket.org/smileychris/django-countries/"
-
-pkgrel=1
-arch=(any)
-depends=('django')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=(6c65fcc3aa7de065a54cdb619397626d)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
-  # fix python->python2, and a typo!
-  sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./setup.py install --root="$pkgdir/" --optimize=1
-}
diff --git a/libre/python2-cssmin-fredj/PKGBUILD b/libre/python2-cssmin-fredj/PKGBUILD
new file mode 100644
index 000000000..0f155de89
--- /dev/null
+++ b/libre/python2-cssmin-fredj/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=python2-cssmin
+pkgname=python2-cssmin-fredj
+pkgver=0.1.4.git4 # 0.1.4.git<number of commits after 0.1.4>
+_gitver='commit=3422b9962c5a6c2adb9597f418131d73e991c9b6'
+pkgdesc="Provides a country field for Django models"
+license=('custom:MIT')
+url="http://bitbucket.org/smileychris/django-countries/"
+
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+pkgrel=1
+arch=(any)
+
+makedepends=('python2-distribute')
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('09649b374d148014a5644e9df8fcf18e')
+
+mkmakedepends=('git')
+mksource=("$pkgname-$pkgver::git://github.com/fredj/cssmin.git#${_gitver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py src/cssmin.py
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+}
+
diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD
new file mode 100644
index 000000000..36bc6a580
--- /dev/null
+++ b/libre/python2-django-countries/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=django-countries
+pkgname=python2-$_pkgname
+pkgver=1.5
+pkgdesc="Provides a country field for Django models"
+url="http://bitbucket.org/smileychris/$_pkgname/"
+license=('custom:MIT')
+
+replaces=($_pkgname)
+conflicts=($_pkgname)
+
+pkgrel=3
+arch=(any)
+depends=('python2-django')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+md5sums=(6c65fcc3aa7de065a54cdb619397626d)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
+  # fix help message: (python2, typo)
+  # "python regenenerate.py" -> "python2 regenerate.py"
+  sed -i 's|python regen[a-z]*\.py|python2 regenerate.py|' */bin/regenerate.py
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index 2158c2892..e8a981a3d 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178747 2013-02-26 16:32:57Z tpowa $
+# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
 pkgver=3.11
-pkgrel=2
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client (without nonfree ServPoET recommendation)"
+pkgrel=3
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
@@ -19,26 +19,23 @@ provides=("rp-pppoe=$pkgver")
 replaces=('rp-pppoe')
 conflicts=('rp-pppoe')
 install=rp-pppoe.install
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
-        adsl adsl.service kmode.patch $pkgname.patch)
-md5sums=('13b5900c56bd602df6cc526e5e520722'
-         '8fc724aa146dba52ef7b3fbe5b8784c6'
-         'adace1ad441aa88dcb3db52fb7f9c97f'
-         'af234125f956f3a356ab0d0fcaa9e8a2'
-         'd38a903a247d689ff0323d7b6caa1c6b'
-         '3c53d550ac408608abb0b6cd6b76b6c2')
+source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
+       adsl.service 
+       kmode.patch
+       $pkgname.patch)
 
-build() {
+prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
   
-  ## Adding patch to remove unfree software recommendation (ServPoET)
+  ## Adding patch to remove nonfree software recommendation (ServPoET)
   patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
 
-  cd ./src
-
-  ## Adding support kernel mode
+  cd "$srcdir/$_pkgname-$pkgver/src"
   patch -Np2 -i ../../kmode.patch
+}
 
+build() {
+  cd "$srcdir/$_pkgname-$pkgver/src"
   ./configure --prefix=/usr --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
@@ -47,6 +44,11 @@ package() {
   cd "$srcdir/$_pkgname-$pkgver/src"
   make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
 
-  install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
-  install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
+  #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
+  install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
 }
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+         'SKIP'
+         'af234125f956f3a356ab0d0fcaa9e8a2'
+         'd38a903a247d689ff0323d7b6caa1c6b'
+         '3c53d550ac408608abb0b6cd6b76b6c2')
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index 8b3c74d7c..b37ef217c 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -7,9 +7,9 @@
 
 _pkgname=soundkonverter
 pkgname=soundkonverter-libre
-pkgver=2.0.0
+pkgver=2.0.1
 pkgrel=1
-pkgdesc="Front-end to various audio converters (without nonfree faac and mac recommendation)"
+pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
 arch=('i686' 'x86_64')
 url="http://www.kde-apps.org/content/show.php?content=29024"
 license=('GPL')
@@ -36,7 +36,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=$_pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('f1df729916b2418c474b859ed6b9eda6')
+md5sums=('d4f039003954c5279e56113237f608ca')
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD
index e3d5b265e..f87ce7e2a 100644
--- a/pcr/netatalk/PKGBUILD
+++ b/pcr/netatalk/PKGBUILD
@@ -5,13 +5,13 @@
 # Contributor: Farhan Yousaf <farhany at xaviya dot com>
 
 pkgname=netatalk
-pkgver=3.0.2
-pkgrel=1
+pkgver=3.0.3
+pkgrel=2
 pkgdesc='A kernel-level implementation of AFP services'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://netatalk.sourceforge.net'
 license=('GPL')
-depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent')
+depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python' 'dbus-glib')
 replaces=('netatalk-git' 'netatalk2')
 backup=('etc/afp.conf'
 	'etc/extmap.conf')
@@ -19,25 +19,28 @@ options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('b5f1c2c4b3a5e64f5bca219415aa1c75')
+md5sums=('0a6f3acefd27ad63d2cde6ae4702e1b4')
 
 build() {
 	cd $pkgname-$pkgver
-	msg2 'Fixing...'
-	sed -i -e 's:AC_CONFIG_SUBDIRS:#AC_CONFIG_SUBDIRS:' -e 's/x"linux/x"generic/' macros/netatalk.m4
-	sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in}
+
+	sed -i -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4
 	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in}
 	cp /usr/share/automake*/missing .
-	autoreconf -i >/dev/null
-	msg2 'Configuring...'
-	CFLAGS="-Wno-unused-result" ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc --with-init-style=systemd \
-		--with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no
-	sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile
-	msg2 'Making...'
-	make >/dev/null
+	autoreconf -i
+
+  ./configure --prefix=/usr \
+              --localstatedir=/var/state \
+              --sysconfdir=/etc \
+              --with-init-style=systemd \
+              --with-cracklib \
+              --with-cnid-cdb-backend \
+              --enable-pgp-uam \
+              --with-libevent=no
+
+	make
 }
 package() {
 	cd $pkgname-$pkgver
-	msg2 'Building...'
-	make DESTDIR="$pkgdir" install >/dev/null
+	make DESTDIR="$pkgdir" install
 }
diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog
index b1ada018b..712a8e5c1 100644
--- a/pcr/netatalk/netatalk.changelog
+++ b/pcr/netatalk/netatalk.changelog
@@ -1,3 +1,28 @@
+2013-03-27 SJ_UnderWater
+
+	* 3.0.3-1:
+	package update
+	minor fixes
+	python dependency
+
+2013-01-27 SJ_UnderWater
+
+	* 3.0.2-1:
+	package update
+	libevent fix
+	copy newer ./missing
+
+2013-01-05 SJ_UnderWater
+
+	* 3.0.1-5:
+	fixed AM deprecations
+	minor install fix
+
+2012-11-28 SJ_UnderWater
+
+	* 3.0.1-4 :
+	fixed mimic model
+
 2012-10-08 SJ_UnderWater
 
 	* 3.0.1-3 :
diff --git a/pcr/netatalk/netatalk.install b/pcr/netatalk/netatalk.install
index 629586531..b27dcd44b 100644
--- a/pcr/netatalk/netatalk.install
+++ b/pcr/netatalk/netatalk.install
@@ -2,12 +2,13 @@ post_install() {
 	post_upgrade
 }
 post_upgrade() {
-	if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
+	if [ -f /etc/rc.conf ];then
+	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
 	echo '>>> Detected old netatalk daemon entries in';
 	echo '>>> /etc/rc.conf, please replace these with';
 	echo '>>> "netatalk" before restarting!';
 	else echo '>>> Add "netatalk" to your DAEMONS list';fi
-	echo '>>>';
+	fi
 	if [ -f /etc/avahi/services/adisk.service ] ||
 	[ -f /etc/avahi/services/afpd.service ];then
 	echo '>>> Detected old netatalk service files in';
@@ -16,5 +17,5 @@ post_upgrade() {
 	if [ -f /opt/netatalk/afp_signature.conf ] ||
 	[ -f /opt/netatalk/afp_voluuid.conf ]; then
 	echo '>>> Found *.conf in /opt/netatalk, please';
-	echo '>>> migrate these to /etc/netatalk before restarting';fi
+	echo '>>> migrate these to /var/state/netatalk before restarting';fi
 }