Commit 8374bc24 authored by Jean Bréfort's avatar Jean Bréfort Committed by Jean Bréfort

use GOImage for the cairo <-> pixbuf conversion. replaced gi18n.h by

2006-05-25  Jean Brefort  <jean.brefort@normalesup.org>

	* component/gnumeric.c: (go_gnm_component_set_data),
	(go_gnm_component_draw): use GOImage for the cairo <-> pixbuf conversion.
	* src/application.c: replaced gi18n.h by gi18n-lib.h.
	* src/clipboard.c: ditto.
	* src/cmd-edit.c: ditto.
	* src/command-context-stderr.c: ditto.
	* src/command-context.c: ditto.
	* src/commands.c: ditto.
	* src/consolidate.c: ditto.
	* src/expr-name.c: ditto.
	* src/expr.c: ditto.
	* src/file-autoft.c: ditto.
	* src/format-template.c: ditto.
	* src/func-builtin.c: ditto.
	* src/func.c: ditto.
	* src/gnm-format.c: ditto.
	* src/gnm-graph-window.c: ditto.
	* src/gnm-plugin.c: ditto.
	* src/gnm-so-filled.c: (gnm_so_filled_draw_cairo): fixed a memory leak and
	the gi18n change.
	* src/gnm-so-line.c: replaced gi18n.h by gi18n-lib.h.
	* src/gnm-so-polygon.c: (gnm_so_polygon_draw_cairo),
	(gnm_so_polygon_class_init): new draw cairo function (not implemented)
	and ditto.
	* src/gnumeric-canvas.c: replaced gi18n.h by gi18n-lib.h.
	* src/gnumeric-pane.c: ditto.
	* src/gui-clipboard.c: ditto.
	* src/gui-file.c: ditto.
	* src/gui-util.c: ditto.
	* src/gutils.c: ditto.
	* src/history.c: ditto.
	* src/hlink.c: ditto.
	* src/input-msg.c: ditto.
	* src/item-bar.c: ditto.
	* src/item-cursor.c: ditto.
	* src/item-edit.c: ditto.
	* src/libgnumeric.c: ditto.
	* src/mathfunc.c: ditto.
	* src/number-match.c: ditto.
	* src/parser.y: ditto.
	* src/pivottable.c: ditto.
	* src/print-info.c: ditto.
	* src/print.c: ditto.
	* src/ranges.c: ditto.
	* src/search.c: ditto.
	* src/selection.c: ditto.
	* src/session.c: ditto.
	* src/sheet-autofill.c: ditto.
	* src/sheet-control-gui.c: ditto.
	* src/sheet-filter.c: ditto.
	* src/sheet-merge.c: ditto.
	* src/sheet-object-graph.c: ditto.
	* src/sheet-object-image.c: ditto.
	* src/sheet-object-widget.c: ditto.
	* src/sheet-object.c: ditto.
	* src/sheet-style.c: ditto.
	* src/sheet-view.c: ditto.
	* src/sheet.c: ditto.
	* src/stf-export.c: ditto.
	* src/stf-parse.c: ditto.
	* src/stf.c: ditto.
	* src/style.c: ditto.
	* src/validation.c: ditto.
	* src/value-sheet.c: ditto.
	* src/value.c: ditto.
	* src/wbc-gtk.c: ditto and set translation domain for actions.
	* src/wbcg-actions.c: replaced gi18n.h by gi18n-lib.h.
	* src/widgets/gnm-dao.c: ditto.
	* src/widgets/gnumeric-expr-entry.c: ditto.
	* src/widgets/gnumeric-lazy-list.c: ditto.
	* src/widgets/widget-font-selector.c: ditto.
	* src/workbook-cmd-format.c: ditto.
	* src/workbook-control-gui.c: ditto.
	* src/workbook-control.c: ditto.
	* src/workbook-edit.c: ditto.
	* src/workbook-view.c: ditto.
	* src/workbook.c: ditto.
	* src/xml-io.c: ditto.
	* src/xml-sax-read.c: ditto.
parent 9a077caa
2006-05-25 Jean Brefort <jean.brefort@normalesup.org>
* component/gnumeric.c: (go_gnm_component_set_data),
(go_gnm_component_draw): use GOImage for the cairo <-> pixbuf conversion.
* src/application.c: replaced gi18n.h by gi18n-lib.h.
* src/clipboard.c: ditto.
* src/cmd-edit.c: ditto.
* src/command-context-stderr.c: ditto.
* src/command-context.c: ditto.
* src/commands.c: ditto.
* src/consolidate.c: ditto.
* src/expr-name.c: ditto.
* src/expr.c: ditto.
* src/file-autoft.c: ditto.
* src/format-template.c: ditto.
* src/func-builtin.c: ditto.
* src/func.c: ditto.
* src/gnm-format.c: ditto.
* src/gnm-graph-window.c: ditto.
* src/gnm-plugin.c: ditto.
* src/gnm-so-filled.c: (gnm_so_filled_draw_cairo): fixed a memory leak and
the gi18n change.
* src/gnm-so-line.c: replaced gi18n.h by gi18n-lib.h.
* src/gnm-so-polygon.c: (gnm_so_polygon_draw_cairo),
(gnm_so_polygon_class_init): new draw cairo function (not implemented)
and ditto.
* src/gnumeric-canvas.c: replaced gi18n.h by gi18n-lib.h.
* src/gnumeric-pane.c: ditto.
* src/gui-clipboard.c: ditto.
* src/gui-file.c: ditto.
* src/gui-util.c: ditto.
* src/gutils.c: ditto.
* src/history.c: ditto.
* src/hlink.c: ditto.
* src/input-msg.c: ditto.
* src/item-bar.c: ditto.
* src/item-cursor.c: ditto.
* src/item-edit.c: ditto.
* src/libgnumeric.c: ditto.
* src/mathfunc.c: ditto.
* src/number-match.c: ditto.
* src/parser.y: ditto.
* src/pivottable.c: ditto.
* src/print-info.c: ditto.
* src/print.c: ditto.
* src/ranges.c: ditto.
* src/search.c: ditto.
* src/selection.c: ditto.
* src/session.c: ditto.
* src/sheet-autofill.c: ditto.
* src/sheet-control-gui.c: ditto.
* src/sheet-filter.c: ditto.
* src/sheet-merge.c: ditto.
* src/sheet-object-graph.c: ditto.
* src/sheet-object-image.c: ditto.
* src/sheet-object-widget.c: ditto.
* src/sheet-object.c: ditto.
* src/sheet-style.c: ditto.
* src/sheet-view.c: ditto.
* src/sheet.c: ditto.
* src/stf-export.c: ditto.
* src/stf-parse.c: ditto.
* src/stf.c: ditto.
* src/style.c: ditto.
* src/validation.c: ditto.
* src/value-sheet.c: ditto.
* src/value.c: ditto.
* src/wbc-gtk.c: ditto and set translation domain for actions.
* src/wbcg-actions.c: replaced gi18n.h by gi18n-lib.h.
* src/widgets/gnm-dao.c: ditto.
* src/widgets/gnumeric-expr-entry.c: ditto.
* src/widgets/gnumeric-lazy-list.c: ditto.
* src/widgets/widget-font-selector.c: ditto.
* src/workbook-cmd-format.c: ditto.
* src/workbook-control-gui.c: ditto.
* src/workbook-control.c: ditto.
* src/workbook-edit.c: ditto.
* src/workbook-view.c: ditto.
* src/workbook.c: ditto.
* src/xml-io.c: ditto.
* src/xml-sax-read.c: ditto.
2006-05-22 Morten Welinder <terra@gnome.org>
* src/workbook-edit.c (wbcg_edit_start): Handle scientific as
......
......@@ -34,6 +34,7 @@
#include <goffice/component/go-component.h>
#include <goffice/utils/go-glib-extras.h>
#include <goffice/utils/go-color.h>
#include <goffice/utils/go-image.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-input-memory.h>
#include <gsf/gsf-output-memory.h>
......@@ -80,37 +81,6 @@ typedef struct
int width, height;
} GOGnmComponent;
/* Red and blue are inverted in a pixbuf compared to cairo */
static void
cairo_to_pixbuf (unsigned char *p, int width, int height, int rowstride)
{
int i,j;
unsigned char a;
guint t;
#define MULT(d,c,a,t) G_STMT_START { t = (a)? c * 255 / a: 0; d = t;} G_STMT_END
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
MULT(a, p[2], p[3], t);
MULT(p[1], p[1], p[3], t);
MULT(p[2], p[0], p[3], t);
p[0] = a;
#else
a = p[3];
MULT(p[3], p[2], a, t);
MULT(p[2], p[1], a, t);
MULT(p[1], p[0], a, t);
p[0] = a;
#endif
p += 4;
}
p += rowstride - width * 4;
}
#undef MULT
}
typedef GOComponentClass GOGnmComponentClass;
#define GO_GNM_COMPONENT_TYPE (go_gnm_component_get_type ())
......@@ -156,7 +126,9 @@ go_gnm_component_set_data (GOComponent *component)
GsfInput *input = gsf_input_memory_new (component->data, component->length, FALSE);
g_object_set (G_OBJECT (io_context), "exec-main-loop", FALSE, NULL);
gognm->wv = wb_view_new_from_input (input, NULL, io_context, NULL);
if (gognm->wv != NULL)
g_object_unref (gognm->wv);
gognm->wv = wb_view_new_from_input (input, NULL, io_context, NULL);
g_object_unref (io_context);
gognm->sheet = wb_view_cur_sheet (gognm->wv);
sv = sheet_get_view (gognm->sheet, gognm->wv);
......@@ -244,7 +216,6 @@ go_gnm_component_draw (GOComponent *component, int width_pixels, int height_pixe
#ifdef GOFFICE_WITH_CAIRO
GOGnmComponent *gognm = GO_GNM_COMPONENT (component);
int col, row;
cairo_surface_t* surface ;
cairo_t *cairo;
GnmCell *cell;
double xoffset = 0., yoffset;
......@@ -252,18 +223,15 @@ go_gnm_component_draw (GOComponent *component, int width_pixels, int height_pixe
SheetObject *so;
SheetObjectAnchor const *anchor;
ColRowInfo const *ri;
GOImage *image;
gdk_pixbuf_fill (component->pixbuf, 0);
if (gognm->wv == NULL)
return;
if (gognm->sheet == NULL)
return;
surface = cairo_image_surface_create_for_data (
gdk_pixbuf_get_pixels (component->pixbuf),
CAIRO_FORMAT_ARGB32,
width_pixels, height_pixels,
gdk_pixbuf_get_rowstride (component->pixbuf));
cairo = cairo_create (surface);
gdk_pixbuf_fill (component->pixbuf, 0);
image = go_image_new_from_pixbuf (component->pixbuf);
cairo = go_image_get_cairo (image);
cairo_scale (cairo, ((double) width_pixels) / gognm->width, ((double) height_pixels) / gognm->height);
for (col = gognm->col_start; col <= gognm->col_end; col++) {
ri = sheet_col_get_info (gognm->sheet, col);
......@@ -311,10 +279,8 @@ go_gnm_component_draw (GOComponent *component, int width_pixels, int height_pixe
l = l->next;
}
cairo_destroy (cairo);
cairo_surface_destroy (surface);
cairo_to_pixbuf (gdk_pixbuf_get_pixels (component->pixbuf),
width_pixels, height_pixels,
gdk_pixbuf_get_rowstride (component->pixbuf));
go_image_get_pixbuf (image);
g_object_unref (image);
#endif
}
......
......@@ -35,7 +35,7 @@
#include <gtk/gtkiconfactory.h>
#include <gtk/gtkselection.h>
#include <gtk/gtkicontheme.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#define GNM_APP(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_APP_TYPE, GnmApp))
#define GNM_APP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GNM_APP_TYPE, GnmAppClass))
......@@ -984,4 +984,3 @@ _gnm_app_flag_windows_changed (void)
windows_update_timer = g_timeout_add (100,
(GSourceFunc)cb_flag_windows_changed, NULL);
}
......@@ -37,7 +37,7 @@
#include "stf-parse.h"
#include "sheet-object-cell-comment.h"
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <locale.h>
#include <string.h>
#include <goffice/utils/go-glib-extras.h>
......
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "cmd-edit.h"
......
......@@ -8,7 +8,7 @@
* (C) 2002-2005 Jon K Hellan
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <stdio.h>
#include "gnumeric.h"
#include "command-context-stderr.h"
......
......@@ -24,7 +24,7 @@
#include "command-context.h"
#include "ranges.h"
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#define CC_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_CMD_CONTEXT_TYPE, GOCmdContextClass))
......
......@@ -24,7 +24,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "commands.h"
......
......@@ -21,7 +21,7 @@
#include <gnumeric-config.h>
#include "gnumeric.h"
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "consolidate.h"
#include "cell.h"
......
......@@ -10,7 +10,7 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include "gnumeric.h"
#include "expr-name.h"
......@@ -835,4 +835,3 @@ sheet_names_check (Sheet const *sheet, GnmRange const *r)
return (nexpr != NULL) ? nexpr->name->str : NULL;
}
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "expr.h"
......
......@@ -21,7 +21,7 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "file-autoft.h"
......
......@@ -20,7 +20,7 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "format-template.h"
......
......@@ -21,7 +21,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include <func.h>
#include <func-builtin.h>
......
......@@ -10,7 +10,7 @@
* Jody Goldberg (jody@gnome.org)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include "gnumeric.h"
#include "func.h"
......
......@@ -29,7 +29,7 @@
#include <goffice/utils/format-impl.h>
#include <goffice/utils/go-glib-extras.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <stdio.h>
#include <style-font.h>
......
......@@ -4,7 +4,7 @@
#include <string.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtkcombobox.h>
#include <gtk/gtklayout.h>
......
......@@ -20,7 +20,7 @@
#include <goffice/utils/go-glib-extras.h>
#include <goffice/utils/go-libxml-extras.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
typedef PluginServiceSimpleClass PluginServiceFunctionGroupClass;
......
......@@ -30,7 +30,7 @@
#include <goffice/graph/gog-style.h>
#include <goffice/utils/go-color.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <math.h>
......@@ -368,6 +368,7 @@ gnm_so_filled_draw_cairo (SheetObject const *so, gpointer data,
cairo_t *cairo = (cairo_t*) data;
GogStyle const *style = sof->style;
cairo_pattern_t *pat = NULL;
gpointer obj;
cairo_new_path (cairo);
if (sof->is_oval) {
......@@ -384,12 +385,14 @@ gnm_so_filled_draw_cairo (SheetObject const *so, gpointer data,
cairo_close_path (cairo);
}
/* Fill the shape */
pat = gog_style_create_cairo_pattern (style, width, height);
pat = gog_style_create_cairo_pattern (style, width, height, &obj);
if (pat) {
cairo_set_source (cairo, pat);
cairo_fill_preserve (cairo);
cairo_pattern_destroy (pat);
}
if (obj)
g_object_unref (G_OBJECT (obj));
/* Draw the line */
cairo_set_line_width (cairo, (style->outline.width)? style->outline.width: 1.);
cairo_set_source_rgba (cairo,
......
......@@ -30,7 +30,7 @@
#include <goffice/graph/gog-style.h>
#include <goffice/utils/go-color.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#define GNM_SO_LINE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_SO_LINE_TYPE, GnmSOLine))
......
......@@ -30,7 +30,7 @@
#include <goffice/graph/gog-style.h>
#include <goffice/utils/go-color.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <math.h>
......@@ -190,6 +190,14 @@ gnm_so_polygon_print (SheetObject const *so, GnomePrintContext *gp_context,
}
#endif /* WITH_GTK */
static void
gnm_so_polygon_draw_cairo (SheetObject const *so, gpointer data,
double width, double height)
{
#ifdef GOFFICE_WITH_CAIRO
#endif
}
static gboolean
gnm_so_polygon_read_xml_dom (SheetObject *so, char const *typename,
XmlParseContext const *ctxt, xmlNodePtr node)
......@@ -316,6 +324,7 @@ gnm_so_polygon_class_init (GObjectClass *gobject_class)
so_class->user_config = gnm_so_polygon_user_config;
so_class->print = gnm_so_polygon_print;
#endif /* WITH_GTK */
so_class->draw_cairo = gnm_so_polygon_draw_cairo;
g_object_class_install_property (gobject_class, SOP_PROP_STYLE,
g_param_spec_object ("style", NULL, NULL, GOG_STYLE_TYPE,
......
......@@ -11,7 +11,7 @@
* Renato Araujo (renato.filho@indt.org.br)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "gnumeric-canvas.h"
......
......@@ -36,7 +36,7 @@
#include <gtk/gtkimage.h>
#include <gtk/gtkdnd.h>
#include <gdk/gdkdisplay.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <math.h>
#define GNUMERIC_ITEM "GnmPane"
#include "item-debug.h"
......
......@@ -38,7 +38,7 @@
#include <goffice/app/io-context.h>
#include <gsf/gsf-input-memory.h>
#include <gsf/gsf-output-memory.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <libxml/globals.h>
#include <locale.h>
#include <string.h>
......
......@@ -12,7 +12,7 @@
* Renato Araujo (renato.filho@indt.org.br)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "gui-file.h"
......
......@@ -7,7 +7,7 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "libgnumeric.h"
#include "gui-util.h"
......
......@@ -8,7 +8,7 @@
* Zbigniew Chyla (cyba@gnome.pl)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "gutils.h"
#include "gnumeric-paths.h"
......
......@@ -6,7 +6,7 @@
*
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <goffice/utils/go-file.h>
#include "gnumeric.h"
#include "history.h"
......
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "hlink.h"
#include "hlink-impl.h"
......
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "input-msg.h"
#include "str.h"
......
......@@ -8,7 +8,7 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "item-bar.h"
......
......@@ -8,7 +8,7 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "item-cursor.h"
......
......@@ -12,7 +12,7 @@
* ranges are highlighted on the spreadsheet).
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "item-edit.h"
......
......@@ -8,7 +8,7 @@
* Miguel de Icaza (miguel@gnu.org)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "libgnumeric.h"
......
......@@ -52,7 +52,7 @@
#include <gnumeric-config.h>
#include "gnumeric.h"
#include "mathfunc.h"
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <math.h>
#include <errno.h>
......
......@@ -14,7 +14,7 @@
* Miguel de Icaza (miguel@gnu.org)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "number-match.h"
......
......@@ -13,7 +13,7 @@
* Almer S. Tigelaar (almer@gnome.org)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "number-match.h"
#include "expr.h"
......
......@@ -23,7 +23,7 @@
#include "pivottable.h"
#include <sheet.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
GnmPivotTable *
gnm_pivottable_new (Sheet *src_sheet, GnmRange const *src,
......
......@@ -28,7 +28,7 @@
#include <goffice/utils/datetime.h>
#include <goffice/utils/go-glib-extras.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <locale.h>
#include <time.h>
......
......@@ -10,7 +10,7 @@
* Handles printing of Sheets.
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "print.h"
......
......@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#undef RANGE_DEBUG
......
......@@ -6,7 +6,7 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "search.h"
......
......@@ -9,7 +9,7 @@
* (C) 1999-2006 Jody Goldberg
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "selection.h"
......
......@@ -34,7 +34,7 @@
#include <gui-file.h>
#include <gui-util.h>
#include <goffice/app/go-doc.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <libgnomeui/gnome-client.h>
......
......@@ -8,7 +8,7 @@
* Morten Welinder (terra@gnome.org), 2006
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "sheet-autofill.h"
......
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "sheet-control-gui-priv.h"
......
......@@ -47,7 +47,7 @@
#include <gdk/gdkevents.h>
#include <gdk/gdkkeysyms.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <stdlib.h>
......
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "sheet-merge.h"
......
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "sheet-object-graph.h"
......
......@@ -7,7 +7,7 @@
* Jody Goldberg (jody@gnome.org)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "sheet-object-image.h"
#include "sheet-object-impl.h"
......
......@@ -21,7 +21,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "sheet-object-widget.h"
......
......@@ -9,7 +9,7 @@
* Jody Goldberg (jody@gnome.org)
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "sheet-object.h"
......
......@@ -32,7 +32,7 @@
#include "cell.h"
#include "gutils.h"
#include <goffice/utils/go-glib-extras.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#ifndef USE_TILE_POOLS
......
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <stdlib.h>
#include "gnumeric.h"
......
......@@ -64,7 +64,7 @@
#include <goffice/utils/go-glib-extras.h>
#include <goffice/utils/go-format.h>
#include <glib/gi18n.h>
#inclu