[gtk+/quartz-integration: 130/130] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 130/130] Merge branch 'master' into quartz-integration
- Date: Tue, 1 Feb 2011 21:53:46 +0000 (UTC)
commit 92a1263f3bccee7b5dfc9ad81f22c1341541a5dc
Merge: c79fbc8 8448780
Author: John Ralls <jralls ceridwen us>
Date: Mon Jan 31 23:21:25 2011 -0800
Merge branch 'master' into quartz-integration
HACKING | 16 +-
README.in | 433 -----
configure.ac | 6 +-
docs/reference/gdk/gdk3-sections.txt | 9 -
docs/reference/gtk/gtk3-sections.txt | 1 +
docs/reference/gtk/migrating-GtkStyleContext.xml | 10 +-
docs/reference/gtk/running.sgml | 17 +-
docs/reference/gtk/tmpl/.gitignore | 2 +
docs/reference/gtk/tmpl/gtkbindings.sgml | 296 ----
docs/reference/gtk/tmpl/gtkclist.sgml | 1312 ---------------
docs/reference/gtk/tmpl/gtkpreview.sgml | 265 ---
docs/reference/gtk/tmpl/gtkprintoperation.sgml | 701 --------
docs/reference/gtk/tmpl/gtkprogress.sgml | 215 ---
docs/reference/gtk/tmpl/gtkrc.sgml | 4 +-
docs/reference/gtk/tmpl/gtkruler.sgml | 134 --
docs/reference/gtk/tmpl/gtkthemes.sgml | 19 -
docs/reference/gtk/tmpl/gtktipsquery.sgml | 163 --
gdk/gdk.symbols | 6 -
gdk/gdkdisplay.c | 112 --
gdk/gdkdisplay.h | 5 -
gdk/gdkdisplayprivate.h | 7 -
gdk/gdkevents.c | 11 +
gdk/gdkevents.h | 57 +-
gdk/gdkscreen.c | 26 -
gdk/gdkscreen.h | 3 -
gdk/quartz/gdkdevice-core-quartz.c | 3 +-
gdk/x11/gdkdevicemanager-core-x11.c | 2 +-
gdk/x11/gdkdisplay-x11.c | 132 +--
gdk/x11/gdkdisplay-x11.h | 7 +-
gdk/x11/gdkdnd-x11.c | 57 +-
gdk/x11/gdkeventsource.c | 8 +-
gdk/x11/gdkmain-x11.c | 7 +
gdk/x11/gdkprivate-x11.h | 5 +-
gdk/x11/gdkscreen-x11.c | 87 -
gtk/Makefile.am | 42 +-
gtk/circles.xbm | 46 -
gtk/gtk-keys.css.default | 3 +
gtk/gtk-keys.css.emacs | 123 ++
gtk/gtk-keys.css.mac | 205 +++
gtk/gtk.css.raleigh | 3 +
gtk/gtk.symbols | 1 +
gtk/gtkbindings.c | 787 +++++++---
gtk/gtkbindings.h | 213 ++-
gtk/gtkbindingsprivate.h | 37 +
gtk/gtkbox.c | 8 +
gtk/gtkcelllayout.c | 49 +
gtk/gtkcellview.c | 55 +-
gtk/gtkcellview.h | 6 +-
gtk/gtkcombobox.c | 46 +-
gtk/gtkcssprovider.c | 181 ++-
gtk/gtkentry.c | 6 +-
gtk/gtkentrycompletion.c | 43 +-
gtk/gtkfilechooser.c | 15 +-
gtk/gtkfilechooserdefault.c | 46 +-
gtk/gtkgrid.c | 2 +-
gtk/gtkicontheme.c | 17 -
gtk/gtkiconview.c | 79 +-
gtk/gtkorientable.c | 2 +-
gtk/gtkorientable.h | 3 -
gtk/gtkorientableprivate.h | 31 +
gtk/gtkplug.c | 27 +-
gtk/gtkprintoperation.c | 72 +-
gtk/gtkprintoperation.h | 155 ++-
gtk/gtkprogressbar.c | 2 +-
gtk/gtkrange.c | 2 +-
gtk/gtkscale.c | 2 +-
gtk/gtkscale.h | 7 -
gtk/gtkscaleprivate.h | 38 +
gtk/gtkseparator.c | 2 +-
gtk/gtksettings.c | 95 +-
gtk/gtksocket.c | 13 -
gtk/gtkspinner.h | 2 +-
gtk/gtkstatusbar.c | 5 +-
gtk/gtkstatusicon.c | 22 +-
gtk/gtkstyle.c | 22 +-
gtk/gtkstyleproperties.c | 22 +
gtk/gtktoolpalette.c | 11 +-
gtk/gtktrayicon-x11.c | 4 -
gtk/gtktreeview.c | 4 +-
gtk/gtktreeviewcolumn.c | 86 +-
gtk/gtkwidget.c | 69 +-
gtk/gtkwidget.h | 2 -
gtk/gtkwindow.c | 117 +--
gtk/gtkwindowprivate.h | 9 -
gtk/line-arrow.xbm | 4 -
gtk/line-wrap.xbm | 4 -
gtk/tests/Makefile.am | 4 +
gtk/tests/cellarea.c | 855 ++++++++++
gtk/tests/stylecontext.c | 19 +
gtk/tests/testing.c | 21 +
gtk/theme-bits/Makefile.am | 15 -
gtk/theme-bits/README | 29 -
gtk/theme-bits/check-13-inconsistent.png | Bin 197 -> 0 bytes
gtk/theme-bits/check-13.png | Bin 267 -> 0 bytes
gtk/theme-bits/decompose-bits.c | 177 --
gtk/theme-bits/radio-13-inconsistent.png | Bin 335 -> 0 bytes
gtk/theme-bits/radio-13.png | Bin 317 -> 0 bytes
gtk/tree_minus.xbm | 5 -
gtk/tree_minus.xpm | 18 -
gtk/tree_plus.xbm | 5 -
gtk/tree_plus.xpm | 18 -
po-properties/es.po | 592 ++++----
po/ca.po | 1934 ++++++++++++----------
po/de.po | 1773 +++++++++++---------
po/kk.po | 1161 +++++++------
tests/Makefile.am | 3 -
tests/testclientmessage.c | 122 --
tests/testgtk.c | 26 -
tests/testgtk.css | 9 +
tests/testtoolbar.c | 23 -
110 files changed, 5959 insertions(+), 7835 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
