X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-profile-graphical%2Frecipes-graphics%2Fwayland%2Fweston%2F0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch;h=b1e0b8a59b88ce49a32ed4a09936996b748fba97;hb=ef0396a7d986d4fe381fe1f8f061083745dd6625;hp=449b7a0fd0c541fb77265e70e748b16cd625c6bc;hpb=bb0882c5dad030f676e424265ebcd869bb3ff899;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch
index 449b7a0fd..b1e0b8a59 100644
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-ivi-shell-rework-goto-labels-to-avoid-memory-leaks.patch
@@ -1,40 +1,40 @@
-index 67619b8f..e9ddf9a4 100644
+diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
+index 58f53bc5..34cdce27 100644
 --- a/ivi-shell/ivi-shell.c
 +++ b/ivi-shell/ivi-shell.c
-@@ -497,44 +497,53 @@ wet_shell_init(struct weston_compositor *compositor,
+@@ -484,13 +484,14 @@ wet_shell_init(struct weston_compositor *compositor,
+ 	       int *argc, char *argv[])
  {
  	struct ivi_shell *shell;
- 	struct ivi_shell_setting setting = { };
 -	int retval = -1;
  
  	shell = zalloc(sizeof *shell);
  	if (shell == NULL)
- 		return -1;
- 
- 	if (ivi_shell_setting_create(&setting, compositor, argc, argv) != 0)
 -		return -1;
 +		goto err_shell;
  
- 	init_ivi_shell(compositor, shell, &setting);
+ 	init_ivi_shell(compositor, shell);
 +	/* TODO deinit_ivi_shell should be implemented, since init_ivi_shell is
 +	 * initializing multiple lists. */
  
  	shell->destroy_listener.notify = shell_destroy;
  	wl_signal_add(&compositor->destroy_signal, &shell->destroy_listener);
+@@ -499,22 +500,29 @@ wet_shell_init(struct weston_compositor *compositor,
+ 	wl_signal_add(&compositor->wake_signal, &shell->wake_listener);
  
  	if (input_panel_setup(shell) < 0)
--		goto out_settings;
-+		goto err_settings;
+-		goto out;
++		goto err_shell;
  
  	shell->text_backend = text_backend_init(compositor);
  	if (!shell->text_backend)
--		goto out_settings;
-+		goto err_settings;
+-		goto out;
++		goto err_shell;
  
  	if (wl_global_create(compositor->wl_display,
  			     &ivi_application_interface, 1,
  			     shell, bind_ivi_application) == NULL)
--		goto out_settings;
+-		goto out;
 +		goto err_text_backend;
  
  	ivi_layout_init_with_compositor(compositor);
@@ -42,23 +42,14 @@ index 67619b8f..e9ddf9a4 100644
 +	 * and signals are initialized.*/
  	shell_add_bindings(compositor, shell);
  
- 	/* Call module_init of ivi-modules which are defined in weston.ini */
- 	if (load_controller_modules(compositor, setting.ivi_module,
- 				    argc, argv) < 0)
--		goto out_settings;
-+		goto err_text_backend;
-+
+-	retval = 0;
 +	return IVI_SUCCEEDED;
  
--	retval = 0;
+-out:
+-	return retval;
 +err_text_backend:
 +	text_backend_destroy(shell->text_backend);
- 
--out_settings:
-+err_settings:
- 	free(setting.ivi_module);
- 
--	return retval;
++
 +err_shell:
 +	free(shell);
 +