Re: Composite GtkBuilder template

On Wed, 2013-04-10 at 20:30 -0500, Federico Mena Quintero wrote:
On Tue, 2013-04-02 at 17:59 +0900, Tristan Van Berkom wrote:

And while it's a huge list of changes, any thorough peer reviews
would be greatly appreciated of course.

This work makes merging my places-sidebar branch completely impossible.
There is a highly nontrivial amount of work in that branch and I really
don't feel like essentially rewriting the whole file due to merge

   I feel your pain, and have also been on the receiving
end of a merge conflict before.

I don't think it's sensible to be doing this kind of
surgery on master directly (and I'm just not willing
to repeat the 2 full days work I did on filechooser from
scratch) but I'll be happy to help you merge this
in your branch so that it applies cleanly.

I'm going to ask you to do these:

1. Revert the commits that modify gtkfilechooserdefault.*, and ensure
that the code compiles.

2. Tell me about it, and I'll merge places-sidebar into master.

3. Then you can go back and re-do your changes for
gtkfilechooserdefault, BUT do not use a ->priv field.
GtkFileChooserDefault *is* a private widget, and it doesn't need a priv
structure.  Having it also makes the code unreadable.  (I'd like the
other internal widgets in GtkFileChooser to be the same, but I can live
with just the main gtkfilechooserdefault being clean).

I can only imagine how much work it was to complete the composite
templates branch; please think that the places-sidebar branch is a
similar investment on my part :)



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