gnumeric r16745 - in trunk: . src

[jody svn gnome org]

Author: jody
Date: Sun Aug 24 01:45:34 2008
New Revision: 16745
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16745&view=rev

Log:
* src/style.c (gnm_pango_context_get) : handle recent pango deprecation.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/style.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Aug 24 01:45:34 2008
@@ -159,8 +159,8 @@
 	gobject-2.0		>= 2.6.0
 	gmodule-2.0		>= 2.6.0
 	gthread-2.0		>= 2.6.0
-	pango			>= 1.8.1
-	pangocairo		>= 1.8.1
+	pango			>= 1.10.0
+	pangocairo		>= 1.10.0
 "
 libspreadsheet_gtk_reqs="
 	libglade-2.0		>= 2.3.6
@@ -709,7 +709,7 @@
 SAVE_LIBS=$LIBS
 CFLAGS="$CFLAGS $GNUMERIC_CFLAGS"
 LIBS="$GNUMERIC_LIBS $LIBS"
-AC_CHECK_FUNCS(g_date_set_time_t g_slice_alloc gtk_recent_manager_get_default gsf_open_pkg_foreach_rel)
+AC_CHECK_FUNCS(g_date_set_time_t g_slice_alloc pango_font_map_create_context gtk_recent_manager_get_default gsf_open_pkg_foreach_rel)
 CFLAGS=$SAVE_CFLAGS
 LIBS=$SAVE_LIBS
 

Modified: trunk/src/style.c
==============================================================================
--- trunk/src/style.c	(original)
+++ trunk/src/style.c	Sun Aug 24 01:45:34 2008
@@ -294,7 +294,11 @@
 		if (!fontmap)
 			fontmap = pango_cairo_font_map_new ();
 		pango_cairo_font_map_set_resolution (PANGO_CAIRO_FONT_MAP (fontmap), 96);
+#ifdef HAVE_PANGO_FONT_MAP_CREATE_CONTEXT
+		context = pango_font_map_create_context (PANGO_FONT_MAP (fontmap));
+#else /* deprecated in 1.22.0 */
 		context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap));
+#endif
 	}
 	pango_context_set_language (context, gtk_get_default_language ());
 	pango_context_set_base_dir (context, PANGO_DIRECTION_LTR);