[meld: 63/63] Merge branch 'Gio'

[Kai Willadsen <kaiw src gnome org>]

commit baa16469bd60fcc278860ef725586a25d998c73c
Merge: 17c1d0d 41e753d
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Dec 17 06:07:40 2015 +1000

    Merge branch 'Gio'

 data/org.gnome.meld.gschema.xml |    6 +-
 data/ui/filediff.ui             |   11 +-
 meld/const.py                   |    8 +-
 meld/dirdiff.py                 |   17 +--
 meld/filediff.py                |  441 ++++++++++++++++-----------------------
 meld/filemerge.py               |   12 -
 meld/meldbuffer.py              |   97 +++++----
 meld/melddoc.py                 |   19 ++-
 meld/meldwindow.py              |   77 ++++---
 meld/newdifftab.py              |    2 +
 meld/patchdialog.py             |   64 ++++--
 meld/settings.py                |    5 +-
 meld/sourceview.py              |   36 +++-
 meld/ui/msgarea.py              |   24 ++-
 meld/vcview.py                  |    2 +-
 15 files changed, 418 insertions(+), 403 deletions(-)
---
diff --cc meld/melddoc.py
index 11a0505,4673c5e..de6fdfd
--- a/meld/melddoc.py
+++ b/meld/melddoc.py
@@@ -192,10 -209,8 +209,10 @@@ class MeldDoc(GObject.GObject)
          uimanager.remove_action_group(self.actiongroup)
          uimanager.remove_ui(self.ui_merge_id)
          self.main_actiongroup = None
 +        self.popup_menu = None
 +        self.ui_merge_id = None
  
-     def on_delete_event(self, appquit=0):
+     def on_delete_event(self):
          """Called when the docs container is about to close.
  
          A doc normally returns Gtk.ResponseType.OK, but may instead return