summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-02-12 14:57:57 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-02-12 16:25:35 +0900
commitb40fd20fbc5c5cc05f514929eddc1d4c08b93636 (patch)
tree43a1c6ad92b66eaa663abc1d02df9ac9f059142d
parent16131b14f0b13551875129e5d1b327a6733facb9 (diff)
e comp x - fix property fetch to use int ptr from the start
this clears up soem warnings and do the cast on providing the pointer to ecore_x_window_prop_property_get() which since it has to allocate the data will be fine for alignment anyway, so a void * cast will do.
-rw-r--r--src/bin/e_comp_x.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index c52d4592e..ccd781b41 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -4496,16 +4496,14 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
4496 } 4496 }
4497 if (cd->fetch_gtk_frame_extents) 4497 if (cd->fetch_gtk_frame_extents)
4498 { 4498 {
4499 unsigned char *data; 4499 unsigned int *extents;
4500 int count; 4500 int count;
4501 4501
4502 if (ecore_x_window_prop_property_get(win, 4502 if (ecore_x_window_prop_property_get(win,
4503 ATM_GTK_FRAME_EXTENTS, 4503 ATM_GTK_FRAME_EXTENTS,
4504 ECORE_X_ATOM_CARDINAL, 32, 4504 ECORE_X_ATOM_CARDINAL, 32,
4505 &data, &count)) 4505 (void *)(&extents), &count))
4506 { 4506 {
4507 unsigned int *extents = (unsigned int*)data;
4508
4509 /* _GTK_FRAME_EXTENTS describes a region l/r/t/b pixels 4507 /* _GTK_FRAME_EXTENTS describes a region l/r/t/b pixels
4510 * from the "window" object in which shadows will be drawn. 4508 * from the "window" object in which shadows will be drawn.
4511 * this area should not be accounted for in sizing or 4509 * this area should not be accounted for in sizing or
@@ -4517,7 +4515,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
4517 (ec->x == ec->comp_data->initial_attributes.x) && 4515 (ec->x == ec->comp_data->initial_attributes.x) &&
4518 (ec->y == ec->comp_data->initial_attributes.y)) 4516 (ec->y == ec->comp_data->initial_attributes.y))
4519 e_comp_object_frame_xy_adjust(ec->frame, ec->x, ec->y, &ec->x, &ec->y); 4517 e_comp_object_frame_xy_adjust(ec->frame, ec->x, ec->y, &ec->x, &ec->y);
4520 free(data); 4518 free(extents);
4521 } 4519 }
4522 cd->fetch_gtk_frame_extents = 0; 4520 cd->fetch_gtk_frame_extents = 0;
4523 } 4521 }