Changeset 1766326 in mainline for uspace/app/taskbar/taskbar.c
- Timestamp:
- 2022-10-18T09:06:07Z (3 years ago)
- Branches:
- master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 7a05d924
- Parents:
- 0761448
- git-author:
- Jiri Svoboda <jiri@…> (2022-10-17 17:05:56)
- git-committer:
- Jiri Svoboda <jiri@…> (2022-10-18 09:06:07)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/taskbar/taskbar.c
r0761448 r1766326 42 42 #include <ui/ui.h> 43 43 #include <ui/window.h> 44 #include <wndmgt.h> 44 45 #include "clock.h" 45 46 #include "taskbar.h" … … 67 68 * 68 69 * @param display_spec Display specification 70 * @param wndmgt_svc Window management service (or WNDMGT_DEFAULT) 69 71 * @param rtaskbar Place to store pointer to new task bar 70 72 * @return @c EOK on success or an error coe 71 73 */ 72 errno_t taskbar_create(const char *display_spec, taskbar_t **rtaskbar) 74 errno_t taskbar_create(const char *display_spec, const char *wndmgt_svc, 75 taskbar_t **rtaskbar) 73 76 { 74 77 ui_wnd_params_t params; … … 83 86 rc = ENOMEM; 84 87 goto error; 88 } 89 90 if (wndmgt_svc != NULL) { 91 rc = wndmgt_open(wndmgt_svc, NULL, NULL, &taskbar->wndmgt); 92 if (rc != EOK) 93 goto error; 85 94 } 86 95 … … 215 224 if (taskbar->ui != NULL) 216 225 ui_destroy(taskbar->ui); 226 if (taskbar->wndmgt != NULL) 227 wndmgt_close(taskbar->wndmgt); 217 228 return rc; 218 229 … … 226 237 ui_window_destroy(taskbar->window); 227 238 ui_destroy(taskbar->ui); 239 if (taskbar->wndmgt != NULL) 240 wndmgt_close(taskbar->wndmgt); 228 241 } 229 242
Note:
See TracChangeset
for help on using the changeset viewer.