gEDA-dev: [PATCH] gattrib: convert dialogs to GtkDialog

[Peter Clifton]

On Sun, 2007-06-17 at 00:10 +0100, Peter Clifton wrote:
> On Sat, 2007-06-16 at 21:38 +0200, Ivan Stankovic wrote:
> > On Sat, Jun 16, 2007 at 09:02:28PM +0200, Carlos Nieves Ónega wrote:
> > > Hunk #11 FAILED at 367.
> > > 11 out of 11 hunks FAILED -- saving rejects to file x_dialog.c.rej

> Here is the cvs commit message:
> 
> http://archives.seul.org/geda/cvs/Jun-2007/msg00073.html
> 
> Please ignore me if this is something different, I just caught the
> thread (and previously noticed the commit) - I haven't read the diffs
> since you originally posted (the / a) patch for x_dialog.c

I just looked over the diffs (after updating my CVS tracker), and I
think your first patch was applied with some changes (mostly indenting
and comments - gschem has no "//" comments allowed as its not 100%
portable.

Presumably this causes the second to fail.

Welcome to the joys of merge conflicts - at least its your own code
though, fixing the merge ought not to be too hard.

Regards,

Peter C