From: Ray Strode <rstrode@redhat.com>
Date: Thu, 31 May 2018 14:51:17 +0000 (-0400)
Subject: Revert "wip! renderer: add disown method"
X-Git-Tag: 0.9.4~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb03dd704899ff107e195711fa28e554022f5c86;p=thirdparty%2Fplymouth.git

Revert "wip! renderer: add disown method"

This reverts commit 0c006993a4d1f345b80130fe40f378981744b432.
---

diff --git a/src/libply-splash-core/ply-renderer-plugin.h b/src/libply-splash-core/ply-renderer-plugin.h
index 8f05004b..f1455d30 100644
--- a/src/libply-splash-core/ply-renderer-plugin.h
+++ b/src/libply-splash-core/ply-renderer-plugin.h
@@ -68,8 +68,6 @@ typedef struct
                                    ply_renderer_input_source_t *input_source);
 
         const char * (*get_device_name)(ply_renderer_backend_t *backend);
-
-        void (*disown) (ply_renderer_backend_t *backend);
 } ply_renderer_plugin_interface_t;
 
 #endif /* PLY_RENDERER_PLUGIN_H */
diff --git a/src/libply-splash-core/ply-renderer.c b/src/libply-splash-core/ply-renderer.c
index f79b4e6a..b9059ef3 100644
--- a/src/libply-splash-core/ply-renderer.c
+++ b/src/libply-splash-core/ply-renderer.c
@@ -317,17 +317,6 @@ ply_renderer_deactivate (ply_renderer_t *renderer)
         return renderer->plugin_interface->deactivate (renderer->backend);
 }
 
-void
-ply_renderer_disown (ply_renderer_t *renderer)
-{
-        assert (renderer->plugin_interface != NULL);
-
-        if (renderer->plugin_interface->disown == NULL)
-                return;
-
-        return renderer->plugin_interface->disown (renderer->backend);
-}
-
 bool
 ply_renderer_is_active (ply_renderer_t *renderer)
 {
diff --git a/src/libply-splash-core/ply-renderer.h b/src/libply-splash-core/ply-renderer.h
index 5fee2074..59391e17 100644
--- a/src/libply-splash-core/ply-renderer.h
+++ b/src/libply-splash-core/ply-renderer.h
@@ -57,7 +57,6 @@ bool ply_renderer_open (ply_renderer_t *renderer);
 void ply_renderer_close (ply_renderer_t *renderer);
 void ply_renderer_activate (ply_renderer_t *renderer);
 void ply_renderer_deactivate (ply_renderer_t *renderer);
-void ply_renderer_disown (ply_renderer_t *renderer);
 bool ply_renderer_is_active (ply_renderer_t *renderer);
 const char *ply_renderer_get_device_name (ply_renderer_t *renderer);
 ply_list_t *ply_renderer_get_heads (ply_renderer_t *renderer);
diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 22f1e21f..fb79aa6d 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -1406,11 +1406,6 @@ close_input_source (ply_renderer_backend_t      *backend,
         input_source->backend = NULL;
 }
 
-static void
-disown (ply_renderer_backend_t *backend)
-{
-}
-
 ply_renderer_plugin_interface_t *
 ply_renderer_backend_get_interface (void)
 {
@@ -1432,8 +1427,7 @@ ply_renderer_backend_get_interface (void)
                 .open_input_source            = open_input_source,
                 .set_handler_for_input_source = set_handler_for_input_source,
                 .close_input_source           = close_input_source,
-                .get_device_name              = get_device_name,
-                .disown                       = disown,
+                .get_device_name              = get_device_name
         };
 
         return &plugin_interface;