[gtk: 7/7] Merge branch 'matthiasc/for-master' into 'master'




commit b534752d5c0fc69a94fe9fe51abe1c047afa57c5
Merge: 9afdb41b6b 929a56e53c
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Sep 12 16:25:17 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #3110 and #2994
    
    See merge request GNOME/gtk!2565

 AUTHORS                          | 30 ++++++++++++++++++-----
 gdk/gdkdevice.c                  |  2 +-
 gdk/gdkdisplay.c                 |  2 +-
 gdk/gdkevents.h                  |  6 ++---
 gdk/gdkpango.c                   |  4 ++--
 gdk/macos/GdkMacosWindow.c       |  2 +-
 gdk/macos/gdkmacoskeymap.c       |  2 +-
 gdk/wayland/gdksurface-wayland.c |  6 ++---
 gdk/win32/gdkclipdrop-win32.c    | 22 ++++++++---------
 gdk/win32/gdkdisplay-win32.c     |  2 +-
 gdk/win32/gdkdrag-win32.c        | 36 ++++++++++++++--------------
 gdk/win32/gdkdrop-win32.c        |  2 +-
 gdk/x11/gdkdrag-x11.c            |  6 ++---
 gdk/x11/gdksurface-x11.c         | 10 ++++----
 gsk/gskrendernodeparser.c        |  4 ++--
 gtk/gtkassistant.c               |  4 ++--
 gtk/gtkbuildable.c               |  2 +-
 gtk/gtkbuilder.h                 |  2 +-
 gtk/gtkcellarea.c                |  2 +-
 gtk/gtkcelllayout.c              |  2 +-
 gtk/gtkcellrenderer.c            |  2 +-
 gtk/gtkcellrendereraccel.c       |  6 ++---
 gtk/gtkcellrendereraccel.h       |  6 ++---
 gtk/gtkcellrenderercombo.c       |  2 --
 gtk/gtkcellrendererprogress.c    |  2 --
 gtk/gtkcolorchooser.c            |  2 +-
 gtk/gtkcombobox.c                |  4 ++--
 gtk/gtkcomposetable.c            |  2 +-
 gtk/gtkdialog.c                  |  4 ++--
 gtk/gtkdialog.h                  | 20 ++++++++--------
 gtk/gtkentry.c                   | 14 +++++------
 gtk/gtkenums.h                   |  4 ++--
 gtk/gtkfilechooser.c             |  2 +-
 gtk/gtkfilechooserbutton.c       |  2 +-
 gtk/gtkfilechooserbutton.h       |  2 +-
 gtk/gtkfilechooserwidget.c       |  3 ++-
 gtk/gtkflowbox.c                 |  2 --
 gtk/gtkfontchooser.c             |  7 +++---
 gtk/gtkgesture.c                 |  2 +-
 gtk/gtkgestureclick.c            |  2 +-
 gtk/gtkgesturelongpress.c        |  2 +-
 gtk/gtkgesturestylus.c           |  2 +-
 gtk/gtkicontheme.c               |  2 +-
 gtk/gtkiconview.c                |  4 ++--
 gtk/gtkimage.h                   |  9 +++----
 gtk/gtkimcontext.c               | 12 +++++-----
 gtk/gtkimcontextquartz.c         |  2 +-
 gtk/gtkinfobar.c                 |  6 ++---
 gtk/gtkinfobar.h                 |  2 +-
 gtk/gtklabel.c                   | 10 ++++----
 gtk/gtklevelbar.c                |  4 +---
 gtk/gtklistbox.c                 |  2 --
 gtk/gtkliststore.c               | 14 +++++------
 gtk/gtkmediafile.c               |  4 ++--
 gtk/gtkmenubutton.c              |  2 +-
 gtk/gtkmenutrackeritem.c         |  2 +-
 gtk/gtkmountoperation.c          |  2 +-
 gtk/gtkorientable.c              |  2 --
 gtk/gtkpagesetup.c               |  2 --
 gtk/gtkpapersize.c               |  2 --
 gtk/gtkprintcontext.c            |  4 +---
 gtk/gtkprinter.c                 |  2 --
 gtk/gtkprintoperation.c          | 10 ++++----
 gtk/gtkprintoperation.h          |  2 +-
 gtk/gtkprintsettings.c           |  2 --
 gtk/gtkprintsettings.h           |  2 +-
 gtk/gtkrange.c                   |  6 ++---
 gtk/gtkrecentmanager.c           |  4 +---
 gtk/gtkrevealer.c                |  2 --
 gtk/gtkscale.c                   |  2 +-
 gtk/gtkscalebutton.c             |  9 ++++---
 gtk/gtkscrollable.c              |  2 +-
 gtk/gtkshortcutaction.c          |  2 +-
 gtk/gtkshortcutsgroup.c          |  6 ++---
 gtk/gtkshortcutsshortcut.c       | 10 ++++----
 gtk/gtksizegroup.c               |  4 ++--
 gtk/gtksizerequestcache.c        |  2 +-
 gtk/gtkspinbutton.c              |  2 +-
 gtk/gtkstackswitcher.c           |  2 --
 gtk/gtkstylecontext.c            |  8 +++----
 gtk/gtktestutils.c               |  4 ++--
 gtk/gtktext.c                    |  2 ++
 gtk/gtktextattributes.h          |  2 +-
 gtk/gtktooltip.c                 |  2 +-
 gtk/gtktreednd.c                 |  4 ++--
 gtk/gtktreemodel.c               |  2 +-
 gtk/gtktreeviewcolumn.c          |  2 +-
 gtk/gtkversion.h.in              |  4 ++--
 gtk/gtkwidget.c                  | 18 +++++++-------
 gtk/gtkwindow.c                  | 28 +++++++++++-----------
 gtk/gtkwindowhandle.c            |  2 +-
 tests/testheaderbar.c            | 23 ++++++++++++++++++
 tests/testheadercontrols.ui      | 52 ++++++++++++++++++++++++++++++++++++++++
 tests/testheightforwidth.c       |  2 +-
 tests/testtooltips.c             |  2 +-
 testsuite/gtk/main.c             |  2 +-
 testsuite/gtk/notify.c           |  4 ++--
 testsuite/gtk/objects-finalize.c |  2 +-
 98 files changed, 313 insertions(+), 252 deletions(-)
---


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