From 09cfe5d5690a75e8f79c94b052980dd191965054 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 14 Aug 2008 19:21:10 +0000
Subject: New convenience function for launching help from Evolution. Displays
 an

2008-08-14  Matthew Barnes  <mbarnes@redhat.com>

	* e-util/e-util.c (e_display_help):
	New convenience function for launching help from Evolution.
	Displays an error dialog over the given parent window if an
	error occurs.

	* addressbook/gui/contact-editor/e-contact-editor.c:
	* calendar/gui/dialogs/comp-editor.c:
	* plugins/email-custom-header/gui/contact-editor/e-contact-editor.c:
	* plugins/exchange-operations/exchange-send-options.c:
	* widgets/misc/e-multi-config-dialog.c:
	* widgets/misc/e-send-options.c:
	Use e_display_help() for displaying help.


svn path=/trunk/; revision=35991
---
 widgets/misc/ChangeLog               |  6 ++++++
 widgets/misc/e-multi-config-dialog.c | 11 ++---------
 widgets/misc/e-send-options.c        | 12 ++++--------
 3 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'widgets')

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 5f7fd73f51..15f82821c4 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-multi-config-dialog.c:
+	* e-send-options.c:
+	Use e_display_help() for displaying help.
+
 2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #546892
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 159b14561c..780a33baaa 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -26,14 +26,13 @@
 
 #include "e-multi-config-dialog.h"
 
+#include <e-util/e-util.h>
 #include <table/e-table-scrolled.h>
 #include <table/e-table-memory-store.h>
 #include <table/e-cell-pixbuf.h>
 #include <table/e-cell-vbox.h>
 #include <table/e-cell-text.h>
 
-#include <libgnome/gnome-help.h>
-
 #define SWITCH_PAGE_INTERVAL 250
 
 struct _EMultiConfigDialogPrivate {
@@ -172,18 +171,12 @@ static void
 impl_response (GtkDialog *dialog, int response_id)
 {
 	EMultiConfigDialog *multi_config_dialog;
-	GError *error = NULL;
 
 	multi_config_dialog = E_MULTI_CONFIG_DIALOG (dialog);
 
 	switch (response_id) {
 	case GTK_RESPONSE_HELP:
-		gnome_help_display (
-			"evolution.xml", "config-prefs", &error);
-		if (error != NULL) {
-			g_warning ("%s", error->message);
-			g_error_free (error);
-		}
+		e_display_help (GTK_WINDOW (dialog), "config-prefs");
 		break;
 	case GTK_RESPONSE_CLOSE:
 	default:
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 32eb33b484..33c80d6917 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -23,11 +23,11 @@
 #endif
 
 #include <string.h>
-#include <libgnome/libgnome.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <time.h>
 
+#include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 
 #include "e-dateedit.h"
@@ -586,7 +586,6 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data
 {
 	ESendOptionsDialogPrivate *priv;
 	ESendOptionsDialog *sod;
-	GError *error = NULL;
 
 	sod = func_data;
 	priv = sod->priv;
@@ -600,12 +599,9 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data
 			g_object_unref (priv->xml);
 			break;
 		case GTK_RESPONSE_HELP:
-			gnome_help_display (
-				"evolution.xml", priv->help_section, &error);
-			if (error != NULL) {
-				g_warning ("%s", error->message);
-				g_error_free (error);
-			}
+			e_display_help (
+				GTK_WINDOW (priv->main),
+				priv->help_section);
     			break;
 	}
 
-- 
cgit