Change FSF Address

[~andy/gtk] / gdk / x11 / gdkdeviceprivate-xi.h

diff --git a/gdk/x11/gdkdeviceprivate-xi.h b/gdk/x11/gdkdeviceprivate-xi.h
index b94ec47f6e0ce473449df9c937d21ed447fad2b1..70626bfacf21cb267bdc79669fd3f0c23ce9ce1a 100644 (file)
--- a/gdk/x11/gdkdeviceprivate-xi.h
+++ b/gdk/x11/gdkdeviceprivate-xi.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GDK_DEVICE_PRIVATE_XI_H__
@@ -23,15 +21,20 @@
 #include "gdkx11device-xi.h"
 #include "gdkdeviceprivate.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput.h>
+
 G_BEGIN_DECLS
 
 struct _GdkX11DeviceXI
 {
   GdkDevice parent_instance;
 
-  /*< private >*/
-  guint32 device_id;
   XDevice *xdevice;
+  gint *axis_data;
+
+  guint32 device_id;
 
   gint button_press_type;
   gint button_release_type;
@@ -42,9 +45,7 @@ struct _GdkX11DeviceXI
   gint proximity_out_type;
   gint state_notify_type;
 
-  /* minimum key code for device */
-  gint min_keycode;
-  gint *axis_data;
+  gint min_keycode; /* minimum key code for device */
   guint in_proximity : 1;
 };