]> git.decadent.org.uk Git - ion3.git/blob - debian/patches/102_fix-string-list-crash.diff
Merge commit '20070708' into HEAD
[ion3.git] / debian / patches / 102_fix-string-list-crash.diff
1 #! /bin/sh -e
2 if [ $# -ne 1 ]; then
3     echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
4     exit 1
5 fi
6 case "$1" in
7     -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
8     -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
9     *)
10         echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
11         exit 1;;
12 esac
13
14 exit 0
15 @DPATCH@
16
17 # Patch thanks to Nedko Arnaudov <nedko@users.sourceforge.net>
18
19 diff -ru ion-3rc-20070608/ioncore/property.c ion-3rc-20070608.fixed/ioncore/property.c
20 --- ion-3rc-20070608/ioncore/property.c 2007-06-08 19:56:51.000000000 +0300
21 +++ ion-3rc-20070608.fixed/ioncore/property.c   2007-06-18 16:32:11.000000000 +0300
22 @@ -213,7 +213,7 @@
23      Status st;
24  
25      if(!ioncore_g.use_mb){
26 -        st=XStringListToTextProperty((char **)&ptr, n, &prop);
27 +        st=XStringListToTextProperty((char **)ptr, n, &prop);
28      }else{
29          st=XmbTextListToTextProperty(ioncore_g.dpy, (char **)ptr, n,
30                                       XTextStyle, &prop);