goffice r2222 - in branches/goffice-0-6: . goffice/gtk plugins/plot_surface

[jbrefort svn gnome org]

Author: jbrefort
Date: Sun Sep 14 05:45:30 2008
New Revision: 2222
URL: http://svn.gnome.org/viewvc/goffice?rev=2222&view=rev

Log:
2008-09-14  Jean Brefort  <jean brefort normalesup org>

	* goffice/gtk/goffice-gtk.c: (go_help_display): applied patch
	from Hib Eris to fix a crash in non-gnome apps using goffice
	with gnome. [#551128]
	* plugins/plot_surface/gog-surface.c: (gog_contour_view_render):
	fixed a bad index.



Modified:
   branches/goffice-0-6/ChangeLog
   branches/goffice-0-6/NEWS
   branches/goffice-0-6/goffice/gtk/goffice-gtk.c
   branches/goffice-0-6/plugins/plot_surface/gog-surface.c

Modified: branches/goffice-0-6/NEWS
==============================================================================
--- branches/goffice-0-6/NEWS	(original)
+++ branches/goffice-0-6/NEWS	Sun Sep 14 05:45:30 2008
@@ -1,5 +1,9 @@
 goffice 0.6.6:
 
+Hib Eris:
+	Fix crash in go_help_display when non gnome applications use
+	goffice with gnome. [#551128]
+
 Morten:
 	* Fix go_url_resolve_relative.  [#550898]
 

Modified: branches/goffice-0-6/goffice/gtk/goffice-gtk.c
==============================================================================
--- branches/goffice-0-6/goffice/gtk/goffice-gtk.c	(original)
+++ branches/goffice-0-6/goffice/gtk/goffice-gtk.c	Sun Sep 14 05:45:30 2008
@@ -752,9 +752,7 @@
 static void
 go_help_display (CBHelpPaths const *paths)
 {
-#ifdef GOFFICE_WITH_GNOME
-	gnome_help_display (paths->app, paths->link, NULL);
-#elif defined(G_OS_WIN32)
+#if defined(G_OS_WIN32)
 	static GHashTable* context_help_map = NULL;
 	guint id;
 
@@ -808,6 +806,12 @@
 		g_free (path);
 	}
 #else
+#ifdef GOFFICE_WITH_GNOME
+	if (gnome_program_get () != NULL) {
+		gnome_help_display (paths->app, paths->link, NULL);
+		return;
+	}
+#endif
 	go_gtk_notice_dialog (NULL, GTK_MESSAGE_ERROR,
 			      "TODO : launch help browser for %s", paths->link);
 #endif

Modified: branches/goffice-0-6/plugins/plot_surface/gog-surface.c
==============================================================================
--- branches/goffice-0-6/plugins/plot_surface/gog-surface.c	(original)
+++ branches/goffice-0-6/plugins/plot_surface/gog-surface.c	Sun Sep 14 05:45:30 2008
@@ -1127,7 +1127,7 @@
 							style->fill.pattern.back = color[zn];
 							gog_renderer_push_style (rend, style);
 							gog_renderer_draw_polygon (rend, path, FALSE);
-							if (xl[2] < 0.) {
+							if (xl[4] < 0.) {
 								path[4].x = path[0].x = x[2];
 								path[4].y = path[0].y = y[2];
 								path[5].code = ART_END;