[Pkg-bazaar-commits] ./bzr-gtk/unstable r444: Merge a fix for the Conflicts dialog.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 444
committer: Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>
branch nick: trunk
timestamp: Fri 2008-03-07 16:05:16 +0000
message:
  Merge a fix for the Conflicts dialog.
modified:
  conflicts.py
    ------------------------------------------------------------
    revno: 442.1.1
    committer: Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>
    branch nick: bug131471
    timestamp: Fri 2008-03-07 16:56:36 +0100
    message:
      Fixed bug #131471 (don't allow pressing the button if there are no conflicts).
    modified:
      conflicts.py
-------------- next part --------------
=== modified file 'conflicts.py'
--- a/conflicts.py	2007-07-31 17:11:00 +0000
+++ b/conflicts.py	2008-03-07 15:56:36 +0000
@@ -100,6 +100,7 @@
                                          gtk.CellRendererText(), text=0))
             self._treeview.set_headers_visible(False)            
             self.model.append([ _("No conflicts in working tree.") ])
+            self._button_diff3.set_sensitive(False)
         else:
             self.model = gtk.ListStore(gobject.TYPE_STRING,
                                        gobject.TYPE_STRING,