Merge the gog-integ branch into the g2 branch.

Derek Atkins warlord at cvs.gnucash.org
Sat Apr 23 20:35:27 EDT 2005


Log Message:
-----------
Merge the gog-integ branch into the g2 branch.
  As we're now depending on gtk+-2.4, etc. we can build this code now.
  It builds.  It seems to work for some people, but not for me.
  However with it being in g2 it should get more exposure and testing.
  Thanks, Josh!

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
        GNOME2_STATUS
        HACKING
        configure.in
    gnucash/lib:
        Makefile.am
    gnucash/src/engine:
        gnc-trace.c
    gnucash/src/gnome:
        gnc-main-window.c
    gnucash/src/gnome-utils:
        Makefile.am
        gnc-gnome-utils.c
        gnc-html.c
    gnucash/src/report/utility-reports:
        Makefile.am
        utility-reports.scm

Added Files:
-----------
    gnucash/lib/goffice:
        ChangeLog
        Makefile.am
        goffice-config.h
        goffice-plugins.mk
        goffice.c
        goffice.h
        goffice.mk
        paths.h.in
        split.c
        split.h
        symbols.py
    gnucash/lib/goffice/app:
        Makefile.am
        go-app.h
        go-cmd-context-impl.h
        go-cmd-context.c
        go-cmd-context.h
        go-doc-control-impl.h
        go-doc-control.c
        go-doc-control.h
        go-doc-impl.h
        go-doc.c
        go-doc.h
        go-error-stack.h
        go-object.c
        go-object.h
        go-plugin.h
        go-service-impl.h
        go-service.c
        go-service.h
        goffice-app.h
    gnucash/lib/goffice/cut-n-paste:
        Makefile.am
    gnucash/lib/goffice/cut-n-paste/egg-recent-files:
        Makefile.am
        egg-recent-item.c
        egg-recent-item.h
        egg-recent-model.c
        egg-recent-model.h
        egg-recent-util.c
        egg-recent-util.h
        egg-recent-view-gtk.c
        egg-recent-view-gtk.h
        egg-recent-view.c
        egg-recent-view.h
        egg-recent.h
    gnucash/lib/goffice/cut-n-paste/pcre:
        Makefile.am
        get.c
        internal.h
        maketables.c
        pcre.c
        pcre.h
        pcreposix.c
        pcreposix.h
        printint.c
        study.c
    gnucash/lib/goffice/drawing:
        Makefile.am
        god-anchor.c
        god-anchor.h
        god-default-attributes.c
        god-default-attributes.h
        god-drawing-group.c
        god-drawing-group.h
        god-drawing-renderer-gdk.c
        god-drawing-renderer-gdk.h
        god-drawing-view.c
        god-drawing-view.h
        god-drawing.c
        god-drawing.h
        god-image-store.c
        god-image-store.h
        god-image.c
        god-image.h
        god-paragraph-attributes.c
        god-paragraph-attributes.h
        god-property-table.c
        god-property-table.h
        god-shape.c
        god-shape.h
        god-text-model.c
        god-text-model.h
    gnucash/lib/goffice/graph:
        Makefile.am
        README
        go-data-impl.h
        go-data-simple.c
        go-data-simple.h
        go-data.c
        go-data.h
        goffice-graph.h
        gog-axis-prefs.glade
        gog-axis.c
        gog-axis.h
        gog-chart-impl.h
        gog-chart.c
        gog-chart.h
        gog-control-foocanvas.c
        gog-control-foocanvas.h
        gog-data-allocator.c
        gog-data-allocator.h
        gog-data-set.c
        gog-data-set.h
        gog-error-bar-prefs.glade
        gog-error-bar.c
        gog-error-bar.h
        gog-graph-impl.h
        gog-graph.c
        gog-graph.h
        gog-grid-line.c
        gog-grid-line.h
        gog-grid.c
        gog-grid.h
        gog-guru-type-selector.glade
        gog-guru.c
        gog-guru.glade
        gog-guru.h
        gog-label.c
        gog-label.h
        gog-legend.c
        gog-legend.h
        gog-object-xml.c
        gog-object-xml.h
        gog-object.c
        gog-object.h
        gog-outlined-object.c
        gog-outlined-object.h
        gog-plot-engine.c
        gog-plot-engine.h
        gog-plot-impl.h
        gog-plot.c
        gog-plot.h
        gog-renderer-gnome-print.c
        gog-renderer-gnome-print.h
        gog-renderer-impl.h
        gog-renderer-pixbuf.c
        gog-renderer-pixbuf.h
        gog-renderer-svg.c
        gog-renderer-svg.h
        gog-renderer.c
        gog-renderer.h
        gog-series-impl.h
        gog-series.c
        gog-series.h
        gog-style-prefs.glade
        gog-style.c
        gog-style.h
        gog-styled-object.c
        gog-styled-object.h
        gog-theme.c
        gog-theme.h
        gog-view.c
        gog-view.h
    gnucash/lib/goffice/graph/plugins:
        Makefile.am
    gnucash/lib/goffice/graph/plugins/plot_barcol:
        Makefile.am
        gog-1.5d.c
        gog-1.5d.h
        gog-barcol-prefs.c
        gog-barcol-prefs.glade
        gog-barcol.c
        gog-barcol.h
        gog-line.c
        gog-line.h
        plot-types.xml.in
        plugin.xml.in
    gnucash/lib/goffice/graph/plugins/plot_pie:
        Makefile.am
        gog-pie-prefs.c
        gog-pie-prefs.glade
        gog-pie-series.glade
        gog-pie.c
        gog-pie.h
        gog-ring-prefs.glade
        plot-types.xml.in
        plugin.xml.in
    gnucash/lib/goffice/graph/plugins/plot_radar:
        Makefile.am
        gog-radar.c
        gog-radar.h
        plot-types.xml.in
        plugin.xml.in
    gnucash/lib/goffice/graph/plugins/plot_surface:
        Makefile.am
        gog-contour-prefs.c
        gog-contour-prefs.glade
        gog-surface.c
        gog-surface.h
        plot-types.xml.in
        plugin.xml.in
    gnucash/lib/goffice/graph/plugins/plot_xy:
        Makefile.am
        gog-bubble-prefs.c
        gog-bubble-prefs.glade
        gog-xy.c
        gog-xy.h
        plot-types.xml.in
        plugin.xml.in
    gnucash/lib/goffice/gui-utils:
        Makefile.am
        go-action-combo-color.c
        go-action-combo-color.h
        go-action-combo-pixmaps.c
        go-action-combo-pixmaps.h
        go-action-combo-stack.c
        go-action-combo-stack.h
        go-action-combo-text.c
        go-action-combo-text.h
        go-color-group.c
        go-color-group.h
        go-color-palette.c
        go-color-palette.h
        go-combo-box.c
        go-combo-box.h
        go-combo-color.c
        go-combo-color.h
        go-combo-pixmaps.c
        go-combo-pixmaps.h
        go-combo-text.c
        go-combo-text.h
        go-dock-band.c
        go-dock-band.h
        go-dock-item-grip.c
        go-dock-item-grip.h
        go-dock-item.c
        go-dock-item.h
        go-dock-layout.c
        go-dock-layout.h
        go-dock.c
        go-dock.h
        go-font-sel.c
        go-font-sel.glade
        go-font-sel.h
        go-gui-utils.c
        go-gui-utils.h
        go-marshalers.list
    gnucash/lib/goffice/pixmaps:
        Makefile.am
        area.xpm
        bar-hboth.png
        bar-hminus.png
        bar-hplus.png
        bar-none.png
        bar-vboth.png
        bar-vminus.png
        bar-vplus.png
        bar.xpm
        bubble.xpm
        chart-pie-2d.svg
        chart-rings-2d.svg
        chart_area_1_1.png
        chart_area_1_1.svg
        chart_area_1_2.png
        chart_area_1_2.svg
        chart_area_1_3.png
        chart_area_1_3.svg
        chart_bar_1_1.png
        chart_bar_1_1.svg
        chart_bar_1_2.png
        chart_bar_1_2.svg
        chart_bar_1_3.png
        chart_bar_1_3.svg
        chart_bar_2_1.png
        chart_bar_2_2.png
        chart_bar_2_3.png
        chart_bubble_1_1.png
        chart_bubble_1_1.svg
        chart_bubble_1_2.png
        chart_bubble_1_2.svg
        chart_column_1_1.png
        chart_column_1_1.svg
        chart_column_1_2.png
        chart_column_1_2.svg
        chart_column_1_3.png
        chart_column_1_3.svg
        chart_column_2_1.png
        chart_column_2_2.png
        chart_column_2_3.png
        chart_column_3_1.png
        chart_cone_1_1.png
        chart_cone_1_2.png
        chart_cone_1_3.png
        chart_cone_2_1.png
        chart_cone_2_2.png
        chart_cone_2_3.png
        chart_cone_3_1.png
        chart_cylinder_1_1.png
        chart_cylinder_1_2.png
        chart_cylinder_1_3.png
        chart_cylinder_2_1.png
        chart_cylinder_2_2.png
        chart_cylinder_2_3.png
        chart_cylinder_3_1.png
        chart_line_1_1.png
        chart_line_1_1.svg
        chart_line_1_2.png
        chart_line_1_2.svg
        chart_line_1_3.png
        chart_line_1_3.svg
        chart_line_2_1.png
        chart_line_2_1.svg
        chart_line_2_2.png
        chart_line_2_2.svg
        chart_line_2_3.png
        chart_line_2_3.svg
        chart_line_3_1.png
        chart_pie_1_1.png
        chart_pie_1_1.svg
        chart_pie_1_2.png
        chart_pie_1_3.png
        chart_pie_2_1.png
        chart_pie_2_1.svg
        chart_pie_2_2.png
        chart_pie_2_3.png
        chart_pyramid_1_1.png
        chart_pyramid_1_2.png
        chart_pyramid_1_3.png
        chart_pyramid_2_1.png
        chart_pyramid_2_2.png
        chart_pyramid_2_3.png
        chart_pyramid_3_1.png
        chart_radar_1_1.png
        chart_radar_1_1.svg
        chart_radar_1_2.png
        chart_radar_1_2.svg
        chart_radar_1_3.png
        chart_radar_1_3.svg
        chart_ring_1_1.png
        chart_ring_1_1.svg
        chart_ring_1_2.png
        chart_ring_1_2.svg
        chart_scatter_1_1.png
        chart_scatter_1_1.svg
        chart_scatter_2_1.png
        chart_scatter_2_2.png
        chart_scatter_3_1.png
        chart_scatter_3_1.svg
        chart_scatter_3_2.png
        chart_scatter_3_2.svg
        chart_stock_1_1.png
        chart_stock_1_2.png
        chart_stock_2_1.png
        chart_stock_2_2.png
        column.xpm
        doughnut.xpm
        linegraph.xpm
        pie.xpm
        radar.xpm
        scatter.xpm
        stock.xpm
        surface.xpm
    gnucash/lib/goffice/split:
        Makefile.am
        application.h
        command-context-priv.h
        command-context-stderr.c
        command-context-stderr.h
        command-context.c
        command-context.h
        dates.c
        dates.h
        datetime.c
        datetime.h
        dependent.h
        error-info.c
        error-info.h
        file.h
        format.c
        format.h
        formats.c
        func.h
        global-gnome-font.c
        global-gnome-font.h
        gnumeric-gconf-priv.h
        gnumeric-gconf.c
        gnumeric-gconf.h
        gnumeric.h
        gui-file.h
        gui-gnumeric.h
        gui-util.c
        gui-util.h
        gutils.c
        gutils.h
        io-context-priv.h
        io-context.c
        io-context.h
        mathfunc.c
        mathfunc.h
        module-plugin-defs.h
        mstyle.c
        mstyle.h
        number-match.c
        number-match.h
        numbers.h
        plugin-loader-module.c
        plugin-loader-module.h
        plugin-loader.c
        plugin-loader.h
        plugin-service-impl.h
        plugin-service.c
        plugin-service.h
        plugin-util.c
        plugin-util.h
        plugin.c
        plugin.h
        position.h
        ranges.h
        regutf8.c
        regutf8.h
        str.c
        str.h
        style-border.c
        style-border.h
        style-color.c
        style-color.h
        style.c
        style.h
        validation.c
        validation.h
        value.c
        value.h
        workbook-control-gui.h
        xml-io-version.h
        xml-io.h
    gnucash/lib/goffice/split/widgets:
        Makefile.am
        widget-font-selector.h
        widget-format-selector.c
        widget-format-selector.h
    gnucash/lib/goffice/utils:
        Makefile.am
        go-color.c
        go-color.h
        go-file.c
        go-file.h
        go-font.c
        go-font.h
        go-format.c
        go-format.h
        go-gradient.c
        go-gradient.h
        go-line.c
        go-line.h
        go-locale.c
        go-locale.h
        go-marker.c
        go-marker.h
        go-math.c
        go-math.h
        go-pattern.c
        go-pattern.h
        go-units.h
        goffice-utils.h
    gnucash/src/gnome-utils:
        gnc-html-graph-gog.c
        gnc-html-graph-gog.h
    gnucash/src/report/utility-reports:
        test-graphing.scm


More information about the gnucash-patches mailing list