gnumeric r16433 - in trunk: . src tools/win32

[jody svn gnome org]

Author: jody
Date: Sat Mar  1 18:42:24 2008
New Revision: 16433
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16433&view=rev

Log:
2008-03-01  Jody Goldberg <jody gnome org>

	* src/style.c : drop use of pangoft2 as a hard coded fallback use
	  pangocairo instead.

	* src/wbc-gtk-actions.c (cb_help_docs) : add a warning if help viewer
	  fails.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/style.c
   trunk/src/wbc-gtk-actions.c
   trunk/tools/win32/jhbuildrc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Mar  1 18:42:24 2008
@@ -10,6 +10,10 @@
 
 Jody:
 	* Fix cell comment positioning problem.  [#506017]
+	* Update win32 build.
+	* Fix win32 help.
+	* Fix File->Sendto on win32.
+	* Fix ssconvert win32.
 
 Morten:
 	* Fix NPV doc problem.  [#506160]

Modified: trunk/src/style.c
==============================================================================
--- trunk/src/style.c	(original)
+++ trunk/src/style.c	Sat Mar  1 18:42:24 2008
@@ -23,7 +23,7 @@
 #include "mathfunc.h"
 #include "gnumeric-gconf.h"
 
-#include <pango/pangoft2.h>
+#include <pango/pangocairo.h>
 #include <gdk/gdkpango.h>
 #include <gtk/gtkmain.h>
 #include <string.h>
@@ -292,9 +292,9 @@
 		context = gdk_pango_context_get_for_screen (screen);
 	} else {
 		if (!fontmap)
-			fontmap = pango_ft2_font_map_new ();
-		pango_ft2_font_map_set_resolution (PANGO_FT2_FONT_MAP (fontmap), 96, 96);
-		context = pango_ft2_font_map_create_context (PANGO_FT2_FONT_MAP (fontmap));
+			fontmap = pango_cairo_font_map_new ();
+		pango_cairo_font_map_set_resolution (PANGO_CAIRO_FONT_MAP (fontmap), 96);
+		context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap));
 	}
 	pango_context_set_language (context, gtk_get_default_language ());
 	pango_context_set_base_dir (context, PANGO_DIRECTION_LTR);
@@ -381,12 +381,6 @@
 	gnumeric_default_font_name = NULL;
 
 	if (fontmap) {
-		/*
-		 * Workaround for bug #143542 (PangoFT2Fontmap leak).
-		 * See also bug #148997 (Text layer rendering leaks font file
-		 * descriptor).
-		 */
-		pango_ft2_font_map_substitute_changed (PANGO_FT2_FONT_MAP (fontmap));
 		g_object_unref (fontmap);
 		fontmap = NULL;
 	}

Modified: trunk/src/wbc-gtk-actions.c
==============================================================================
--- trunk/src/wbc-gtk-actions.c	(original)
+++ trunk/src/wbc-gtk-actions.c	Sat Mar  1 18:42:24 2008
@@ -869,22 +869,27 @@
 static GNM_ACTION_DEF (cb_help_docs)
 {
 	char   *argv[] = { NULL, NULL, NULL };
-	GError *error = NULL;
+	GError *err = NULL;
 
 #ifndef G_OS_WIN32
 	argv[0] = (char *)"yelp";
 	argv[1] = (char *)"ghelp:gnumeric";
 	g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
-		NULL, NULL, NULL, &error);
+		NULL, NULL, NULL, &err);
 #else
-	/* TODO : handle translations when we generate them */
+	/* TODO : Should really start in same directory as the gspawn-* helpers
+	 * are installed in case they are not in the path */
 	argv[0] = (char *)"hh";
 	argv[1] = g_build_filename (gnm_sys_data_dir (), "doc", "C",
 			"gnumeric.chm", NULL);
 	g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
-		NULL, NULL, NULL, &error);
+		NULL, NULL, NULL, &err);
 	g_free (argv[1]);
 #endif
+	if (NULL != err) {
+		go_cmd_context_error (GO_CMD_CONTEXT (wbcg), err);
+		g_error_free (err);
+	}
 }
 
 static GNM_ACTION_DEF (cb_help_web)

Modified: trunk/tools/win32/jhbuildrc
==============================================================================
--- trunk/tools/win32/jhbuildrc	(original)
+++ trunk/tools/win32/jhbuildrc	Sat Mar  1 18:42:24 2008
@@ -47,9 +47,9 @@
 
 #Exporting tool flags enviroment variables
 os.environ['LDFLAGS']	 = ' -mno-cygwin -L'+prefix+'/lib  -no-undefined'
-os.environ['CFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mwindows -mno-cygwin -mms-bitfields -march=i686 ' 
-os.environ['CPPFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mwindows '
-os.environ['CXXFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mwindows -mno-cygwin -mms-bitfields -march=i686 '
+os.environ['CFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686 ' 
+os.environ['CPPFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686'
+os.environ['CXXFLAGS']	 = ' -O0 -g -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686 '
 os.environ['ARFLAGS']	 = 'rcs'
 os.environ['INSTALL']	 = os.path.expanduser('~/bin/install-check')