[gnumeric] Compilation: make sure we compile on gtk 2.12



commit 8a0dd43a6ac82e0398833ff0b528f99062a81f1d
Author: Morten Welinder <terra gnome org>
Date:   Mon Aug 31 09:32:45 2009 -0400

    Compilation: make sure we compile on gtk 2.12

 configure.in               |    2 +-
 src/dialogs/ChangeLog      |    5 +++++
 src/dialogs/dialog-about.c |    7 ++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 3006edd..6328cde 100644
--- a/configure.in
+++ b/configure.in
@@ -668,7 +668,7 @@ LIBS="$GNUMERIC_LIBS $LIBS"
 
 AC_CHECK_FUNCS(g_date_set_time_t g_slice_alloc g_option_context_set_delocalize)
 AC_CHECK_FUNCS(pango_font_map_create_context)
-AC_CHECK_FUNCS(gtk_recent_manager_get_default gtk_orientable_set_orientation gtk_adjustment_configure gtk_widget_get_window gsf_open_pkg_foreach_rel)
+AC_CHECK_FUNCS(gtk_recent_manager_get_default gtk_orientable_set_orientation gtk_adjustment_configure gtk_widget_get_window gsf_open_pkg_foreach_rel gtk_dialog_get_content_area)
 AC_CHECK_FUNCS(gsf_infile_msvba_steal_modules)
 
 AC_MSG_CHECKING([for PANGO_WEIGHT_THIN etc.])
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index eddf532..c5bb6b7 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-31  Morten Welinder  <terra gnome org>
+
+	* dialog-about.c (dialog_about): Handle C90 and missing
+	gtk_dialog_get_content_area.
+
 2009-08-30  Morten Welinder <terra gnome org>
 
 	* Release 1.9.11
diff --git a/src/dialogs/dialog-about.c b/src/dialogs/dialog-about.c
index 74ec25e..5aebb18 100644
--- a/src/dialogs/dialog-about.c
+++ b/src/dialogs/dialog-about.c
@@ -552,11 +552,12 @@ dialog_about (WBCGtk *wbcg)
 {
 	GtkWidget *w, *c;
 	GList *children;
+	AboutState *state;
 
 	if (gnumeric_dialog_raise_if_exists (wbcg, ABOUT_KEY))
 		return;
 
-	AboutState *state = g_new0 (AboutState, 1);
+	state = g_new0 (AboutState, 1);
 
 	w = g_object_new (GTK_TYPE_ABOUT_DIALOG,
 			  "title", _("About Gnumeric"),
@@ -574,7 +575,11 @@ dialog_about (WBCGtk *wbcg)
 	g_signal_connect_swapped (w, "destroy",
 				  G_CALLBACK (free_state), state);
 
+#ifdef HAVE_GTK_DIALOG_GET_CONTENT_AREA
 	c = gtk_dialog_get_content_area (GTK_DIALOG (w));
+#else
+	c = GTK_DIALOG (w)->vbox;
+#endif
 	children = gtk_container_get_children (GTK_CONTAINER (c));
 
 	if (children && GTK_IS_VBOX (children->data)) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]