[goffice] Fix the --without-gtk build. [#618592]

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

commit 4b6ca9045e57ccc1d2e6b9c79574c89638349fa7
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon May 17 09:02:44 2010 +0200

    Fix the --without-gtk build. [#618592]

 ChangeLog                 |    6 ++++++
 NEWS                      |    3 +++
 goffice/goffice.h         |    1 +
 goffice/graph/gog-chart.c |    7 +++++--
 4 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 64c0dda..50c1543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-17  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/goffice.h: applied patch from Bobby Powers: fix without-gtk
+	build. [#618592]
+	* goffice/graph/gog-chart.c (gog_chart_class_init):
+
 2010-05-16  Morten Welinder  <terra gnome org>
 
 	* goffice/math/go-quad.c: quad precision routines.
diff --git a/NEWS b/NEWS
index 5f77d8d..fed02bf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 goffice 0.8.4:
 
+Bobby Powers:
+	* Fix the --without-gtk build. [#618592]
+
 Morten:
 	* Regression fixes.
 	* Improve linear regression accuracy.
diff --git a/goffice/goffice.h b/goffice/goffice.h
index cdb34d0..c288bbe 100644
--- a/goffice/goffice.h
+++ b/goffice/goffice.h
@@ -27,6 +27,7 @@
 #ifdef GOFFICE_WITH_GTK
 #include <gtk/gtk.h>
 #else
+#include <cairo/cairo.h>
 #include <pango/pango.h>
 #endif
 
diff --git a/goffice/graph/gog-chart.c b/goffice/graph/gog-chart.c
index 6535b7f..adbd99d 100644
--- a/goffice/graph/gog-chart.c
+++ b/goffice/graph/gog-chart.c
@@ -293,8 +293,6 @@ cb_manual_position_changed (GtkComboBox *combo, PlotAreaPrefState *state)
 	}
 }
 
-#endif
-
 static void
 gog_chart_populate_editor (GogObject *gobj,
 			   GOEditor *editor,
@@ -368,6 +366,7 @@ gog_chart_populate_editor (GogObject *gobj,
 
 	go_editor_set_store_page (editor, &chart_pref_page);
 }
+#endif
 
 static void
 gog_chart_children_reordered (GogObject *obj)
@@ -655,7 +654,11 @@ gog_chart_class_init (GogObjectClass *gog_klass)
 	gobject_klass->set_property = gog_chart_set_property;
 	gobject_klass->get_property = gog_chart_get_property;
 
+#ifdef GOFFICE_WITH_GTK
 	gog_klass->populate_editor = gog_chart_populate_editor;
+#else
+	gog_klass->populate_editor = NULL;
+#endif
 
 	gog_klass->can_manual_size = TRUE;