[meld/meld-3-12] filediff: Handle save responses better in delete events (bgo#744081)

[Kai Willadsen <kaiw src gnome org>]

commit 8c6f7815507ba908ad9dd4f1ee3e0a7306ae1cf4
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Feb 7 06:14:26 2015 +1000

    filediff: Handle save responses better in delete events (bgo#744081)
    
    The "you have modified files" dialog offers a "Close without saving"
    option, which returns a CLOSE response code instead of our usual OK.
    This was being handled correctly in most places, but not when the tab
    was being closed via a delete event. This patch fixes it so that the
    check_save_modified() always returns either OK or CANCEL, since that's
    really the only thing we need out of it.
    
    This commit also removes a stray delete-event handler on a widget that
    should never ever be loaded.

 data/ui/filediff.ui |    1 -
 meld/filediff.py    |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index 1fb7429..b1369b2 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -103,7 +103,6 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">window1</property>
-    <signal name="destroy" handler="on_delete_event" swapped="no"/>
     <child>
       <object class="GtkVBox" id="filediff">
         <property name="visible">True</property>
diff --git a/meld/filediff.py b/meld/filediff.py
index 59666e3..395f9ff 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -893,6 +893,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             elif response == Gtk.ResponseType.DELETE_EVENT:
                 response = Gtk.ResponseType.CANCEL
 
+        if response == Gtk.ResponseType.CLOSE:
+            response = Gtk.ResponseType.OK
+
         if response == Gtk.ResponseType.OK and self.meta:
             parent = self.meta.get('parent', None)
             saved = self.meta.get('middle_saved', False)