Hi Daniel, I've now merged my glade differences with Chris's, so that the netsurf.glade here, as well as the netsurfglademerge.diff, represent the merger of both of our work to the glade file netsurf.glade
gtk_options.c needed the addition of fclose(), free(), now it's better the file 20090408.diff includes the merged netsurf.glade patches too I hope that simplifies life for you; you [or he] would need to edit his diff file to remove the glade diffs, as they are now included in my diff file the relevant parts of the tree being, for reference . |-- Makefile |-- Makefile.sources |-- desktop | `-- options.c |-- gtk | |-- dialogs | | |-- gtk_about.c | | |-- gtk_about.h | | |-- gtk_options.c | | |-- gtk_options.h | | |-- gtk_source.c | | `-- gtk_source.h | |-- gtk_gui.c | |-- gtk_gui.h | |-- gtk_scaffolding.c | |-- gtk_scaffolding.h | |-- gtk_selection.c | |-- gtk_selection.h | |-- gtk_tabs.c | |-- gtk_tabs.h | |-- gtk_window.c | |-- gtk_window.h | |-- options.h | |-- res | | |-- history.glade | | |-- languages | | |-- messages -> ../../!NetSurf/Resources/en/Messages | | |-- netsurf.glade | | |-- options.glade | | `-- source.glade | `-- scaffolding.diff As I hope that is the blocking 2.0 items patched, now I'll take a break to allow you to review/merge all of that :-) Best Mark http://www.halloit.com Key ID 046B65CF
20090408.tar.bz2
Description: application/bzip
