reverted r528 : it s breaking amd64/x86_64 git-svn-id: http://tint2.googlecode.com/svn/trunk@529 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
3 files changed,
7 insertions(+),
7 deletions(-)
M
src/taskbar/task.c
→
src/taskbar/task.c
@@ -209,7 +209,7 @@ if (!panel->g_task.icon) return;
int i; Imlib_Image img = NULL; XWMHints *hints = 0; - int32_t *data = 0; + long *data = 0; int k; for (k=0; k<TASK_STATE_COUNT; ++k) {@@ -224,7 +224,7 @@ data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
if (data) { // get ARGB icon int w, h; - int32_t *tmp_data; + long *tmp_data; tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1);
M
src/util/window.c
→
src/util/window.c
@@ -218,7 +218,7 @@ return (win == get_property32(server.root_win, server.atom._NET_ACTIVE_WINDOW, XA_WINDOW));
} -int get_icon_count (int32_t *data, int num) +int get_icon_count (long *data, int num) { int count, pos, w, h;@@ -236,10 +236,10 @@ return count;
} -int32_t *get_best_icon (int32_t *data, int icon_count, int num, int *iw, int *ih, int best_icon_size) +long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size) { int width[icon_count], height[icon_count], pos, i, w, h; - int32_t *icon_data[icon_count]; + long *icon_data[icon_count]; /* List up icons */ pos = 0;
M
src/util/window.h
→
src/util/window.h
@@ -22,8 +22,8 @@ int window_is_urgent (Window win);
int window_is_hidden (Window win); int window_is_active (Window win); int window_is_skip_taskbar (Window win); -int get_icon_count (int32_t *data, int num); -int32_t *get_best_icon (int32_t *data, int icon_count, int num, int *iw, int *ih, int best_icon_size); +int get_icon_count (long *data, int num); +long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size); void window_maximize_restore (Window win); void window_toggle_shade (Window win); int window_get_desktop (Window win);