aboutsummaryrefslogtreecommitdiff
path: root/x11-wm/jewel/files/patch-goodies-fspanel_fspanel.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/jewel/files/patch-goodies-fspanel_fspanel.c')
-rw-r--r--x11-wm/jewel/files/patch-goodies-fspanel_fspanel.c53
1 files changed, 51 insertions, 2 deletions
diff --git a/x11-wm/jewel/files/patch-goodies-fspanel_fspanel.c b/x11-wm/jewel/files/patch-goodies-fspanel_fspanel.c
index a99b5b9c5f01..ae0f9c2a25ff 100644
--- a/x11-wm/jewel/files/patch-goodies-fspanel_fspanel.c
+++ b/x11-wm/jewel/files/patch-goodies-fspanel_fspanel.c
@@ -1,5 +1,23 @@
---- goodies/fspanel/fspanel.c.orig 2007-12-06 22:35:02.000000000 +0100
-+++ goodies/fspanel/fspanel.c 2007-12-06 22:37:02.000000000 +0100
+--- 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)
@@ -10,3 +28,34 @@
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)
+ {