[meld: 75/75] Merge branch 'deprecation-cleanup' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit b2514b81f72ba022b1d9d6c689eebbecacf00de6
Merge: 0bab0435 505e7e2f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jan 6 02:29:07 2019 +0000

    Merge branch 'deprecation-cleanup' into 'master'
    
    Deprecation cleanup
    
    See merge request GNOME/meld!27

 .gitignore                                         |   1 +
 bin/meld                                           |  19 +-
 data/meld.css                                      |   8 +
 data/org.gnome.meld.gschema.xml                    |  13 -
 data/ui/EditableList.ui                            | 354 --------
 data/ui/appmenu-fallback.xml                       |  12 -
 data/ui/dirdiff.ui                                 | 540 ------------
 data/ui/filediff.ui                                | 909 ---------------------
 data/ui/findbar.ui                                 | 289 -------
 data/ui/meldapp-ui.xml                             |   1 -
 data/ui/tab-placeholder.ui                         | 612 --------------
 data/ui/vcview.ui                                  | 696 ----------------
 meld/build_helpers.py                              |  30 +-
 meld/conf.py                                       |  19 +-
 meld/dirdiff.py                                    | 182 +++--
 meld/filediff.py                                   | 192 +++--
 meld/gutterrendererchunk.py                        |  13 +-
 meld/meldapp.py                                    |  44 +-
 meld/meldbuffer.py                                 |   8 +-
 meld/melddoc.py                                    |  52 +-
 meld/meldwindow.py                                 | 199 ++---
 meld/misc.py                                       |  37 -
 meld/newdifftab.py                                 |  57 +-
 meld/patchdialog.py                                |  25 +-
 meld/preferences.py                                | 200 ++++-
 .../resources/gtk/help-overlay.ui                  |   2 +-
 meld/resources/gtk/menus.ui                        |  32 +
 .../16x16/actions/meld-change-apply-left.png       | Bin
 .../16x16/actions/meld-change-apply-right.png      | Bin
 .../icons}/16x16/actions/meld-change-copy.png      | Bin
 .../icons}/16x16/actions/meld-change-delete.png    | Bin
 meld/resources/icons/README                        |   6 +
 meld/resources/meld.gresource.xml                  |  25 +
 .../resources/ui/about-dialog.ui                   |  30 +-
 .../meldapp.ui => meld/resources/ui/appwindow.ui   |  40 +-
 meld/resources/ui/column-list.ui                   | 132 +++
 meld/resources/ui/commit-dialog.ui                 | 282 +++++++
 meld/resources/ui/dirdiff.ui                       | 533 ++++++++++++
 {data => meld/resources}/ui/encoding-selector.ui   |   0
 meld/resources/ui/filediff.ui                      | 731 +++++++++++++++++
 meld/resources/ui/filter-list.ui                   | 187 +++++
 meld/resources/ui/findbar.ui                       | 284 +++++++
 {data => meld/resources}/ui/language-selector.ui   |   0
 meld/resources/ui/new-diff-tab.ui                  | 607 ++++++++++++++
 {data => meld/resources}/ui/patch-dialog.ui        |   4 +-
 {data => meld/resources}/ui/preferences.ui         |   6 +-
 meld/resources/ui/push-dialog.ui                   |  65 ++
 meld/resources/ui/revert-dialog.ui                 |  79 ++
 meld/resources/ui/save-confirm-dialog.ui           | 100 +++
 meld/resources/ui/vcview.ui                        | 350 ++++++++
 meld/settings.py                                   |   2 +-
 meld/sourceview.py                                 |   2 +-
 meld/tree.py                                       |  53 ++
 meld/ui/_gtktemplate.py                            | 234 ++++++
 meld/ui/bufferselectors.py                         |  97 ++-
 meld/ui/emblemcellrenderer.py                      |  85 +-
 meld/ui/findbar.py                                 |  53 +-
 meld/ui/gnomeglade.py                              |  72 --
 meld/ui/listselector.py                            | 110 ---
 meld/ui/listwidget.py                              |  57 +-
 meld/ui/notebook.py                                |  24 +-
 meld/ui/util.py                                    |  64 +-
 meld/ui/vcdialogs.py                               |  40 +-
 meld/vcview.py                                     | 121 +--
 test/conftest.py                                   |   9 +
 test/dirdiff/test_files_same.py                    |  10 +-
 test/dirdiff/test_remove_blank_lines.py            |   6 +-
 test/test_chunk_actions.py                         |   8 +-
 test/test_filediff.py                              |   6 +-
 69 files changed, 4810 insertions(+), 4250 deletions(-)
---