summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2015-08-25 14:31:09 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2015-08-26 16:06:44 +0200
commit4c2224995e452f6f55c49755f4ef418bd0e13081 (patch)
treeb8540dd71096fb4f907dfab400cb6835f68587e3
parentd81ad96a8f20070d71b9dce0a525a2dca5ceadb0 (diff)
ecore_wayland: bind and destroy session_recovery interface correctly.
This was missing from the initial session recovery support patches. Bind the interface so we can actually work with it on the client side and destroy it at the end. @fix
-rw-r--r--src/lib/ecore_wayland/ecore_wl.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index fff8dd6de3..13758c6c3f 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -506,6 +506,8 @@ _ecore_wl_shutdown(Eina_Bool close)
506 506
507 _ecore_wl_xkb_shutdown(_ecore_wl_disp); 507 _ecore_wl_xkb_shutdown(_ecore_wl_disp);
508 508
509 if (_ecore_wl_disp->wl.session_recovery)
510 session_recovery_destroy(_ecore_wl_disp->wl.session_recovery);
509#ifdef USE_IVI_SHELL 511#ifdef USE_IVI_SHELL
510 if (_ecore_wl_disp->wl.ivi_application) 512 if (_ecore_wl_disp->wl.ivi_application)
511 ivi_application_destroy(_ecore_wl_disp->wl.ivi_application); 513 ivi_application_destroy(_ecore_wl_disp->wl.ivi_application);
@@ -654,6 +656,11 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
654 _ecore_wl_output_add(ewd, id); 656 _ecore_wl_output_add(ewd, id);
655 else if (!strcmp(interface, "wl_seat")) 657 else if (!strcmp(interface, "wl_seat"))
656 _ecore_wl_input_add(ewd, id); 658 _ecore_wl_input_add(ewd, id);
659 else if (!strcmp(interface, "session_recovery"))
660 {
661 ewd->wl.session_recovery =
662 wl_registry_bind(registry, id, &session_recovery_interface, 1);
663 }
657#ifdef USE_IVI_SHELL 664#ifdef USE_IVI_SHELL
658 else if (!strcmp(interface, "ivi_application")) 665 else if (!strcmp(interface, "ivi_application"))
659 { 666 {