gnumeric r17049 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Tue Dec 30 20:36:23 2008
New Revision: 17049
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17049&view=rev

Log:
2008-12-30  Morten Welinder  <terra gnome org>

	* configure.in (LIBS): Up pango requirement modestly.
	* src/main-application.c (main): Drop check for old pango bug.



Modified:
   trunk/ChangeLog
   trunk/README
   trunk/configure.in
   trunk/src/main-application.c

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Tue Dec 30 20:36:23 2008
@@ -20,7 +20,7 @@
 	libgoffice	>= 0.7.3	libgoffice-0-5-dev
 	libglade	>= 2.3.6	libglade2-dev
 	gnome-xml   	>= 2.4.12	libxml2-dev
-	pango		>= 1.8.1	libpango1.0-dev
+	pango		>= 1.12.0	libpango1.0-dev
 	NOTE: gnome-xml is also known as libxml
 
 Optionally:

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Dec 30 20:36:23 2008
@@ -150,7 +150,7 @@
 	gobject-2.0		>= 2.6.0
 	gmodule-2.0		>= 2.6.0
 	gthread-2.0		>= 2.6.0
-	pango			>= 1.10.0
+	pango			>= 1.12.0
 	pangocairo		>= 1.10.0
 "
 libspreadsheet_gtk_reqs="

Modified: trunk/src/main-application.c
==============================================================================
--- trunk/src/main-application.c	(original)
+++ trunk/src/main-application.c	Tue Dec 30 20:36:23 2008
@@ -304,39 +304,6 @@
 
 
 static void
-check_pango_attr_list_splice_bug (void)
-{
-	PangoAttrList *l1 = pango_attr_list_new ();
-	PangoAttrList *l2 = pango_attr_list_new ();
-	PangoAttribute *a = pango_attr_weight_new (1000);
-	PangoAttrIterator *it;
-	gboolean buggy;
-
-	a->start_index = 4;
-	a->end_index = 5;
-	pango_attr_list_insert (l1, a);
-
-	pango_attr_list_splice (l1, l2, 0, 1);
-	pango_attr_list_unref (l2);
-
-	it = pango_attr_list_get_iterator (l1);
-	if (pango_attr_iterator_next (it)) {
-		gint s, e;
-		pango_attr_iterator_range (it, &s, &e);
-		buggy = (s != 5 || e != 6);
-	} else
-		buggy = TRUE;
-	pango_attr_iterator_destroy (it);
-	pango_attr_list_unref (l1);
-
-	if (buggy)
-		g_warning (_("The Pango library present on your system is buggy, see\n"
-			     "http://bugzilla.gnome.org/show_bug.cgi?id=316054\n";
-			     "Editing rich text therefore does not work well.  Please check\n"
-			     "with your distribution if a fixed Pango library is available."));
-}
-
-static void
 cb_workbook_removed (void)
 {
 	if (gnm_app_workbook_list () == NULL) {
@@ -426,7 +393,6 @@
 	with_gui = !func_def_file && !func_state_file && !split_funcdocs;
 
 	if (with_gui) {
-		check_pango_attr_list_splice_bug ();
 		gnm_session_init (argv[0]);
 	}