On Jul 27, 2014 4:01 AM, "Christoph Brill" <[email protected]> wrote: > > 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 file 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)
It shouldn't be necessary, but I like the consistency of doing so. Could you provide these patches in git format-patch format? Just for the commit message and author. Thanks. Cheers, Kai
_______________________________________________ meld-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/meld-list
