[gtk+/quartz-integration: 246/246] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 246/246] Merge branch 'master' into quartz-integration
- Date: Tue, 8 Nov 2011 18:39:19 +0000 (UTC)
commit 888abb4f5387e8a3d2fc5abeb4ae990b2a6b45fa
Merge: aca6ed7 085b98f
Author: John Ralls <jralls ceridwen us>
Date: Tue Nov 8 10:37:55 2011 -0800
Merge branch 'master' into quartz-integration
NEWS | 74 +
build/win32/vs10/gtk+.props | 2 +-
build/win32/vs9/gtk+.vsprops | 2 +-
configure.ac | 49 +-
demos/gtk-demo/drawingarea.c | 2 +-
demos/gtk-demo/main.c | 2 +-
demos/gtk-demo/menus.c | 18 +-
docs/reference/gdk/Makefile.am | 2 +-
docs/reference/gdk/gdk-docs.sgml | 4 +
docs/reference/gdk/gdk3-sections.txt | 3 +
docs/reference/gtk/Makefile.am | 2 +-
docs/reference/gtk/gtk-docs.sgml | 4 +
docs/reference/gtk/gtk3-sections.txt | 5 +
docs/reference/gtk/running.sgml | 2 +
docs/reference/libgail-util/Makefile.am | 2 +-
gdk/Makefile.am | 2 +
gdk/broadway/gdkdisplaymanager-broadway.c | 14 -
gdk/broadway/gdkwindow-broadway.c | 6 +-
gdk/gdk.c | 12 +-
gdk/gdk.symbols | 5 +
gdk/gdkapplaunchcontext.h | 4 +-
gdk/gdkcursor.h | 4 +-
gdk/gdkdeprecated.c | 107 +
gdk/gdkdevicemanager.c | 92 +-
gdk/gdkdisplay.c | 80 +-
gdk/gdkdisplay.h | 7 +
gdk/gdkdisplaymanager.c | 3 +
gdk/gdkevents.c | 50 +
gdk/gdkevents.h | 3 +-
gdk/gdkkeys.c | 189 ++
gdk/gdkkeys.h | 3 +
gdk/gdkkeysprivate.h | 7 +
gdk/gdkmain.h | 19 +-
gdk/gdkpango.c | 5 +-
gdk/gdktypes.h | 35 +
gdk/gdkwindow.c | 116 +-
gdk/gdkwindow.h | 49 +-
gdk/gdkwindowimpl.h | 20 +-
gdk/gen-keyname-table.pl | 37 +-
gdk/keynames-translate.txt | 28 +
gdk/quartz/GdkQuartzNSWindow.c | 5 +
gdk/quartz/gdkdevice-core-quartz.c | 5 -
gdk/quartz/gdkdisplaymanager-quartz.c | 14 -
gdk/quartz/gdkeventloop-quartz.c | 49 +-
gdk/quartz/gdkevents-quartz.c | 184 +-
gdk/quartz/gdkglobals-quartz.c | 11 +-
gdk/quartz/gdkkeys-quartz.c | 53 +-
gdk/quartz/gdkwindow-quartz.c | 14 +-
gdk/wayland/gdkdisplaymanager-wayland.c | 127 --
gdk/wayland/gdkwindow-wayland.c | 13 +-
gdk/win32/gdkdisplaymanager-win32.c | 14 -
gdk/win32/gdkwindow-win32.c | 2 +
gdk/x11/gdkcursor-x11.c | 2 +-
gdk/x11/gdkdevice-core-x11.c | 2 +-
gdk/x11/gdkdevice-xi.c | 2 +-
gdk/x11/gdkdisplay-x11.c | 8 +-
gdk/x11/gdkdisplaymanager-x11.c | 2 +
gdk/x11/gdkkeys-x11.c | 148 +--
gdk/x11/gdkprivate-x11.h | 2 +
gdk/x11/gdkscreen-x11.c | 18 +-
gdk/x11/gdkwindow-x11.c | 47 +-
gtk/Makefile.am | 116 +-
gtk/a11y/Makefile.am | 2 -
gtk/a11y/gail.c | 9 +
gtk/a11y/gtkcomboboxaccessible.c | 2 +-
gtk/a11y/gtktoplevelaccessible.c | 6 +
gtk/a11y/gtktreeviewaccessible.c | 2 +-
gtk/a11y/gtkwindowaccessible.c | 6 +-
gtk/{ => deprecated}/gtkfontsel.c | 9 +-
gtk/{ => deprecated}/gtkfontsel.h | 71 +-
gtk/{ => deprecated}/gtkhandlebox.c | 28 +
gtk/{ => deprecated}/gtkhandlebox.h | 10 +-
gtk/{ => deprecated}/gtkhbbox.c | 2 +-
gtk/{ => deprecated}/gtkhbbox.h | 5 +-
gtk/{ => deprecated}/gtkhbox.c | 5 +-
gtk/{ => deprecated}/gtkhbox.h | 5 +-
gtk/{ => deprecated}/gtkhpaned.c | 1 -
gtk/{ => deprecated}/gtkhpaned.h | 5 +-
gtk/{ => deprecated}/gtkhscale.c | 1 -
gtk/{ => deprecated}/gtkhscale.h | 8 +-
gtk/{ => deprecated}/gtkhscrollbar.c | 2 +-
gtk/{ => deprecated}/gtkhscrollbar.h | 8 +-
gtk/{ => deprecated}/gtkhseparator.c | 1 -
gtk/{ => deprecated}/gtkhseparator.h | 6 +-
gtk/{ => deprecated}/gtkrc.c | 7 +-
gtk/{ => deprecated}/gtkrc.h | 100 +-
gtk/{ => deprecated}/gtkstyle.c | 784 +++++++-
gtk/{ => deprecated}/gtkstyle.h | 553 +++---
gtk/{ => deprecated}/gtktable.c | 49 +-
gtk/{ => deprecated}/gtktable.h | 18 +-
gtk/{ => deprecated}/gtktearoffmenuitem.c | 6 +
gtk/{ => deprecated}/gtktearoffmenuitem.h | 2 -
gtk/{ => deprecated}/gtkvbbox.c | 2 +-
gtk/{ => deprecated}/gtkvbbox.h | 6 -
gtk/{ => deprecated}/gtkvbox.c | 4 +-
gtk/{ => deprecated}/gtkvbox.h | 7 +-
gtk/{ => deprecated}/gtkvpaned.c | 2 +-
gtk/{ => deprecated}/gtkvpaned.h | 4 -
gtk/{ => deprecated}/gtkvscale.c | 1 -
gtk/{ => deprecated}/gtkvscale.h | 7 -
gtk/{ => deprecated}/gtkvscrollbar.c | 2 +-
gtk/{ => deprecated}/gtkvscrollbar.h | 7 -
gtk/{ => deprecated}/gtkvseparator.c | 2 +-
gtk/{ => deprecated}/gtkvseparator.h | 6 -
gtk/gtk.h | 39 +-
gtk/gtk.symbols | 6 +
gtk/gtkaboutdialog.c | 4 +-
gtk/gtkaccelgroup.c | 256 +++-
gtk/gtkaccelgroup.h | 12 +
gtk/gtkaction.c | 2 +-
gtk/gtkappchooserdialog.c | 18 +-
gtk/gtkappchooseronline.c | 3 +-
gtk/gtkappchooseronline.h | 2 +
gtk/gtkappchooseronlinepk.c | 3 +-
gtk/gtkassistant.h | 4 +
gtk/gtkbbox.c | 1 +
gtk/gtkbindings.c | 4 +-
gtk/gtkbindings.h | 1 +
gtk/gtkbox.c | 3 +-
gtk/gtkbox.h | 7 -
gtk/gtkboxprivate.h | 36 +
gtk/gtkbuilder.c | 2 +-
gtk/gtkbutton.h | 8 +-
gtk/gtkcellarea.c | 28 +-
gtk/gtkcelllayout.c | 2 +-
gtk/gtkcellrenderer.h | 13 +-
gtk/gtkcellrendererprogress.c | 2 +-
gtk/gtkcellrendererspin.c | 3 +-
gtk/gtkcellview.c | 6 +-
gtk/gtkcellview.h | 1 +
gtk/gtkcolorsel.c | 13 +-
gtk/gtkcombobox.c | 106 +-
gtk/gtkcombobox.h | 5 +-
gtk/gtkcontainer.c | 36 +-
gtk/gtkcontainerprivate.h | 1 +
gtk/gtkcssprovider.c | 3 +-
gtk/gtkcssselector.c | 3 +
gtk/gtkcustompaperunixdialog.c | 61 +-
gtk/gtkdialog.c | 1 +
gtk/gtkdialog.h | 2 +-
gtk/gtkdnd-quartz.c | 177 +-
gtk/gtkdnd.c | 120 +-
gtk/gtkentry.c | 21 +-
gtk/gtkentrycompletion.c | 2 +-
gtk/gtkenums.h | 2 +
gtk/gtkfilechooser.c | 2 +-
gtk/gtkfilechooserdefault.c | 11 +-
gtk/gtkfilesystemmodel.c | 3 +
gtk/gtkfontbutton.c | 6 +-
gtk/gtkgrid.c | 24 +-
gtk/gtkiconcache.c | 30 +-
gtk/gtkiconfactory.c | 1 +
gtk/gtkiconfactory.h | 12 +-
gtk/gtkicontheme.c | 7 +-
gtk/gtkicontheme.h | 2 +-
gtk/gtkiconview.c | 52 +-
gtk/gtkimcontext.c | 2 +-
gtk/gtkimcontextsimple.c | 20 +-
gtk/gtkimmodule.c | 71 +-
gtk/gtkimmulticontext.c | 42 +-
gtk/gtkinfobar.c | 8 +-
gtk/gtklabel.c | 9 +-
gtk/gtklayout.h | 9 +-
gtk/gtklinkbutton.c | 19 +-
gtk/gtkliststore.c | 4 +-
gtk/gtkmain.c | 257 +---
gtk/gtkmainprivate.h | 37 -
gtk/gtkmarshalers.list | 1 +
gtk/gtkmenu.c | 5 +-
gtk/gtkmenuitem.c | 23 +-
gtk/gtkmenuitem.h | 2 +
gtk/gtkmenushell.c | 6 +-
gtk/gtkmodules.c | 34 +-
gtk/gtkmodules.h | 3 +-
gtk/{gtkvpaned.c => gtkmodulesprivate.h} | 56 +-
gtk/gtkmountoperation-x11.c | 68 +-
gtk/gtkmountoperation.c | 2 +-
gtk/gtknotebook.c | 195 +-
gtk/gtkoverlay.c | 1 -
gtk/gtkplug.h | 2 +-
gtk/gtkprintbackend.c | 1 +
gtk/gtkprintcontext.c | 2 +-
gtk/gtkprintoperation.c | 27 +-
gtk/gtkprintunixdialog.c | 4 +-
gtk/gtkprivate.c | 206 ++
gtk/gtkprivate.h | 85 +-
gtk/gtkquartz.c | 90 +-
gtk/gtkquartz.h | 4 +-
gtk/gtkradiobutton.c | 2 +-
gtk/gtkradiomenuitem.c | 6 +-
gtk/gtkradiotoolbutton.c | 26 +-
gtk/gtkrange.c | 3 +-
gtk/gtkrc.key.mac | 133 +-
gtk/gtkrecentchooserdefault.c | 4 +-
gtk/gtkrecentmanager.c | 4 +-
gtk/gtkscale.c | 23 +-
gtk/gtkscalebutton.c | 2 +-
gtk/gtkscrolledwindow.c | 4 +-
gtk/gtksearchenginesimple.c | 12 +-
gtk/gtksettings.c | 25 +-
gtk/gtksettings.h | 8 +-
gtk/gtksizegroup.c | 2 +-
gtk/gtksizerequest.c | 1 +
gtk/gtksocket.c | 2 +-
gtk/gtkspinbutton.c | 1 -
gtk/gtkstatusbar.c | 4 +-
gtk/gtkstatusicon.c | 2 +-
gtk/gtkstock.c | 65 +-
gtk/gtkstock.h | 4 +-
gtk/gtkstylecontext.c | 108 +-
gtk/gtkstylecontext.h | 48 +-
gtk/gtkstyleproperties.c | 6 +-
gtk/gtkstyleproperty.c | 2 +-
gtk/gtkstyleprovider.h | 8 +-
gtk/gtksymboliccolor.c | 6 +-
gtk/gtktestutils.c | 6 +
gtk/gtktextattributes.c | 1 -
gtk/gtktextattributes.h | 2 +-
gtk/gtktextbufferserialize.c | 8 +-
gtk/gtktexttag.c | 1 -
gtk/gtktextview.c | 19 +-
gtk/gtkthemingengine.c | 1 +
gtk/gtktoolbar.c | 66 +-
gtk/gtktoolbutton.c | 6 +-
gtk/gtktoolitem.c | 1 -
gtk/gtktooltip.c | 103 +-
gtk/gtktreedatalist.c | 12 +-
gtk/gtktreemenu.c | 2 +-
gtk/gtktreemodel.c | 6 +-
gtk/gtktreemodelfilter.c | 51 +-
gtk/gtktreestore.c | 4 +-
gtk/gtktreeview.c | 86 +-
gtk/gtktreeviewcolumn.c | 17 +-
gtk/gtkuimanager.c | 15 +-
gtk/gtkuimanager.h | 2 +
gtk/gtkviewport.c | 2 +-
gtk/gtkwidget.c | 818 +-------
gtk/gtkwidget.h | 62 +-
gtk/gtkwidgetpath.c | 1 +
gtk/gtkwidgetprivate.h | 4 +
gtk/gtkwin32.c | 139 ++
gtk/gtkwindow.c | 48 +-
gtk/tests/Makefile.am | 8 +-
gtk/tests/accel.c | 73 +
gtk/tests/builder.c | 2 +-
gtk/tests/defaultvalue.c | 6 +-
gtk/tests/filtermodel.c | 196 ++-
gtk/tests/grid.c | 6 +-
gtk/tests/object.c | 2 +-
gtk/updateiconcache.c | 8 +-
modules/input/Makefile.am | 6 +-
po-properties/POTFILES.in | 22 +-
po-properties/POTFILES.skip | 2 +
po-properties/de.po | 749 ++++----
po-properties/en_GB.po | 29 +-
po-properties/gl.po | 14 +-
po-properties/he.po | 1834 +++++++++--------
po-properties/pt_BR.po | 19 +-
po-properties/sr.po | 23 +-
po-properties/sr latin po | 23 +-
po-properties/zh_CN.po | 190 +-
po/POTFILES.in | 22 +-
po/POTFILES.skip | 2 +
po/en_GB.po | 111 +-
po/eo.po | 887 +++++----
po/es.po | 147 +-
po/gl.po | 495 +++---
po/he.po | 776 ++++----
po/ja.po | 1272 ++----------
po/nl.po | 2137 +++++++-------------
po/pt_BR.po | 117 +-
po/vi.po | 1211 ++++++-----
po/zh_CN.po | 138 +-
tests/Makefile.am | 7 +-
tests/a11y/accessibility-dump.c | 4 +-
tests/css/parser/Makefile.am | 1 +
tests/css/parser/declarations-valid-26.css | 1 +
tests/css/parser/declarations-valid-26.ref.css | 4 +
tests/print-editor.c | 28 +-
tests/prop-editor.c | 78 +-
tests/reftests/Makefile.am | 6 +
tests/reftests/background-color-transparent.css | 4 +
tests/reftests/background-color-transparent.ref.ui | 46 +
tests/reftests/background-color-transparent.ui | 46 +
tests/reftests/style-properties-only-child.css | 9 +
tests/reftests/style-properties-only-child.ref.ui | 32 +
tests/reftests/style-properties-only-child.ui | 32 +
tests/reftests/unresolvable.css | 2 +-
tests/testaccel.c | 4 +-
tests/testadjustsize.c | 44 +-
tests/testdnd.c | 44 +-
tests/testentryicons.c | 60 +-
tests/testexpand.c | 58 +-
tests/testfontselection.c | 2 +-
tests/testfontselectiondialog.c | 2 +-
tests/testframe.c | 22 +-
tests/testgeometry.c | 34 +-
tests/testgtk.c | 643 ++-----
tests/testimage.c | 40 +-
tests/testmerge.c | 44 +-
tests/testnotebookdnd.c | 38 +-
tests/testorientable.c | 19 +-
tests/testselection.c | 22 +-
tests/testtoolbar.c | 49 +-
tests/testtreeview.c | 27 +-
tests/testwindows.c | 134 +-
tests/widget-factory.ui | 24 +
307 files changed, 10092 insertions(+), 10174 deletions(-)
---
diff --cc gtk/tests/filtermodel.c
index 04db578,c2883dd..2bec285
--- a/gtk/tests/filtermodel.c
+++ b/gtk/tests/filtermodel.c
@@@ -6842,6 -7107,14 +7030,12 @@@ register_filter_model_tests (void
specific_bug_621076);
g_test_add_func ("/TreeModelFilter/specific/bug-657353-related",
specific_bug_657353_related);
- g_test_add_func ("/TreeModelFilter/specific/bug-657353",
- specific_bug_657353);
g_test_add_func ("/TreeModelFilter/specific/bug-658696",
specific_bug_658696);
+ g_test_add_func ("/TreeModelFilter/specific/bug-659022/row-changed-emission",
+ specific_bug_659022_row_changed_emission);
+ g_test_add_func ("/TreeModelFilter/specific/bug-659022/row-deleted-node-invisible",
+ specific_bug_659022_row_deleted_node_invisible);
+ g_test_add_func ("/TreeModelFilter/specific/bug-659022/row-deleted-free-level",
+ specific_bug_659022_row_deleted_free_level);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
