aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm/jewel/files/patch-goodies-fspanel_fspanel.c
blob: ae0f9c2a25ff196ce452e06d287887af1d0bda09 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
--- goodies/fspanel/fspanel.c.orig  2005-01-03 22:54:58.000000000 +0100
+++ goodies/fspanel/fspanel.c   2013-09-26 17:27:52.000000000 +0200
@@ -179,7 +179,7 @@
    XDeleteProperty(dd, win, net_wm_strut);
 }
 
-void *get_prop_data (Window win, Atom prop, Atom type, int *items)
+unsigned long*get_prop_data (Window win, Atom prop, Atom type, int *items)
 {
    Atom type_ret;
    int format_ret;
@@ -195,7 +195,7 @@
    if (items)
        *items = items_ret;
 
-   return prop_data;
+   return (unsigned long *)prop_data;
 }
 
 void get_task_hinticon (task *tk)
@@ -393,7 +393,8 @@
 
 void scale_icon (task *tk)
 {
-   int xx, yy, x, y, w, h, d, bw;
+   int xx, yy, x, y;
+   unsigned int w, h, d, bw;
    Pixmap pix, mk = None;
    XGCValues gcv;
    GC mgc=None;
@@ -746,7 +747,7 @@
 
    XMapWindow (dd, win);
 
-   tb = calloc (1, sizeof (taskbar));
+   tb = (taskbar *)calloc (1, sizeof (taskbar));
    tb->win = win;
    
    return tb;
@@ -760,10 +761,10 @@
    if (tb->my_desktop != find_desktop (win) || is_hidden (win))
        return;
 
-   tk = calloc (1, sizeof (task));
+   tk = (task *)calloc (1, sizeof (task));
    tk->win = win;
    tk->focused = focus;
-   tk->name = get_prop_data (win, XA_WM_NAME, XA_STRING, 0);
+   tk->name = (char *)(void *)get_prop_data (win, XA_WM_NAME, XA_STRING, 0);
    tk->iconified = is_iconified (win);
 
    get_task_kdeicon (tk);
@@ -1075,7 +1076,7 @@
        /* window's title changed */
        if (tk->name)
            XFree (tk->name);
-       tk->name = get_prop_data (tk->win, XA_WM_NAME, XA_STRING, 0);
+       tk->name = (char *)(void *)get_prop_data (tk->win, XA_WM_NAME, XA_STRING, 0);
        gui_draw_task (tb, tk);
    } else if (at == atom_WM_STATE)
    {