[goffice: 2/2] Merge branch 'outline'

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

commit 23363996069b42d90432be38b8574731b163035d
Merge: d88d7e1... f261759...
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Sep 1 07:38:58 2009 +0200

    Merge branch 'outline'
    
    Conflicts:
    	ChangeLog

 ChangeLog                          |    5 ++
 goffice/canvas/goc-circle.c        |    4 +-
 goffice/canvas/goc-ellipse.c       |    4 +-
 goffice/canvas/goc-line.c          |    2 +-
 goffice/canvas/goc-polygon.c       |    4 +-
 goffice/canvas/goc-polyline.c      |    2 +-
 goffice/canvas/goc-rectangle.c     |    4 +-
 goffice/graph/gog-equation.c       |    8 +-
 goffice/graph/gog-error-bar.c      |    8 +-
 goffice/graph/gog-theme.c          |   98 ++++++++++++++--------------
 goffice/gtk/go-3d-rotation-sel.c   |   10 ++--
 goffice/gtk/go-color-group.c       |    2 +-
 goffice/gtk/go-color-palette.c     |  130 ++++++++++++++++++------------------
 goffice/gtk/go-color-selector.c    |   36 +++++-----
 goffice/gtk/go-combo-color.c       |    8 +-
 goffice/gtk/go-gradient-selector.c |    4 +-
 goffice/gtk/go-marker-selector.c   |    4 +-
 goffice/gtk/go-pattern-selector.c  |    8 +-
 goffice/gtk/go-rotation-sel.c      |    8 +-
 goffice/utils/go-color.c           |   16 ++--
 goffice/utils/go-color.h           |   88 ++++++++++++------------
 goffice/utils/go-format.c          |   32 +++++-----
 goffice/utils/go-image.c           |    4 +-
 goffice/utils/go-libxml-extras.c   |    4 +-
 goffice/utils/go-marker.c          |    4 +-
 goffice/utils/go-pattern.c         |   10 ++--
 goffice/utils/go-style.c           |   18 +++---
 plugins/plot_radar/gog-radar.c     |   12 ++--
 plugins/plot_surface/gog-contour.c |    4 +-
 plugins/plot_xy/gog-xy.c           |   14 ++--
 30 files changed, 280 insertions(+), 275 deletions(-)
---
diff --cc ChangeLog
index 243fefa,5c2c3cc..74c1952
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
+ 2009-09-01  Jean Brefort  <jean brefort normalesup org>
+ 
+ 	* goffice/utils/go-color.h: prefixed all macros with GO_
+ 	* all files: use renamed go-color.h macros.
+ 
 +2009-08-31  Morten Welinder <terra gnome org>
 +
 +	* docs/reference/Makefile.am: Clean more stuff to force regens.
 +
  2009-08-31  Jean Brefort  <jean brefort normalesup org>
  
  	* all files: deprecate GOStyle::outline. [#593608]