[gtk+/quartz-integration: 124/124] Merge branch 'master' into quartz-integration



commit 3b98e38f73d2d5eca98e2161574425a050524c1d
Merge: f439103 927f134
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 15 23:21:07 2011 -0700

    Merge branch 'master' into quartz-integration

 Makefile.am                               |    4 +-
 configure.ac                              |   16 +
 gdk/Makefile.am                           |    6 +-
 gdk/broadway/Makefile.am                  |   75 ++
 gdk/broadway/broadway-demo.c              |  230 +++++
 gdk/broadway/broadway.c                   | 1139 +++++++++++++++++++++++
 gdk/broadway/broadway.h                   |   67 ++
 gdk/broadway/broadway.js                  |  666 ++++++++++++++
 gdk/broadway/client.html                  |   11 +
 gdk/broadway/gdkbroadwaycursor.h          |   56 ++
 gdk/broadway/gdkbroadwaydisplaymanager.h  |   47 +
 gdk/broadway/gdkbroadwayvisual.h          |   47 +
 gdk/broadway/gdkbroadwaywindow.h          |   52 ++
 gdk/broadway/gdkcursor-broadway.c         |  185 ++++
 gdk/broadway/gdkdevice-broadway.c         |  385 ++++++++
 gdk/broadway/gdkdevice-broadway.h         |   52 ++
 gdk/broadway/gdkdevicemanager-broadway.c  |  148 +++
 gdk/broadway/gdkdevicemanager-broadway.h  |   54 ++
 gdk/broadway/gdkdisplay-broadway.c        | 1005 ++++++++++++++++++++
 gdk/broadway/gdkdisplay-broadway.h        |   98 ++
 gdk/broadway/gdkdisplaymanager-broadway.c |  162 ++++
 gdk/broadway/gdkdnd-broadway.c            |  223 +++++
 gdk/broadway/gdkeventsource.c             |  396 ++++++++
 gdk/broadway/gdkeventsource.h             |   34 +
 gdk/broadway/gdkglobals-broadway.c        |   33 +
 gdk/broadway/gdkim-broadway.c             |   40 +
 gdk/broadway/gdkkeys-broadway.c           |  190 ++++
 gdk/broadway/gdkmain-broadway.c           |   46 +
 gdk/broadway/gdkprivate-broadway.h        |  218 +++++
 gdk/broadway/gdkproperty-broadway.c       |  100 ++
 gdk/broadway/gdkscreen-broadway.c         |  329 +++++++
 gdk/broadway/gdkscreen-broadway.h         |   80 ++
 gdk/broadway/gdkselection-broadway.c      |  146 +++
 gdk/broadway/gdktestutils-broadway.c      |   67 ++
 gdk/broadway/gdkvisual-broadway.c         |  290 ++++++
 gdk/broadway/gdkwindow-broadway.c         | 1423 +++++++++++++++++++++++++++++
 gdk/broadway/gdkwindow-broadway.h         |   77 ++
 gdk/broadway/toarray.pl                   |   15 +
 gdk/gdkdisplaymanager.c                   |    9 +
 po-properties/gl.po                       |  909 ++++++++++---------
 tests/testsocket_common.c                 |    2 +
 41 files changed, 8681 insertions(+), 451 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]