[drgeo/goffice: 82/82] Merge branch 'goffice-0.8' into goffice

[Jean Bréfort <jbrefort src gnome org>]

commit 39126fdfc813de2b74b2158180aed46ad8dc056c
Merge: 786b3b0 efa3f22
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sat Feb 13 15:25:49 2010 +0100

    Merge branch 'goffice-0.8' into goffice
    
    Conflicts:
    	ChangeLog
    	configure.ac
    	goffice/Makefile.am
    	goffice/drgeo.cc
    	goffice/drgeo_cairodrawable.cc
    	goffice/drgeo_cairodrawable.h
    	goffice/goffice_mdi.cc
    	goffice/goffice_mdi.h
    	po/ChangeLog

 .cvsignore                     |   27 -
 ChangeLog                      |   67 +-
 MAINTAINERS                    |    3 +
 autogen.sh                     |   21 +
 configure.ac                   |   14 +-
 geo/drgeo_figure.cc            |    2 +-
 goffice/Makefile.am            |    2 -
 goffice/drgeo.cc               |   39 +-
 goffice/drgeo_cairodrawable.cc |   40 +-
 goffice/drgeo_cairodrawable.h  |    3 +-
 goffice/goffice_mdi.cc         |    7 +-
 goffice/goffice_mdi.h          |    4 +-
 goffice/plugin.xml             |   23 +
 po/.cvsignore                  |   12 -
 po/ChangeLog                   |  111 ++-
 po/LINGUAS                     |   45 +
 po/Makefile.in.in              |  256 -----
 po/{no.po => ar.po}            | 1725 ++++++++++++++++-------------
 po/cs.po                       |   26 +-
 po/da.po                       | 1400 +++++++++++++-----------
 po/de.po                       | 1178 +++++++++++---------
 po/dz.po                       | 2394 ++++++++++++++++++++++++++++++++++++++++
 po/el.po                       | 1074 ++++++++++---------
 po/en_GB.po                    | 1392 +++++++++++++-----------
 po/es.po                       |  350 +++---
 po/eu.po                       |  424 ++++---
 po/{no.po => fi.po}            | 1315 +++++++++++-----------
 po/fr.po                       |  187 ++--
 po/hu.po                       |    4 +-
 po/nb.po                       |  345 ++++---
 po/ne.po                       | 1775 ++++++++++++++++--------------
 po/{no.po => oc.po}            | 1289 +++++++++++-----------
 po/pt_BR.po                    | 1161 +++++++++++---------
 po/sl.po                       | 2358 +++++++++++++++++----------------------
 po/sv.po                       | 1622 +++++++++++++--------------
 po/vi.po                       | 2271 +++++++++++++++++++++++++++++++++++++
 po/{no.po => zh_HK.po}         | 1358 ++++++++++++-----------
 po/zh_TW.po                    | 1200 +++++++++++----------
 38 files changed, 15363 insertions(+), 10161 deletions(-)
---
diff --cc goffice/drgeo.cc
index 335ee1a,067e8af..6aea8ab
--- a/goffice/drgeo.cc
+++ b/goffice/drgeo.cc
@@@ -179,42 -178,28 +178,20 @@@ cairo_to_pixbuf (unsigned char *p, int 
  }
  
  static void
- go_drgeo_component_draw (GOComponent *component, int width_pixels, int height_pixels)
+ go_drgeo_component_render (GOComponent *component, cairo_t *cr, double width_pixels, double height_pixels)
  {
  	GODrGeoComponent *godrgeo = GO_DRGEO_COMPONENT (component);
- 	gdk_pixbuf_fill (component->pixbuf, 0x00000000);
- 	cairo_surface_t* 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));
- 	drgeoCairoDrawable *drawable = new drgeoCairoDrawable (godrgeo->figure, surface);
 -/*	gdk_pixbuf_fill (component->pixbuf, 0x00000000);
 -	cairo_surface_t* 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));*/
+ 	drgeoCairoDrawable *drawable = new drgeoCairoDrawable (godrgeo->figure, cr);
  	drawable->setMetrics (width_pixels / godrgeo->width,
  							godrgeo->xoffset, godrgeo->yoffset,
  							godrgeo->width, godrgeo->height);
  	godrgeo->figure->redraw (0);
  	godrgeo->figure->setDrawable (NULL);
  	delete drawable;
- 	cairo_to_pixbuf (gdk_pixbuf_get_pixels (component->pixbuf), 
- 					width_pixels, height_pixels, 
- 					gdk_pixbuf_get_rowstride (component->pixbuf));
 -/*	cairo_to_pixbuf (gdk_pixbuf_get_pixels (component->pixbuf), 
 -					width_pixels, height_pixels, 
 -					gdk_pixbuf_get_rowstride (component->pixbuf));*/
  }
  
- static void
- go_drgeo_component_print (GOComponent *component, GnomePrintContext *gpc,
- 												double width, double height)
- {
- 	GODrGeoComponent *godrgeo = GO_DRGEO_COMPONENT (component);
- 	drgeoGPDrawable *drawable = new drgeoGPDrawable (godrgeo->figure, gpc);
- 	drawable->setMetrics (width / godrgeo->width, godrgeo->xoffset,
- 						godrgeo->yoffset - godrgeo->height,
- 						godrgeo->width, godrgeo->height);
- 	godrgeo->figure->redraw (0);
- 	godrgeo->figure->setDrawable (NULL);
- 	delete drawable;
- }
 +
- static gboolean
+ static GtkWindow *
  go_drgeo_component_edit (GOComponent *component)
  {
  	GODrGeoComponent *godrgeo = GO_DRGEO_COMPONENT (component);
diff --cc goffice/drgeo_cairodrawable.cc
index f39fcc9,8a8d39c..ab20437
--- a/goffice/drgeo_cairodrawable.cc
+++ b/goffice/drgeo_cairodrawable.cc
@@@ -2,7 -2,7 +2,7 @@@
   * DrGeo GOffice component
   * drgeo_cairodrawable.cc
   *
-- * Copyright (C) 2006 Jean Bréfort <jean brefort normalesup org>
++ * Copyright (C) 2006-2010 Jean Bréfort <jean brefort normalesup org>
   *
   * This program is free software; you can redistribute it and/or 
   * modify it under the terms of the GNU General Public License as 
diff --cc goffice/drgeo_cairodrawable.h
index 528073c,02bcbc9..9179228
--- a/goffice/drgeo_cairodrawable.h
+++ b/goffice/drgeo_cairodrawable.h
@@@ -2,7 -2,7 +2,7 @@@
   * DrGeo GOffice component
   * drgeo_cairodrawable.h
   *
-- * Copyright (C) 2006 Jean Bréfort <jean brefort normalesup org>
++ * Copyright (C) 2006-2010 Jean Bréfort <jean brefort normalesup org>
   *
   * This program is free software; you can redistribute it and/or 
   * modify it under the terms of the GNU General Public License as 
diff --cc goffice/goffice_mdi.cc
index 27f0cdf,82912a6..1edd26f
--- a/goffice/goffice_mdi.cc
+++ b/goffice/goffice_mdi.cc
@@@ -2,7 -2,7 +2,7 @@@
   * DrGeo GOffice component
   * goffice_mdi.cc
   *
-- * Copyright (C) 2006 Jean Bréfort <jean brefort normalesup org>
++ * Copyright (C) 2006-2010 Jean Bréfort <jean brefort normalesup org>
   *
   * This program is free software; you can redistribute it and/or 
   * modify it under the terms of the GNU General Public License as 
diff --cc goffice/goffice_mdi.h
index bac1944,99fca06..ccd5d88
--- a/goffice/goffice_mdi.h
+++ b/goffice/goffice_mdi.h
@@@ -2,7 -2,7 +2,7 @@@
   * DrGeo GOffice component
   * goffice_mdi.cc
   *
-- * Copyright (C) 2006 Jean Bréfort <jean brefort normalesup org>
++ * Copyright (C) 2006-2010 Jean Bréfort <jean brefort normalesup org>
   *
   * This program is free software; you can redistribute it and/or 
   * modify it under the terms of the GNU General Public License as