all: use the new API to register keys

The new API requires explicitly to specify the related keys.

https://bugzilla.gnome.org/show_bug.cgi?id=755551

6 files changed, 28 insertions, 21 deletions

diff --git a/src/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c
index dfdfef8..3e94a4c 100644
--- a/src/bookmarks/grl-bookmarks.c
+++ b/src/bookmarks/grl-bookmarks.c
@@ -152,7 +152,7 @@ grl_bookmarks_plugin_register_keys (GrlRegistry *registry,
                              G_TYPE_DATE_TIME,
                              G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_BOOKMARKS_KEY_BOOKMARK_TIME =
-      grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
   /* If key was not registered, could be that it is already registered. If so,
      check if type is the expected one, and reuse it */
   if (GRL_BOOKMARKS_KEY_BOOKMARK_TIME == GRL_METADATA_KEY_INVALID) {
diff --git a/src/gravatar/grl-gravatar.c b/src/gravatar/grl-gravatar.c
index 4ee47a3..27cffbd 100644
--- a/src/gravatar/grl-gravatar.c
+++ b/src/gravatar/grl-gravatar.c
@@ -59,6 +59,7 @@ static gboolean grl_gravatar_source_may_resolve (GrlSource *source,
                                                  GList **missing_keys);
 
 static GrlKeyID register_gravatar_key (GrlRegistry *registry,
+                                       GrlKeyID bind_key,
                                        const gchar *name,
                                        const gchar *nick,
                                        const gchar *blurb);
@@ -105,24 +106,17 @@ grl_gravatar_source_plugin_register_keys (GrlRegistry *registry,
 {
   GRL_METADATA_KEY_ARTIST_AVATAR =
     register_gravatar_key (registry,
+                           GRL_METADATA_KEY_ARTIST,
                            "artist-avatar",
                            "ArtistAvatar",
                            "Avatar for the artist");
 
   GRL_METADATA_KEY_AUTHOR_AVATAR =
     register_gravatar_key (registry,
+                           GRL_METADATA_KEY_AUTHOR,
                            "author-avatar",
                             "AuthorAvatar",
                             "Avatar for the author");
-
-  /* Create relationship */
-  grl_registry_register_metadata_key_relation (registry,
-                                               GRL_METADATA_KEY_ARTIST,
-                                               GRL_METADATA_KEY_ARTIST_AVATAR);
-
-  grl_registry_register_metadata_key_relation (registry,
-                                               GRL_METADATA_KEY_AUTHOR,
-                                               GRL_METADATA_KEY_AUTHOR_AVATAR);
 }
 
 GRL_PLUGIN_DEFINE (GRL_MAJOR,
@@ -174,6 +168,7 @@ G_DEFINE_TYPE (GrlGravatarSource,
 
 static GrlKeyID
 register_gravatar_key (GrlRegistry *registry,
+                       GrlKeyID bind_key,
                        const gchar *name,
                        const gchar *nick,
                        const gchar *blurb)
@@ -187,7 +182,7 @@ register_gravatar_key (GrlRegistry *registry,
                               NULL,
                               G_PARAM_READWRITE);
 
-  key = grl_registry_register_metadata_key (registry, spec, NULL);
+  key = grl_registry_register_metadata_key (registry, spec, bind_key, NULL);
 
   /* If key was not registered, could be that it is already registered. If so,
      check if type is the expected one, and reuse it */
diff --git a/src/opensubtitles/grl-opensubtitles.c b/src/opensubtitles/grl-opensubtitles.c
index a6c5b2e..9224fa0 100644
--- a/src/opensubtitles/grl-opensubtitles.c
+++ b/src/opensubtitles/grl-opensubtitles.c
@@ -88,6 +88,7 @@ gboolean grl_opensubtitles_source_plugin_init (GrlRegistry *registry,
 
 static GrlKeyID
 register_metadata_key (GrlRegistry *registry,
+                       GrlKeyID bind_key,
                        const char *name,
                        const char *nick,
                        const char *blurb)
@@ -102,7 +103,7 @@ register_metadata_key (GrlRegistry *registry,
                               G_PARAM_READWRITE
                               | G_PARAM_STATIC_STRINGS);
 
-  key = grl_registry_register_metadata_key (registry, spec, NULL);
+  key = grl_registry_register_metadata_key (registry, spec, bind_key, NULL);
 
   if (key == GRL_METADATA_KEY_INVALID) {
     key = grl_registry_lookup_metadata_key (registry, name);
@@ -129,12 +130,14 @@ grl_opensubtitles_source_plugin_init (GrlRegistry *registry,
 
   GRL_OPENSUBTITLES_METADATA_KEY_SUBTITLES_URL =
     register_metadata_key (registry,
+                           GRL_METADATA_KEY_INVALID,
                            "subtitles-url",
                            "subtitles-url",
                            "Subtitles URL");
 
   GRL_OPENSUBTITLES_METADATA_KEY_SUBTITLES_LANG =
     register_metadata_key (registry,
+                           GRL_METADATA_KEY_INVALID,
                            "subtitles-lang",
                            "subtitles-lang",
                            "Subtitles Language");
diff --git a/src/thetvdb/grl-thetvdb.c b/src/thetvdb/grl-thetvdb.c
index aced782..4051ad0 100644
--- a/src/thetvdb/grl-thetvdb.c
+++ b/src/thetvdb/grl-thetvdb.c
@@ -229,7 +229,7 @@ grl_thetvdb_plugin_register_keys (GrlRegistry *registry,
                               NULL,
                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_THETVDB_METADATA_KEY_THETVDB_ID =
-    grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
 
   spec = g_param_spec_string ("thetvdb-imdb-id",
                               "thetvdb-imdb-id",
@@ -237,7 +237,7 @@ grl_thetvdb_plugin_register_keys (GrlRegistry *registry,
                               NULL,
                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_THETVDB_METADATA_KEY_IMDB_ID =
-    grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
 
   spec = g_param_spec_string ("thetvdb-zap2it-id",
                               "thetvdb-zap2it-id",
@@ -245,7 +245,7 @@ grl_thetvdb_plugin_register_keys (GrlRegistry *registry,
                               NULL,
                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_THETVDB_METADATA_KEY_ZAP2IT_ID =
-    grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
 
   spec = g_param_spec_string ("thetvdb-guest-stars",
                               "thetvdb-guest-stars",
@@ -253,7 +253,7 @@ grl_thetvdb_plugin_register_keys (GrlRegistry *registry,
                               NULL,
                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_THETVDB_METADATA_KEY_GUEST_STARS =
-    grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
 
   spec = g_param_spec_string ("thetvdb-fanart",
                               "thetvdb-fanart",
@@ -261,7 +261,7 @@ grl_thetvdb_plugin_register_keys (GrlRegistry *registry,
                               NULL,
                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_THETVDB_METADATA_KEY_FANART =
-    grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
 
   spec = g_param_spec_string ("thetvdb-banner",
                               "thetvdb-banner",
@@ -269,7 +269,7 @@ grl_thetvdb_plugin_register_keys (GrlRegistry *registry,
                               NULL,
                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_THETVDB_METADATA_KEY_BANNER =
-    grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
 
   spec = g_param_spec_string ("thetvdb-poster",
                               "thetvdb-poster",
@@ -277,7 +277,7 @@ grl_thetvdb_plugin_register_keys (GrlRegistry *registry,
                               NULL,
                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_THETVDB_METADATA_KEY_POSTER =
-    grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
 
   spec = g_param_spec_string ("thetvdb-episode-screenshot",
                               "thetvdb-episode-screenshot",
@@ -285,7 +285,7 @@ grl_thetvdb_plugin_register_keys (GrlRegistry *registry,
                               NULL,
                               G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
   GRL_THETVDB_METADATA_KEY_EPISODE_SS =
-    grl_registry_register_metadata_key (registry, spec, NULL);
+    grl_registry_register_metadata_key (registry, spec, GRL_METADATA_KEY_INVALID, NULL);
 }
 
 GRL_PLUGIN_DEFINE (GRL_MAJOR,
diff --git a/src/tmdb/grl-tmdb.c b/src/tmdb/grl-tmdb.c
index c1b6fc0..20c2124 100644
--- a/src/tmdb/grl-tmdb.c
+++ b/src/tmdb/grl-tmdb.c
@@ -113,6 +113,7 @@ static void grl_tmdb_source_finalize (GObject *object);
 
 static GrlKeyID
 register_metadata_key (GrlRegistry *registry,
+                       GrlKeyID bind_key,
                        const char *name,
                        const char *nick,
                        const char *blurb);
@@ -166,24 +167,28 @@ grl_tmdb_source_plugin_register_keys (GrlRegistry *registry,
 {
   GRL_TMDB_METADATA_KEY_BACKDROP =
     register_metadata_key (registry,
+                           GRL_METADATA_KEY_INVALID,
                            "tmdb-backdrop",
                            "tmdb-backdrop",
                            "A list of URLs for movie backdrops");
 
   GRL_TMDB_METADATA_KEY_POSTER =
     register_metadata_key (registry,
+                           GRL_METADATA_KEY_INVALID,
                            "tmdb-poster",
                            "tmdb-poster",
                            "A list of URLs for movie posters");
 
   GRL_TMDB_METADATA_KEY_IMDB_ID =
     register_metadata_key (registry,
+                           GRL_METADATA_KEY_INVALID,
                            "tmdb-imdb-id",
                            "tmdb-imdb-id",
                            "ID of this movie at imdb.org");
 
   GRL_TMDB_METADATA_KEY_TMDB_ID =
     register_metadata_key (registry,
+                           GRL_METADATA_KEY_INVALID,
                            "tmdb-id",
                            "tmdb-id",
                            "ID of this movie at tmdb.org");
@@ -386,6 +391,7 @@ grl_tmdb_source_finalize (GObject *object)
 
 static GrlKeyID
 register_metadata_key (GrlRegistry *registry,
+                       GrlKeyID bind_key,
                        const char *name,
                        const char *nick,
                        const char *blurb)
@@ -400,7 +406,7 @@ register_metadata_key (GrlRegistry *registry,
                               G_PARAM_READWRITE
                               | G_PARAM_STATIC_STRINGS);
 
-  key = grl_registry_register_metadata_key (registry, spec, NULL);
+  key = grl_registry_register_metadata_key (registry, spec, bind_key, NULL);
 
   if (key == GRL_METADATA_KEY_INVALID) {
     key = grl_registry_lookup_metadata_key (registry, name);
diff --git a/src/tracker/grl-tracker.c b/src/tracker/grl-tracker.c
index 900e3a5..40e0e2f 100644
--- a/src/tracker/grl-tracker.c
+++ b/src/tracker/grl-tracker.c
@@ -275,6 +275,7 @@ grl_tracker_plugin_register_keys (GrlRegistry *registry,
                                                            NULL,
                                                            G_PARAM_STATIC_STRINGS |
                                                            G_PARAM_READWRITE),
+                                      GRL_METADATA_KEY_INVALID,
                                       NULL);
   grl_registry_register_metadata_key (grl_registry_get_default (),
                                       g_param_spec_string ("gibest-hash",
@@ -283,6 +284,7 @@ grl_tracker_plugin_register_keys (GrlRegistry *registry,
                                                            NULL,
                                                            G_PARAM_STATIC_STRINGS |
                                                            G_PARAM_READWRITE),
+                                      GRL_METADATA_KEY_INVALID,
                                       NULL);
   grl_registry_register_metadata_key (grl_registry_get_default (),
                                       g_param_spec_string ("tracker-urn",
@@ -291,6 +293,7 @@ grl_tracker_plugin_register_keys (GrlRegistry *registry,
                                                            NULL,
                                                            G_PARAM_STATIC_STRINGS |
                                                            G_PARAM_READWRITE),
+                                      GRL_METADATA_KEY_INVALID,
                                       NULL);
 }