[gtk+/quartz-integration: 715/851] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 715/851] Merge branch 'master' into quartz-integration
- Date: Fri, 24 Dec 2010 21:26:51 +0000 (UTC)
commit 2006176143b4f3852aac63838c4662494b9d30f1
Merge: 228c98c 367211e
Author: John Ralls <jralls ceridwen us>
Date: Tue Dec 21 23:21:10 2010 -0800
Merge branch 'master' into quartz-integration
Makefile.am | 57 +-
NEWS | 91 +
configure.ac | 106 +-
demos/Makefile.am | 15 +-
demos/gtk-demo/Makefile.am | 9 +-
demos/gtk-demo/changedisplay.c | 2 +-
docs/reference/gdk/Makefile.am | 6 +-
docs/reference/gdk/gdk3-sections.txt | 49 +-
docs/reference/gtk/Makefile.am | 3 +-
docs/reference/gtk/compiling.sgml | 2 +-
docs/reference/gtk/gtk3-sections.txt | 1 -
docs/reference/gtk/running.sgml | 9 +
docs/reference/gtk/x11.sgml | 38 +-
docs/tools/Makefile.am | 27 +-
docs/tools/shooter.c | 2 +-
examples/Makefile.am | 3 +-
gdk-3.0-uninstalled.pc.in | 8 -
gdk-3.0.pc.in | 6 +-
gdk/Makefile.am | 149 +-
gdk/abicheck.sh | 4 +-
gdk/gdk.c | 226 +-
gdk/gdk.h | 2 +-
gdk/gdk.symbols | 62 +-
gdk/gdkapplaunchcontext.c | 193 +-
gdk/gdkapplaunchcontext.h | 17 +-
...kglobals-x11.c => gdkapplaunchcontextprivate.h} | 34 +-
gdk/gdkcursor.c | 308 ++-
gdk/gdkcursor.h | 26 +-
gdk/{x11/gdkglobals-x11.c => gdkcursorprivate.h} | 33 +-
gdk/gdkdevice.c | 460 ++--
gdk/gdkdevice.h | 49 +-
gdk/gdkdevicemanager.c | 35 +-
gdk/gdkdevicemanager.h | 37 +-
gdk/gdkdevicemanagerprivate.h | 54 +
gdk/gdkdeviceprivate.h | 76 +-
gdk/gdkdisplay.c | 978 ++++++-
gdk/gdkdisplay.h | 108 +-
gdk/gdkdisplaymanager.c | 223 +-
gdk/gdkdisplaymanager.h | 26 +-
gdk/gdkdisplaymanagerprivate.h | 65 +
gdk/gdkdisplayprivate.h | 296 ++
gdk/gdkdnd.c | 330 ++-
gdk/gdkdnd.h | 75 +-
gdk/gdkdndprivate.h | 82 +
gdk/gdkevents.c | 76 +-
gdk/gdkglobals.c | 2 -
gdk/gdkinternals.h | 224 +--
gdk/gdkkeys.c | 447 ++-
gdk/gdkkeys.h | 15 -
gdk/gdkkeysprivate.h | 74 +
gdk/gdkmain.h | 33 +-
gdk/gdkoffscreenwindow.c | 78 +-
gdk/gdkproperty.h | 92 +-
gdk/gdkscreen.c | 457 +++-
gdk/gdkscreen.h | 32 +-
gdk/gdkscreenprivate.h | 98 +
gdk/gdkselection.c | 263 +-
gdk/gdkspawn.h | 62 -
gdk/gdktypes.h | 18 +-
gdk/gdkvisual.c | 192 ++-
gdk/gdkvisual.h | 49 +-
gdk/{x11/gdkglobals-x11.c => gdkvisualprivate.h} | 50 +-
gdk/gdkwindow.c | 1335 +++++++-
gdk/gdkwindow.h | 14 +-
gdk/gdkwindowimpl.h | 145 +-
gdk/quartz/Makefile.am | 1 -
gdk/quartz/gdkapplaunchcontext-quartz.c | 42 -
gdk/quartz/gdkcursor-quartz.c | 8 -
gdk/quartz/gdkdnd-quartz.c | 50 -
gdk/quartz/gdkevents-quartz.c | 8 -
gdk/quartz/gdkmain-quartz.c | 12 -
gdk/quartz/gdkwindow-quartz.c | 27 +-
gdk/tests/Makefile.am | 2 +-
gdk/win32/Makefile.am | 1 -
gdk/win32/gdkapplaunchcontext-win32.c | 42 -
gdk/win32/gdkcursor-win32.c | 6 -
gdk/win32/gdkdnd-win32.c | 34 -
gdk/win32/gdkevents-win32.c | 9 -
gdk/win32/gdkmain-win32.c | 22 -
gdk/win32/gdkprivate-win32.h | 3 -
gdk/win32/gdkwin32.h | 4 +
gdk/win32/gdkwindow-win32.c | 45 +-
gdk/x11/Makefile.am | 72 +-
gdk/x11/gdkapplaunchcontext-x11.c | 114 +-
gdk/x11/gdkasync.c | 6 +-
gdk/x11/gdkasync.h | 2 +-
gdk/x11/gdkcursor-x11.c | 646 ++---
gdk/x11/gdkdevice-core-x11.c | 611 ++++
gdk/x11/gdkdevice-core.c | 499 ---
gdk/x11/gdkdevice-xi.c | 409 ++--
gdk/x11/gdkdevice-xi.h | 88 -
gdk/x11/gdkdevice-xi2.c | 518 ++--
gdk/x11/gdkdevice-xi2.h | 65 -
...emanager-core.c => gdkdevicemanager-core-x11.c} | 590 ++--
gdk/x11/gdkdevicemanager-core.h | 54 -
gdk/x11/gdkdevicemanager-x11.c | 21 +-
gdk/x11/gdkdevicemanager-xi.c | 474 ++--
gdk/x11/gdkdevicemanager-xi.h | 57 -
gdk/x11/gdkdevicemanager-xi2.c | 338 ++-
gdk/x11/gdkdevicemanager-xi2.h | 62 -
...lobals-x11.c => gdkdevicemanagerprivate-core.h} | 33 +-
.../{gdkdevice-core.h => gdkdeviceprivate-xi.h} | 48 +-
gdk/x11/gdkdisplay-x11.c | 1047 +++----
gdk/x11/gdkdisplay-x11.h | 58 +-
gdk/x11/gdkdisplaymanager-x11.c | 135 +
gdk/x11/gdkdnd-x11.c | 3387 +++++++++-----------
gdk/x11/gdkeventsource.c | 104 +-
gdk/x11/gdkeventsource.h | 15 +-
gdk/x11/gdkeventtranslator.c | 18 +-
gdk/x11/gdkeventtranslator.h | 25 +-
gdk/x11/gdkgeometry-x11.c | 125 +-
gdk/x11/gdkim-x11.c | 103 -
gdk/x11/gdkkeys-x11.c | 1185 +++----
gdk/x11/gdkmain-x11.c | 332 +--
gdk/x11/gdkprivate-x11.h | 352 ++-
gdk/x11/gdkproperty-x11.c | 232 +--
gdk/x11/gdkscreen-x11.c | 965 ++----
gdk/x11/gdkscreen-x11.h | 34 +-
gdk/x11/gdkselection-x11.c | 841 +++---
gdk/x11/gdkspawn-x11.c | 214 --
gdk/x11/gdktestutils-x11.c | 109 +-
gdk/x11/gdkvisual-x11.c | 396 +--
gdk/x11/gdkwindow-x11.c | 1769 +++--------
gdk/x11/gdkwindow-x11.h | 3 -
gdk/x11/gdkx.h | 218 +--
gdk/x11/gdkx11applaunchcontext.h | 49 +
gdk/x11/gdkx11cursor.h | 82 +
gdk/x11/gdkx11device-core.h | 42 +
gdk/x11/gdkx11device-xi.h | 42 +
gdk/x11/gdkx11device-xi2.h | 41 +
gdk/x11/gdkx11devicemanager-core.h | 43 +
gdk/x11/gdkx11devicemanager-xi.h | 43 +
gdk/x11/gdkx11devicemanager-xi2.h | 43 +
gdk/x11/gdkx11display.h | 94 +
gdk/x11/gdkx11displaymanager.h | 49 +
gdk/x11/gdkx11dnd.h | 49 +
gdk/x11/gdkx11keys.h | 49 +
gdk/x11/gdkx11property.h | 59 +
gdk/x11/gdkx11screen.h | 106 +
gdk/x11/gdkx11selection.h | 64 +
gdk/x11/{gdkglobals-x11.c => gdkx11utils.h} | 39 +-
gdk/x11/gdkx11visual.h | 66 +
gdk/x11/gdkx11window.h | 91 +
gdk/x11/gdkxftdefaults.c | 43 +-
gdk/x11/gdkxid.c | 98 +-
gdk/x11/xsettings-common.h | 32 +-
gtk+-3.0.pc.in | 6 +-
gtk+-unix-print-3.0.pc.in | 2 +-
gtk/Makefile.am | 44 +-
gtk/abicheck.sh | 2 +-
gtk/gtk.symbols | 1 -
gtk/gtkaboutdialog.c | 20 +-
gtk/gtkaccelgroup.c | 4 +-
gtk/gtkbuilder.h | 1 -
gtk/gtkcellarea.c | 86 +-
gtk/gtkcellarea.h | 13 +
gtk/gtkcellareabox.c | 204 +-
gtk/gtkcellareabox.h | 9 +-
gtk/gtkcellareaboxcontext.c | 385 ++--
gtk/gtkcellareaboxcontext.h | 3 +-
gtk/gtkcelllayout.c | 11 +-
gtk/gtkclipboard.c | 2 +-
gtk/gtkcolorsel.c | 7 +-
gtk/gtkcssprovider.c | 2 +-
gtk/gtkdnd-quartz.c | 4 +-
gtk/gtkdnd.c | 18 +-
gtk/gtkentry.c | 10 +-
gtk/gtkfilechooserdefault.c | 2 +-
gtk/gtkfilechooserentry.c | 2 +-
gtk/gtkhandlebox.c | 2 +-
gtk/gtkhsv.c | 2 +-
gtk/gtkiconfactory.c | 8 +-
gtk/gtkicontheme.c | 1 -
gtk/gtklabel.c | 4 +-
gtk/gtklayout.c | 2 +-
gtk/gtklinkbutton.c | 2 +-
gtk/gtkliststore.h | 1 -
gtk/gtkmain.c | 34 +-
gtk/gtkmain.h | 1 -
gtk/gtkpaned.c | 4 +-
gtk/gtkplug-x11.c | 15 +-
gtk/gtkplug.c | 17 +-
gtk/gtkprintoperation-unix.c | 23 +-
gtk/gtkprintunixdialog.c | 2 +-
gtk/gtkquartz.c | 23 +-
gtk/gtkrc.c | 80 +-
gtk/gtkrecentchooserdefault.c | 2 +-
gtk/gtksearchengine.c | 4 +-
gtk/gtkselection.c | 44 +-
gtk/gtksocket.c | 52 +-
gtk/gtkstyle.c | 31 +-
gtk/gtkstyle.h | 4 +
gtk/gtkstylecontext.c | 74 +-
gtk/gtkstyleproperties.c | 6 +
gtk/gtktextchild.h | 2 +-
gtk/gtktextview.c | 8 +-
gtk/gtktooltip.c | 2 +-
gtk/gtktrayicon-x11.c | 14 +-
gtk/gtktreemodelfilter.h | 1 -
gtk/gtktreemodelsort.h | 2 +-
gtk/gtktreestore.h | 2 +-
gtk/gtktreeviewcolumn.c | 2 +-
gtk/gtkwindow.c | 2 +-
gtk/tests/Makefile.am | 7 +-
gtk/tests/builder.c | 4 +
modules/input/Makefile.am | 6 +-
modules/other/gail/Makefile.am | 3 +-
modules/printbackends/cups/Makefile.am | 3 +-
modules/printbackends/file/Makefile.am | 3 +-
modules/printbackends/lpr/Makefile.am | 4 +-
modules/printbackends/papi/Makefile.am | 4 +-
modules/printbackends/test/Makefile.am | 2 +-
modules/printbackends/test/gtkprintbackendtest.c | 30 +-
perf/Makefile.am | 11 +-
po-properties/he.po | 297 +-
tests/Makefile.am | 13 +-
tests/flicker.c | 1 -
tests/testcellarea.c | 12 +-
tests/testdnd.c | 11 +-
tests/testgtk.c | 6 +-
tests/testtreeedit.c | 75 +-
221 files changed, 15022 insertions(+), 12833 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
