[gtk+/treeview-refactor: 53/53] Merge branch 'master' into treeview-refactor
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/treeview-refactor: 53/53] Merge branch 'master' into treeview-refactor
- Date: Thu, 25 Nov 2010 06:02:48 +0000 (UTC)
commit 57a94bfb5364392a2469c592c4cf88536be7e061
Merge: e53dc34 eb5a500
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Thu Nov 25 15:07:47 2010 +0900
Merge branch 'master' into treeview-refactor
configure.ac | 19 +-
demos/gtk-demo/offscreen_window.c | 35 +-
demos/gtk-demo/offscreen_window2.c | 35 +-
docs/reference/gtk/gtk3-sections.txt | 97 +-
docs/reference/gtk/migrating-2to3.xml | 42 +-
docs/reference/gtk/tmpl/gtkenums.sgml | 9 -
docs/reference/gtk/tmpl/gtkwindowgroup.sgml | 8 +-
gdk/Makefile.am | 2 +-
gdk/abicheck.sh | 2 +-
gdk/gdk.c | 4 +-
gdk/gdk.symbols | 1329 ++++--------
gdk/gdkdevice.c | 158 +-
gdk/gdkdevice.h | 49 +-
gdk/gdkdevicemanager.c | 8 +-
gdk/gdkdisplay.c | 32 +-
gdk/gdkevents.c | 13 +-
gdk/gdkinternals.h | 6 +
gdk/gdkkeys.c | 2 +-
gdk/gdkoffscreenwindow.c | 4 +-
gdk/gdkpango.c | 4 +-
gdk/gdkselection.c | 6 +-
gdk/gdkwindow.c | 34 +-
gdk/makefile.msc | 2 +-
gdk/quartz/gdkevents-quartz.c | 35 +-
gdk/quartz/gdkinput.c | 10 +-
gdk/win32/gdkdevice-win32.c | 4 +-
gdk/win32/gdkdevice-wintab.c | 2 +-
gdk/win32/gdkevents-win32.c | 33 +-
gdk/x11/gdkcursor-x11.c | 4 +-
gdk/x11/gdkdevice-core.c | 4 +-
gdk/x11/gdkdevice-xi.c | 15 +-
gdk/x11/gdkdevice-xi2.c | 2 +-
gdk/x11/gdkdevicemanager-xi.c | 15 +-
gdk/x11/gdkdevicemanager-xi2.c | 8 +-
gdk/x11/gdkdisplay-x11.c | 18 +-
gdk/x11/gdkdnd-x11.c | 4 +-
gdk/x11/gdkeventsource.c | 30 +-
gdk/x11/gdkkeys-x11.c | 3 +-
gdk/x11/gdkscreen-x11.c | 6 +-
gdk/x11/gdkselection-x11.c | 6 +-
gdk/x11/gdkwindow-x11.c | 19 +-
gdk/x11/gdkxid.c | 8 +-
gtk/Makefile.am | 9 +-
gtk/abicheck.sh | 2 +-
gtk/gtk.h | 3 -
gtk/gtk.symbols | 3183 +++++++++------------------
gtk/gtkaboutdialog.c | 6 +-
gtk/gtkbox.c | 8 +-
gtk/gtkbutton.c | 388 ++--
gtk/gtkbutton.h | 22 +-
gtk/gtkbuttonprivate.h | 55 +
gtk/gtkcellrendereraccel.c | 2 +-
gtk/gtkcheckbutton.c | 5 +-
gtk/gtkcolorsel.c | 2 +-
gtk/gtkcombobox.c | 9 +-
gtk/gtkdnd.c | 2 +-
gtk/gtkentry.c | 1418 +++++++------
gtk/gtkentry.h | 58 +-
gtk/gtkentryprivate.h | 1 +
gtk/gtkenums.h | 7 -
gtk/gtkfilechooserdefault.c | 62 +-
gtk/gtkfilechooserprivate.h | 2 +
gtk/gtkhruler.c | 51 -
gtk/gtkhruler.h | 80 -
gtk/gtkmenu.c | 9 +-
gtk/gtkmenushell.c | 14 +-
gtk/gtkplug-x11.c | 2 +-
gtk/gtkplug.c | 2 +-
gtk/gtkradiobutton.c | 32 +-
gtk/gtkruler.c | 959 --------
gtk/gtkruler.h | 120 -
gtk/gtkscalebutton.c | 2 +-
gtk/gtkscrolledwindow.c | 39 +-
gtk/gtkselection.c | 2 +-
gtk/gtkselection.h | 9 +-
gtk/gtksizerequest.c | 41 +-
gtk/gtkspinbutton.c | 13 +-
gtk/gtktogglebutton.c | 25 +-
gtk/gtktooltip.c | 2 +-
gtk/gtktreeview.c | 281 ++-
gtk/gtkvruler.c | 80 -
gtk/gtkvruler.h | 80 -
gtk/gtkwidget.c | 113 +-
gtk/gtkwidget.h | 37 +-
gtk/gtkwindow.c | 2 +-
gtk/makefile.msc.in | 8 +-
gtk/tests/builder.c | 2 -
gtk/updateiconcache.c | 44 +-
modules/other/gail/gailbutton.c | 8 +
modules/other/gail/gailentry.c | 40 +-
po-properties/ca.po | 2 +-
po/de.po | 2220 ++++++++++---------
po/nb.po | 571 +++---
po/ug.po | 176 +-
tests/gtkoffscreenbox.c | 35 +-
tests/testgtk.c | 69 -
tests/testinput.c | 19 +-
97 files changed, 4969 insertions(+), 7590 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]