summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>2015-06-22 15:32:23 +0900
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-06-23 15:57:16 +0300
commit3aa8aedb47ccad305b1a55aa03308f4becd6d497 (patch)
tree4df22d08b76149b14fca7717a5399685d3fee5f4
parent5d4a323c36855a6294d25e28b476da1e2118e72d (diff)
downloadweston-3aa8aedb47ccad305b1a55aa03308f4becd6d497.tar.gz
ivi-shell: rename to ivi_layout_layer_destroy()
"remove" is not proper name beacause it destorys a layer. The name of the api is changed from layer_remove to layer_destroy. Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r--ivi-shell/ivi-layout-export.h2
-rw-r--r--ivi-shell/ivi-layout.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index 68d37603..8a920098 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -470,7 +470,7 @@ struct ivi_controller_interface {
/**
* \brief Removes a ivi_layer which is currently managed by the service
*/
- void (*layer_remove)(struct ivi_layout_layer *ivilayer);
+ void (*layer_destroy)(struct ivi_layout_layer *ivilayer);
/**
* \brief Get all ivi_layers which are currently registered and managed
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index b4165a82..5f9235c2 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1904,7 +1904,7 @@ ivi_layout_layer_remove_notification_by_callback(struct ivi_layout_layer *ivilay
}
static void
-ivi_layout_layer_remove(struct ivi_layout_layer *ivilayer)
+ivi_layout_layer_destroy(struct ivi_layout_layer *ivilayer)
{
struct ivi_layout *layout = get_instance();
@@ -3005,7 +3005,7 @@ static struct ivi_controller_interface ivi_controller_interface = {
.add_notification_remove_layer = ivi_layout_add_notification_remove_layer,
.remove_notification_remove_layer = ivi_layout_remove_notification_remove_layer,
.layer_create_with_dimension = ivi_layout_layer_create_with_dimension,
- .layer_remove = ivi_layout_layer_remove,
+ .layer_destroy = ivi_layout_layer_destroy,
.get_layers = ivi_layout_get_layers,
.get_id_of_layer = ivi_layout_get_id_of_layer,
.get_layer_from_id = ivi_layout_get_layer_from_id,