[gnumeric] GUI: fix multihead issues.

[Morten Welinder <mortenw src gnome org>]

commit 24c69a7632fe76d9e4c9e78773d96718fcf111db
Author: Morten Welinder <terra gnome org>
Date:   Mon May 31 14:58:42 2010 -0400

    GUI: fix multihead issues.

 ChangeLog             |    5 +++++
 NEWS                  |    3 +++
 src/wbc-gtk-actions.c |   27 +++++++++++++++------------
 3 files changed, 23 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4b51375..96ec4ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31  Morten Welinder  <terra gnome org>
+
+	* src/wbc-gtk-actions.c (cb_help_web, cb_help_irc, cb_help_bug):
+	use go_gtk_url_show so we get the right screen.
+
 2010-05-30  Morten Welinder <terra gnome org>
 
 	* configure.in: Post-release bump.
diff --git a/NEWS b/NEWS
index bf14e84..612c05f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.10.6
 
+Morten:
+	* Make sure windows for help commands show up on right screen.
+
 --------------------------------------------------------------------------
 Gnumeric 1.10.5
 
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index f911aa3..c3840d0 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1029,31 +1029,34 @@ static GNM_ACTION_DEF (cb_help_docs)
 	}
 }
 
-static GNM_ACTION_DEF (cb_help_web)
+static void
+show_url (WBCGtk *wbcg, const char *url)
 {
-	GError *err = go_url_show ("http://www.gnumeric.org/";);
+	GError *err;
+	GdkScreen *screen;
+
+	screen = gtk_window_get_screen (wbcg_toplevel (wbcg));
+	err = go_gtk_url_show (url, screen);
 	if (err != NULL) {
 		go_cmd_context_error (GO_CMD_CONTEXT (wbcg), err);
 		g_error_free (err);
 	}
 }
 
+
+static GNM_ACTION_DEF (cb_help_web)
+{
+	show_url (wbcg, "http://www.gnumeric.org/";);
+}
+
 static GNM_ACTION_DEF (cb_help_irc)
 {
-	GError *err = go_url_show ("irc://irc.gnome.org/gnumeric");
-	if (err != NULL) {
-		go_cmd_context_error (GO_CMD_CONTEXT (wbcg), err);
-		g_error_free (err);
-	}
+	show_url (wbcg, "irc://irc.gnome.org/gnumeric");
 }
 
 static GNM_ACTION_DEF (cb_help_bug)
 {
-	GError *err = go_url_show ("http://bugzilla.gnome.org/enter_bug.cgi?product=Gnumeric";);
-	if (err != NULL) {
-		go_cmd_context_error (GO_CMD_CONTEXT (wbcg), err);
-		g_error_free (err);
-	}
+	show_url (wbcg, "http://bugzilla.gnome.org/enter_bug.cgi?product=Gnumeric";);
 }
 
 static GNM_ACTION_DEF (cb_help_about) { dialog_about (wbcg); }