Tue Oct 8 02:32:53 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-10-08 02:34:09 -0700
committer: root <root@rshg054.dnsready.net> 2013-10-08 02:34:09 -0700
commit: 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a (patch)
tree: a6af20a38d47d7a7ae8e1b98f70005c54644bbdd /community
parent: 9159b8ca1c97a398204d7a7d4d78c3394639bd02 (diff)
110 files changed, 411 insertions, 10624 deletions
diff --git a/community/account-plugins/PKGBUILD b/community/account-plugins/PKGBUILD
deleted file mode 100644
index b5928821b..000000000
--- a/community/account-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 79484 2012-11-06 04:10:50Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=account-plugins
-pkgver=0.9
-pkgrel=1
-pkgdesc="Account configuration plugins for credentials preferences"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/online-accounts-account-plugins"
-license=('GPL')
-depends=('credentials-preferences' 'signon-keyring-extension' 'signon-plugin-oauth2')
-makedepends=('gobject-introspection' 'vala' 'intltool')
-optdepends=('python-gobject: for account-console tool')
-options=('!libtool')
-install=$pkgname.install
-source=(https://launchpad.net/online-accounts-account-plugins/12.10/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('58deed9e3305877bb4db426a51451ec0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/account-plugins/account-plugins.install b/community/account-plugins/account-plugins.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community/account-plugins/account-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD
index 709f26825..de121bebf 100644
--- a/community/almanah/PKGBUILD
+++ b/community/almanah/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90849 2013-05-14 21:40:34Z andrea $
+# $Id: PKGBUILD 98185 2013-10-07 12:08:18Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=almanah
 pkgver=0.10.1
-pkgrel=3
+pkgrel=4
 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"
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 6e14bf1ac..b252b3314 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 94015 2013-07-13 12:31:02Z svenstaro $
+# $Id: PKGBUILD 98184 2013-10-07 12:07:00Z jgc $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
-pkgver=0.7.13
-pkgrel=2
+pkgver=0.9.2
+pkgrel=1
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64')
 url='http://cclive.sourceforge.net/'
-license=('GPL3')
-depends=('boost-libs' 'pcre' 'curl' 'libquvi')
-makedepends=('boost' 'chrpath')
-source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz")
-md5sums=('654892be303c2738dd078dbe6c78595d')
+license=('AGPL3')
+depends=('boost-libs' 'pcre' 'curl' 'libquvi' 'glibmm')
+makedepends=('boost')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('b21f2ed68242901dc0439132a4ea6629')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr boost_cv_rpath_link_ldflag="-L/usr/lib"
   make
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  chrpath --delete "$pkgdir"/usr/bin/cclive
 }
diff --git a/community/cdck/PKGBUILD b/community/cdck/PKGBUILD
deleted file mode 100644
index 4a3dc6f32..000000000
--- a/community/cdck/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 65681 2012-02-21 21:16:27Z cbrannon $
-# Maintainer: Chris Brannon <chris@the-brannons.com>
-# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
-# Previous Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-# Contributor: Slash <demodevil5[at]yahoo[dot]com>
-
-pkgname=cdck
-pkgver=0.7.0
-pkgrel=4
-pkgdesc="A simple program to verify CD/DVD quality"
-arch=('i686' 'x86_64')
-url="http://swaj.net/unix/"
-license=('GPL')
-depends=(gcc-libs)
-makedepends=('perl')
-options=('!libtool')
-source=(http://swaj.net/unix/cdck/${pkgname}-${pkgver}.tar.gz)
-md5sums=('15029d54b99f2e5cf8aae28077669d3f')
-
-build() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr --mandir=/usr/share/man
-    PATH="/usr/bin/core_perl:$PATH" make
-}
-
-package() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 8d6240c03..4f85c62de 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,44 +1,28 @@
-# $Id: PKGBUILD 95589 2013-08-14 21:07:27Z bgyorgy $
+# $Id: PKGBUILD 98187 2013-10-07 12:08:21Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
 # Based on gnome-control-center:
 # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=1.8.2
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
-depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet')
+depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet' 'cinnamon-settings-daemon')
 optdepends=('gnome-color-manager: for color management tasks')
 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"
-        "gnomerrlabeler.patch"
-        "idle-delay.patch"
-        "remove_obex.patch")
-sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f'
-            'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db'
-            '98227484162071744b5a336a5b3915c211f5eb1559034b3d40e4a9d790fe0e31'
-            '3df65b1f5e691d4a4634c05698da6df79cb23a0ebf71b201f23c48742b75b6e4')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
+sha256sums=('2a8ea5c17e515afd47d0f76127dbc5172281ef2b6aaf8a5c800ff7079d6d80f2')
 
 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"
-
-  # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
-  patch -Np1 -i "$srcdir/remove_obex.patch"
-
   autoreconf -fi
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-systemd \
diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch
deleted file mode 100644
index 7160bc788..000000000
--- a/community/cinnamon-control-center/gnomerrlabeler.patch
+++ /dev/null
@@ -1,766 +0,0 @@
-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-lib.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
deleted file mode 100644
index bdf0a8a4a..000000000
--- a/community/cinnamon-control-center/idle-delay.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c
---- cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c	2013-08-14 22:10:57.491152667 +0200
-+++ cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c	2013-08-14 21:58:36.533247961 +0200
-@@ -978,9 +978,6 @@
-   has_lid = up_client_get_lid_is_present (self->priv->up_client);
- 
- out:
--  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid);
--  gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid);
--  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid);    
-   gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries);
-   gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries);
-   gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries);
-@@ -1067,26 +1064,6 @@
-   g_signal_connect (widget, "changed",
-                     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.8.2.orig/panels/power/power.ui cinnamon-control-center-1.8.2/panels/power/power.ui
---- cinnamon-control-center-1.8.2.orig/panels/power/power.ui	2013-05-22 18:25:19.000000000 +0200
-+++ cinnamon-control-center-1.8.2/panels/power/power.ui	2013-08-14 21:57:54.872240364 +0200
-@@ -222,50 +222,6 @@
-               </packing>
-             </child>
-             <child>
--              <object class="GtkLabel" id="label_lid_action">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="halign">end</property>
--                <property name="label" translatable="yes">When the lid is closed</property>
--              </object>
--              <packing>
--                <property name="left_attach">0</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkComboBox" id="combobox_lid_battery">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="model">liststore_lid</property>
--                <property name="hexpand">True</property>
--                <accessibility>
--                  <relation type="labelled-by" target="label_header_battery"/>
--                  <relation type="labelled-by" target="label_lid_action"/>
--                </accessibility>
--              </object>
--              <packing>
--                <property name="left_attach">1</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkComboBox" id="combobox_lid_ac">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="model">liststore_lid</property>
--                <property name="hexpand">True</property>
--                <accessibility>
--                  <relation type="labelled-by" target="label_header_ac"/>
--                  <relation type="labelled-by" target="label_lid_action"/>
--                </accessibility>
--              </object>
--              <packing>
--                <property name="left_attach">2</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
-               <object class="GtkSeparator" id="separator_indicator">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
-@@ -468,12 +424,10 @@
-   </object>
-   <object class="GtkSizeGroup" id="sizegroup_combos">
-     <widgets>
--      <widget name="combobox_lid_battery"/>
--      <widget name="combobox_lid_ac"/>    
-       <widget name="combobox_critical"/>
-       <widget name="combobox_sleep_battery"/>
-       <widget name="combobox_sleep_ac"/>
-       <widget name="combobox_sleep_ac"/>
-     </widgets>
-   </object>
--</interface>
-\ No newline at end of file
-+</interface>
-diff -Naur cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c
---- cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c	2013-08-14 22:10:57.541153876 +0200
-+++ cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c	2013-08-14 21:55:41.905692072 +0200
-@@ -352,10 +352,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);
- }
- 
-@@ -385,7 +381,7 @@
- {
-   GtkTreeIter iter;
-   GtkTreeModel *model;
--  gint value;
-+  guint value;
-   gint value_tmp, value_prev;
-   gboolean ret;
-   guint i;
-@@ -400,7 +396,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,
-@@ -511,7 +507,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-control-center/remove_obex.patch b/community/cinnamon-control-center/remove_obex.patch
deleted file mode 100644
index abcf1be88..000000000
--- a/community/cinnamon-control-center/remove_obex.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/panels/bluetooth/bluetooth.ui
-+++ b/panels/bluetooth/bluetooth.ui
-@@ -543,34 +543,6 @@
-                                 <property name="position">3</property>
-                               </packing>
-                             </child>
--                            <child>
--                              <object class="GtkBox" id="browse_box">
--                                <property name="visible">True</property>
--                                <property name="can_focus">False</property>
--                                <child>
--                                  <placeholder/>
--                                </child>
--                                <child>
--                                  <object class="GtkButton" id="browse_button">
--                                    <property name="label" translatable="yes">Browse Files...</property>
--                                    <property name="can_focus">True</property>
--                                    <property name="receives_default">True</property>
--                                    <property name="use_action_appearance">False</property>
--                                  </object>
--                                  <packing>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                    <property name="pack_type">end</property>
--                                    <property name="position">1</property>
--                                  </packing>
--                                </child>
--                              </object>
--                              <packing>
--                                <property name="expand">False</property>
--                                <property name="fill">True</property>
--                                <property name="position">4</property>
--                              </packing>
--                            </child>
-                           </object>
-                           <packing>
-                             <property name="expand">False</property>
---- a/panels/bluetooth/cc-bluetooth-panel.c
-+++ b/panels/bluetooth/cc-bluetooth-panel.c
-@@ -311,7 +311,6 @@ cc_bluetooth_panel_update_properties (Cc
- 	gtk_widget_hide (WID ("keyboard_box"));
- 	gtk_widget_hide (WID ("sound_box"));
- 	gtk_widget_hide (WID ("mouse_box"));
--	gtk_widget_hide (WID ("browse_box"));
- 	gtk_widget_hide (WID ("send_box"));
- 
- 	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
-@@ -367,10 +366,10 @@ cc_bluetooth_panel_update_properties (Cc
- 
- 			uuids = (const char **) g_value_get_boxed (&value);
- 			for (i = 0; uuids && uuids[i] != NULL; i++) {
--				if (g_str_equal (uuids[i], "OBEXObjectPush"))
-+				if (g_str_equal (uuids[i], "OBEXObjectPush")) {
- 					gtk_widget_show (WID ("send_box"));
--				else if (g_str_equal (uuids[i], "OBEXFileTransfer"))
--					gtk_widget_show (WID ("browse_box"));
-+					break;
-+				}
- 			}
- 			g_value_unset (&value);
- 		}
-@@ -538,34 +537,6 @@ send_callback (GtkButton        *button,
- 	g_free (alias);
- }
- 
--static void
--mount_finish_cb (GObject *source_object,
--		 GAsyncResult *res,
--		 gpointer user_data)
--{
--	GError *error = NULL;
--
--	if (bluetooth_browse_address_finish (source_object, res, &error) == FALSE) {
--		g_printerr ("Failed to mount OBEX volume: %s", error->message);
--		g_error_free (error);
--		return;
--	}
--}
--
--static void
--browse_callback (GtkButton        *button,
--		 CcBluetoothPanel *self)
--{
--	char *bdaddr;
--
--	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
--
--	bluetooth_browse_address (G_OBJECT (self), bdaddr,
--				  GDK_CURRENT_TIME, mount_finish_cb, NULL);
--
--	g_free (bdaddr);
--}
--
- /* Visibility/Discoverable */
- static void discoverable_changed (BluetoothClient  *client,
- 				  GParamSpec       *spec,
-@@ -894,8 +865,6 @@ cc_bluetooth_panel_init (CcBluetoothPane
- 			  G_CALLBACK (keyboard_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("sound_link")), "activate-link",
- 			  G_CALLBACK (sound_callback), self);
--	g_signal_connect (G_OBJECT (WID ("browse_button")), "clicked",
--			  G_CALLBACK (browse_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("send_button")), "clicked",
- 			  G_CALLBACK (send_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("switch_connection")), "notify::active",
-                             
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
new file mode 100644
index 000000000..d9d585db2
--- /dev/null
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Alexandre Filgueria <alexfilgueira@antergos.com>
+# Contributor:  Jan de Groot <jan@archlinux.org>
+
+pkgname=cinnamon-desktop
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Library with common API for various Cinnamon modules"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes)
+makedepends=(intltool gobject-introspection itstool gnome-common)
+url="https://github.com/linuxmint/cinnamon-desktop"
+options=(!libtool)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
+sha256sums=('dd4ef4c14699a0566ae8e7e060a7db8574ef65dcdac80751de350788ea99ff3c')
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static \
+    --with-gnome-distributor="Arch Linux"
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index f935b5bab..66ed0d014 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -4,34 +4,37 @@
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-screensaver
-pkgver=1.8.0
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://github.com/linuxmint/cinnamon-screensaver"
 backup=(etc/pam.d/cinnamon-screensaver)
-depends=('cinnamon' 'gnome-screensaver')
+depends=('cinnamon' 'cinnamon-desktop')
 makedepends=('intltool' 'gnome-common')
 options=(!emptydirs)
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
        cinnamon-screensaver.pam
        fix-dbus-compatibility.patch
        lock_screen_on_suspend.patch)
-sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1'
+sha256sums=('90da7f811892f667202ecd1240091f9c4d253eebe223bbfedb3d544dd68b3fc7'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
             'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6'
             '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
 
-
   # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes
   patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
 
   # Lock screen on suspend with systemd
   patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
                --libexecdir=/usr/lib/cinnamon-screensaver \
@@ -45,9 +48,6 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver"
 
-  # Remove conflicts with gnome-screensaver
-  rm "$pkgdir"/usr/bin/gnome-screensaver{,-command}
-
   # Autostart only in Cinnamon
   cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \
     "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD
new file mode 100644
index 000000000..c73cb60eb
--- /dev/null
+++ b/community/cinnamon-session/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=cinnamon-session
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(systemd dconf gsettings-desktop-schemas gtk3
+         hicolor-icon-theme libgl libsm libxtst upower)
+makedepends=(intltool mesa json-glib gtk-doc xtrans gnome-common)
+options=('!emptydirs')
+install=cinnamon-session.install
+url="https://github.com/linuxmint/cinnamon-session"
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
+        timeout.patch)
+sha256sums=('d1eba64a5484f086f257ee75799d12afd77373fbdb0ced8d3ae48eadcd02a878'
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Increase timeout, for slow machines
+  patch -Np1 -i ../timeout.patch
+}
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \
+      --disable-schemas-compile --enable-systemd --disable-gconf
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-session/cinnamon-session.install b/community/cinnamon-session/cinnamon-session.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/community/cinnamon-session/cinnamon-session.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/community/cinnamon-session/timeout.patch b/community/cinnamon-session/timeout.patch
new file mode 100644
index 000000000..f4f5b64ca
--- /dev/null
+++ b/community/cinnamon-session/timeout.patch
@@ -0,0 +1,24 @@
+diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
+--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+ 
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+ 
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+                                        const char *default_provider,
+diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
+--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
+@@ -30,7 +30,7 @@
+ #include <X11/Xatom.h>
+ 
+ /* Wait up to this long for a running check to finish */
+-#define PROPERTY_CHANGE_TIMEOUT 5000
++#define PROPERTY_CHANGE_TIMEOUT 12000
+ 
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL            0
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
new file mode 100644
index 000000000..127c715ba
--- /dev/null
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=cinnamon-settings-daemon
+pkgver=2.0.1
+pkgrel=1
+pkgdesc="The Cinnamon Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dconf' 'cinnamon-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
+         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'libxklavier'
+         'libgnomekbd')
+makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl' 'gnome-common')
+options=('!emptydirs' '!libtool')
+install=cinnamon-settings-daemon.install
+url="https://github.com/linuxmint/cinnamon-settings-daemon"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
+sha256sums=('f03f5ea46bec11a6a0ed02b232dab8cb99a84fd8a9b52a76a454a7ba74dc1168')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install b/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/community/cinnamon-settings-daemon/cinnamon-settings-daemon.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/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index cd3603d04..a873998db 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 97850 2013-09-30 10:27:55Z allan $
+# $Id: PKGBUILD 98186 2013-10-07 12:08:20Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.8.8
-pkgrel=5
+pkgver=1.9.2
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 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'
+depends=('accountsservice' 'caribou' 'clutter-gtk' 'cjs' 'gnome-bluetooth'
+         'gnome-icon-theme' 'gnome-menus' 'cinnamon-settings-daemon' 'cinnamon-session'
          'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
-         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow'
-         'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat'
-         'gnome-panel')
+         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pexpect'
+         'python2-pyinotify' 'python2-lxml' 'webkitgtk' 'gnome-panel' 'python2' 'cinnamon-translations')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
             'cinnamon-screensaver: lock screen'
@@ -27,66 +26,38 @@ options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
         "remove_GC.patch"
-        "keyboard_applet.patch"
         "fix-control-center-check.patch"
-        "gnome-3.8.patch"
-        "switch-applications.patch"
-        "fallback-helpers.patch"
-        "idle-dim.patch"
-        "background.patch"
-        "bluetooth_obex_transfer.patch"
-        "disable-mpris-support.patch")
-sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d'
+        "background.patch")
+sha256sums=('0abaa8da02c4d626084aa482adc551af154796c4c35faaebebdac896ce72aa6d'
             '3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680'
-            'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
-            '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e'
-            '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
-            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
-            'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100'
-            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f'
-            '4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2'
-            'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7')
+            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f')
 
-build() {
+prepare() {
   cd ${srcdir}/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
+  sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
   find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
   # Fix crasher when disconnecting from wifi
   patch -Np1 -i ../remove_GC.patch
 
-  # Fix Keyboard applet
-  # https://github.com/linuxmint/Cinnamon/issues/1337
-  patch -Np1 -i ../keyboard_applet.patch
-
   # Check for the cc-panel path, not for the unneeded binary
   patch -Np1 -i ../fix-control-center-check.patch
 
-  # https://github.com/linuxmint/Cinnamon/pull/1888
-  patch -Np1 -i ../gnome-3.8.patch
-
-  # Fix windows switcher keybinding with default settings in GNOME 3.8
-  patch -Np1 -i ../switch-applications.patch
-
-  # Start media keys and mount helpers with the session
-  patch -Np1 -i ../fallback-helpers.patch
-
-  # Fix brightness applet for GNOME 3.8
-  patch -Np1 -i ../idle-dim.patch
-
   # Fix missing backgrounds
   patch -Np1 -i ../background.patch
 
-  # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
-  patch -Np1 -i ../bluetooth_obex_transfer.patch
+  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
+  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings.desktop
 
-  # Disable MPRIS support (workaround for FS#35282)
-  patch -Np1 -i ../disable-mpris-support.patch
+  # fix for the python2 PAM module  
+  sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+}
+
+build() {
+  cd ${srcdir}/Cinnamon*
 
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
@@ -96,7 +67,7 @@ build() {
                --disable-schemas-compile \
                --enable-compile-warnings=yes \
                --with-session-tracking=systemd
-  make
+  make CFLAGS="${CFLAGS} -Wno-deprecated -Wno-deprecated-declarations"
 }
 
 package() {
@@ -105,7 +76,4 @@ package() {
 
   # Remove leftover files after patching
   find "$pkgdir" -type f -name *.orig | xargs rm
-
-  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
-  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' "$pkgdir/usr/share/applications/cinnamon-settings.desktop"
 }
diff --git a/community/cinnamon/bluetooth_obex_transfer.patch b/community/cinnamon/bluetooth_obex_transfer.patch
deleted file mode 100644
index 0e632c48b..000000000
--- a/community/cinnamon/bluetooth_obex_transfer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
-@@ -455,22 +455,6 @@ MyApplet.prototype = {
-                 this._applet.send_to_address(device.bdaddr, device.alias);
-             }));
-         }
--        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
--            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
--                this._applet.browse_address(device.bdaddr, event.get_time(),
--                    Lang.bind(this, function(applet, result) {
--                        try {
--                            applet.browse_address_finish(result);
--                        } catch (e) {
--                            this._ensureSource();
--                            this._source.notify(new MessageTray.Notification(this._source,
--                                 _("Bluetooth"),
--                                 _("Error browsing device"),
--                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
--                        }
--                    }));
--            }));
--        }
- 
-         switch (device.type) {
-         case GnomeBluetoothApplet.Type.KEYBOARD:
diff --git a/community/cinnamon/disable-mpris-support.patch b/community/cinnamon/disable-mpris-support.patch
deleted file mode 100644
index dff615f4f..000000000
--- a/community/cinnamon/disable-mpris-support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
---- Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js	2013-08-14 16:44:19.955273614 +0000
-+++ Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js	2013-08-14 16:46:34.171029992 +0000
-@@ -600,13 +600,6 @@
- 
-             // menu not showed by default
-             this._players = {};
--            // watch players
--            for (var p=0; p<compatible_players.length; p++) {
--                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
--                    Lang.bind(this, this._addPlayer),
--                    Lang.bind(this, this._removePlayer)
--                );
--            }
- 
-             this._control = new Gvc.MixerControl({ name: 'Cinnamon Volume Control' });
-             this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
diff --git a/community/cinnamon/fallback-helpers.patch b/community/cinnamon/fallback-helpers.patch
deleted file mode 100644
index b6810cdba..000000000
--- a/community/cinnamon/fallback-helpers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-25 01:30:35.435650613 +0200
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Cinnamon (Software Rendering)
--RequiredComponents=cinnamon2d;gnome-settings-daemon;
-+RequiredComponents=cinnamon2d;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
- DesktopName=GNOME
- 
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-25 01:30:33.645607769 +0200
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Cinnamon
--RequiredComponents=cinnamon;gnome-settings-daemon;
-+RequiredComponents=cinnamon;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
- DesktopName=GNOME
- 
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
deleted file mode 100644
index b79ea497a..000000000
--- a/community/cinnamon/gnome-3.8.patch
+++ /dev/null
@@ -1,4186 +0,0 @@
-From 2ba97ed278777fcb96b86cd58e9176536585ad2d 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/16] 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 72133f97fbd99c78169cec49e18b97da3edba524 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/16] 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 28210e29e3e0d81c68320b9511574a168f5779e4 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/16] 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 f12f8c5..939ea70 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -746,6 +746,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>
-@@ -776,8 +793,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>
---- linuxmint-Cinnamon-a464dc9.orig/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 18:01:56.000000000 +0200
-+++ linuxmint-Cinnamon-a464dc9/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py  2013-04-30 23:36:46.718385152 +0200
-@@ -232,11 +232,11 @@
-     
- 
- 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 @@
-         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)
-     
-@@ -445,12 +445,11 @@
-             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, -1)
--        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 @@
-         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, self._cinnamon_background_schema)
-         if self._cinnamon_background_schema["mode"] == "slideshow":
-             self.mainbox.add(self.slideshow_pane)
-         else:
-@@ -536,21 +535,21 @@
-         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 74154ab..99aee95 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 3bab29c..6bac83c 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 c971d472a88f8ea725b2bef33715016e111732d9 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/16] 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 939ea70..6d8c82d 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -808,7 +808,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 0147459229b449757bac9a92c173c4bd3c2f9eca 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/16] 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 6d8c82d..567dca8 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -808,7 +808,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 706d244a9dbe2ace9860044e2245a285d8473f47 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/16] [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  | 511 ++++++---------------
- .../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, 774 insertions(+), 1034 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._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._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) {
--            if (icon) {    
--                this.set_applet_icon_symbolic_name('battery-missing');
--                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 50c4e1e..c8427ac 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,95 +11,50 @@ 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: 'ox',
--                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='s' />
-+<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/";
--let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp" ];
--let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ];
-+let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ];
-+let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ];
- /* dummy vars for translation */
- let x = _("Playing");
- x = _("Paused");
-@@ -112,131 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */
- const ICON_SIZE = 28;
- 
- 
--function Prop() {
--    this._init.apply(this, arguments);
--}
--
--Prop.prototype = {
--    _init: function(owner) {
--        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
--    }
--}
--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);
--            }));
--    }
-+var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace);
-+function Prop(owner, initCallback, cancellable) {
-+    return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
- }
--DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace)
- 
--function MediaServer2Player() {
--    this._init.apply(this, arguments);
-+var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace);
-+function MediaServer2(owner, initCallback, cancellable) {
-+    return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
- }
- 
--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);
--            }));
--    },
--    setPosition: function(value) {
--        this.SetRemote('Position', value);
--    },
--    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);
--    },
--    getCanSeek: function(callback) {
--        this.GetRemote('CanSeek', Lang.bind(this,
--            function(canSeek, err) {
--                if (!err) {
--                    callback(this, canSeek);
--                }
--            }));
--    }
-+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);
-@@ -355,7 +198,6 @@ Player.prototype = {
-     _init: function(system_status_button, owner) {
-         PopupMenu.PopupMenuSection.prototype._init.call(this);
- 
--        this.showPosition = true; // @todo: Get from settings
-         this._owner = owner;
-         this._system_status_button = system_status_button;
-         this._name = this._owner.split('.')[3];
-@@ -389,7 +231,7 @@ Player.prototype = {
-         this.infos_top.add_actor(this._artist.getActor());
-         this.infos_bottom.add_actor(this._album.getActor());
-         this.infos_top.add_actor(this._title.getActor());
--
-+        this.infos_bottom.add_actor(this._time.getActor());
-         this._trackInfosTop.set_child(this.infos_top);
-         this._trackInfosBottom.set_child(this.infos_bottom);
- 
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -414,45 +414,20 @@
-         this._trackControls.set_child(this.controls);
-         this.addActor(this._trackControls);
- 
--        this._seekControls = new St.Bin({style_class: 'sound-seek', x_align: St.Align.START});
--        this.seekControls = new St.BoxLayout({style_class: 'sound-seek-box'});
--        this.seekControls.add_actor(this._time.getActor());
--
--        this._positionSlider = new PopupMenu.PopupSliderMenuItem(0);
--        this._positionSlider.connect('value-changed', Lang.bind(this, function(item) {
--            let time = item._value * this._songLength;
--            this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength));
--        }));
--        this._positionSlider.connect('drag-end', Lang.bind(this, function(item) {
--            let time = item._value * this._songLength;
--            this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength));
--            this._wantedSeekValue = Math.round(time * 1000000);
--            this._mediaServerPlayer.SetPositionRemote(this._trackObj, time * 1000000);
--        }));
--
--        this.sliderBin = new St.Bin({style_class: 'sound-seek-slider'});
--        this.sliderBin.set_child(this._positionSlider.actor);
--        this.seekControls.add_actor(this.sliderBin);
--        this._seekControls.set_child(this.seekControls);
--        this.addActor(this._seekControls);
--
--        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) {
-@@ -465,39 +440,23 @@
-         this._getMetadata();
-         this._currentTime = 0;
-         this._getPosition();
--        this._wantedSeekValue = 0;
--        this._updatePositionSlider();
- 
--        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"]);
--            //qmmp
--            if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-+                this._setMetadata(value["Metadata"]);
-+            // qmmp
-+            if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-                 if (value["playbackStatus"])
--                    this._setStatus(iface, value["playbackStatus"]);
-+                    this._setStatus(value["playbackStatus"]);
-                 if (value["metadata"])
--                    this._setMetadata(sender, value["metadata"]);
--            } 
--        }));
--
--        this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) {
--            if (value > 0) {
--                this._setPosition(value);
--            }
--            // Seek initiated by the position slider
--            else if (this._wantedSeekValue > 0) {
--                // Some broken gstreamer players (Banshee) reports always 0
--                // when the track is seeked so we set the position at the
--                // value we set on the slider
--                this._setPosition(this._wantedSeekValue);
-+                    this._setMetadata(value["metadata"]);
-             }
--            // Seek value send by the player
--            else
--                this._setPosition(value);
-+        }));
- 
--            this._wantedSeekValue = 0;
-+        this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
-+            this._setPosition(sender, value);
-         }));
- 
-         Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
-
-@@ -512,45 +303,26 @@ Player.prototype = {
-         this._playerInfo.setText(this._getName() + " - " + _(status));
-     },
- 
--    _updatePositionSlider: function(position) {
--        this._mediaServerPlayer.getCanSeek(Lang.bind(this, function(sender, canSeek) {
--            this._canSeek = canSeek;
--            
--            if (this._songLength == 0 || position == false)
--                this._canSeek = false
--
--            // Clem: The following code was commented out. When the next song started, it resulted in hiding the sound menu, making it hard for the user to repeatedly click on the next song button.
--            // There's probably a better fix and this was not tested with players which don't support seeking, but it fixes the regression created by the slider (apparently when the slider is hidden it closes the menu)
--            // if (this._playerStatus == "Playing" && this._canSeek && this.showPosition)
--            //     this._positionSlider.actor.show();
--            // else
--            //     this._positionSlider.actor.hide();
--        }));
--    },
--
--    _setPosition: function(value) {
--        if (value == null && this._playerStatus != 'Stopped') {
--            this._updatePositionSlider(false);
--        }
--        else {
--            this._currentTime = value / 1000000;
--            this._updateTimer();
--        }
-+    _setPosition: function(sender, value) {
-+        this._stopTimer();
-+        this._currentTime = value / 1000000;
-+        this._updateTimer();
-+        if (this._playerStatus == "Playing")
-+            this._runTimer();
-     },
- 
-     _getPosition: function() {
--        this._mediaServerPlayer.getPosition(Lang.bind(this, function(sender, value) {
--            this._setPosition(value);
--        }));
-+    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")
-@@ -559,26 +333,29 @@ 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"]) {
--            this._trackObj = metadata["mpris:trackid"];
--        }
-+        /*if (metadata["mpris:trackid"]) {
-+            this._trackId = {
-+                _init: function() {
-+                    DBus.session.proxifyObject(this, this._owner, metadata["mpris:trackid"]);
-+                }
-+            }
-+        }*/
- 
-         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;
-             }
-         }
-@@ -600,8 +377,7 @@ Player.prototype = {
-                     cover.read_async(null, null, Lang.bind(this, this._onReadCover));
-                 }
-                 else {
--                    cover_path = decodeURIComponent(this._trackCoverFile);
--                    cover_path = cover_path.replace("file://", "");
-+                    cover_path = decodeURIComponent(this._trackCoverFile.substr(7));
-                     this._showCover(cover_path);
-                 }
-             }
-@@ -611,13 +387,10 @@ Player.prototype = {
-     },
- 
-     _getMetadata: function() {
--        this._mediaServerPlayer.getMetadata(Lang.bind(this,
--            this._setMetadata
--        ));
-+    this._setMetadata(this._mediaServerPlayer.Metadata);
-     },
- 
--    _setStatus: function(sender, status) {
--        this._updatePositionSlider();
-+    _setStatus: function(status) {
-         this._playerStatus = status;
-         if (status == "Playing") {
-             this._playButton.setIcon("media-playback-pause");
-@@ -631,53 +404,39 @@ Player.prototype = {
-             this._playButton.setIcon("media-playback-start");
-             this._stopTimer();
-         }
--
-         this._playerInfo.setImage("player-" + status.toLowerCase());
-         this._setName(status);
-     },
- 
-     _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() {
--        if (this.showPosition && this._canSeek) {
--            if (!isNaN(this._currentTime) && !isNaN(this._songLength) && this._currentTime > 0)
--                this._positionSlider.setValue(this._currentTime / this._songLength);
--            else
--                this._positionSlider.setValue(0);
--        }
-         this._time.setLabel(this._formatTime(this._currentTime) + " / " + this._formatTime(this._songLength));
-     },
- 
-     _runTimer: function() {
--        if (this._playerStatus == 'Playing') {
--            this._timeoutId = Mainloop.timeout_add_seconds(1, Lang.bind(this, this._runTimer));
--            this._currentTime += 1;
--            this._updateTimer();
--        }
-+        /*if (!Tweener.resumeTweens(this)) {
-+            Tweener.addTween(this,
-+                { time: this._songLength - this._currentTime,
-+                  transition: 'linear',
-+                  onUpdate: Lang.bind(this, this._updateTimer) });
-+        }*/
-     },
- 
-     _pauseTimer: function() {
--        if (this._timeoutId != 0) {
--            Mainloop.source_remove(this._timeoutId);
--            this._timeoutId = 0;
--        }
--        this._updateTimer();
-+        //Tweener.pauseTweens(this);
-     },
- 
-     _stopTimer: function() {
-+        /*Tweener.removeTweens(this);
-         this._currentTime = 0;
--        this._pauseTimer();
--        this._updateTimer();
-+        this._updateTimer();*/
-     },
- 
-     _formatTime: function(s) {
-@@ -771,7 +530,7 @@ MediaPlayerLauncher.prototype = {
-     },
- 
-     activate: function (event) {
--    	this._menu.actor.hide();
-+        this._menu.actor.hide();
-         this._app.activate_full(-1, event.get_time());
-         return true;
-     }
-@@ -799,7 +558,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], Gio.BusNameWatcherFlags.NONE,
-                     Lang.bind(this, this._addPlayer),
-                     Lang.bind(this, this._removePlayer)
-                 );
-@@ -930,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;
-@@ -945,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);
- 
-@@ -974,21 +733,21 @@ MyApplet.prototype = {
-         this._volumeControlShown = true;
- 
-         if (this._nbPlayers()==0){
--        	this._availablePlayers = new Array();
-+            this._availablePlayers = new Array();
-             let appsys = Cinnamon.AppSystem.get_default();
-             let allApps = appsys.get_all();
-             let listedDesktopFiles = new Array();
-             for (let y=0; y<allApps.length; y++) {
--            	let app = allApps[y];
--            	let entry = app.get_tree_entry();
--            	let path = entry.get_desktop_file_path();
--            	for (var p=0; p<compatible_players.length; p++) {
-+                let app = allApps[y];
-+                let entry = app.get_tree_entry();
-+                let path = entry.get_desktop_file_path();
-+                for (var p=0; p<compatible_players.length; p++) {
-                     let desktopFile = compatible_players[p]+".desktop";
--            		if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) {
--                		this._availablePlayers.push(app);
-+                    if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) {
-+                        this._availablePlayers.push(app);
-                         listedDesktopFiles.push(desktopFile);
--            		}
--           		}
-+                    }
-+                }
-             }
- 
-             if (this._availablePlayers.length > 0){
-@@ -1137,19 +896,19 @@ MyApplet.prototype = {
-             this._mutedChanged (null, null, '_output');
-             this._volumeChanged (null, null, '_output');
-             let sinks = this._control.get_sinks();
--	        this._selectDeviceItem.menu.removeAll();
--	        for (let i = 0; i < sinks.length; i++) {
--	        	let sink = sinks[i];
--	        	let menuItem = new PopupMenu.PopupMenuItem(sink.get_description());
--	        	if (sinks[i].get_id() == this._output.get_id()) {
--	        		menuItem.setShowDot(true);
--	        	}
--	        	menuItem.connect('activate', Lang.bind(this, function() {
--	        		log('Changing default sink to ' + sink.get_description());
--	                this._control.set_default_sink(sink);
--	            }));
--	            this._selectDeviceItem.menu.addMenuItem(menuItem);
--	        }
-+            this._selectDeviceItem.menu.removeAll();
-+            for (let i = 0; i < sinks.length; i++) {
-+                let sink = sinks[i];
-+                let menuItem = new PopupMenu.PopupMenuItem(sink.get_description());
-+                if (sinks[i].get_id() == this._output.get_id()) {
-+                    menuItem.setShowDot(true);
-+                }
-+                menuItem.connect('activate', Lang.bind(this, function() {
-+                    log('Changing default sink to ' + sink.get_description());
-+                    this._control.set_default_sink(sink);
-+                }));
-+                this._selectDeviceItem.menu.addMenuItem(menuItem);
-+            }
-         } else {
-             this._outputSlider.setValue(0);
-             this.setIconName('audio-volume-muted-symbolic');
-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 3446e7a..7523b6f 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 99aee95..b602915 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 135d2228bbf6d3b1be5f90e0e599cd3880e06d93 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/16] [GDBus][Sound/Power Applet] Fix dbus port issues
-
----
- 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 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) {
--- 
-1.8.1.6
-
-
-From 5880ce34538ec2791b5e58cc3ffc07e41c189c82 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/16] 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 647bd58c93541acdba11cd11d586d2cb08a0a4eb 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/16] 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 7a8233638187d00798cf3a4b66a27d707eaec804 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/16] [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 1a74c4a4d010a6ddcd2350b1ea298710bc1c08b1 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/16] 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 dfa107fd874866da2f634c65a90e2c13a447464c 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/16] 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 28b39b2372a571ddcc1298f34f2d7e653f6b2e96 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/16] 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 aba3a7666d3679e5803862af07edc47e7b093b11 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/16] 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 3e1cdf6d88ade9abe5a0b8773b565d345c01f2cb 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/16] 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
-
-
-From 7904eaf179918f4f97b328f2b5f340776544ca49 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 18:27:39 -0400
-Subject: [PATCH 16/16] Sledgehammer merge of:
-
-f251f0b77d01cb9a80212b1dce2538c60a5bf59e
-
-Don't ask...
----
- .../share/cinnamon/applets/sound@cinnamon.org/applet.js    | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-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 c8427ac..a7b2e09 100644
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -53,8 +53,8 @@ const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
- 
- /* global values */
- let icon_path = "/usr/share/cinnamon/theme/";
--let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ];
--let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ];
-+let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp"];
-+let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ];
- /* dummy vars for translation */
- let x = _("Playing");
- x = _("Paused");
-
-@@ -377,7 +384,8 @@ Player.prototype = {
-                     cover.read_async(null, null, Lang.bind(this, this._onReadCover));
-                 }
-                 else {
--                    cover_path = decodeURIComponent(this._trackCoverFile.substr(7));
-+                    cover_path = decodeURIComponent(this._trackCoverFile);
-+                    cover_path = cover_path.replace("file://", "");
-                     this._showCover(cover_path);
-                 }
-             }
--- 
-1.8.1.6
-
-From 1f209cec0fa0e9d12b3c29884302f4b8e70ff4c9 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Thu, 9 May 2013 11:48:08 -0400
-Subject: [PATCH] Fix notifications and other stuff
-
----
- .../cinnamon/applets/sound@cinnamon.org/applet.js  |   2 +-
- js/ui/notificationDaemon.js                        |   7 +-
- src/main.c                                         | 169 ++++++++++++---------
- 3 files changed, 103 insertions(+), 75 deletions(-)
-
-diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
-index b037e07..58b2df3 100644
---- a/js/ui/notificationDaemon.js
-+++ b/js/ui/notificationDaemon.js
-@@ -220,7 +220,12 @@ NotificationDaemon.prototype = {
-     NotifyAsync: function(params, invocation) {
-         let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
-         let id;
--        
-+
-+        for (let hint in hints) {
-+            // unpack the variants
-+            hints[hint] = hints[hint].deep_unpack();
-+        }
-+
-         let rewrites = rewriteRules[appName];
-         if (rewrites) {
-             for (let i = 0; i < rewrites.length; i++) {
-diff --git a/src/main.c b/src/main.c
-index 418fb60..773fb65 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -34,99 +34,122 @@
- #define OVERRIDES_SCHEMA "org.cinnamon.overrides"
- 
- static void
-+cinnamon_dbus_acquire_name (GDBusProxy *bus,
-+                         guint32     request_name_flags,
-+                         guint32    *request_name_result,
-+                         gchar      *name,
-+                         gboolean    fatal)
-+{
-+  GError *error = NULL;
-+  GVariant *request_name_variant;
-+
-+  if (!(request_name_variant = g_dbus_proxy_call_sync (bus,
-+                                                       "RequestName",
-+                                                       g_variant_new ("(su)", name, request_name_flags),
-+                                                       0, /* call flags */
-+                                                       -1, /* timeout */
-+                                                       NULL, /* cancellable */
-+                                                       &error)))
-+    {
-+      g_printerr ("failed to acquire %s: %s\n", name, error->message);
-+      if (!fatal)
-+        return;
-+      exit (1);
-+    }
-+  g_variant_get (request_name_variant, "(u)", request_name_result);
-+}
-+
-+static void
-+cinnamon_dbus_acquire_names (GDBusProxy *bus,
-+                          guint32     request_name_flags,
-+                          gchar      *name,
-+                          gboolean    fatal, ...) G_GNUC_NULL_TERMINATED;
-+
-+static void
-+cinnamon_dbus_acquire_names (GDBusProxy *bus,
-+                          guint32     request_name_flags,
-+                          gchar      *name,
-+                          gboolean    fatal, ...)
-+{
-+  va_list al;
-+  guint32 request_name_result;
-+  va_start (al, fatal);
-+  for (;;)
-+  {
-+    cinnamon_dbus_acquire_name (bus,
-+                             request_name_flags,
-+                             &request_name_result,
-+                             name, fatal);
-+    name = va_arg (al, gchar *);
-+    if (!name)
-+      break;
-+    fatal = va_arg (al, gboolean);
-+  }
-+  va_end (al);
-+}
-+
-+static void
- cinnamon_dbus_init (gboolean replace)
- {
-+  GDBusConnection *session;
-+  GDBusProxy *bus;
-   GError *error = NULL;
--  DBusGConnection *session;
--  DBusGProxy *bus;
-   guint32 request_name_flags;
-   guint32 request_name_result;
- 
--  /** TODO:
--   * In the future we should use GDBus for this.  However, in
--   * order to do that, we need to port all of the JavaScript
--   * code.  Otherwise, the name will be claimed on the wrong
--   * connection.
--   */
--  session = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+  session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
- 
--  bus = dbus_g_proxy_new_for_name (session,
--                                   DBUS_SERVICE_DBUS,
--                                   DBUS_PATH_DBUS,
--                                   DBUS_INTERFACE_DBUS);
-+  if (error) {
-+    g_printerr ("Failed to connect to session bus: %s", error->message);
-+    exit (1);
-+  }
- 
--  request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT;
-+  bus = g_dbus_proxy_new_sync (session,
-+                               G_DBUS_PROXY_FLAGS_NONE,
-+                               NULL, /* interface info */
-+                               "org.freedesktop.DBus",
-+                               "/org/freedesktop/DBus",
-+                               "org.freedesktop.DBus",
-+                               NULL, /* cancellable */
-+                               &error);
-+
-+  request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT;
-   if (replace)
-     request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, CINNAMON_DBUS_SERVICE,
--                          G_TYPE_UINT, request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_printerr ("failed to acquire org.Cinnamon: %s\n", error->message);
--      exit (1);
--    }
-+
-+  cinnamon_dbus_acquire_name (bus,
-+                           request_name_flags,
-+                           &request_name_result,
-+                           CINNAMON_DBUS_SERVICE, TRUE);
-   if (!(request_name_result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER
-         || request_name_result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER))
-     {
--      g_printerr ("%s already exists on bus and --replace not specified\n",
--                  CINNAMON_DBUS_SERVICE);
-+      g_printerr (CINNAMON_DBUS_SERVICE " already exists on bus and --replace not specified\n");
-       exit (1);
-     }
- 
--  /* Also grab org.gnome.Panel to replace any existing panel process */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error, G_TYPE_STRING,
--                          "org.gnome.Panel", G_TYPE_UINT,
--                          DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID, G_TYPE_UINT,
--                          &request_name_result, G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.gnome.Panel: %s\n", error->message);
--      exit (1);
--    }
--
--  /* ...and the org.gnome.Magnifier service.
--   */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, MAGNIFIER_DBUS_SERVICE,
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire %s: %s\n", MAGNIFIER_DBUS_SERVICE, error->message);
--      /* Failing to acquire the magnifer service is not fatal.  Log the error,
--       * but keep going. */
--    }
--
--  /* ...and the org.freedesktop.Notifications service; we always
--   * specify REPLACE_EXISTING to ensure we kill off
--   * notification-daemon if it was running.
-+  /*
-+   * We always specify REPLACE_EXISTING to ensure we kill off
-+   * the existing service if it was running.
-    */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, "org.freedesktop.Notifications",
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.freedesktop.Notifications: %s\n", error->message);
--    }
-+  request_name_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE;
- 
-+  cinnamon_dbus_acquire_names (bus,
-+                            request_name_flags,
-+  /* Also grab org.gnome.Panel to replace any existing panel process */
-+                            "org.gnome.Panel", TRUE,
-+  /* ...and the org.gnome.Magnifier service. */
-+                            MAGNIFIER_DBUS_SERVICE, FALSE,
-+  /* ...and the org.freedesktop.Notifications service. */
-+                            "org.freedesktop.Notifications", FALSE,
-+                            NULL);
-   /* ...and the on-screen keyboard service */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, "org.gnome.Caribou.Keyboard",
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.gnome.Caribou.Keyboard: %s\n", error->message);
--    }
--
-+  cinnamon_dbus_acquire_name (bus,
-+                           DBUS_NAME_FLAG_REPLACE_EXISTING,
-+                           &request_name_result,
-+                           "org.gnome.Caribou.Keyboard", FALSE);
-   g_object_unref (bus);
-+  g_object_unref (session);
- }
- 
- static void
--- 
-1.8.1.6
-
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -801,7 +801,7 @@
-             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], Gio.BusNameWatcherFlags.NONE,
-                     Lang.bind(this, this._addPlayer),
-                     Lang.bind(this, this._removePlayer)
-                 );
--- 
-1.8.1.6
-\ No newline at end of file
diff --git a/community/cinnamon/idle-dim.patch b/community/cinnamon/idle-dim.patch
deleted file mode 100644
index 17f5af616..000000000
--- a/community/cinnamon/idle-dim.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
---- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-04-30 18:01:56.000000000 +0200
-+++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-05-02 19:32:12.934254811 +0200
-@@ -9,8 +9,7 @@
- 
- /* constants */
- const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
--const DimSettingsAc = "idle-dim-ac";
--const DimSettingsBattery = "idle-dim-battery";
-+const DimSettings = "idle-dim";
- const PowerBusName = 'org.gnome.SettingsDaemon';
- const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
- 
-@@ -116,10 +115,8 @@
-             
-             this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings"));
-             
--            let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc);
--            this._settingsMenu.menu.addMenuItem(dimSwitchAc);
--            let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery);
--            this._settingsMenu.menu.addMenuItem(dimSwitchBattery);
-+            let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings);
-+            this._settingsMenu.menu.addMenuItem(dimSwitch);
-                       
-             //initial update.
-             //We have to wait until dbus calls back to decide whether to display brightness controls.
-@@ -145,7 +142,7 @@
-                     this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-                 }
-                 
--                this.menu.addSettingsAction(_("Settings"), "screen");
-+                this.menu.addSettingsAction(_("Settings"), "screensaver");
- 		    }));
-         }
-         catch (e) {
diff --git a/community/cinnamon/keyboard_applet.patch b/community/cinnamon/keyboard_applet.patch
deleted file mode 100644
index 6b3694086..000000000
--- a/community/cinnamon/keyboard_applet.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/applet.js b/applet.js
---- a/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
-@@ -1,9 +1,10 @@
- const Applet = imports.ui.applet;
--const Gkbd = imports.gi.Gkbd;
- const Lang = imports.lang;
--const Cinnamon = imports.gi.Cinnamon;
-+const Gio = imports.gi.Gio;
-+const GLib = imports.gi.GLib;
- const St = imports.gi.St;
- const Gtk = imports.gi.Gtk;
-+const GnomeDesktop = imports.gi.GnomeDesktop;
- const Main = imports.ui.main;
- const PopupMenu = imports.ui.popupMenu;
- const Util = imports.misc.util;
-@@ -15,11 +16,12 @@
- LayoutMenuItem.prototype = {
-     __proto__: PopupMenu.PopupBaseMenuItem.prototype,
- 
--    _init: function(config, id, indicator, long_name) {
-+    _init: function(ipsettings, id, index, indicator, long_name) {
-         PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
- 
--        this._config = config;
-+        this._ipsettings = ipsettings;
-         this._id = id;
-+        this._index = index;
-         this.label = new St.Label({ text: long_name });
-         this.indicator = indicator;
-         this.addActor(this.label);
-@@ -28,7 +30,7 @@
- 
-     activate: function(event) {
-         PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
--        this._config.lock_group(this._id);
-+        this._ipsettings.set_value('current', GLib.Variant.new_uint32(this._index));
-     }
- };
- 
-@@ -54,18 +56,18 @@
-             this._layoutItems = [ ];
- 
-             this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
--            this._config = Gkbd.Configuration.get();
--            this._config.connect('changed', Lang.bind(this, this._syncConfig));
--            this._config.connect('group-changed', Lang.bind(this, this._syncGroup));
-+            this._xkbInfo = new GnomeDesktop.XkbInfo();
-+            this._ipsettings = new Gio.Settings({ schema: 'org.gnome.desktop.input-sources' });
-+            this._ipsettings.connect('changed::sources', Lang.bind(this, this._syncConfig));
-+            this._ipsettings.connect('changed::current', Lang.bind(this, this._syncGroup));
-             global.settings.connect('changed::keyboard-applet-use-flags', Lang.bind(this, this._reload_settings));
--            this._config.start_listen();
- 
-             this._syncConfig();
- 
-             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-             this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
-                 Main.overview.hide();
--                Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
-+                Util.spawn(['gkbd-keyboard-display', '-l', this._selectedLayout._id]);
-             }));                                
-             this.menu.addAction(_("Show Character Table"), Lang.bind(this, function() {
-                 Main.overview.hide();
-@@ -98,7 +100,6 @@
-     },
-     
-     _reload_settings: function() {
--        this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
-         this._syncConfig();
-     },
-     
-@@ -127,8 +128,8 @@
-     _syncConfig: function() {
-         this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
- 
--        let groups = this._config.get_group_names();
--        if (groups.length > 1) {
-+        let sources = this._ipsettings.get_value('sources');
-+        if (sources.n_children() > 1) {
-             this.actor.show();
-         } else {
-             this.menu.close();
-@@ -141,25 +142,29 @@
-         for (let i = 0; i < this._labelActors.length; i++)
-             this._labelActors[i].destroy();
- 
--        let short_names = this._adjustGroupNames(this._config.get_short_group_names());
--
-         this._selectedLayout = null;
-         this._layoutItems = [ ];
-         this._labelActors = [ ];
--        for (let i = 0; i < groups.length; i++) {
--            let icon_name = this._config.get_group_name(i);
-+        for (let i = 0; i < sources.n_children(); i++) {
-+            let [type, id] = sources.get_child_value(i).deep_unpack();
-+            let displayName = id;
-+            let shortName = id;
-+            let xkbLayout = id;
-+            if (type == 'xkb') {
-+                [_exists, displayName, shortName, xkbLayout, _xkbVariant] = this._xkbInfo.get_layout_info(id);
-+            } // TODO: errorhandling, handle 'ibus'
-+            let icon_name = xkbLayout; // FIXME: Really?
-             let actor;
-             if (this._showFlags)
-                 actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.FULLCOLOR, style_class: 'popup-menu-icon' });
-             else
--                actor = new St.Label({ text: short_names[i] });
--            let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
--            item._short_group_name = short_names[i];
-+                actor = new St.Label({ text: shortName });
-+            let item = new LayoutMenuItem(this._ipsettings, id, i, actor, displayName);
-             item._icon_name = icon_name;
-             this._layoutItems.push(item);
-             this.menu.addMenuItem(item, i);
- 
--            let shortLabel = new St.Label({ text: short_names[i] });
-+            let shortLabel = new St.Label({ text: shortName });
-             this._labelActors.push(shortLabel);
-         }
- 
-@@ -167,17 +172,17 @@
-     },
- 
-     _syncGroup: function() {
--        let selected = this._config.get_current_group();
-+        let current = this._ipsettings.get_uint('current');
- 
-         if (this._selectedLayout) {
-             this._selectedLayout.setShowDot(false);
-             this._selectedLayout = null;
-         }
- 
--        let item = this._layoutItems[selected];
-+        let item = this._layoutItems[current];
-         item.setShowDot(true);
- 
--        let selectedLabel = this._labelActors[selected];
-+        let selectedLabel = this._labelActors[current];
- 
-         if (this._showFlags) {
-             this.set_applet_icon_name(item._icon_name);
diff --git a/community/cinnamon/switch-applications.patch b/community/cinnamon/switch-applications.patch
deleted file mode 100644
index 1254a7ce4..000000000
--- a/community/cinnamon/switch-applications.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-24 21:19:49.262020614 +0200
-@@ -43,8 +43,8 @@
-     # Cinnamon stuff
-     [_("Toggle Scale"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-down", True, "cinnamon"],
-     [_("Toggle Expo"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-up", True, "cinnamon"],
--    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows", True, "cinnamon"],
--    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows-backward", True, "cinnamon"],
-+    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications", True, "cinnamon"],
-+    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications-backward", True, "cinnamon"],
-     [_("Run dialog (must restart Cinnamon)"), "org.gnome.desktop.wm.keybindings", "panel-run-dialog", True, "cinnamon"],
-     [_("Menu button (must restart Cinnamon)"), "org.cinnamon.muffin", "overlay-key", False, "cinnamon"],
- 
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js
---- linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js	2013-04-24 21:21:22.447677094 +0200
-@@ -131,11 +131,11 @@
-                                             Lang.bind(this, this._showWorkspaceSwitcher));
-         Meta.keybindings_set_custom_handler('switch-to-workspace-down',
-                                             Lang.bind(this, this._showWorkspaceSwitcher));
--        Meta.keybindings_set_custom_handler('switch-windows',
-+        Meta.keybindings_set_custom_handler('switch-applications',
-                                             Lang.bind(this, this._startAppSwitcher));
-         Meta.keybindings_set_custom_handler('switch-group',
-                                             Lang.bind(this, this._startAppSwitcher));
--        Meta.keybindings_set_custom_handler('switch-windows-backward',
-+        Meta.keybindings_set_custom_handler('switch-applications-backward',
-                                             Lang.bind(this, this._startAppSwitcher));
-         Meta.keybindings_set_custom_handler('switch-group-backward',
-                                             Lang.bind(this, this._startAppSwitcher));
diff --git a/community/cjs/PKGBUILD b/community/cjs/PKGBUILD
new file mode 100644
index 000000000..7c6439e20
--- /dev/null
+++ b/community/cjs/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=cjs
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Javascript Bindings for Cinnamon"
+arch=(i686 x86_64)
+url="https://github.com/linuxmint/cjs"
+license=(GPL)
+depends=(cairo gobject-introspection js185 dbus-glib)
+makedepends=(gnome-common)
+options=('!libtool')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cjs/archive/${pkgver}.tar.gz")
+sha256sums=('2fea6c491e6ce8567201f14c0e926181154d798d4811dd65da477c014bfb2a9a')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Python2 fix
+  sed -i 's|#! /usr/bin/env python|#! /usr/bin/env python2|' \
+  		scripts/make-tests
+
+  ./autogen.sh --prefix=/usr --disable-static --libexecdir=/usr/lib
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  # Needs a display
+  make -k check || :
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/consonance/PKGBUILD b/community/consonance/PKGBUILD
deleted file mode 100644
index f70d45618..000000000
--- a/community/consonance/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 82327 2013-01-15 11:34:58Z allan $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
-# Contributor: Auguste Pop <auguste [at] gmail [dot] com>
-# Contributor: boenki <boenki at gmx dot de>
-# Contributor: sujith_m82 <m.sujith@gmail.com>
-
-pkgname=consonance
-pkgver=0.5.1
-pkgrel=10
-pkgdesc="A lightweight GTK+ music manager that aims to be fast, bloat-free and light on memory consumption"
-arch=('i686' 'x86_64')
-url="http://sites.google.com/site/consonancemanager"
-license=('GPL')
-depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libmad'
-         'libcdio-paranoia' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3'
-         'taglib')
-install=$pkgname.install
-source=($url/releases-1/$pkgname-$pkgver.tar.gz
-        libnotify.patch
-        cdio-includes.patch)
-md5sums=('2a195dd2314f7b65cc57cc871a4c5a47'
-         'caa1e8b41723950fd926bfefccbbd8ac'
-         '239b451ba8795f8c287e994a7e32d859')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  patch -Np1 -i "$srcdir"/libnotify.patch
-  patch -Np1 -i "$srcdir"/cdio-includes.patch
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/consonance/cdio-includes.patch b/community/consonance/cdio-includes.patch
deleted file mode 100644
index c570468b1..000000000
--- a/community/consonance/cdio-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr consonance-0.5.1.orig/src/cdda.h consonance-0.5.1/src/cdda.h
---- consonance-0.5.1.orig/src/cdda.h	2013-01-14 05:14:54.000000000 +0200
-+++ consonance-0.5.1/src/cdda.h	2013-01-14 05:15:16.000000000 +0200
-@@ -18,7 +18,7 @@
- #ifndef CDDA_H
- #define CDDA_H
- 
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #include <cdio/cd_types.h>
- 
- struct con_cdda_decoder {
diff --git a/community/consonance/consonance.install b/community/consonance/consonance.install
deleted file mode 100644
index f1474aee3..000000000
--- a/community/consonance/consonance.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install()
-{
-    usr/bin/update-desktop-database -q
-}
-
-post_upgrade()
-{
-    post_install
-}
-
-post_remove()
-{
-    post_install
-}
diff --git a/community/consonance/libnotify.patch b/community/consonance/libnotify.patch
deleted file mode 100644
index f59acbfd9..000000000
--- a/community/consonance/libnotify.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/statusicon.c b/src/statusicon.c
-index f72e808..04efa58 100644
---- a/src/statusicon.c
-+++ b/src/statusicon.c
-@@ -47,11 +47,10 @@ void show_osd(struct con_win *cwin)
- 
- 	/* Create notification instance */
- 
--	osd = notify_notification_new_with_status_icon(
-+	osd = notify_notification_new(
- 		cwin->cstate->curr_mobj->tags->title,
- 		(const gchar *)body,
--		NULL,
--		GTK_STATUS_ICON(cwin->status_icon));
-+		gtk_status_icon_get_icon_name(GTK_STATUS_ICON(cwin->status_icon)));
- 	notify_notification_set_timeout(osd, OSD_TIMEOUT);
- 
- 	/* Add album art if set */
diff --git a/community/credentials-preferences/PKGBUILD b/community/credentials-preferences/PKGBUILD
deleted file mode 100644
index e4172f82d..000000000
--- a/community/credentials-preferences/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 87397 2013-03-30 21:57:57Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=credentials-preferences
-_pkgname=credentials-control-center
-pkgver=0.1.5
-pkgrel=1
-pkgdesc="Control panel for configuring online account credentials and settings"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/gnome-control-center-signon"
-license=('GPL' 'LGPL')
-depends=('libaccounts-glib' 'libsignon-glib' 'gtk3')
-makedepends=('gobject-introspection' 'vala' 'intltool' 'itstool')
-options=('!libtool')
-install=$pkgname.install
-source=(https://launchpad.net/gnome-control-center-signon/13.04/$pkgver/+download/$_pkgname-$pkgver.tar.xz
-        http://pkgbuild.com/~bgyorgy/sources/$_pkgname-translations-20121018.tar.gz)
-md5sums=('deaa290c89dffee5198f3f0f6f2e1fe1'
-         '702d6b39136e10ba6dfad0afd300b2af')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # 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 helper script
-  sed -i 's/test/test -e/' online-accounts-preferences.in
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/credentials-preferences/credentials-preferences.install b/community/credentials-preferences/credentials-preferences.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community/credentials-preferences/credentials-preferences.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD
deleted file mode 100644
index d4d820d93..000000000
--- a/community/dee/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 97721 2013-09-27 20:10:42Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=dee
-pkgver=1.2.7
-pkgrel=1
-pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/dee"
-license=('LGPL')
-depends=('glib2' 'icu')
-makedepends=('python2' 'gobject-introspection' 'vala')
-options=('!libtool')
-source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('b92f27f0a99cac24c2128880601bb7d7')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py"
-}
diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD
deleted file mode 100644
index 484ddb151..000000000
--- a/community/ekg/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 94723 2013-07-29 16:25:52Z bpiotrowski $
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-
-pkgname=ekg
-pkgver=1.8rc2
-pkgrel=1
-pkgdesc="A text-mode Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://ekg.chmurka.net/"
-license=('GPL')
-depends=('libjpeg' 'aspell' 'python2' 'giflib' 'libgadu')
-source=(http://ekg.chmurka.net/$pkgname-$pkgver.tar.gz)
-md5sums=('f697c711da91ddf57c882114539e92fe')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's#gg%s#ekg%s#' src/ekg.c
-  ./configure --prefix=/usr --with-pthread --enable-aspell --with-python
-  make
-}
-
-package() {
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/include $pkgdir/usr/lib
-}
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
deleted file mode 100644
index bb85acd5d..000000000
--- a/community/ekg2/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 96537 2013-08-31 09:41:14Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=ekg2
-pkgver=0.3.1
-pkgrel=8
-pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client'
-arch=('i686' 'x86_64')
-url="http://ekg2.org/"
-license=('GPL')
-depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib')
-optdepends=('xosd: xosd support'
-	    'sqlite: sqlite support'
-            'gtk2: gtk support')
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz
-        ekg2-0.3.1-giflib5.patch)
-md5sums=('68fc05b432c34622df6561eaabef5a40'
-         'e5855316bf7e9b456ebabb7cb9340e98')
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h
-  patch -Np1 -i ../ekg2-0.3.1-giflib5.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/ekg2 \
-    --with-libgadu \
-    --with-xosd \
-    --enable-unicode \
-    --enable-shared \
-    --without-gpg \
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod
-  rm -rf "$pkgdir"/usr/libexec
-  chmod -R 755 "$pkgdir"/usr/lib/perl5
-  chmod +s "$pkgdir"/usr/lib/ekg2/ioctld
-}
diff --git a/community/ekg2/ekg2-0.3.1-giflib5.patch b/community/ekg2/ekg2-0.3.1-giflib5.patch
deleted file mode 100644
index d11b1ecec..000000000
--- a/community/ekg2/ekg2-0.3.1-giflib5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c
---- a/plugins/gg/commands.c	2011-03-17 18:08:11.000000000 +0100
-+++ b/plugins/gg/commands.c	2013-08-31 11:31:42.521377436 +0200
-@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname,
- 	GifFileType *file;
- 	int fd;
- 	fd = open(fname, O_RDONLY);
-+	int giferror;
- 	if (fd == -1) {
- 		snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname);
- 		goto err;
- 	}
- 	
--	if (!(file = DGifOpenFileHandle(fd))) {
-+	if (!(file = DGifOpenFileHandle(fd, giferror))) {
- 		snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", 
--			GifLastError());
-+			GifErrorString(giferror));
- 		goto err2;
- 	}
- 
-@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname,
- 	}
- 	
- 	if (DGifSlurp(file) != GIF_OK) {
--		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifLastError());
-+		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifErrorString(GIF_ERROR));
- 		goto err3;
- 	}
- 
diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD
index 2e690f13d..4ce4b5a74 100644
--- a/community/emerillon/PKGBUILD
+++ b/community/emerillon/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=emerillon
 pkgver=0.1.90
-pkgrel=4
+pkgrel=5
 pkgdesc="Map viewer for OpenStreetMap"
 arch=('i686' 'x86_64')
 url="http://projects.gnome.org/emerillon/"
@@ -18,7 +18,11 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile
+              --disable-static --disable-schemas-compile --disable-maintainer-mode
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD
deleted file mode 100644
index d9e7a0399..000000000
--- a/community/fssos-nsvs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 90505 2013-05-12 23:35:37Z eric $
-# Maintainer: Dale Blount <dale@archlinux.org>
-
-pkgname=fssos-nsvs
-pkgver=0.5
-pkgrel=11
-pkgdesc="NSVS for FSSOS"
-arch=('i686' 'x86_64')
-url="http://fssos.sourceforge.net/"
-license=('GPL')
-depends=('bash' 'mariadb')
-backup=('etc/nsvsd.conf')
-options=('!libtool' '!makeflags')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz"
-        'nsvsd.service')
-md5sums=('3f17c2f6339f1a322b712b467023d825'
-         '9c791d2086e13f774548d9d6ba2cf9d5')
-
-build() {
-  cd nsvs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
-  make CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-}
-
-package() {
-  cd nsvs-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service"
-}
diff --git a/community/fssos-nsvs/fssos-nsvs.install b/community/fssos-nsvs/fssos-nsvs.install
deleted file mode 100644
index 253ae64d2..000000000
--- a/community/fssos-nsvs/fssos-nsvs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    if [ -z "`grep '^nsvsd::' /etc/group`" ]; then
-	groupadd -g 83 nsvsd
-    fi
-    if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then
-	useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    userdel nsvsd &> /dev/null
-    groupdel nsvsd &> /dev/null
-}
diff --git a/community/fssos-nsvs/nsvsd.service b/community/fssos-nsvs/nsvsd.service
deleted file mode 100644
index 8c3d12b67..000000000
--- a/community/fssos-nsvs/nsvsd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Name Service Via Sockets Daemon
-
-[Service]
-ExecStart=/usr/bin/nsvsd -f /etc/nsvsd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index f35596fea..9a3f81196 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92909 2013-06-18 13:47:52Z heftig $
+# $Id: PKGBUILD 98198 2013-10-07 12:11:31Z jgc $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,21 +6,21 @@
 # Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Plugins for gedit"
 arch=(x86_64 i686)
 license=(GPL)
 url="http://live.gnome.org/GeditPlugins"
 depends=(gedit python-dbus)
-makedepends=(intltool gnome-doc-utils vte3 libgit2-glib)
+makedepends=(intltool gnome-doc-utils vte3 libgit2-glib itstool)
 optdepends=('gucharmap: for charmap plugin'
             'vte3: for embedded terminal'
             'libgit2-glib: for git plugin')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
-sha256sums=('2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80')
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz")
+sha256sums=('17cb703a09a0346b6a73d0e34eec87cde9073ffd5e0168741f0830a419ab57cd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD
index 5276b2464..68b379cd0 100644
--- a/community/glabels/PKGBUILD
+++ b/community/glabels/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 79126 2012-10-30 23:07:20Z heftig $
+# $Id: PKGBUILD 98190 2013-10-07 12:08:24Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: yugrotavele <yugrotavele at archlinux dot us>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=glabels
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Creating labels and business cards the very easy way"
 arch=('i686' 'x86_64')
 url="http://glabels.org/"
 license=('GPL' 'LGPL')
-depends=('librsvg' 'evolution-data-server>=3.6.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
+depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
 makedepends=('barcode' 'intltool' 'gnome-doc-utils')
 options=('!libtool')
 install=$pkgname.install
diff --git a/community/gnome-applets/01_battstat_upower.patch b/community/gnome-applets/01_battstat_upower.patch
deleted file mode 100644
index fa31e720b..000000000
--- a/community/gnome-applets/01_battstat_upower.patch
+++ /dev/null
@@ -1,622 +0,0 @@
-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
deleted file mode 100644
index 193c879af..000000000
--- a/community/gnome-applets/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $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=3
-pkgdesc="Small applications for the GNOME panel"
-arch=('i686' 'x86_64')
-license=('GPL')
-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"
-
-  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 DESTDIR="$pkgdir" install
-
-  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
deleted file mode 100644
index 26f7e4d6b..000000000
--- a/community/gnome-applets/disable-gweather-applet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index fc36c743c..000000000
--- a/community/gnome-applets/fix-autoconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 134a617fc..000000000
--- a/community/gnome-applets/gnome-applets-cpupower.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-applets/gnome-applets.install b/community/gnome-applets/gnome-applets.install
deleted file mode 100644
index e3441e722..000000000
--- a/community/gnome-applets/gnome-applets.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-applets
-
-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 $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-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
-}
diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
index 4ae65559c..b6779e91b 100644
--- a/community/gnome-panel/PKGBUILD
+++ b/community/gnome-panel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97693 2013-09-27 16:05:09Z bgyorgy $
+# $Id: PKGBUILD 98191 2013-10-07 12:08:25Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-panel
 pkgname=('gnome-panel' 'gnome-flashback-session')
 pkgver=3.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="Legacy GNOME panel"
@@ -16,13 +16,18 @@ makedepends=('gobject-introspection' 'intltool' 'itstool' 'networkmanager')
 install=$pkgbase.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
+        libgweather-3.10.patch
         session.patch)
 sha256sums=('d1cda458a38cb4f7d2a50c61b1a72f4bf4c39cab65ae0e6cfdc4e0c122252e7a'
+            'd9e21449fc6c5f235673fe47e5b817ac7597490518a557908b14ca875263d90e'
             'cd4c21cf394ea5a702c660bb0d31cae31260bec1cee4e7ca8ee6c8aec2707ebb')
 
 prepare() {
   cd "$pkgbase-$pkgver"
 
+  # Fix build with libgweather 3.10
+  patch -Np1 -i "$srcdir/libgweather-3.10.patch"
+
   # Add more required components to the session file
   patch -Np1 -i "$srcdir/session.patch"
 }
diff --git a/community/gnome-panel/libgweather-3.10.patch b/community/gnome-panel/libgweather-3.10.patch
new file mode 100644
index 000000000..0a6e0e4e4
--- /dev/null
+++ b/community/gnome-panel/libgweather-3.10.patch
@@ -0,0 +1,15 @@
+diff -Naur gnome-panel-3.6.2.orig/applets/clock/clock-location.c gnome-panel-3.6.2/applets/clock/clock-location.c
+--- gnome-panel-3.6.2.orig/applets/clock/clock-location.c	2013-09-27 02:39:03.315952789 +0000
++++ gnome-panel-3.6.2/applets/clock/clock-location.c	2013-09-27 02:40:24.552036953 +0000
+@@ -542,9 +542,8 @@
+ 	}
+ 
+ 	priv->weather_info =
+-		gweather_info_new_for_world (priv->world,
+-					     priv->loc,
+-					     GWEATHER_FORECAST_LIST);
++		gweather_info_new (priv->loc,
++				   GWEATHER_FORECAST_LIST);
+ 	g_signal_connect (priv->weather_info, "updated",
+ 			  G_CALLBACK (weather_info_updated), loc);
+ 
diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD
index de2149b50..ec02738b0 100644
--- a/community/gnome-phone-manager/PKGBUILD
+++ b/community/gnome-phone-manager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95475 2013-08-12 20:33:04Z bgyorgy $
+# $Id: PKGBUILD 98192 2013-10-07 12:08:26Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-phone-manager
 pkgver=0.69
-pkgrel=2
+pkgrel=3
 pkgdesc="Control your mobile phone from your GNOME desktop"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/PhoneManager"
diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD
index 9649da0d5..864708ec6 100644
--- a/community/gnome-screensaver/PKGBUILD
+++ b/community/gnome-screensaver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96399 2013-08-27 14:10:08Z bgyorgy $
+# $Id: PKGBUILD 98193 2013-10-07 12:08:28Z jgc $
 # 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=5
+pkgrel=6
 pkgdesc="Legacy GNOME screensaver"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -25,7 +25,7 @@ sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
             'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb'
             '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
 
   # Upstream patch that moves gnome-screensaver desktop file out of autostart
@@ -36,6 +36,10 @@ build() {
 
   # Lock screen on suspend with systemd
   patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
 
   autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD
deleted file mode 100644
index 8c2ae9f43..000000000
--- a/community/gnome-settings-daemon-compat/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 88930 2013-04-24 22:24:31Z bgyorgy $
-# 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=3
-pkgdesc="Compatibility package that provides background, media keys and mount helpers for the Gnome Flashback session"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-settings-daemon')
-makedepends=('docbook-xsl' 'intltool' '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
-        standalone-media-keys-helper.patch
-        draw-background-unconditionally.patch
-        sessionisactive-port.patch
-        revert-input-sources.patch
-        xinput.patch 
-        remove-libgsd-dependency.patch
-        move-desktop-file.patch)
-sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9'
-            'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162'
-            '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a'
-            '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915'
-            '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a'
-            'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d'
-            '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c'
-            'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4')
-
-build() {
-  cd $_pkgname-$pkgver
-
-  # Build background and media keys helpers as a stand alone binary
-  patch -Np1 -i ../standalone-background-helper.patch
-  patch -Np1 -i ../standalone-media-keys-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
-
-  # Add compatibility patches for media keys plugin
-  patch -Np1 -i ../revert-input-sources.patch
-  patch -Np1 -i ../xinput.patch
-
-  # Remove libgsd dependency
-  patch -Np1 -i ../remove-libgsd-dependency.patch
-
-  # Move desktop files out of autostart, so they can be easily reusable in custom sessions
-  patch -Np1 -i ../move-desktop-file.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/common
-  make -C plugins/automount
-  make -C plugins/background
-  make -C plugins/media-keys
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make -C plugins/automount DESTDIR="$pkgdir" install
-  make -C plugins/background DESTDIR="$pkgdir" install
-  make -C plugins/media-keys 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
deleted file mode 100644
index c279420de..000000000
--- a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-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/move-desktop-file.patch b/community/gnome-settings-daemon-compat/move-desktop-file.patch
deleted file mode 100644
index fe9272767..000000000
--- a/community/gnome-settings-daemon-compat/move-desktop-file.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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-04-24 23:13:10.169941000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:41.064001562 +0200
-@@ -9,4 +9,3 @@
- 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/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-04-24 23:13:12.830004000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-24 23:13:36.613896914 +0200
-@@ -21,7 +21,7 @@
- 	$(SYSTEMD_LIBS)			\
- 	$(AUTOMOUNT_LIBS)
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- autostart_in_files = gnome-fallback-mount-helper.desktop.in
- autostart_in_in_files = gnome-fallback-mount-helper.desktop.in.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-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-24 23:13:07.229872000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:43.670729520 +0200
-@@ -9,4 +9,3 @@
- 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/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-24 23:13:04.913151000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-24 23:13:47.907495798 +0200
-@@ -17,7 +17,7 @@
- 	$(SETTINGS_PLUGIN_LIBS)		\
- 	$(BACKGROUND_LIBS)
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- 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)
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:12:58.579668000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:13:51.747586073 +0200
-@@ -9,4 +9,3 @@
- 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/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-04-24 23:13:02.026416000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 23:13:54.570985777 +0200
-@@ -75,7 +75,7 @@
- 	$(MEDIA_KEYS_LIBS)			\
- 	-lm
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
- autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
diff --git a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
deleted file mode 100644
index b843ac2ce..000000000
--- a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-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/revert-input-sources.patch b/community/gnome-settings-daemon-compat/revert-input-sources.patch
deleted file mode 100644
index dc769de4e..000000000
--- a/community/gnome-settings-daemon-compat/revert-input-sources.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From cc45fec342713745f391533a202976e97670f9e5 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 12 Dec 2012 09:31:40 +0000
-Subject: Revert "media-keys: Add key bindings to switch input sources"
-
-These are now provided by gnome-shell.
-
-This reverts commit fc58c347900f906e304591135ca6c13d9950ab4d.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=690106
----
-diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-index b56b5d1..25e5f3e 100644
---- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-@@ -175,16 +175,6 @@
-       <_summary>Magnifier zoom out</_summary>
-       <_description>Binding for the magnifier to zoom out</_description>
-     </key>
--    <key name="switch-input-source" type="s">
--      <default>''</default>
--      <_summary>Switch input source</_summary>
--      <_description>Binding to select the next input source</_description>
--    </key>
--    <key name="switch-input-source-backward" type="s">
--      <default>''</default>
--      <_summary>Switch input source backward</_summary>
--      <_description>Binding to select the previous input source</_description>
--    </key>
-   </schema>
- 
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index e5977d0..cd6fbc2 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -98,10 +98,6 @@ static const gchar introspection_xml[] =
- #define VOLUME_STEP 6           /* percents for one volume button press */
- #define MAX_VOLUME 65536.0
- 
--#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
--#define KEY_CURRENT_INPUT_SOURCE "current"
--#define KEY_INPUT_SOURCES        "sources"
--
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -1807,40 +1803,6 @@ do_keyboard_brightness_action (GsdMediaKeysManager *manager,
- }
- 
- static void
--do_switch_input_source_action (GsdMediaKeysManager *manager,
--                               MediaKeyType         type)
--{
--        GSettings *settings;
--        GVariant *sources;
--        gint i, n;
--
--        settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
--        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
--
--        n = g_variant_n_children (sources);
--        if (n < 2)
--                goto out;
--
--        i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
--
--        if (type == SWITCH_INPUT_SOURCE_KEY)
--                i += 1;
--        else
--                i -= 1;
--
--        if (i < 0)
--                i = n - 1;
--        else if (i >= n)
--                i = 0;
--
--        g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
--
-- out:
--        g_variant_unref (sources);
--        g_object_unref (settings);
--}
--
--static void
- do_custom_action (GsdMediaKeysManager *manager,
-                   MediaKey            *key,
-                   gint64               timestamp)
-@@ -1999,10 +1961,6 @@ do_action (GsdMediaKeysManager *manager,
-         case BATTERY_KEY:
-                 do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp);
-                 break;
--        case SWITCH_INPUT_SOURCE_KEY:
--        case SWITCH_INPUT_SOURCE_BACKWARD_KEY:
--                do_switch_input_source_action (manager, type);
--                break;
-         /* Note, no default so compiler catches missing keys */
-         case CUSTOM_KEY:
-                 g_assert_not_reached ();
-diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
-index a16d0e7..437ed2c 100644
---- a/plugins/media-keys/shortcuts-list.h
-+++ b/plugins/media-keys/shortcuts-list.h
-@@ -80,8 +80,6 @@ typedef enum {
-         KEYBOARD_BRIGHTNESS_DOWN_KEY,
-         KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
-         BATTERY_KEY,
--        SWITCH_INPUT_SOURCE_KEY,
--        SWITCH_INPUT_SOURCE_BACKWARD_KEY,
-         CUSTOM_KEY
- } MediaKeyType;
- 
-@@ -148,8 +146,6 @@ static struct {
-         { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" },
-         { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" },
-         { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" },
--        { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL },
--        { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL },
-         { BATTERY_KEY, NULL, "XF86Battery" },
- };
- 
---
-cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/sessionisactive-port.patch b/community/gnome-settings-daemon-compat/sessionisactive-port.patch
deleted file mode 100644
index dc5fd260e..000000000
--- a/community/gnome-settings-daemon-compat/sessionisactive-port.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
deleted file mode 100644
index b52de042f..000000000
--- a/community/gnome-settings-daemon-compat/standalone-background-helper.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-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
-+_Comment=Background plugin
-+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/background/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/background/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-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
deleted file mode 100644
index 61be1737e..000000000
--- a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
+++ /dev/null
@@ -1,564 +0,0 @@
-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-04-24 03:11:02.893859531 +0200
-+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-24 13:43:11.128884064 +0200
-@@ -9,7 +9,6 @@
-     <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
-     <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
-     <child name="keyboard" schema="org.gnome.settings-daemon.plugins.keyboard"/>
--    <child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
-     <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/>
-     <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
-     <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c	2013-04-24 13:43:11.132217470 +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-media-keys-manager.h"
-+
-+int
-+main (int argc,
-+      char **argv)
-+{
-+        GMainLoop *loop;
-+        GsdMediaKeysManager *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_media_keys_manager_new ();
-+
-+        gsd_media_keys_manager_start (manager, &error);
-+
-+        if (error != NULL) {
-+                g_printerr ("Unable to start the media-keys manager: %s",
-+                            error->message);
-+
-+                g_error_free (error);
-+                _exit (1);
-+        }
-+
-+        g_main_loop_run (loop);
-+
-+        gsd_media_keys_manager_stop (manager);
-+        g_main_loop_unref (loop);
-+
-+        return 0;
-+}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 13:43:11.132217470 +0200
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+_Name=Media keys
-+_Comment=Media keys plugin
-+Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper
-+Icon=multimedia
-+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/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c	2013-04-24 13:43:11.132217470 +0200
-@@ -44,7 +44,6 @@
- #include <gudev/gudev.h>
- #endif
- 
--#include "gnome-settings-profile.h"
- #include "gsd-marshal.h"
- #include "gsd-media-keys-manager.h"
- 
-@@ -622,8 +621,6 @@
-         char **custom_paths;
-         int i;
- 
--        gnome_settings_profile_start (NULL);
--
-         gdk_error_trap_push ();
- 
-         manager->priv->keys = g_ptr_array_new_with_free_func ((GDestroyNotify) media_key_free);
-@@ -661,8 +658,6 @@
-         gdk_flush ();
-         if (gdk_error_trap_pop ())
-                 g_warning ("Grab failed for some keys, another application may already have access the them.");
--
--        gnome_settings_profile_end (NULL);
- }
- 
- static void
-@@ -2090,7 +2085,6 @@
-         char *theme_name;
- 
-         g_debug ("Starting media_keys manager");
--        gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new (SETTINGS_BINDING_DIR);
-         g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
-@@ -2137,19 +2131,14 @@
- 
-         /* Start filtering the events */
-         for (l = manager->priv->screens; l != NULL; l = l->next) {
--                gnome_settings_profile_start ("gdk_window_add_filter");
--
-                 g_debug ("adding key filter for screen: %d",
-                          gdk_screen_get_number (l->data));
- 
-                 gdk_window_add_filter (gdk_screen_get_root_window (l->data),
-                                        (GdkFilterFunc) filter_key_events,
-                                        manager);
--                gnome_settings_profile_end ("gdk_window_add_filter");
-         }
- 
--        gnome_settings_profile_end (NULL);
--
-         manager->priv->start_idle_id = 0;
- 
-         return FALSE;
-@@ -2161,8 +2150,6 @@
- {
-         const char * const subsystems[] = { "input", "usb", "sound", NULL };
- 
--        gnome_settings_profile_start (NULL);
--
-         if (supports_xinput2_devices (&manager->priv->opcode) == FALSE) {
-                 g_debug ("No Xinput2 support, disabling plugin");
-                 return TRUE;
-@@ -2179,8 +2166,6 @@
-          * The rest (grabbing and setting the keys) can happen in an
-          * idle.
-          */
--        gnome_settings_profile_start ("gvc_mixer_control_new");
--
-         manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys");
- 
-         g_signal_connect (manager->priv->volume,
-@@ -2198,14 +2183,10 @@
- 
-         gvc_mixer_control_open (manager->priv->volume);
- 
--        gnome_settings_profile_end ("gvc_mixer_control_new");
--
-         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
- 
-         register_manager (manager_object);
- 
--        gnome_settings_profile_end (NULL);
--
-         return TRUE;
- }
- 
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-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-media-keys-plugin.h"
--#include "gsd-media-keys-manager.h"
--
--struct GsdMediaKeysPluginPrivate {
--        GsdMediaKeysManager *manager;
--};
--
--#define GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginPrivate))
--
--GNOME_SETTINGS_PLUGIN_REGISTER (GsdMediaKeysPlugin, gsd_media_keys_plugin)
--
--static void
--gsd_media_keys_plugin_init (GsdMediaKeysPlugin *plugin)
--{
--        plugin->priv = GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin);
--
--        g_debug ("GsdMediaKeysPlugin initializing");
--
--        plugin->priv->manager = gsd_media_keys_manager_new ();
--}
--
--static void
--gsd_media_keys_plugin_finalize (GObject *object)
--{
--        GsdMediaKeysPlugin *plugin;
--
--        g_return_if_fail (object != NULL);
--        g_return_if_fail (GSD_IS_MEDIA_KEYS_PLUGIN (object));
--
--        g_debug ("GsdMediaKeysPlugin finalizing");
--
--        plugin = GSD_MEDIA_KEYS_PLUGIN (object);
--
--        g_return_if_fail (plugin->priv != NULL);
--
--        if (plugin->priv->manager != NULL) {
--                g_object_unref (plugin->priv->manager);
--        }
--
--        G_OBJECT_CLASS (gsd_media_keys_plugin_parent_class)->finalize (object);
--}
--
--static void
--impl_activate (GnomeSettingsPlugin *plugin)
--{
--        gboolean res;
--        GError  *error;
--
--        g_debug ("Activating media_keys plugin");
--
--        error = NULL;
--        res = gsd_media_keys_manager_start (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error);
--        if (! res) {
--                g_warning ("Unable to start media_keys manager: %s", error->message);
--                g_error_free (error);
--        }
--}
--
--static void
--impl_deactivate (GnomeSettingsPlugin *plugin)
--{
--        g_debug ("Deactivating media_keys plugin");
--        gsd_media_keys_manager_stop (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager);
--}
--
--static void
--gsd_media_keys_plugin_class_init (GsdMediaKeysPluginClass *klass)
--{
--        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
--        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
--
--        object_class->finalize = gsd_media_keys_plugin_finalize;
--
--        plugin_class->activate = impl_activate;
--        plugin_class->deactivate = impl_deactivate;
--
--        g_type_class_add_private (klass, sizeof (GsdMediaKeysPluginPrivate));
--}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-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_MEDIA_KEYS_PLUGIN_H__
--#define __GSD_MEDIA_KEYS_PLUGIN_H__
--
--#include <glib.h>
--#include <glib-object.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--
--G_BEGIN_DECLS
--
--#define GSD_TYPE_MEDIA_KEYS_PLUGIN                (gsd_media_keys_plugin_get_type ())
--#define GSD_MEDIA_KEYS_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPlugin))
--#define GSD_MEDIA_KEYS_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
--#define GSD_IS_MEDIA_KEYS_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN))
--#define GSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_PLUGIN))
--#define GSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
--
--typedef struct GsdMediaKeysPluginPrivate GsdMediaKeysPluginPrivate;
--
--typedef struct
--{
--        GnomeSettingsPlugin    parent;
--        GsdMediaKeysPluginPrivate *priv;
--} GsdMediaKeysPlugin;
--
--typedef struct
--{
--        GnomeSettingsPluginClass parent_class;
--} GsdMediaKeysPluginClass;
--
--GType   gsd_media_keys_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_MEDIA_KEYS_PLUGIN_H__ */
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 14:26:01.414463895 +0200
-@@ -1,17 +1,11 @@
- icondir = $(datadir)/icons/hicolor
- context = actions
- 
--plugin_name = media-keys
--
--NULL =
--
- SUBDIRS = cut-n-paste
--plugin_LTLIBRARIES = libmedia-keys.la
- 
- BUILT_SOURCES = 			\
- 	gsd-marshal.h			\
--	gsd-marshal.c			\
--	$(NULL)
-+	gsd-marshal.c
- 
- gsd-marshal.c: gsd-marshal.list
- 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@
-@@ -19,62 +13,16 @@
- gsd-marshal.h: gsd-marshal.list
- 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@
- 
--libmedia_keys_la_SOURCES = 		\
--	gsd-media-keys-plugin.h		\
--	gsd-media-keys-plugin.c		\
--	gsd-media-keys-manager.h	\
--	gsd-media-keys-manager.c	\
--	gsd-osd-window.c		\
--	gsd-osd-window.h		\
--	gsd-osd-window-private.h	\
--	shortcuts-list.h		\
--	$(BUILT_SOURCES)		\
--	$(NULL)
--
--libmedia_keys_la_CPPFLAGS = \
--	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
--	-I$(top_srcdir)/plugins/common				\
--	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
--	-DBINDIR=\"$(bindir)\"					\
--	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
--	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
--	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
--	$(AM_CPPFLAGS)
--
--libmedia_keys_la_CFLAGS = \
--	$(PLUGIN_CFLAGS)		\
--	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(MEDIA_KEYS_CFLAGS)		\
--	$(AM_CFLAGS)
--
--libmedia_keys_la_LDFLAGS = 		\
--	$(GSD_PLUGIN_LDFLAGS)
--
--libmedia_keys_la_LIBADD  = 		\
--	$(top_builddir)/plugins/common/libcommon.la			\
--	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
--	$(MEDIA_KEYS_LIBS)						\
--	$(SETTINGS_PLUGIN_LIBS)						\
--	-lm
--
--plugin_in_files = 		\
--	media-keys.gnome-settings-plugin.in
--
--plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
--
- noinst_PROGRAMS = test-media-window
- 
- test_media_window_SOURCES =			\
- 	gsd-osd-window.c			\
- 	gsd-osd-window.h			\
- 	gsd-osd-window-private.h		\
--	test-media-window.c			\
--	$(NULL)
-+	test-media-window.c
- 
- test_media_window_CPPFLAGS = \
- 	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
- 	-I$(top_srcdir)/plugins/common				\
- 	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
- 	-DDATADIR=\""$(datadir)"\"				\
-@@ -93,21 +41,19 @@
- 	$(SETTINGS_PLUGIN_LIBS)			\
- 	-lm
- 
--libexec_PROGRAMS = gsd-test-media-keys
-+libexec_PROGRAMS = gnome-fallback-media-keys-helper
- 
--gsd_test_media_keys_SOURCES =			\
-+gnome_fallback_media_keys_helper_SOURCES =	\
- 	gsd-media-keys-manager.c		\
- 	gsd-media-keys-manager.h		\
- 	gsd-osd-window.c			\
- 	gsd-osd-window.h			\
- 	gsd-osd-window-private.h		\
--	test-media-keys.c			\
--	$(BUILT_SOURCES)			\
--	$(NULL)
-+	gnome-fallback-media-keys-helper.c	\
-+	$(BUILT_SOURCES)
- 
--gsd_test_media_keys_CPPFLAGS = \
-+gnome_fallback_media_keys_helper_CPPFLAGS = \
- 	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
- 	-I$(top_srcdir)/plugins/common				\
- 	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
- 	-DBINDIR=\"$(bindir)\"					\
-@@ -116,14 +62,12 @@
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
- 	$(AM_CPPFLAGS)
- 
--gsd_test_media_keys_CFLAGS = \
-+gnome_fallback_media_keys_helper_CFLAGS = \
- 	$(PLUGIN_CFLAGS)		\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(MEDIA_KEYS_CFLAGS)		\
--	$(AM_CFLAGS)
-+	$(MEDIA_KEYS_CFLAGS)
- 
--gsd_test_media_keys_LDADD = \
--	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
-+gnome_fallback_media_keys_helper_LDADD = \
- 	$(top_builddir)/plugins/common/libcommon.la			\
- 	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
- 	$(SETTINGS_DAEMON_LIBS)			\
-@@ -131,17 +75,24 @@
- 	$(MEDIA_KEYS_LIBS)			\
- 	-lm
- 
-+autostartdir = $(sysconfdir)/xdg/autostart
-+autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
-+autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
-+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-+
-+$(autostart_in_files): $(autostart_in_in_files)
-+	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+ 
-+@INTLTOOL_DESKTOP_RULE@
-+
- EXTRA_DIST = 				\
- 	gsd-marshal.list		\
- 	README.media-keys-API		\
- 	test-media-window-clutter.c	\
--	$(plugin_in_files)
-+	$(autostart_in_in_files)
- 
- CLEANFILES = 			\
- 	$(BUILT_SOURCES)	\
--	$(plugin_DATA)
--
--DISTCLEANFILES =		\
--	$(plugin_DATA)
-+	$(autostart_DATA)	\
-+	$(autostart_in_files)
- 
--@GSD_INTLTOOL_PLUGIN_RULE@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in	2012-04-07 15:21:20.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,8 +0,0 @@
--[GNOME Settings Plugin]
--Module=media-keys
--IAge=0
--_Name=Media keys
--_Description=Media keys plugin
--Authors=
--Copyright=Copyright © 2007
--Website=
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c	2012-06-01 22:02:53.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,7 +0,0 @@
--#define NEW gsd_media_keys_manager_new
--#define START gsd_media_keys_manager_start
--#define STOP gsd_media_keys_manager_stop
--#define MANAGER GsdMediaKeysManager
--#include "gsd-media-keys-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-04-24 03:11:02.897192946 +0200
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.in	2013-04-24 13:43:11.132217470 +0200
-@@ -34,7 +34,7 @@
- [type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in
- plugins/media-keys/cut-n-paste/gvc-mixer-control.c
- plugins/media-keys/gsd-media-keys-manager.c
--[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in
-+plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
- plugins/mouse/gsd-mouse-manager.c
- [type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in
- plugins/power/gpm-common.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	2013-04-24 03:11:02.897192946 +0200
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.skip	2013-04-24 13:43:11.132217470 +0200
-@@ -22,5 +22,6 @@
- data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
- plugins/background/gnome-fallback-background-helper.desktop.in
- plugins/automount/gnome-fallback-mount-helper.desktop.in
-+plugins/media-keys/gnome-fallback-media-keys-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-compat/xinput.patch b/community/gnome-settings-daemon-compat/xinput.patch
deleted file mode 100644
index 67c8082cb..000000000
--- a/community/gnome-settings-daemon-compat/xinput.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 07 Feb 2013 04:14:22 +0000
-Subject: Fix media-keys handling with GTK+ 3.7.8
-
-GDK now requests XI 2.3 and if the X server supports that
-version, subsequent requests for a lower version yield
-a BadValue. Therefore, we need to change the code in
-gsd-input-helper.c to request 2.3 as well.
----
-diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
-index 54427af..d5d2a2a 100644
---- a/plugins/common/gsd-input-helper.c
-+++ b/plugins/common/gsd-input-helper.c
-@@ -144,18 +144,11 @@ supports_xinput2_devices (int *opcode)
-         gdk_error_trap_push ();
- 
-         major = 2;
--        minor = 0;
-+        minor = 3;
- 
-         if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
-                 gdk_error_trap_pop_ignored ();
--                /* try for 2.2, maybe gtk has already announced 2.2 support */
--                gdk_error_trap_push ();
--                major = 2;
--                minor = 2;
--                if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
--                    gdk_error_trap_pop_ignored ();
-                     return FALSE;
--                }
-         }
-         gdk_error_trap_pop_ignored ();
- 
---
-cgit v0.9.1
diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD
index 8a7bde9c5..f000022d6 100644
--- a/community/gnonlin/PKGBUILD
+++ b/community/gnonlin/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 76165 2012-09-12 12:34:14Z arodseth $
+# $Id: PKGBUILD 98219 2013-10-07 15:43:14Z spupykin $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gnonlin
-pkgver=0.10.17
+pkgver=1.1.90
 pkgrel=1
 pkgdesc='Library for creating non-linear video editors'
 arch=('x86_64' 'i686')
 url='http://gnonlin.sourceforge.net/'
-depends=('gstreamer0.10>=0.10.36')
-makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.36' 'pkgconfig')
+depends=('gstreamer')
+makedepends=('python' 'gst-plugins-base' 'pkgconfig')
 options=('!libtool')
 license=('LGPL')
-source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2")
+source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz")
 sha256sums=('e4a2dd8af1c0c97f2f63e918a25c26e871c896e88b7ee85948509f68f29e8935')
+sha256sums=('b2214ee45583a4532d110e852e2aecf787cefa8fe50f44c8234fb55713feba61')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index 618d79414..3772bee45 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81579 2012-12-24 15:01:10Z spupykin $
+# $Id: PKGBUILD 98195 2013-10-07 12:08:31Z jgc $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet-gtk
 pkgver=0.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A frontend for GNUnet"
 arch=('i686' 'x86_64')
 url="http://gnunet.org"
diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
index 7550aed59..ae05b5186 100644
--- a/community/goaccess/PKGBUILD
+++ b/community/goaccess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95903 2013-08-18 15:28:38Z fyan $
+# $Id: PKGBUILD 98175 2013-10-07 01:47:21Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Josh VanderLinden <arch@cloudlery.com>
 # Contributor: Nicolas Storme <nicolas@atelier-web.com>
 
 pkgname=goaccess
-pkgver=0.6
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="An open source real-time web log analyzer and interactive viewer"
 arch=('i686' 'x86_64')
@@ -24,4 +24,4 @@ package() {
   make prefix="$pkgdir/usr" install
 }
 
-sha512sums=('cd3fb241a9d84f2f9023c179a96d441f7f7d52e9c7227b31a3a18761c60ae6abdbfc70799c0a2c5ceb8788afd36eeaaf55ed7944310fb5809dd403d7fe09dfbd')
+sha512sums=('67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b')
diff --git a/community/gst-editing-services/PKGBUILD b/community/gst-editing-services/PKGBUILD
new file mode 100644
index 000000000..c7c38a563
--- /dev/null
+++ b/community/gst-editing-services/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 98225 2013-10-07 15:51:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Lubosz Sarnecki <lubosz@gmail.com>
+# Contributor: Kerrick Staley <mail@kerrickstaley.com>
+# Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
+
+pkgname=gst-editing-services
+pkgver=1.1.90.1.1774.fb6aabf
+pkgrel=1
+pkgdesc='GStreamer editing services (Git version)'
+arch=('i686' 'x86_64')
+license=('LGPL')
+url='http://gstreamer.freedesktop.org/modules/gst-editing-services.html'
+depends=('gst-plugins-base')
+makedepends=('git' 'intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
+options=('!libtool')
+source=('git://anongit.freedesktop.org/gstreamer/gst-editing-services')
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $srcdir/gst-editing-services
+  version=$(grep AC_INIT configure.ac | sed 's/AC_INIT(GStreamer Editing Services, //' | sed 's/,//')
+  hash=$(git log --pretty=format:'%h' -n 1)
+  revision=$(git rev-list --count HEAD)
+  echo $version.$revision.$hash
+}
+
+build() {
+  cd $srcdir/gst-editing-services
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/gst-editing-services
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/gst-python/PKGBUILD b/community/gst-python/PKGBUILD
new file mode 100644
index 000000000..c18cf9d9e
--- /dev/null
+++ b/community/gst-python/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 98229 2013-10-07 15:57:05Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-python
+pkgver=1.1.90
+pkgrel=2
+pkgdesc="Python bindings for GStreamer"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('python2-gobject' 'gst-plugins-base')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2)
+md5sums=('16d85442b98fab61bab66a53eb571d6a')
+
+build() {
+  cd "${srcdir}/gst-python-${pkgver}"
+  export PYTHON=python2
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/gst-python-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
deleted file mode 100644
index cda7de6b6..000000000
--- a/community/gwibber/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 97853 2013-09-30 10:27:58Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gwibber
-pkgver=3.6.0
-pkgrel=5
-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=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-pillow' 'python2-xdg' 'dconf')
-makedepends=('intltool' 'vala')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        lp_934530.patch
-        lp_1051801.patch
-        lp_1088775.patch
-        gtkspell3-port.patch
-        gwibber-pillow.patch)
-md5sums=('5988e36e9f592c6eca6537ba6878307a'
-         '8c43ae0ed96c52602befeff640a8672a'
-         '0eb53f4f248a6c600b6c6dfaac12341f'
-         '5698a3b1699c018719b193362486c9b5'
-         'e8c657543542d8141fdfe4b87a24d7fe'
-         '8380d55786490965dfad37be09216dcb')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  # Apply some fixes from Ubuntu
-  patch -Np1 -i "$srcdir/lp_934530.patch"
-  patch -Np1 -i "$srcdir/lp_1051801.patch"
-  patch -Np1 -i "$srcdir/lp_1088775.patch"
-
-  # Port to the new gtkspell3
-  patch -Np1 -i "$srcdir/gtkspell3-port.patch"
-
-  # Port to python-pillow
-  patch -Np1 -i "$srcdir/gwibber-pillow.patch"
-
-  # Use the standalone accounts configuration panel
-  sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala
-  sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py
-
-  # Remove unneeded dependency on libdbusmenu
-  sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in}
-
-  # Fix libaccounts-glib dependency
-  sed -i 's/--pkg accounts/--pkg libaccounts-glib/' */Makefile.{am,in} */*/Makefile.{am,in}
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  autoreconf -fi
-  intltoolize --force
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-schemas-compile --disable-unity
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/gwibber/gtkspell3-port.patch b/community/gwibber/gtkspell3-port.patch
deleted file mode 100644
index a7cc5da37..000000000
--- a/community/gwibber/gtkspell3-port.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac
---- gwibber-3.6.0.orig/configure.ac	2012-10-03 02:09:08.000000000 +0200
-+++ gwibber-3.6.0/configure.ac	2013-03-28 21:34:39.227995294 +0100
-@@ -159,10 +159,10 @@
- 
- if test "x$enable_spell" = "xyes"; then
-         PKG_CHECK_MODULES(GTKSPELL,
--                  gtkspell-3.0)
-+                  gtkspell3-3.0)
-         AC_SUBST(GTKSPELL_CFLAGS)
-         AC_SUBST(GTKSPELL_CFLAGS)
--	GTKSPELL_PKG="--pkg gtkspell-3.0"
-+	GTKSPELL_PKG="--pkg gtkspell3-3.0"
-         AC_SUBST(GTKSPELL_PKG)
- fi
- 
-diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala
---- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala	2012-08-21 06:14:19.000000000 +0200
-+++ gwibber-3.6.0/libgwibber-gtk/entry.vala	2013-03-28 21:36:32.830637428 +0100
-@@ -141,7 +141,8 @@
- #if HAVE_GTKSPELL
-             try
-             {
--              var spell = new Gtk.Spell.attach(this, null);
-+              var spell = new GtkSpell.Checker();
-+              spell.attach(this);
-             }
-             catch (Error e)
-             {
diff --git a/community/gwibber/gwibber-pillow.patch b/community/gwibber/gwibber-pillow.patch
deleted file mode 100644
index 211d22e73..000000000
--- a/community/gwibber/gwibber-pillow.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py gwibber-3.6.0/gwibber/microblog/util/imagehandler.py
---- gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py	2012-08-21 06:14:09.000000000 +0200
-+++ gwibber-3.6.0/gwibber/microblog/util/imagehandler.py	2013-09-15 15:03:07.056371930 +0200
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
- 
--import os, hashlib, urllib2, Image
-+import os, hashlib, urllib2
-+from PIL import Image
- 
- DEFAULT_AVATAR = 'http://digg.com/img/udl.png'
- 
-diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/resources.py gwibber-3.6.0/gwibber/microblog/util/resources.py
---- gwibber-3.6.0.orig/gwibber/microblog/util/resources.py	2012-08-21 06:14:09.000000000 +0200
-+++ gwibber-3.6.0/gwibber/microblog/util/resources.py	2013-09-15 15:02:36.825648020 +0200
-@@ -8,7 +8,7 @@
- from hashlib import sha1
- from os import makedirs, remove, environ
- from os.path import join, isdir, realpath, exists
--import Image
-+from PIL import Image
- from datetime import datetime
- from gwibber.microblog import network
- from gwibber.microblog.util.const import *
diff --git a/community/gwibber/gwibber.install b/community/gwibber/gwibber.install
deleted file mode 100644
index d973d53f7..000000000
--- a/community/gwibber/gwibber.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/gwibber/lp_1051801.patch b/community/gwibber/lp_1051801.patch
deleted file mode 100644
index 706c79e54..000000000
--- a/community/gwibber/lp_1051801.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'bin/gwibber-service'
---- old/bin/gwibber-service	2012-02-13 20:39:02 +0000
-+++ new/bin/gwibber-service	2012-09-20 06:35:40 +0000
-@@ -74,6 +74,7 @@
- message_monitor = dispatcher.MessagesMonitor()
- """
- 
-+dbus.mainloop.glib.threads_init()
- logger.debug("Setting up monitors")
- connection_monitor = dispatcher.ConnectionMonitor()
- urlshortener = dispatcher.URLShorten()
-
diff --git a/community/gwibber/lp_1088775.patch b/community/gwibber/lp_1088775.patch
deleted file mode 100644
index 2f3b318d0..000000000
--- a/community/gwibber/lp_1088775.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== modified file 'gwibber/microblog/plugins/facebook/__init__.py'
---- old/gwibber/microblog/plugins/facebook/__init__.py	2012-09-24 20:55:20 +0000
-+++ new/gwibber/microblog/plugins/facebook/__init__.py	2013-01-14 15:41:35 +0000
-@@ -326,7 +326,10 @@
-     
-     if data.has_key("privacy"):
-       m["privacy"] = {}
--      m["privacy"]["description"] = data["privacy"]["description"]
-+      if data["privacy"].has_key("description"):
-+        m["privacy"]["description"] = data["privacy"]["description"]
-+      else:
-+        m["privacy"]["description"] = ""
-       m["privacy"]["value"] = data["privacy"]["value"]
- 
-     # Handle target for wall posts with a specific recipient
-
diff --git a/community/gwibber/lp_934530.patch b/community/gwibber/lp_934530.patch
deleted file mode 100644
index 6f2bd4302..000000000
--- a/community/gwibber/lp_934530.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== modified file 'gwibber/microblog/network.py'
---- old/gwibber/microblog/network.py	2012-03-31 15:02:54 +0000
-+++ new/gwibber/microblog/network.py	2012-06-13 16:48:52 +0000
-@@ -37,8 +37,14 @@
-       logger.error("HTTP Error for %s - error code: %s", e.geturl().split("?")[0], e.getcode())
-       self.res = "HTTP error: {0}".format(e.getcode())
-     except urllib2.URLError, e:
--      logger.error("Network failure: %s", e.reason)
--      self.res = "Network error: {0}".format(e.reason)
-+      logger.error("Network failure: %s", e.message)
-+      self.res = "Network error: {0}".format(e.message)
-+    except IOError, e:
-+      logger.error("Network failure: %s", e.message)
-+      self.res = "Network error: {0}".format(e.message)
-+    except:
-+      logger.error("Network failure: UNKNOWN")
-+      self.res = "Network error: UNKNOWN"
- 
-   def get_json(self):
-     try:
-
diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD
deleted file mode 100644
index da7660150..000000000
--- a/community/libmatio/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 88815 2013-04-23 01:03:57Z eric $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libmatio
-pkgver=1.5.1
-pkgrel=1
-pkgdesc='C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files'
-arch=('x86_64' 'i686')
-license=('LGPL')
-url='http://sourceforge.net/projects/matio'
-depends=('zlib')
-options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.bz2")
-sha1sums=('12b8ed59688b2f41903ddc3e7975f21f10fe42bb')
-
-build() {
-  cd matio-$pkgver
-  ./configure --prefix=/usr --enable-shared 
-  make
-}
-
-check() {
-  cd matio-$pkgver
-  make check
-}
- 
-package() {
-  cd matio-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD
deleted file mode 100644
index d17506366..000000000
--- a/community/libsignon-glib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 92688 2013-06-12 04:57:26Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=libsignon-glib
-pkgver=1.10
-pkgrel=1
-pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/accounts-sso/"
-license=('LGPL')
-depends=('signon')
-makedepends=('python2-gobject')
-options=('!libtool')
-source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('224f66c9662843705da4b35d781a50d6aeb8ca5f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static \
-              PYTHON=python2
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Signon.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Signon.py"
-}
diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD
deleted file mode 100644
index f7198378c..000000000
--- a/community/mpdscribble/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 82753 2013-01-23 20:52:45Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowwski.pl>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: evr <evanroman at gmail>
-# Contributor: Luiz Ribeiro <luizribeiro@gmail.com>
-
-pkgname=mpdscribble
-pkgver=0.22
-pkgrel=6
-pkgdesc='MPD client which submits track info to Last.fm'
-url='http://mpd.wikia.com/wiki/Client:Mpdscribble'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup' 'glib2' 'libmpdclient')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2
-        service)
-sha256sums=('1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41'
-            '8a6568235e8b2ac7535a6f99f4401450a4162bac0cacb938af2ec39a808e1132')
-
-build() {
-  cd mpdscribble-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-http-client=soup
-
-  make
-}
-
-package() {
-  cd mpdscribble-$pkgver
-
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/service \
-    "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service
-
-  # default config is really an example
-  install -D -m644 "${pkgdir}"/etc/mpdscribble.conf \
-    "${pkgdir}"/usr/share/mpdscribble/mpdscribble.conf.example
-  rm -f "${pkgdir}"/etc/mpdscribble.conf
-
-  install -d "${pkgdir}"/var/cache/mpdscribble
-  touch "${pkgdir}"/var/cache/mpdscribble/mpdscribble.cache
-}
diff --git a/community/mpdscribble/mpdscribble.install b/community/mpdscribble/mpdscribble.install
deleted file mode 100644
index e7038d5d8..000000000
--- a/community/mpdscribble/mpdscribble.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  echo 'An example config is provided in /usr/share/mpdscribble/mpdscribble.conf.example'
-  echo
-  echo 'For system-wide config copy this file to /etc/mpdscribble.conf'
-  echo 'For per-user config copy this file to ~/.mpdscribble/mpdscribble.conf'
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-pre_upgrade() {
-  # removed /etc/mpdscribble.conf on FEB 19 2011
-  # only display warning for people with mpdscribble older then 0.21
-  if (( "$(vercmp 0.21-1 $2)" > 0 )) && [[ -f /etc/mpdscribble.conf ]]
-  then
-    echo "$1 is new $2 is old"
-    cp /etc/mpdscribble.conf /etc/mpdscribble.conf.oldbackup
-    echo 'The package does not provide /etc/mpdscribble.conf anymore.'
-    echo 'Copied /etc/mpdscribble.conf to /etc/mpdscribble.conf.oldbackup'
-    echo
-    echo 'The example file is now located at /etc/mpdscribble.conf.example'
-  fi
-}
diff --git a/community/mpdscribble/service b/community/mpdscribble/service
deleted file mode 100644
index 25f64d7d5..000000000
--- a/community/mpdscribble/service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=last.fm updater for MPD
-After=mpd.service
-
-[Service]
-ExecStart=/usr/bin/mpdscribble --no-daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index c96db6f68..1b211fb4f 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97469 2013-09-20 21:13:42Z bpiotrowski $
+# $Id: PKGBUILD 98183 2013-10-07 12:06:59Z jgc $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
 
 pkgname=mpv
 pkgver=0.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index a577edb80..75cbc998b 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,32 +1,26 @@
-# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $
+# $Id: PKGBUILD 98231 2013-10-07 17:24:18Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.8.2
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
 depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \
-		 'libcanberra' 'startup-notification' 'zenity' 'dconf')
+		 'libcanberra' 'startup-notification' 'zenity' 'dconf' 'cinnamon-desktop')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
-        "switch-applications.patch")
-sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049'
-            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
+sha256sums=('e16efc49d7629141d0d784ca855b9276c83deee0669b7053d457e9f7676dc028')
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  # Fix windows switcher keybinding with default settings in GNOME 3.8
-  patch -Np1 -i ../switch-applications.patch
-
-
   PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
   				 			 --localstatedir=/var --disable-static --disable-schemas-compile
   make
diff --git a/community/muffin/switch-applications.patch b/community/muffin/switch-applications.patch
deleted file mode 100644
index 61b727b57..000000000
--- a/community/muffin/switch-applications.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c linuxmint-muffin-1ad6bd4/src/core/keybindings.c
---- linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c	2013-04-15 15:53:35.000000000 +0200
-+++ linuxmint-muffin-1ad6bd4/src/core/keybindings.c	2013-04-24 18:37:54.028549911 +0200
-@@ -3774,14 +3774,14 @@
-                           handle_switch, META_TAB_LIST_GROUP);
- 
-   add_builtin_keybinding (display,
--                          "switch-windows",
-+                          "switch-applications",
-                           SCHEMA_COMMON_KEYBINDINGS,
-                           META_KEY_BINDING_REVERSES,
-                           META_KEYBINDING_ACTION_SWITCH_WINDOWS,
-                           handle_switch, META_TAB_LIST_NORMAL);
- 
-   add_builtin_keybinding (display,
--                          "switch-windows-backward",
-+                          "switch-applications-backward",
-                           SCHEMA_COMMON_KEYBINDINGS,
-                           REVERSES_AND_REVERSED,
-                           META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD,
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 766d5f445..3bf250712 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 96434 2013-08-28 19:54:26Z faidoc $
+# $Id: PKGBUILD 98197 2013-10-07 12:08:32Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=1.8.5
-pkgrel=1
+pkgver=2.0.0
+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')
+         'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2'
+         'cinnamon-translations')
 makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
 optdepends=('gksu: Open as Root')
 options=('!emptydirs' '!libtool')
 install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "tracker-0.16.patch"
-        "remove-desktop-background.patch")
-sha256sums=('ba43794293c66ebc31a9c4145d6e7a8326321a4f0e58b28fe4f3d56a8fe39874'
-            '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626'
-            '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
+sha256sums=('3848d55a20134826aa6512898c78b05a953f5d2f353817e7003c1a4f6286e31c')
 
-build() {
+prepare() {
   cd linuxmint-nemo-*
 
   # 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
+  # Fix build
+  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
+
+  # Rename 'Files' app name to avoid having the same as nautilus
+  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+}
 
-  # https://github.com/linuxmint/nemo/pull/263
-  patch -Np1 -i ../remove-desktop-background.patch
+build() {
+  cd linuxmint-nemo-*
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
@@ -49,9 +50,6 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 
-  # Rename 'Files' app name to avoid having the same as nautilus
-  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' "$pkgdir/usr/share/applications/nemo.desktop"
-
   # Autostart only in Cinnamon to avoid conflict with GNOME Classic session
   cp "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop" \
     "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop"
diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch
deleted file mode 100644
index 0301cc820..000000000
--- a/community/nemo/remove-desktop-background.patch
+++ /dev/null
@@ -1,1050 +0,0 @@
-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/6] 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.6
-
-
-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/6] 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.6
-
-
-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/6] 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.6
-
-
-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/6] 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.6
-
-
-From f487954ebce3f564744e9c83b5dd40fa8f8fad6d Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 08:33:41 -0400
-Subject: [PATCH 5/6] Fall back to org.gnome.desktop.background schema when
- cinnamon is not installed
-
----
- libnemo-private/nemo-global-preferences.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
-index 336afc3..7eb04ef 100644
---- a/libnemo-private/nemo-global-preferences.c
-+++ b/libnemo-private/nemo-global-preferences.c
-@@ -76,7 +76,25 @@
- 	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");
--	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");
-+
-+    const gchar * const *schema_list = g_settings_list_schemas ();
-+    int i = 0;
-+    gboolean has_cinnamon = FALSE;
-+    if (schema_list != NULL) {
-+        while (schema_list[i] != NULL) {
-+            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
-+                has_cinnamon = TRUE;
-+                break;
-+            }
-+            i++;
-+        }
-+    }
-+
-+    if (has_cinnamon) {
-+        cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
-+    } else {
-+        cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
-+    }
- }
--- 
-1.8.1.6
-
-
-From 9739a1b30603868ea6b8b12cf7aeb167be5aea22 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 09:31:49 -0400
-Subject: [PATCH 6/6] simplify schema check
-
----
- libnemo-private/nemo-global-preferences.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
-index 7eb04ef..0470595 100644
---- a/libnemo-private/nemo-global-preferences.c
-+++ b/libnemo-private/nemo-global-preferences.c
-@@ -79,20 +79,9 @@
- 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
- 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
- 
--    const gchar * const *schema_list = g_settings_list_schemas ();
--    int i = 0;
--    gboolean has_cinnamon = FALSE;
--    if (schema_list != NULL) {
--        while (schema_list[i] != NULL) {
--            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
--                has_cinnamon = TRUE;
--                break;
--            }
--            i++;
--        }
--    }
--
--    if (has_cinnamon) {
-+    GSettingsSchemaSource *schema_source;
-+    schema_source = g_settings_schema_source_get_default();
-+    if (g_settings_schema_source_lookup (schema_source, "org.cinnamon.background", FALSE)) {
-         cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
-     } else {
-         cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
--- 
-1.8.1.6
-
diff --git a/community/nemo/tracker-0.16.patch b/community/nemo/tracker-0.16.patch
deleted file mode 100644
index 49964678d..000000000
--- a/community/nemo/tracker-0.16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/openclonk/PKGBUILD b/community/openclonk/PKGBUILD
deleted file mode 100644
index 1157c0a30..000000000
--- a/community/openclonk/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 94898 2013-08-01 06:55:20Z bpiotrowski $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Wesley <rudirennsau at hotmail dot com>
-
-pkgname=openclonk
-pkgver=5.3.3
-pkgrel=2
-pkgdesc="A multiplayer-action-tactic-skill game"
-arch=('i686' 'x86_64')
-url="http://openclonk.org"
-license=('custom')
-depends=('gtk2' 'glew' 'sdl_mixer' 'libxpm'  'hicolor-icon-theme' 'libupnp')
-makedepends=('cmake' 'boost' 'imagemagick' 'mesa')
-install=$pkgname.install
-source=(http://hg.openclonk.org/$pkgname/archive/$pkgname-release-$pkgver-src.tar.gz)
-md5sums=('a61d8a7d7c41bcc8d85a647c25095658')
-
-build() {
-  [[ -d build ]] && rm -rf build
-  mkdir build && cd build
-
-  cmake ../ -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR="$pkgdir"/ install
-
-  install -Dm644 clonk.png "$pkgdir"/usr/share/pixmaps/clonk.png
-  install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
-  install -m644 ../licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/community/openclonk/openclonk.install b/community/openclonk/openclonk.install
deleted file mode 100644
index b9bbaf706..000000000
--- a/community/openclonk/openclonk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index 3bb48927d..bf7598853 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 70446 2012-05-07 08:29:18Z lfleischer $
+# $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 
 pkgname=quvi
-pkgver=0.4.2
-pkgrel=1
+pkgver=0.9.3.1
+pkgrel=2
 pkgdesc='Command-line tool for parsing video download links.'
 arch=('i686' 'x86_64')
 url='http://quvi.sourceforge.net/'
-license=('LGPL')
+license=('AGPL3')
 depends=('libquvi')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('05f1e2c711d1ca9d4bc68b8de553941d'
-         '523b17d5a9024c8b0a1636917d79e792')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+md5sums=('24b3173f8662a6bb33d9a8a58662764f'
+         'SKIP')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/raptor1/PKGBUILD b/community/raptor1/PKGBUILD
deleted file mode 100644
index 0401aee5a..000000000
--- a/community/raptor1/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 72968 2012-06-25 18:19:15Z andrea $
-# Maintainer:
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=raptor1
-pkgver=1.4.21
-pkgrel=4
-pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
-arch=('i686' 'x86_64')
-url="http://librdf.org/raptor"
-depends=('curl' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!docs')
-source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz"
-        'curl.patch')
-md5sums=('992061488af7a9e2d933df6b694bb876'
-         '8fe28761645d6a6607b25c94f9ada964')
-
-build() {
-  cd "${srcdir}"/raptor-${pkgver}
-  patch -p1 -i "${srcdir}"/curl.patch
-
-  ./configure --prefix=/usr \
-    --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/raptor-${pkgver}"
-  make prefix="${pkgdir}"/usr install
-  
-  mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1
-  rm -f "${pkgdir}"/usr/share/man/man1/rapper.1
-}
diff --git a/community/raptor1/curl.patch b/community/raptor1/curl.patch
deleted file mode 100644
index 590140536..000000000
--- a/community/raptor1/curl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h
---- raptor-1.4.21/src/raptor_internal.h.curl	2010-01-29 17:54:42.000000000 -0600
-+++ raptor-1.4.21/src/raptor_internal.h	2011-07-31 11:02:44.182465296 -0500
-@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
- 
- #ifdef RAPTOR_WWW_LIBCURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/community/sensors-applet/PKGBUILD b/community/sensors-applet/PKGBUILD
deleted file mode 100644
index 1a62c5692..000000000
--- a/community/sensors-applet/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 89360 2013-04-28 20:21:26Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=sensors-applet
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="Applet for GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings"
-arch=('i686' 'x86_64')
-url="http://sensors-applet.sourceforge.net/"
-license=('GPL')
-depends=('gnome-panel' 'libatasmart' 'lm_sensors' 'xdg-utils')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('hddtemp: get HDD temperatures'
-            'udisks: get HDD temperatures')
-options=('!libtool')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz
-        gtk38.patch)
-md5sums=('425078fc1ff5a98af1547e039002a73f'
-         '7289cb0acd5c05daf824df6a90967240')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Enable reprecations
-  sed -i '/CFLAGS+=/d' configure{,.ac}
-
-  # Fix compatibility with GTK+ 3.8
-  patch -Np1 -i "$srcdir/gtk38.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-scrollkeeper --with-nvidia=no
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community/sensors-applet/gtk38.patch b/community/sensors-applet/gtk38.patch
deleted file mode 100644
index 530d756a3..000000000
--- a/community/sensors-applet/gtk38.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c sensors-applet-3.0.0/sensors-applet/sensors-applet.c
---- sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c	2011-11-03 12:33:36.000000000 +0100
-+++ sensors-applet-3.0.0/sensors-applet/sensors-applet.c	2013-04-28 20:08:31.002620583 +0200
-@@ -641,122 +641,8 @@
-         /* get the first active sensor */
-         first_sensor = (ActiveSensor *)sensors_applet->active_sensors->data;
- 
--        switch (display_mode) {
--        case DISPLAY_VALUE:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
-+        num_sensors_per_group = 1;
- 
--                /* make sure all widths and heights are non zero,
--                 * otherwise will get a divide by zero exception below
--                 * - is a non critical error since can happen when
--                 * elements first added to list, so simply return - is
--                 * not a programming error */
--                if (value_width == 0 && value_height == 0) {
--                        return;
--                }
--
--                num_sensors_per_group = (sensors_applet->size / 
--                                         (horizontal ? value_height : 
--                                          value_width));
--                break;
--
--        case DISPLAY_LABEL_WITH_VALUE:
--                /* even though we end up packing the event boxes into the
--                 * panel, these dont give back request sizes, so need to ask
--                 * widgets directly */
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
--
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->label),
--                                        &req);
--                label_width = req.width + COLUMN_SPACING;
--                label_height = req.height + ROW_SPACING;
--        
--                /* make sure all widths and heights are non zero, otherwise
--                 * will get a divide by zero exception below 
--                 * - is a non critical error since can happen when
--                 * elements first added to list, so simply return - is
--                 * not a programming error */
--                if (!(label_width && label_height &&
--                      value_width && value_height)) {
--                        return;
--                }
--
--                switch (layout_mode) {
--                case VALUE_BESIDE_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? MAX(label_height, value_height) : 
--                                                  (label_width + value_width)));
--                        break;
--                case VALUE_BELOW_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? (label_height + value_height) : 
--                                                  MAX(label_width, value_width)));
--
--
--                        break;
--                }
--                break;
--
--        case DISPLAY_ICON_WITH_VALUE:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
--
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
--                                        &req);
--                icon_width = req.width + COLUMN_SPACING;
--                icon_height = req.height + ROW_SPACING;
--                
--                //watch out if num_sensors_per_group is correctly computed
--		//while icon_height is 0
--                if (!(icon_width &&
--                      value_width && value_height)) {
--                        return;
--                }
--
--                
--                switch (layout_mode) {
--                case VALUE_BESIDE_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? MAX(icon_height, value_height) : 
--                                                  (icon_width + value_width)));
--                        break;
--                case VALUE_BELOW_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? (icon_height + value_height) : 
--                                                  MAX(icon_width, value_width)));
--
--
--                        break;
--                }
--                break;
--
--        case DISPLAY_ICON:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
--                                        &req);
--                icon_width = req.width + COLUMN_SPACING;
--                icon_height = req.height + ROW_SPACING;
--                if (!(icon_width && icon_height)) {
--                        return;
--                }
--
--                num_sensors_per_group = (sensors_applet->size / 
--                                         (horizontal ? icon_height : 
--                                          icon_width));
--                break;
--
--        case DISPLAY_GRAPH:
--                /* only show graphs in a line like System Monitor
--                 * applet */
--                num_sensors_per_group = 1;
--                break;
--        }
-         /* ensure always atleast 1 sensor per group */
-         if (num_sensors_per_group < 1) {
-                 /* force a better layout */
diff --git a/community/sensors-applet/sensors-applet.install b/community/sensors-applet/sensors-applet.install
deleted file mode 100644
index a23a623cc..000000000
--- a/community/sensors-applet/sensors-applet.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/signon-keyring-extension/PKGBUILD b/community/signon-keyring-extension/PKGBUILD
deleted file mode 100644
index ea0d03b3e..000000000
--- a/community/signon-keyring-extension/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 79491 2012-11-06 04:11:27Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-keyring-extension
-_pkgname=keyring
-pkgver=0.4
-pkgrel=1
-pkgdesc="GNOME keyring extension for signond"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/online-accounts-keyring-extension"
-license=('LGPL')
-depends=('signon' 'libgnome-keyring')
-source=(https://launchpad.net/online-accounts-keyring-extension/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2)
-md5sums=('4bbe5840cf0d5cfd142ba5ef262a38ed')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Do not install tests
-  echo 'INSTALLS =' >>tests/tests.pro
-
-  qmake PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD
deleted file mode 100644
index f74d2b649..000000000
--- a/community/signon-plugin-oauth2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 93075 2013-06-23 22:20:48Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-plugin-oauth2
-_pkgname=signon-oauth2
-pkgver=0.18
-pkgrel=1
-pkgdesc="OAuth 2 plugin for signon"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/accounts-sso/"
-license=('LGPL')
-depends=('signon-ui' 'qjson')
-makedepends=('signon')
-source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
-sha1sums=('4b7aabd69a67814b19447215b6466a93523d5dce')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  sed -i '/-Werror/d' common-project-config.pri
-
-  # Do not install tests and example
-  echo 'INSTALLS =' >>tests/tests.pro
-  echo 'INSTALLS =' >>example/example.pro
-
-  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/signon-ui/Makefile b/community/signon-ui/Makefile
deleted file mode 100644
index 3ede78507..000000000
--- a/community/signon-ui/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Add here the language codes for the translated .po files:
-LINGUAS =
-
-I18N_DOMAIN = signon-ui
-
-PO_FILES = $(addsuffix .po, $(LINGUAS))
-MO_FILES = $(addsuffix .mo, $(LINGUAS))
-
-DEL_FILE = rm -f
-INSTALL = /usr/bin/install -c -m 644
-MKDIR = mkdir -p
-
-all: $(MO_FILES)
-
-install: all
-	for lang in $(LINGUAS); do \
-		dir=$(INSTALL_ROOT)/usr/share/locale/$$lang/LC_MESSAGES; \
-		$(MKDIR) $$dir; \
-		$(INSTALL) $$lang.mo $$dir/$(I18N_DOMAIN).mo; \
-	done
-
-%.mo: %.po
-	msgfmt -o "$@" "$<"
-
-clean:
-	-$(DEL_FILE) $(MO_FILES)
-
-distclean: clean
-
-check: all
-
diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD
deleted file mode 100644
index 453349cd5..000000000
--- a/community/signon-ui/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 92692 2013-06-12 05:09:15Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-ui
-pkgver=0.15
-pkgrel=1
-pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/online-accounts-signon-ui"
-license=('GPL')
-depends=('libaccounts-qt' 'qtwebkit' 'signon' 'libnotify')
-source=(https://launchpad.net/online-accounts-signon-ui/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2)
-md5sums=('67ac8ce4cc85b69ec6ff67ae892fda90')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Do not install tests
-  echo 'INSTALLS =' >>tests/unit/tst_inactivity_timer.pro
-  echo 'INSTALLS =' >>tests/unit/tst_signon_ui.pro
-
-  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD
deleted file mode 100644
index 91b84c9e5..000000000
--- a/community/tremulous/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 86782 2013-03-22 00:57:25Z eric $
-#Contributor: Daenyth <Daenyth+arch [AT] gmail [dot] com>
-
-pkgname=tremulous
-pkgver=1.1.0
-pkgrel=9
-pkgdesc="A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates."
-url="http://tremulous.net"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('sdl' 'openal>=1.7.411' 'libgl' "tremulous-data=$pkgver" "freetype2")
-makedepends=(mesa)
-provides=("tremulous-updated=$pkgver-$pkgrel")
-conflicts=('tremulous-updated')
-replaces=('trem-backport' 'tremulous-updated')
-source=(http://releases.mercenariesguild.net/client/mg-client-manual.txt
-        http://releases.mercenariesguild.net/client/mgclient_source_Release_1.011.tar.gz
-        http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz
-        http://projects.mercenariesguild.net/attachments/download/109/game.qvm
-        http://projects.mercenariesguild.net/attachments/download/111/lakitu7_qvm.txt
-        tremdedrc
-        tremulous.desktop
-        tremded.sh
-        tremulous.sh
-        tremulous.xpm
-        fix_fs26749.patch)
-
-backup=('etc/tremdedrc')
-noextract=(mg_tremded_source_1.01.tar.gz)
-
-md5sums=('e0e1b6e03e7596da00a77fe638560402'
-         '95e526b961f875ba66b6fdd4842c913b'
-         '938bdf944dff667b74e2132a87a49780'
-         '90343619d140557d0c481a61ffa5756c'
-         'a0b8970b33a27798c125f9152049013c'
-         'f0056120d0192a0d4d591d1114439c52'
-         'aef37632a2edcf74a53503a49530bad2'
-         'b755d7c022cddc449ca2de508dfeee30'
-         '8e89473f9fdb481ad44e5cea5f6f681e'
-         '7e3a881608f1c7c0ccece1e07fcf92d8'
-         'e85511d8a9e7309dc24fb90917463900')
-
-build() {
-  local _arch=${CARCH/i686/x86}
-
-  # Build the server
-  mkdir -p "$srcdir/tremded"
-  bsdtar -x -C "$srcdir/tremded" -f "$srcdir/mg_tremded_source_1.01.tar.gz"
-  cd "$srcdir/tremded"
-  make
-# Build the client
-  cd "$srcdir/Release_1.011"
-  patch -Np1 -i "$srcdir/fix_fs26749.patch"
-  make
-}
-
-package() {
-  cd "$srcdir/tremded"
-  install -D -m755 build/release-linux-$_arch/tremded.$_arch "$pkgdir/opt/tremulous/tremded.$_arch"
-  install -D -m644 "$srcdir/tremdedrc"                         "$pkgdir/etc/tremdedrc"
-  install -D -m644 "$srcdir/game.qvm"                          "$pkgdir/opt/tremulous/game.qvm"
-  install -D -m755 "$srcdir/tremded.sh"                        "$pkgdir/usr/bin/tremded"
-
-  cd "$srcdir/Release_1.011"
-  install -Dm755 build/release-linux-$_arch/tremulous.$_arch "$pkgdir/opt/tremulous/tremulous.$_arch"
-  install -D -m755 "$srcdir/tremulous.sh"                      "$pkgdir/usr/bin/tremulous"
-
-  # Install the documentation
-  install -Dm644 "$srcdir/mg-client-manual.txt" "$pkgdir/usr/share/tremulous/mg-client-manual.txt"
-  install -Dm644 "$srcdir/lakitu7_qvm.txt"      "$pkgdir/usr/share/tremulous/lakitu7_qvm.txt"
-
-  # Install the .desktop and icon files
-  install -D -m644 "$srcdir/tremulous.xpm"     "$pkgdir/usr/share/pixmaps/tremulous.xpm"
-  install -D -m644 "$srcdir/tremulous.desktop" "$pkgdir/usr/share/applications/tremulous.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/tremulous/fix_fs26749.patch b/community/tremulous/fix_fs26749.patch
deleted file mode 100644
index 12a73138c..000000000
--- a/community/tremulous/fix_fs26749.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c
---- Release_1.011-old/src/qcommon/parse.c	2011-12-02 19:11:49.307368651 -0500
-+++ Release_1.011/src/qcommon/parse.c	2011-12-02 19:13:27.556836387 -0500
-@@ -981,7 +981,7 @@
- {
-   if (*string == '\"')
-   {
--    strcpy(string, string+1);
-+    memmove(string, string+1, strlen(string));
-   }
-   if (string[strlen(string)-1] == '\"')
-   {
-@@ -1784,7 +1784,7 @@
-     if ((*ptr == '\\' || *ptr == '/') &&
-         (*(ptr+1) == '\\' || *(ptr+1) == '/'))
-     {
--      strcpy(ptr, ptr+1);
-+      memmove(ptr, ptr+1, strlen(ptr));
-     }
-     else
-     {
diff --git a/community/tremulous/tremded.sh b/community/tremulous/tremded.sh
deleted file mode 100644
index 339bdd501..000000000
--- a/community/tremulous/tremded.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-CARCH=`uname -m`
-ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64
-
-[ -f /etc/tremdedrc ] && . /etc/tremdedrc
-[ -f "$HOME/.tremdedrc" ] && . "$HOME/.tremdedrc"
-
-if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then
-	echo "Cannot find game.qvm -- linking to installed version."
-	if [ ! -d "$HOME/.tremulous/base/vm" ]; then
-		mkdir -p "$HOME/.tremulous/base/vm/" || exit 1
-	fi
-	ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1
-fi
-
-cd /opt/tremulous/
-./tremded.$ext "$TREM_ARGS" "$@"
diff --git a/community/tremulous/tremdedrc b/community/tremulous/tremdedrc
deleted file mode 100644
index 7fbe122f6..000000000
--- a/community/tremulous/tremdedrc
+++ /dev/null
@@ -1 +0,0 @@
-TREM_ARGS="+set dedicated 1 +exec server.cfg"
diff --git a/community/tremulous/tremulous.desktop b/community/tremulous/tremulous.desktop
deleted file mode 100644
index 357c357bd..000000000
--- a/community/tremulous/tremulous.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tremulous
-Comment=A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates.
-Icon=/usr/share/pixmaps/tremulous.xpm
-Exec=tremulous
-Terminal=false
-Categories=Game;ActionGame;
diff --git a/community/tremulous/tremulous.sh b/community/tremulous/tremulous.sh
deleted file mode 100644
index 01575befc..000000000
--- a/community/tremulous/tremulous.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-CARCH=`uname -m`
-ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64
-
-if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then
-	echo "Cannot find game.qvm -- linking to installed version."
-	if [ ! -d "$HOME/.tremulous/base/vm" ]; then
-		mkdir -p "$HOME/.tremulous/base/vm/" || exit 1
-	fi
-	ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1
-fi
-
-cd /opt/tremulous/
-./tremulous.$ext "$@"
diff --git a/community/tremulous/tremulous.xpm b/community/tremulous/tremulous.xpm
deleted file mode 100644
index 5e070c862..000000000
--- a/community/tremulous/tremulous.xpm
+++ /dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * tremulous_xpm[] = {
-"48 48 39 1",
-" 	c None",
-".	c #0F0F0F",
-"+	c #181818",
-"@	c #000000",
-"#	c #282828",
-"$	c #212121",
-"%	c #060606",
-"&	c #1D1D1D",
-"*	c #252525",
-"=	c #080808",
-"-	c #0E0E0E",
-";	c #050505",
-">	c #0B0B0B",
-",	c #0C0C0C",
-"'	c #232323",
-")	c #1F1F1F",
-"!	c #030303",
-"~	c #0D0D0D",
-"{	c #040404",
-"]	c #020202",
-"^	c #141414",
-"/	c #1E1E1E",
-"(	c #131313",
-"_	c #111111",
-":	c #010101",
-"<	c #191919",
-"[	c #090909",
-"}	c #292929",
-"|	c #070707",
-"1	c #121212",
-"2	c #1B1B1B",
-"3	c #161616",
-"4	c #0A0A0A",
-"5	c #222222",
-"6	c #242424",
-"7	c #1A1A1A",
-"8	c #151515",
-"9	c #101010",
-"0	c #171717",
-"                                                ",
-"                         ...                    ",
-"                       +@@@@@#                  ",
-"                      $@@@@@@%                  ",
-"                     &@@@@@@@@               *  ",
-"  =-                 ;@@@@@@@@>             ,@- ",
-"  @@'                ;@@@@@@@@@            ,@@  ",
-"  )@!                ;@@@@@@@@@           ~@@;  ",
-"   ;@{               ]@@@@@@@@@~         ,@@;   ",
-"   ^@@]             /@@@@@@@@@@@(       -@@;    ",
-"    .@@;            /@@@@@@@@@@@       -@@@/    ",
-"     _@@]           /@@@@@@@@@@@     #:@@@_     ",
-"      @@@;          /@@@@@@@@@@<     :@@@-      ",
-"       :@@!          ]@@@@@@@@@     @@@@-       ",
-"       $@@@;         ;@@@@@@@@[   ~]@@@-        ",
-"        %@@@;       }!@@@@@@@@- }|@@@@,         ",
-"         !@@@;     1@@@@@@@@@@ 2@@@@@~          ",
-"          ;@@@%    [@@@@@@@@@@@@@@@@,           ",
-"           @@@@{|||:@@@@@@@@@@@@@@!-            ",
-"           -@@@@@@@@@@@@@@@@@@@@@]              ",
-"            .@@@@@@@@@@@@@@@@@@@{               ",
-"              ]@@@@@@@@@@@@@@@@@                ",
-"               .@@@@@@@@@@@@@@@@                ",
-"                +@@@@@@@@@@@@@@@@@@@@@@@@@@/    ",
-"                 =@@@@@@@@@@@@@@@@@@@@@@@@@/    ",
-"               .=@@@@@@@@@@@@@@@@@@%            ",
-"             ,@@@@@@@@@@@@@@@@@@@@@             ",
-"        2>]@@@@@@@@@@@@@@@@@@@@@@@3             ",
-"      *:@@@@@@@@@@@@@@@@@@@@@@@@@^              ",
-"      @@@|||  4]@@@@@@@@@@@@@@@@@               ",
-"      556       _@@@@@@@@@@@@@@@@3              ",
-"                 >@@@@@@@@@@@@@@@@+             ",
-"                 ;@@@@@@@@@@@@@@@@@7            ",
-"                &@@@@@@@@@@@@@@@@@@@+           ",
-"                @@@@@@@@@@@@@@@@@@@@@/          ",
-"               8@@@@@@@@@@@@@@@[  =@@|          ",
-"               ;@@:::@@@@@@@@@[    %@@[         ",
-"               @@9   (@@@@@@@4      =@@         ",
-"              ,@@      {:@@:         {@!        ",
-"              !@@        <<          3@@0       ",
-"              !@-                     3@@6      ",
-"              ]@(                      (@[      ",
-"             7@@                        ]@      ",
-"             7@@                         *      ",
-"             7@}                                ",
-"             7@                                 ",
-"              .                                 ",
-"                                                "};
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index aa519f85c..03bd912a6 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90538 2013-05-13 00:36:03Z seblu $
+# $Id: PKGBUILD 98179 2013-10-07 10:07:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,17 +6,18 @@
 
 pkgname=ulogd
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
-depends=('libmnl' 'libnfnetlink')
+depends=('libmnl'
+         'libnetfilter_acct'
+         'libnetfilter_conntrack'
+         'libnetfilter_log'
+         'libnfnetlink')
 backup=('etc/ulogd.conf')
 makedepends=('libmariadbclient'
-             'libnetfilter_acct'
-             'libnetfilter_conntrack'
-             'libnetfilter_log'
              'libpcap'
              'libdbi'
              'postgresql-libs'
@@ -24,15 +25,14 @@ makedepends=('libmariadbclient'
 optdepends=("${makedepends[@]}")
 options=('!libtool')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-	      "$pkgname.logrotate"
-	      "$pkgname.conf"
-	      "$pkgname.service")
+        "$pkgname.logrotate"
+        "$pkgname.conf"
+        "$pkgname.service")
 md5sums=('660516de4b5b1e110c12dae414619e0f'
-         'dd32eeee0949adff4188544419acd17e'
-         'c21531312f95e790ed19aa267a17d35a'
+         '95f05af0a0c8f5fdea5bd92ccb2fd465'
+         '7ccdb48cd152ff502334d3f6b2a4daab'
          '092d72209e30c132e0a08112e4062772')
 
-
 build() {
   cd $pkgname-$pkgver
   ./configure \
diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf
index 822575613..f96bd1d2c 100644
--- a/community/ulogd/ulogd.conf
+++ b/community/ulogd/ulogd.conf
@@ -1,20 +1,19 @@
 [global]
-nlgroup=1
 logfile="/var/log/ulogd.log"
 loglevel=5
 rmem=131071
 bufsize=150000
 
-plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so"
+plugin="/usr/lib/ulogd/ulogd_inppkt_NFLOG.so"
 plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
 plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
 plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
 plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
 
-stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log1:NFLOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
-[ulog1]
-nlgroup=1
+[log1]
+group=1
 
 [emu1]
 file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate
index 312c71acb..299e93d02 100644
--- a/community/ulogd/ulogd.logrotate
+++ b/community/ulogd/ulogd.logrotate
@@ -5,6 +5,6 @@
   create 0640 root root
 
   postrotate
-    [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
+    systemctl kill --signal=SIGHUP ulogd.service || true
   endscript
 }
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index f4229bc84..f848250f7 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 95443 2013-08-12 08:50:29Z spupykin $
+# $Id: PKGBUILD 98181 2013-10-07 10:07:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.2.7
+pkgver=2.0.1
 pkgrel=1
 _pkgdata=20130807
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
 url="http://www.draisberghof.de/usb_modeswitch/"
 license=('GPL')
-depends=('libusb-compat' 'tcl')
+depends=('libusb' 'tcl')
 makedepends=('gcc' 'make')
 backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('18d889d72195534ae9133a8181cad42b'
+md5sums=('e48d4419d0574d342bb183f7465556d0'
          '91feff51deba6e48e78506b8f4db2274'
          'dd14f254f6c3642ce16fd7c2f43ee112')
 
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 0f23b5b2a..eae92f3b6 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97960 2013-10-01 23:19:17Z seblu $
+# $Id: PKGBUILD 98211 2013-10-07 14:38:11Z andyrtr $
 # 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.18
-pkgrel=6
+pkgrel=8
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/vobcopy/PKGBUILD b/community/vobcopy/PKGBUILD
deleted file mode 100644
index f1446abd2..000000000
--- a/community/vobcopy/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 66897 2012-02-29 23:21:33Z giovanni $
-# Maintainer: Daenyth
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tino Reichardt <milky-archlinux@mcmilk.de>
-
-pkgname=vobcopy
-pkgver=1.2.0
-pkgrel=4
-pkgdesc="Copies DVD .vob files to harddisk, decrypting them on the way"
-arch=('i686' 'x86_64')
-url="http://www.vobcopy.org"
-license=('GPL2')
-depends=('libdvdread' 'libdvdcss')
-options=('!docs')
-source=(http://www.vobcopy.org/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('88f735ccd051093ff40dab4597bc586e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="$pkgdir" PREFIX=/usr/ MANDIR=/usr/share/man install
-}
diff --git a/community/xdelta/PKGBUILD b/community/xdelta/PKGBUILD
deleted file mode 100644
index c1fef78a1..000000000
--- a/community/xdelta/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 83064 2013-01-27 09:58:41Z andrea $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=xdelta
-pkgver=1.1.4
-pkgrel=4
-pkgdesc="binary file delta generator"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/xdelta/"
-license=('GPL')
-depends=('glib' 'zlib')
-options=('!libtool')
-source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        xdelta-1.1.4-aclocal.patch)
-md5sums=('1b896c01ebf0e353b7e3c3071b05f496'
-         '1d8ab5909bdf977a2783c164b66906fd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/xdelta-1.1.4-aclocal.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community/xdelta/xdelta-1.1.4-aclocal.patch b/community/xdelta/xdelta-1.1.4-aclocal.patch
deleted file mode 100644
index ad8c99de5..000000000
--- a/community/xdelta/xdelta-1.1.4-aclocal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdelta-1.1.3/xdelta.m4.aclocal	2004-10-20 00:20:47.875648144 +0200
-+++ xdelta-1.1.3/xdelta.m4	2004-10-20 00:21:47.205628616 +0200
-@@ -4,7 +4,7 @@
- dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or
- dnl
--AC_DEFUN(AM_PATH_XDELTA,
-+AC_DEFUN([AM_PATH_XDELTA],
- [dnl
- dnl Get the cflags and libraries from the xdelta-config script
- dnl
author	root <root@rshg054.dnsready.net>	2013-10-08 02:34:09 -0700
committer	root <root@rshg054.dnsready.net>	2013-10-08 02:34:09 -0700
commit	3a0ad5dc35d5cff379cdfc736b9cae856416fe6a (patch)
tree	a6af20a38d47d7a7ae8e1b98f70005c54644bbdd /community
parent	9159b8ca1c97a398204d7a7d4d78c3394639bd02 (diff)