core: Rename PluginRegistry to Registry

8 files changed, 26 insertions, 26 deletions

diff --git a/tests/metadata_source.c b/tests/metadata_source.c
index 6429567..9a9ba0f 100644
--- a/tests/metadata_source.c
+++ b/tests/metadata_source.c
@@ -56,9 +56,9 @@ registry_load_error_handler (const gchar *log_domain,
 static bool
 load_metadata_sources ()
 {
-  GrlPluginRegistry *reg;
+  GrlRegistry *reg;
 
-  reg = grl_plugin_registry_get_default ();
+  reg = grl_registry_get_default ();
   if (!reg)
     return false;
 
@@ -66,14 +66,14 @@ load_metadata_sources ()
   g_test_log_set_fatal_handler (registry_load_error_handler, NULL);
 #endif
 
-  if (!grl_plugin_registry_load_all (reg, NULL))
+  if (!grl_registry_load_all (reg, NULL))
     return false;
 
-  keys = grl_plugin_registry_get_metadata_keys (reg);
+  keys = grl_registry_get_metadata_keys (reg);
   if (!keys)
     return false;
 
-  sources = grl_plugin_registry_get_sources (reg, false);
+  sources = grl_registry_get_sources (reg, false);
   if (!sources)
     return false;
 
diff --git a/tests/python/test_fs.py b/tests/python/test_fs.py
index b74ea4f..add454d 100644
--- a/tests/python/test_fs.py
+++ b/tests/python/test_fs.py
@@ -28,7 +28,7 @@ _tempdir = tempfile.mkdtemp()
 class TestFSOperations(unittest.TestCase):
     def __init__(self, method_name):
         super(TestFSOperations, self).__init__(method_name)
-        self.registry = Grl.PluginRegistry.get_default()
+        self.registry = Grl.Registry.get_default()
         self.plugin = self.registry.lookup_source("grl-filesystem")
 
         self.file_tree_pictures = [
@@ -256,7 +256,7 @@ class TestFSOperations(unittest.TestCase):
 
 def _init():
     Grl.init([])
-    registry = Grl.PluginRegistry.get_default()
+    registry = Grl.Registry.get_default()
 
     fs_config = Grl.Config.new("grl-filesystem", None)
     fs_config.set_string("base-path", _tempdir)
diff --git a/tests/python/test_media.py b/tests/python/test_media.py
index ccd4727..1532636 100644
--- a/tests/python/test_media.py
+++ b/tests/python/test_media.py
@@ -55,5 +55,5 @@ class TestMedia(unittest.TestCase):
 
 # who said "this is ugly" ?
 Grl.init([])
-registry = Grl.PluginRegistry.get_default()
+registry = Grl.Registry.get_default()
 registry.load_by_id("grl-filesystem")
diff --git a/tests/python/test_metadata_source.py b/tests/python/test_metadata_source.py
index 67282cb..9642e9a 100644
--- a/tests/python/test_metadata_source.py
+++ b/tests/python/test_metadata_source.py
@@ -16,7 +16,7 @@ class TestMetadataSource(unittest.TestCase):
     def __init__(self, method_name):
         super(TestMetadataSource, self).__init__(method_name)
         Grl.init([])
-        self.registry = Grl.PluginRegistry.get_default()
+        self.registry = Grl.Registry.get_default()
         self.registry.load_all()
         ops = Grl.SupportedOps(Grl.SupportedOps.RESOLVE |
                                Grl.SupportedOps.SET_METADATA)
diff --git a/tests/python/test_options.py b/tests/python/test_options.py
index 19126c4..5a8f1c5 100644
--- a/tests/python/test_options.py
+++ b/tests/python/test_options.py
@@ -179,7 +179,7 @@ class TestOptions(unittest.TestCase):
 class TestFileSystem(unittest.TestCase):
     def __init__(self, method_name):
         super(TestFileSystem, self).__init__(method_name)
-        self.registry = Grl.PluginRegistry.get_default()
+        self.registry = Grl.Registry.get_default()
         self.plugin = self.registry.lookup_source("grl-filesystem")
 
     def test_caps(self):
@@ -189,5 +189,5 @@ class TestFileSystem(unittest.TestCase):
 
 # who said "this is ugly" ?
 Grl.init([])
-registry = Grl.PluginRegistry.get_default()
+registry = Grl.Registry.get_default()
 registry.load_by_id("grl-filesystem")
diff --git a/tests/python/test_plugin.py b/tests/python/test_plugin.py
index 9ebc6c7..68b1437 100644
--- a/tests/python/test_plugin.py
+++ b/tests/python/test_plugin.py
@@ -14,7 +14,7 @@ class TestMediaPlugin(unittest.TestCase):
     def __init__(self, method_name):
         super(TestMediaPlugin, self).__init__(method_name)
         Grl.init([])
-        self.registry = Grl.PluginRegistry.get_default()
+        self.registry = Grl.Registry.get_default()
         self.registry.load_all()
         sources = self.registry.get_sources(False)
         if sources:
diff --git a/tests/python/test_registry.py b/tests/python/test_registry.py
index 654a2fa..b13c5bd 100644
--- a/tests/python/test_registry.py
+++ b/tests/python/test_registry.py
@@ -12,7 +12,7 @@ except:
     logging.warning("Unable to import Grilo's introspection bindings")
     exit()
 
-class TestPluginRegistry(unittest.TestCase):
+class TestRegistry(unittest.TestCase):
 
     EXISTING_LIBRARY_PATH = None
 
@@ -24,9 +24,9 @@ class TestPluginRegistry(unittest.TestCase):
     NONEXISTING_SOURCE = 'NON_EXISTING_SOURCE'
 
     def __init__(self, method_name):
-        super(TestPluginRegistry, self).__init__(method_name)
+        super(TestRegistry, self).__init__(method_name)
         Grl.init([])
-        self.registry = Grl.PluginRegistry.get_default()
+        self.registry = Grl.Registry.get_default()
         plugin_paths = util.GRL_PLUGIN_PATH.split(':')
         for path in plugin_paths:
             if path:
@@ -43,12 +43,12 @@ class TestPluginRegistry(unittest.TestCase):
         pass
 
     def test_get_default_not_null(self):
-        registry = Grl.PluginRegistry.get_default()
+        registry = Grl.Registry.get_default()
         self.assertTrue(registry)
 
     def test_get_default_singleton(self):
-        registry1 = Grl.PluginRegistry.get_default()
-        registry2 = Grl.PluginRegistry.get_default()
+        registry1 = Grl.Registry.get_default()
+        registry2 = Grl.Registry.get_default()
         self.assertEquals(registry1, registry2)
 
     def test_add_directory(self):
diff --git a/tests/registry.c b/tests/registry.c
index af55072..4826e1b 100644
--- a/tests/registry.c
+++ b/tests/registry.c
@@ -50,7 +50,7 @@ registry_load_error_handler (const gchar *log_domain,
 #endif
 
 typedef struct {
-  GrlPluginRegistry *registry;
+  GrlRegistry *registry;
   GMainLoop *loop;
 } RegistryFixture;
 
@@ -61,7 +61,7 @@ registry_fixture_setup (RegistryFixture *fixture, gconstpointer data)
   g_test_log_set_fatal_handler (registry_load_error_handler, NULL);
 #endif
 
-  fixture->registry = grl_plugin_registry_get_default ();
+  fixture->registry = grl_registry_get_default ();
   fixture->loop = g_main_loop_new (NULL, TRUE);
 }
 
@@ -74,9 +74,9 @@ registry_fixture_teardown (RegistryFixture *fixture, gconstpointer data)
 static void
 registry_init (void)
 {
-  GrlPluginRegistry *registry;
+  GrlRegistry *registry;
 
-  registry = grl_plugin_registry_get_default ();
+  registry = grl_registry_get_default ();
   g_assert (registry);
 }
 
@@ -85,7 +85,7 @@ registry_load (RegistryFixture *fixture, gconstpointer data)
 {
   gboolean res;
 
-  res = grl_plugin_registry_load_all (fixture->registry, NULL);
+  res = grl_registry_load_all (fixture->registry, NULL);
   g_assert_cmpint (res, ==, TRUE);
 }
 
@@ -98,20 +98,20 @@ registry_unregister (RegistryFixture *fixture, gconstpointer data)
 
   g_test_bug ("627207");
 
-  sources = grl_plugin_registry_get_sources (fixture->registry, FALSE);
+  sources = grl_registry_get_sources (fixture->registry, FALSE);
 
   for (sources_iter = sources, i = 0; sources_iter;
       sources_iter = g_list_next (sources_iter), i++) {
     GrlMediaPlugin *source = GRL_MEDIA_PLUGIN (sources_iter->data);
 
-    grl_plugin_registry_unregister_source (fixture->registry, source, NULL);
+    grl_registry_unregister_source (fixture->registry, source, NULL);
   }
   g_list_free (sources);
 
   /* We expect to have loaded sources */
   g_assert_cmpint (i, !=, 0);
 
-  sources = grl_plugin_registry_get_sources (fixture->registry, FALSE);
+  sources = grl_registry_get_sources (fixture->registry, FALSE);
   for (sources_iter = sources, i = 0; sources_iter;
       sources_iter = g_list_next (sources_iter), i++)
     ;