version bump from upstream

- Use a flat directory instead of a hierarchy to install plugins
  into (Christian Persch) (#513246)
- Don't scan the plugins directory recursively (Christian Persch)
  (#513246)
- Install the settings plugin to a versioned directory to fix install
  with libdir == libexecdir (Christan Persch) (#504203)
- Review short and long descriptions for GConf keys (Luca Ferretti)
  (#514047)
- Don't crash when running the screensaver fails (Jens Granseuer)
  (#514385)
- Rename src folder to gnome-settings-daemon (Damien Carberry, Jens
  Granseuer) (#511820)
- Add uninstalled.pc file for building against an uninstalled copy of
  g-s-d (Damien Carberry, Jens Granseuer) (#511820)
- Add separate checks for libbackground and use external copy (Jens
  Granseuer)
- Use gnome_settings_daemon for the GConf path (Jens Granseuer) (#514411)
- Release the Glade XML ASAP and keep track of the 2 widgets we need
  (Jens Granseuer)
- Make sure we return a GError if initialization fails (Jens Granseuer)
  (#514926)
- Load the XKB settings initially (Matthias Clasen) (#511771)
- Fix leaks (Jens Granseuer)
- Unref the GConfClient only after done with it (Jens Granseuer)
- Check for xinput (Sebastien Bacher) (#514942)
- Fix copy'n'paste error (Jens Granseuer) (#515426)
- Declare variables at the beginning of a block to make older compilers
  happy (Jens Granseuer)
- Add back support for defining plugin start order (Jens Granseuer)
- Assign return value from g_slist_sort to the plugins list variable
  (Wouter Bolsterlee) (#515340)
- Replace gnome_vfs usage with GIO (Rodrigo Moya) (#513990)

1 files changed, 0 insertions, 50 deletions

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.21.90.2-no-error-for-manager-start.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.21.90.2-no-error-for-manager-start.patch
deleted file mode 100644
index e254c4ce..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.21.90.2-no-error-for-manager-start.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: plugins/a11y-keyboard/gsd-a11y-keyboard-plugin.c
-===================================================================
---- plugins/a11y-keyboard/gsd-a11y-keyboard-plugin.c	(revision 114)
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-plugin.c	(working copy)
-@@ -70,15 +70,12 @@
- impl_activate (GnomeSettingsPlugin *plugin)
- {
-         gboolean res;
--        GError  *error;
- 
-         g_debug ("Activating a11y_keyboard plugin");
- 
--        error = NULL;
--        res = gsd_a11y_keyboard_manager_start (GSD_A11Y_KEYBOARD_PLUGIN (plugin)->priv->manager, &error);
-+        res = gsd_a11y_keyboard_manager_start (GSD_A11Y_KEYBOARD_PLUGIN (plugin)->priv->manager);
-         if (! res) {
--                g_warning ("Unable to start a11y_keyboard manager: %s", error->message);
--                g_error_free (error);
-+                g_warning ("Unable to start a11y_keyboard manager");
-         }
- }
- 
-Index: plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h
-===================================================================
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h	(revision 114)
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.h	(working copy)
-@@ -48,8 +48,7 @@
- GType                   gsd_a11y_keyboard_manager_get_type            (void);
- 
- GsdA11yKeyboardManager *gsd_a11y_keyboard_manager_new                 (void);
--gboolean                gsd_a11y_keyboard_manager_start               (GsdA11yKeyboardManager *manager,
--                                                                       GError                **error);
-+gboolean                gsd_a11y_keyboard_manager_start               (GsdA11yKeyboardManager *manager);
- void                    gsd_a11y_keyboard_manager_stop                (GsdA11yKeyboardManager *manager);
- 
- G_END_DECLS
-Index: plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-===================================================================
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(revision 114)
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(working copy)
-@@ -719,8 +719,7 @@
- }
- 
- gboolean
--gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager,
--                                 GError                **error)
-+gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager)
- {
-         guint        event_mask;
-         GConfClient *client;