[banshee/gtk3] LibrarySchema: remove duplicate MoveOnInfoSave SchemaEntry
- From: AndrÃs Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/gtk3] LibrarySchema: remove duplicate MoveOnInfoSave SchemaEntry
- Date: Thu, 20 Dec 2012 13:38:32 +0000 (UTC)
commit e6126c0a2e3682d334a2654f456edc91cd92a570
Author: Andres G. Aragoneses <knocte gmail com>
Date: Thu Dec 20 13:38:24 2012 +0000
LibrarySchema: remove duplicate MoveOnInfoSave SchemaEntry
This "move_on_info_save" config key was not being used, and already
existent in LibrarySource class (with an Old prefix). This also raises
the question if deleting deprecated GConf keys would be interesting to
do during this GConf->GSettings migration, so I'm adding a TODO here to
not forget.
The error being thrown due to this duplication was:
org.gnome.banshee.gschema.xml: Error on line 147 char 1: <key name='move-on-info-save'> already specified. --strict was specified; exiting.
make[2]: *** [org.gnome.banshee.gschema.valid] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2
.../Banshee.Library/LibrarySchema.cs | 7 -------
.../Banshee.Library/LibrarySource.cs | 1 +
2 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/src/Core/Banshee.Services/Banshee.Library/LibrarySchema.cs b/src/Core/Banshee.Services/Banshee.Library/LibrarySchema.cs
index 3d1ff7e..1d5afbb 100644
--- a/src/Core/Banshee.Services/Banshee.Library/LibrarySchema.cs
+++ b/src/Core/Banshee.Services/Banshee.Library/LibrarySchema.cs
@@ -55,13 +55,6 @@ namespace Banshee.Configuration.Schema
"%album_artist_initial%, %artist% (deprecated, use %album_artist%)."
);
- public static readonly SchemaEntry<bool> MoveOnInfoSave = new SchemaEntry<bool>(
- "library", "move_on_info_save",
- false,
- "Move music on info save",
- "Move music within banshee music library directory when saving track info"
- );
-
public static readonly SchemaEntry<bool> WriteMetadata = new SchemaEntry<bool>(
"library", "write_metadata",
false,
diff --git a/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs b/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
index 7a4a0fc..d242e52 100644
--- a/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
+++ b/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
@@ -49,6 +49,7 @@ namespace Banshee.Library
public abstract class LibrarySource : PrimarySource
{
// Deprecated, don't use in new code
+ // TODO: remove before GConf->GSettings migration?
internal static readonly Banshee.Configuration.SchemaEntry<string> OldLocationSchema = new Banshee.Configuration.SchemaEntry<string> ("library", "base_location", null, null, null);
internal static readonly Banshee.Configuration.SchemaEntry<bool> OldImportSetting = new Banshee.Configuration.SchemaEntry<bool> ("library", "copy_on_import", false, null, null);
internal static readonly Banshee.Configuration.SchemaEntry<bool> OldRenameSetting = new Banshee.Configuration.SchemaEntry<bool> ("library", "move_on_info_save", false, null, null);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]