[meld] Fix broken commit



commit 8f3782e92af5fe754952384dd11895405ebfc26f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Apr 28 13:56:04 2013 +1000

    Fix broken commit

 data/ui/filediff.ui |    2 +-
 meld/filediff.py    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index cf4c61b..ff97b71 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -178,7 +178,7 @@
     </child>
     <action-widgets>
       <action-widget response="-6">cancel_button</action-widget>
-      <action-widget response="-5">save_button</action-widget>
+      <action-widget response="-5">revert_button</action-widget>
     </action-widgets>
   </object>
   <object class="GtkWindow" id="container">
diff --git a/meld/filediff.py b/meld/filediff.py
index 36555a6..7ff0e8a 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1631,7 +1631,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         response = gtk.RESPONSE_OK
         unsaved = [b.data.label for b in self.textbuffer if b.data.modified]
         if unsaved:
-            ui_path = paths.ui_dir("revert.ui")
+            ui_path = paths.ui_dir("filediff.ui")
             dialog = gnomeglade.Component(ui_path, "revert_dialog")
             dialog.widget.set_transient_for(self.widget.get_toplevel())
             # FIXME: Should be packed into dialog.widget.get_message_area(),


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