r35919 - in /desktop/unstable/brasero/debian: changelog patches/04_put-settings-in-the-correct-path.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Oct 11 21:14:46 2012
New Revision: 35919

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35919
Log:
debian/patches/04_put-settings-in-the-correct-path.patch: Use correct
schema path /org/gnome/brasero instead of /apps/brasero. Patch
cherry-picked from upstream Git.

Added:
    desktop/unstable/brasero/debian/patches/04_put-settings-in-the-correct-path.patch
Modified:
    desktop/unstable/brasero/debian/changelog
    desktop/unstable/brasero/debian/patches/series

Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=35919&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog [utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog [utf-8] Thu Oct 11 21:14:46 2012
@@ -1,3 +1,11 @@
+brasero (3.4.1-4) UNRELEASED; urgency=low
+
+  * debian/patches/04_put-settings-in-the-correct-path.patch: Use correct
+    schema path /org/gnome/brasero instead of /apps/brasero. Patch
+    cherry-picked from upstream Git.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 11 Oct 2012 23:12:58 +0200
+
 brasero (3.4.1-3) unstable; urgency=low
 
   * Revert unwanted 3.4.1-2.1 NMU.

Added: desktop/unstable/brasero/debian/patches/04_put-settings-in-the-correct-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/04_put-settings-in-the-correct-path.patch?rev=35919&op=file
==============================================================================
--- desktop/unstable/brasero/debian/patches/04_put-settings-in-the-correct-path.patch (added)
+++ desktop/unstable/brasero/debian/patches/04_put-settings-in-the-correct-path.patch [utf-8] Thu Oct 11 21:14:46 2012
@@ -1,0 +1,40 @@
+From ef9b42b134fb1c6c743fde63df88fa9294988528 Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell at canonical.com>
+Date: Mon, 16 Apr 2012 11:22:47 +1000
+Subject: [PATCH] Put settings in the correct path
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674169
+---
+ libbrasero-burn/burn-plugin.c |    2 +-
+ src/brasero-drive-settings.c  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libbrasero-burn/burn-plugin.c b/libbrasero-burn/burn-plugin.c
+index 09c5e9d..fe4a2da 100644
+--- a/libbrasero-burn/burn-plugin.c
++++ b/libbrasero-burn/burn-plugin.c
+@@ -1271,7 +1271,7 @@ brasero_plugin_init_real (BraseroPlugin *object)
+ 	}
+ 
+ 	/* now see if we need to override the hardcoded priority of the plugin */
+-	settings_path = g_strconcat ("/apps/brasero/plugins/",
++	settings_path = g_strconcat ("/org/gnome/brasero/plugins/",
+ 	                             priv->name,
+ 	                             G_DIR_SEPARATOR_S,
+ 	                             NULL);
+diff --git a/src/brasero-drive-settings.c b/src/brasero-drive-settings.c
+index 965a57a..729dc62 100644
+--- a/src/brasero-drive-settings.c
++++ b/src/brasero-drive-settings.c
+@@ -46,7 +46,7 @@ struct _BraseroDriveSettingsPrivate
+ #define BRASERO_DRIVE_SETTINGS_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_DRIVE_SETTINGS, BraseroDriveSettingsPrivate))
+ 
+ #define BRASERO_SCHEMA_DRIVES			"org.gnome.brasero.drives"
+-#define BRASERO_DRIVE_PROPERTIES_PATH		"/apps/brasero/drives/"
++#define BRASERO_DRIVE_PROPERTIES_PATH		"/org/gnome/brasero/drives/"
+ #define BRASERO_PROPS_FLAGS			"flags"
+ #define BRASERO_PROPS_SPEED			"speed"
+ 
+-- 
+1.7.10.4
+

Modified: desktop/unstable/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/series?rev=35919&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/series [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/series [utf-8] Thu Oct 11 21:14:46 2012
@@ -1,1 +1,2 @@
 03_cue-invalid-frame-75.patch
+04_put-settings-in-the-correct-path.patch