[gedit] metadata: adapt key names for TeplFileMetadata

[Sébastien Wilmet <swilmet src gnome org>]

commit 8c0825424db186bd1be6118dc840f13e27cf810b
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Nov 14 10:53:15 2019 +0100

    metadata: adapt key names for TeplFileMetadata
    
    When GVfs is used, it will be equivalent (users won't lose their
    metadata).
    
    On Windows - with the metadata manager - users will lose their metadata
    since the key names now have the gedit namespace. But it's just
    metadata.

 gedit/gedit-document-private.h     | 12 +++---------
 plugins/spell/gedit-spell-plugin.c |  9 ++-------
 2 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/gedit/gedit-document-private.h b/gedit/gedit-document-private.h
index dabb2a805..2cec9e301 100644
--- a/gedit/gedit-document-private.h
+++ b/gedit/gedit-document-private.h
@@ -28,15 +28,9 @@
 
 G_BEGIN_DECLS
 
-#ifdef G_OS_WIN32
-#define GEDIT_METADATA_ATTRIBUTE_POSITION "position"
-#define GEDIT_METADATA_ATTRIBUTE_ENCODING "encoding"
-#define GEDIT_METADATA_ATTRIBUTE_LANGUAGE "language"
-#else
-#define GEDIT_METADATA_ATTRIBUTE_POSITION "metadata::gedit-position"
-#define GEDIT_METADATA_ATTRIBUTE_ENCODING "metadata::gedit-encoding"
-#define GEDIT_METADATA_ATTRIBUTE_LANGUAGE "metadata::gedit-language"
-#endif
+#define GEDIT_METADATA_ATTRIBUTE_POSITION "gedit-position"
+#define GEDIT_METADATA_ATTRIBUTE_ENCODING "gedit-encoding"
+#define GEDIT_METADATA_ATTRIBUTE_LANGUAGE "gedit-language"
 
 glong           _gedit_document_get_seconds_since_last_save_or_load    (GeditDocument       *doc);
 
diff --git a/plugins/spell/gedit-spell-plugin.c b/plugins/spell/gedit-spell-plugin.c
index 47d449433..611677826 100644
--- a/plugins/spell/gedit-spell-plugin.c
+++ b/plugins/spell/gedit-spell-plugin.c
@@ -30,13 +30,8 @@
 
 #include "gedit-spell-app-activatable.h"
 
-#ifdef G_OS_WIN32
-#define GEDIT_METADATA_ATTRIBUTE_SPELL_LANGUAGE "spell-language"
-#define GEDIT_METADATA_ATTRIBUTE_SPELL_ENABLED  "spell-enabled"
-#else
-#define GEDIT_METADATA_ATTRIBUTE_SPELL_LANGUAGE "metadata::gedit-spell-language"
-#define GEDIT_METADATA_ATTRIBUTE_SPELL_ENABLED  "metadata::gedit-spell-enabled"
-#endif
+#define GEDIT_METADATA_ATTRIBUTE_SPELL_LANGUAGE "gedit-spell-language"
+#define GEDIT_METADATA_ATTRIBUTE_SPELL_ENABLED  "gedit-spell-enabled"
 
 #define SPELL_ENABLED_STR "1"
 #define SPELL_BASE_SETTINGS    "org.gnome.gedit.plugins.spell"