X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.c;h=c35bba990cf063df24bba38199146a38d3475d0b;hb=80a6f06c0a3d6de2c7d94066c5a9764b97a600af;hp=fe21bc441884a9851e2ee0309db42137d26d3543;hpb=1fad2da07f7fed1d640d57a2c7c2f666ebb409c4;p=chaz%2Fopenbox

diff --git a/openbox/prop.c b/openbox/prop.c
index fe21bc44..c35bba99 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    prop.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -206,7 +207,7 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, gint size,
                     data[i] = xdata[i];
                     break;
                 case 16:
-                    ((gushort*)data)[i] = ((gushort*)xdata)[i];
+                    ((guint16*)data)[i] = ((gushort*)xdata)[i];
                     break;
                 case 32:
                     ((guint32*)data)[i] = ((gulong*)xdata)[i];
@@ -245,7 +246,7 @@ static gboolean get_all(Window win, Atom prop, Atom type, gint size,
                     (*data)[i] = xdata[i];
                     break;
                 case 16:
-                    ((gushort*)*data)[i] = ((gushort*)xdata)[i];
+                    ((guint16*)*data)[i] = ((gushort*)xdata)[i];
                     break;
                 case 32:
                     ((guint32*)*data)[i] = ((gulong*)xdata)[i];