[meld] Handle dummy_toolbar_diffmap the same way as dummy_toolbar_linkmap
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Handle dummy_toolbar_diffmap the same way as dummy_toolbar_linkmap
- Date: Thu, 7 Aug 2014 20:54:24 +0000 (UTC)
commit af503f73028f53513cb388375527972c7e302eb0
Author: Christoph Brill <egore911 gmail com>
Date: Sat Jul 26 19:58:42 2014 +0200
Handle dummy_toolbar_diffmap the same way as dummy_toolbar_linkmap
I'm not sure if this is neccessary, useful or even correct. At least it
does not show any regressions.
meld/filediff.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index be3f6c8..1d25afb 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -183,7 +183,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
"linkmap", "msgarea_mgr", "readonlytoggle",
"scrolledwindow", "selector_hbox", "textview", "vbox",
"dummy_toolbar_linkmap", "filelabel_toolitem", "filelabel",
- "fileentry_toolitem",
+ "fileentry_toolitem", "dummy_toolbar_diffmap"
]
self.map_widgets_into_lists(widget_lists)
@@ -1887,12 +1887,14 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
self.num_panes = n
for widget in (
self.vbox[:n] + self.file_toolbar[:n] + self.diffmap[:n] +
- self.linkmap[:n - 1] + self.dummy_toolbar_linkmap[:n - 1]):
+ self.linkmap[:n - 1] + self.dummy_toolbar_linkmap[:n - 1] +
+ self.dummy_toolbar_diffmap[:n - 1]):
widget.show()
for widget in (
self.vbox[n:] + self.file_toolbar[n:] + self.diffmap[n:] +
- self.linkmap[n - 1:] + self.dummy_toolbar_linkmap[n - 1:]):
+ self.linkmap[n - 1:] + self.dummy_toolbar_linkmap[n - 1:] +
+ self.dummy_toolbar_diffmap[n - 1:]):
widget.hide()
self.actiongroup.get_action("MakePatch").set_sensitive(n > 1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]