SooChan Lim [Fri, 2 Jun 2023 00:35:01 +0000 (09:35 +0900)]
e_msg: chagne E_API to EINTERN
Change-Id: I292a0477ea95a2fadccd4d4804b515974e864783
SooChan Lim [Fri, 2 Jun 2023 00:33:35 +0000 (09:33 +0900)]
e_mouse: remove the unused enum
Change-Id: I8ea6a58e2b676fecf64c2f08facd495a12b1f55b
SooChan Lim [Fri, 2 Jun 2023 00:32:37 +0000 (09:32 +0900)]
e_mouse: change E_API to EINTERN
Change-Id: Idfd4f51a836f8ff78191d748dc543c632774b870
SooChan Lim [Fri, 2 Jun 2023 00:30:45 +0000 (09:30 +0900)]
e_module: change E_API to EINTERN
Change-Id: I8fe54fccb558c2493418549c3c79867707dc19c2
SooChan Lim [Fri, 2 Jun 2023 00:13:13 +0000 (09:13 +0900)]
e_maximize: change E_API to EINTERN
Change-Id: Ief103c62f2bd4161a27626c8177db248f74c5167
SooChan Lim [Fri, 2 Jun 2023 00:07:29 +0000 (09:07 +0900)]
e_layout: change E_API to EINTERN
Change-Id: Ifbc5f674f8b9f72170d11ccf265135c3221b5bcf
SooChan Lim [Thu, 1 Jun 2023 23:16:24 +0000 (08:16 +0900)]
e_grabinput: change E_API to ETNTERN
Change-Id: I203f9604f6d5597dda25919e884d29fb8e4289bc
SooChan Lim [Thu, 1 Jun 2023 23:09:59 +0000 (08:09 +0900)]
e_pixmap: change EINTERN to E_API
Change-Id: I66ce08892bb8d86d8c857d65e7d6eaba90f7d3c1
SooChan Lim [Thu, 1 Jun 2023 09:18:11 +0000 (18:18 +0900)]
e_keyrouter: change E_API to EINTERN
Change-Id: I0ffa04c6ec4bfc271118a33d2d6c9a3914a4233a
SooChan Lim [Thu, 1 Jun 2023 09:09:04 +0000 (18:09 +0900)]
e_input: change E_API to EINTERN
Change-Id: Ibadd3dd61565e1320ab64346c82811e6cc6c7a72
SooChan Lim [Thu, 1 Jun 2023 08:44:50 +0000 (17:44 +0900)]
e_info_server: change EINTERN to E_API
Change-Id: Ie35986217e9765853a870fd2d546134ee32caa18
SooChan Lim [Thu, 1 Jun 2023 08:43:21 +0000 (17:43 +0900)]
e_info_server_input: put the EINTERN
Change-Id: Id10093f2ec895bbeb4b17981325e1b3107a91aa5
SooChan Lim [Thu, 1 Jun 2023 08:41:23 +0000 (17:41 +0900)]
e_info_protocol: put the EINTERN
Change-Id: I7b94f058282043322c074a7ae4ccbf465e36fb64
SooChan Lim [Thu, 1 Jun 2023 08:40:05 +0000 (17:40 +0900)]
e_hwc: change EINTERN to E_API
Change-Id: I21419a76c65e52803a44d59c87b1923d6ca3ffa8
SooChan Lim [Thu, 1 Jun 2023 04:32:17 +0000 (13:32 +0900)]
e_devicemgr: change E_API to EINTERN
Change-Id: I24cbb20e2c931adeed804acb7ce935118c5e221c
SooChan Lim [Thu, 1 Jun 2023 02:47:15 +0000 (11:47 +0900)]
e_dbus_conn: change E_API to EINTERN
Change-Id: I043944a8b2059bdd1a798c68fa6ed77a27f4581a
SooChan Lim [Thu, 1 Jun 2023 02:44:19 +0000 (11:44 +0900)]
e_config: change E_API to E_INTERN
Change-Id: Ib0499326d7267ff4782dad5205e3cb953a8cba3e
SooChan Lim [Thu, 1 Jun 2023 02:32:55 +0000 (11:32 +0900)]
e_comp_wl_input: change E_API to EINTERN
Change-Id: I06e6d50c1777826f7e8278c72365f873f844591c
SooChan Lim [Thu, 1 Jun 2023 01:42:55 +0000 (10:42 +0900)]
e_error: change E_API into EINTERN
Change-Id: I7d47961140163fae3a5a05eb5760c8828d35f063
SooChan Lim [Thu, 1 Jun 2023 01:40:44 +0000 (10:40 +0900)]
e_env: change E_API into EINTERN
Change-Id: I0744ebeec13079d73722571130fd5d1a199e1d66
SooChan Lim [Thu, 1 Jun 2023 01:39:56 +0000 (10:39 +0900)]
e_dnd: change E_API into EINTERN
Change-Id: I924cd8cce7c44d07ae1a4628c49a8ac6ca94aac6
SooChan Lim [Thu, 1 Jun 2023 01:34:21 +0000 (10:34 +0900)]
e_focus: remove the symbol which has no implementation.
Change-Id: I35c82809cbf290e9980de485ca780327b5e8fa87
SooChan Lim [Thu, 1 Jun 2023 01:31:09 +0000 (10:31 +0900)]
e_focus: change E_API to EINTERN
Change-Id: Icff9edcb0b4e01d26dd0f92ccb84a26e63761fdf
Junseok Kim [Wed, 24 May 2023 05:53:26 +0000 (14:53 +0900)]
e_dnd: Cancel drag when rotation changed
Change-Id: Ia8c8ad475f1b3a146e44b78e8f065458fc0dc389
Junseok Kim [Wed, 31 May 2023 06:24:55 +0000 (15:24 +0900)]
e_comp_wl: Move pointer during drag
There was a bug that pointer didn't move when dragging.
And there're another potential issue that send wl_pointer_motion even if wl_pointer_leave already sent.
for fix these issue, apply the following modifications.
- move pointer without drag state.
- send wl_pointer_motion when drag client is NULL.
Change-Id: I0fc866620571721fc43dbc421df0fc4a9d51cf24
SooChan Lim [Thu, 1 Jun 2023 07:32:35 +0000 (16:32 +0900)]
e_theme: change EINTERN to E_API
Change-Id: I4cfef8e3901e41bd6bdc2f8b73c649a31a96b0ec
SooChan Lim [Thu, 1 Jun 2023 07:31:51 +0000 (16:31 +0900)]
e_prefix: change EINTERN to E_API
Change-Id: I44c10c29d3bcf2d04f72b84aa2f1e5ca3d50e0d2
SooChan Lim [Thu, 1 Jun 2023 07:30:07 +0000 (16:30 +0900)]
e_comp_wl_rsm: change EINTERN to E_API
Change-Id: I1fa2b95e2aa51db058720b1e20452af77a60715a
SooChan Lim [Thu, 1 Jun 2023 07:02:45 +0000 (16:02 +0900)]
e_pixmap: change EINTERN to E_API
Change-Id: I9f419e1e68ef457c73cb4111d84dac740d40344a
SooChan Lim [Thu, 1 Jun 2023 06:49:32 +0000 (15:49 +0900)]
e_hints: change EINTERN to E_API
Change-Id: I39441879ce7bd73c7b8731d1e3845125401db4ad
SooChan Lim [Thu, 1 Jun 2023 06:36:09 +0000 (15:36 +0900)]
e_comp_object: change EINTERN to E_API
Change-Id: I3a61b85a7449716386aec895bcb827594496b5c9
SooChan Lim [Thu, 1 Jun 2023 05:28:35 +0000 (14:28 +0900)]
e_policy: remove the split_policy
split_policy is deprecated.
Change-Id: I8447191bf4ed79faf0905eb7bf02f0a65ca1363d
SooChan Lim [Thu, 1 Jun 2023 05:27:26 +0000 (14:27 +0900)]
remove the unused file
Change-Id: Ie70df1bc51f114d517817a8b1c3d578c8406acdc
SooChan Lim [Thu, 1 Jun 2023 05:22:27 +0000 (14:22 +0900)]
change EINTERN to E_API
Change-Id: I6fd0b65d5d833c642132b13153eb9f175b36ab9a
SooChan Lim [Wed, 31 May 2023 08:17:28 +0000 (17:17 +0900)]
fix the build warnings
Change-Id: I96c5763308acc1fcfe9ad6266f8fffba86bb15fc
SooChan Lim [Wed, 10 May 2023 06:01:10 +0000 (15:01 +0900)]
e_client: remove the unused variables
Change-Id: Ia207cf01a2879c3e840a7ee641c02661c68673fe
SooChan Lim [Wed, 10 May 2023 06:37:19 +0000 (15:37 +0900)]
e_client: remove the shelf_fix
It is deprecated.
Change-Id: I3d11ea66ae7e132d94102f0486becc0ea219043f
SooChan Lim [Wed, 10 May 2023 06:35:58 +0000 (15:35 +0900)]
e_client: remove the stick_desks variable
It is deprecated.
Change-Id: I5914c92423ace015804246e2d39944b6b76f8d36
SooChan Lim [Wed, 10 May 2023 06:34:26 +0000 (15:34 +0900)]
e_client: remove the color_editor variable
It is deprecated.
Change-Id: Icbba96361f4796b20d234fd544c29565266c759a
SooChan Lim [Wed, 10 May 2023 06:32:03 +0000 (15:32 +0900)]
e_client: remove the remember variable
It is deprecated.
Change-Id: Iba4879f8796c2f253bb170512300224b1aeed926
SooChan Lim [Wed, 10 May 2023 06:14:11 +0000 (15:14 +0900)]
e_client: remove the post_show/resize/move variables
They are deprecated.
Change-Id: I5b3d92a039cd5707511d244272f31a090eaa0ab6
SooChan Lim [Wed, 10 May 2023 06:12:43 +0000 (15:12 +0900)]
eclient: remove the post_job variable
It is deprecated.
Change-Id: I6592127b65f2d1a74c88bd6ef4725981f8be7818
SooChan Lim [Wed, 10 May 2023 06:06:47 +0000 (15:06 +0900)]
e_client: remove the layout structure
It is deprecated
Change-Id: Ife3b26a9dbf0105f7d33337db633dc10952c219d
SooChan Lim [Wed, 10 May 2023 06:06:03 +0000 (15:06 +0900)]
e_policy: remove the e_policy_client_is_splitted function
It is deprecate.
Change-Id: I8ede4c51aaacfef092215749da42cc81bd1373df
SooChan Lim [Wed, 10 May 2023 05:50:33 +0000 (14:50 +0900)]
e_client: remove the leader and group varaiables
They are not used anymore.
Change-Id: Id0156f74a37596ee6b6bf239d6b3af66c4316054
SooChan Lim [Wed, 10 May 2023 05:39:26 +0000 (14:39 +0900)]
e_client: remove the modal variable at e_client
It is not used anymore.
Change-Id: I491414a28def3e933fc69398e188620fb85ce131
SooChan Lim [Thu, 11 May 2023 07:55:02 +0000 (16:55 +0900)]
e_dialog: remove dialog drawing stuffs
Change-Id: Ie2e5a1ac19374b1e19057fd4248c982c9d751d00
SooChan Lim [Wed, 10 May 2023 11:52:56 +0000 (20:52 +0900)]
e_comp_object: remove E_Comp_Object_Type
It is deprecated
Change-Id: Ie868ee99868dacf29ee61e5db56307e5e04bf7fe
SooChan Lim [Wed, 10 May 2023 11:31:36 +0000 (20:31 +0900)]
e_comp_object: remove E_COMP_OBJECT_TYPE_POPUP
It is not used anymore
Change-Id: Ib6b548e373349e15ac4ff2370e8ea8dd25249a89
SooChan Lim [Wed, 10 May 2023 11:30:52 +0000 (20:30 +0900)]
e_comp_object: remove E_COMP_OBJECT_TYPE_MENU
It is not used anymore.
Change-Id: I996bd5920e0e35d298547b30f1accb8b850d1a68
SooChan Lim [Thu, 11 May 2023 06:30:13 +0000 (15:30 +0900)]
e_dbusmenu: remove e_dbusmenu
It is deprecated.
Change-Id: I0dde1ec3d2120e1de5914a3066ca4373f910dcc0
SooChan Lim [Wed, 10 May 2023 10:26:59 +0000 (19:26 +0900)]
e_zoomap: remove the zoomap
It is deprecated.
Change-Id: I0c4f6e7d226be3efda1d7d42118d631b2205f05c
SooChan Lim [Wed, 17 May 2023 23:12:10 +0000 (08:12 +0900)]
e_comp_wl: change E_Comp_Client_Data into E_Comp_Wl_Client_Data
E_Comp_Client_Data will be deprecated.
Change-Id: I69b39649f7d50ebf7ee4c6b5ddee7dcdcb4dfdc0
SooChan Lim [Tue, 23 May 2023 10:04:03 +0000 (19:04 +0900)]
e_hints: make some function to be static
Change-Id: Icad4ac9677754c427255ac9a7dd075ac569fea7c
SooChan Lim [Tue, 23 May 2023 09:59:09 +0000 (18:59 +0900)]
e_hints: remove the unused funtions
They are not used anymore.
Change-Id: Ia22510670d3a5395fefd2cf943ead53b6c7780fa
SooChan Lim [Tue, 23 May 2023 09:41:28 +0000 (18:41 +0900)]
e_hints: change E_API to EINTERN
Change-Id: Iafe74042603a38ebfc6ece82201c5292fd5c2804
SooChan Lim [Wed, 24 May 2023 05:35:00 +0000 (14:35 +0900)]
e_pixmap: remove the unused functions
Change-Id: Iea67d4309edfa6550ac8507cb18e4ffdf30a0bb4
SooChan Lim [Wed, 24 May 2023 05:27:50 +0000 (14:27 +0900)]
e_pixmap: change E_API into EINTERN
some funtion is not used by e20 module.
Change-Id: Ia226d79e797ba2253b76fa27ee5b28c953dd87e9
SooChan Lim [Thu, 11 May 2023 06:46:11 +0000 (15:46 +0900)]
e_win: remove e_win
It is deprecated.
Change-Id: Iba0f76e603f161635e3dcac3a69009f623bc692e
SooChan Lim [Wed, 17 May 2023 09:58:04 +0000 (18:58 +0900)]
e_comp: remove the lock_fps variable at E_Config
It is deprecated.
Change-Id: I1d5ad27e9f32306c8a938a6de85cc638831f2fd2
SooChan Lim [Wed, 24 May 2023 00:14:21 +0000 (09:14 +0900)]
e_policy: defined but not implemented
Change-Id: I9a7c55d7db3a06b8de31f13551488f9333c6e438
SooChan Lim [Wed, 17 May 2023 23:51:22 +0000 (08:51 +0900)]
e_resist: remove e_resist
It is deprecated.
Change-Id: Id1f1ce176ad5cc3565a7c1d572103139c09fa6ec
SooChan Lim [Wed, 10 May 2023 07:30:54 +0000 (16:30 +0900)]
e_init: remove e_init files
It is deprecated.
Change-Id: I5424385daa0e98fe4c55dd023337b16054657d36
SooChan Lim [Thu, 18 May 2023 07:10:02 +0000 (16:10 +0900)]
e_signals: change all E_API to EINTERN
Change-Id: Ied10df11d6dbef0b709dab17a2c2ec89e26d987f
SooChan Lim [Fri, 19 May 2023 01:23:14 +0000 (10:23 +0900)]
e_utils: remove the unused code
Change-Id: If351d44f39360104f3e58027efa09fc2938a6621
SooChan Lim [Fri, 19 May 2023 01:16:37 +0000 (10:16 +0900)]
e_utils: move e_util_pointer_center to e_action.c
get rid of e_util_pointer_center from e_tuils.h file.
Change-Id: I783b83f16808ca4ec6c820776f365588519d2989
SooChan Lim [Fri, 19 May 2023 01:10:57 +0000 (10:10 +0900)]
e_utils: change all E_API to EINTERN
Change-Id: I4ec9390f351fdddf604c5ab9874eae049f464fd2
SooChan Lim [Wed, 24 May 2023 05:46:39 +0000 (14:46 +0900)]
e_place: change E_API into EINTERN
Change-Id: I8490980158634a17a7ee07f02b5cd547c8f077eb
SooChan Lim [Thu, 18 May 2023 06:55:51 +0000 (15:55 +0900)]
e_user: change all E_API to EINTERN
Change-Id: Idf66abdaed87a8637098f328cb98a8b99f57756c
SooChan Lim [Thu, 18 May 2023 06:49:02 +0000 (15:49 +0900)]
e_comp_wl: change all E_API to EINTERN
Change-Id: Ibb0ce8f3de8a799c374892a04c529297d009239a
SooChan Lim [Thu, 18 May 2023 06:42:11 +0000 (15:42 +0900)]
e_comp_wl_tbm: change all E_API to EINTERN
Change-Id: I3ac2fcad2886d91ef04e884997e50a34e6133482
SooChan Lim [Thu, 18 May 2023 06:32:31 +0000 (15:32 +0900)]
e_comp_wl_rsm: change all E_API to EINTERN
Change-Id: I8796f6ecb63ed39eca07afe5e3b68f65b5ed3a4c
SooChan Lim [Thu, 18 May 2023 01:11:20 +0000 (10:11 +0900)]
e_comp_object: change all E_API to EINTERN
Change-Id: If5b60feef103e6636fb96442ecc2a1300e64f2a1
SooChan Lim [Wed, 10 May 2023 07:26:19 +0000 (16:26 +0900)]
e_icon: change all E_API to EINTERN
Change-Id: I7efe41e83f42bfde7db68c2a487a41afb7ab183e
SooChan Lim [Thu, 18 May 2023 00:31:00 +0000 (09:31 +0900)]
e_comp_cfdata: change all E_API to EINTERN
Change-Id: I13b1955f20be6ec271fb398582526429dbbbf28e
Junkyeong Kim [Wed, 31 May 2023 05:11:33 +0000 (14:11 +0900)]
e_info_server: change win_id type to uint64_t
Change-Id: I9a9ebd80d4d72b118512dc33e32e3cff48f6b0a4
Doyoun Kang [Wed, 24 May 2023 06:48:45 +0000 (15:48 +0900)]
e_dnd: remove ECORE_EVENT_KEY_DOWN/UP code
Change-Id: I6f0269df9a71e4d5e370b7f42074a6b751f06cba
Doyoun Kang [Wed, 24 May 2023 06:48:07 +0000 (15:48 +0900)]
e_comp_object: remove ECORE_EVENT_KEY_DOWN code
Change-Id: Ia05048787f5388739818a1711164261df2afdc8b
Doyoun Kang [Wed, 24 May 2023 06:47:37 +0000 (15:47 +0900)]
e_comp: remove ECORE_EVENT_KEY_DOWN code
Change-Id: Ia4c110de58e473d594e258aaf32cc9b43baf8dbe
Doyoun Kang [Wed, 24 May 2023 06:47:00 +0000 (15:47 +0900)]
e_client: remove ECORE_EVENT_KEY_DOWN code
Change-Id: Ib70c887aef12bf3a8b05d33b8cd1b6f7367aa337
Junseok Kim [Tue, 16 May 2023 04:42:35 +0000 (13:42 +0900)]
e_comp_wl_data: Make unfocused client can start drag
Past drag and drop can start only focused client.
But the display server supports touch interaction,
and there're some clients have to use Drag & Drop without focused. (e.g. softkey)
For these clients, enable client to start drag that unfocused.
Change-Id: Iad8414b847f3208989ffbd1aa82992257fc5faa1
Changyeon Lee [Mon, 22 May 2023 06:40:03 +0000 (15:40 +0900)]
e_comp_wl: add ttrace between idle exiter and cb prepare
Change-Id: I36dd35e333c299b55c38d5b37ba0fe6913d69cb8
Changyeon Lee [Mon, 22 May 2023 06:37:38 +0000 (15:37 +0900)]
e_hwc_windows: add ttrace at e_hwc_windows_commit
Change-Id: I5f3c06dc84076e76dff07eae7754ae08a4b12444
Changyeon Lee [Mon, 22 May 2023 06:36:36 +0000 (15:36 +0900)]
e_comp_object: add ttrace at evas_object_image_native_surface_set
Change-Id: I0ad9a9a8c7644952169fa9046ae404b98284cfb1
duna.oh [Mon, 22 May 2023 05:44:29 +0000 (14:44 +0900)]
e_comp_wl: add checking if e_comp->pointer is null
Change-Id: I9967ef30abb72dd97d59f2bc65b3287e06e3f576
duna.oh [Mon, 22 May 2023 02:15:09 +0000 (11:15 +0900)]
e_pointer: add null checking in e_pointer_object_set()
Change-Id: I2ff3a61e21a6bcf4d296eb793a8fe1e03099b509
duna.oh [Mon, 22 May 2023 01:56:55 +0000 (10:56 +0900)]
e_comp_wl: add break in switch in _e_comp_wl_cursor_timer_control()
Change-Id: I57182350abbeaedf9484811a5cc601cd3a2598f4
duna.oh [Mon, 22 May 2023 01:00:37 +0000 (10:00 +0900)]
e_comp_wl: add null checking in e_comp_wl_input_cursor_timer_enable_set()
Change-Id: I22c1cfa7b1da182978314cdcbb8e9f28f17f8da9
Doyoun Kang [Thu, 18 May 2023 01:50:48 +0000 (10:50 +0900)]
e_policy_wl: add privilege for taskbar service window
Change-Id: I683584cd6e996cb8908ac1e5989e5f9485cfcdcc
Seunghun Lee [Thu, 18 May 2023 01:47:07 +0000 (10:47 +0900)]
viewport: Fix wrong use of e_client_from_surface_resource()
This has been used with a wrong wl_resource. This meant to be used with
wl_surface resource.
Change-Id: I1d53313624446ecea4553f38b4358b2dc652f9e6
duna.oh [Tue, 16 May 2023 06:03:00 +0000 (15:03 +0900)]
e_comp_wl: fix to set ec->pointer_enter_sent in mouse_in/out_send() and out()
Change-Id: Ibbfa26825fa0021068e50f24ce6d24aa6a4473f3
duna.oh [Thu, 11 May 2023 09:43:52 +0000 (18:43 +0900)]
e_comp_wl: add function to check if cursor timer is needed to apply
Change-Id: I2ee45838328a2f18056d6fd89c9717dee0160f64
duna.oh [Thu, 11 May 2023 00:42:58 +0000 (09:42 +0900)]
e_comp_wl_input: do not apply cursor timer logic if client has unset cursor
add has_cursor_unset member variable in E_Client struct.
If ec->has_cursor_unset is TRUE, do not apply cursor timer logic which is
to hide cursor when mouse event doesn't come (idle for such sec.) and to show
cursor when mouse event starts to come.
Change-Id: I2442ac345832b2795bf211db3c6a18f35df76595
duna.oh [Wed, 10 May 2023 07:33:29 +0000 (16:33 +0900)]
e_comp_wl: add checking pointer_enter_sent in _e_comp_wl_cursor_reload()
Change-Id: I0b30aeb0e80ed8f2726eaeda42e8e78f1bf5a71f
duna.oh [Wed, 10 May 2023 07:02:38 +0000 (16:02 +0900)]
e_comp_wl_input: add checking show_cursor before setting cursor's visible TRUE
Change-Id: I7978a61c6f71cb976c0428c7927e63fe5423ee54
duna.oh [Wed, 10 May 2023 07:00:15 +0000 (16:00 +0900)]
e_pointer: refactoring e_pointer_object_set()
Change-Id: Ic5c9e2a6c50e30e9a6d12e6d9b8b1f38ee0cd095
duna.oh [Wed, 10 May 2023 05:11:02 +0000 (14:11 +0900)]
e_comp_wl: add intercept hooks for cursor timer when mouse wheel/down/up
Change-Id: I00467aa607b43a5f8e463e5e44394b26d7e8eb79
Changyeon Lee [Mon, 15 May 2023 03:07:47 +0000 (12:07 +0900)]
Revert "Revert "e_comp_object: make the frame object transparent when it is unredirected""
This reverts commit
521314d7db521047cb2e2aaff06b450046e12e36.
e_comp_object_color_get return user_color of trasnparent if transparent is set
Change-Id: Ic465c0d141994a08ec9684abf6257a8ece77d89e
Changyeon Lee [Wed, 10 May 2023 11:37:27 +0000 (20:37 +0900)]
e_info: add -win_id option to fps
winfo -fps -win_id [win_id] : print client fps.
Change-Id: Ia524c8edd19ba95b6e52cd32a16dd3252a27d539
duna.oh [Thu, 11 May 2023 08:30:49 +0000 (17:30 +0900)]
e_input: add checking TOUCH capability in e_input_device_pointer_xy_get()
seat->ptr.x/y could be updated by TOUCH or POINTER device.
This patch fixes the bug that if no POINTER device is attached, user couldn't
get the right values of ptr.x/y.
Change-Id: I9a8c7b708882a30a81a02db6ad6f4d2a4a87aed8