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

4 files changed, 18 insertions, 17 deletions

diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index f3c5c58464..2c992a4fac 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/contact-editor/e-contact-editor.c:
+	Use e_display_help() for displaying help.
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 6918a9b43c..ab882cc197 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -26,7 +26,6 @@
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-error.h>
-#include <libgnome/libgnome.h>
 #include <glade/glade.h>
 #include "mail/em-menu.h"
 #include "mail/em-utils.h"
@@ -34,6 +33,7 @@
 #include "composer/e-msg-composer.h"
 #include "libedataserver/e-account.h"
 #include "e-util/e-config.h"
+#include "e-util/e-util.h"
 #include "email-custom-header.h"
 
 
@@ -197,7 +197,6 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	CustomHeaderOptionsDialog *mch;
-	GError *error = NULL;     
 
 	mch = func_data;
 	priv = mch->priv;
@@ -211,12 +210,9 @@ epech_header_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) {
-				g_warning ("%s", error->message);
-				g_error_free (error);
-			}
+			e_display_help (
+				GTK_WINDOW (priv->main),
+				priv->help_section);
 			break;
 	}
 
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index f16f1301cf..09fb3274af 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	* exchange-send-options.c:
+	Use e_display_help() for displaying help.
+
 2008-08-06  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #435969
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index 02c50e78e0..ef7687df93 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -26,9 +26,8 @@
 #include <libedataserverui/e-name-selector.h>
 #include <libedataserverui/e-contact-store.h>
 #include "exchange-operations.h"
+#include <e-util/e-util.h>
 #include <e-util/e-error.h>
-#include <libgnome/libgnome.h>
-#include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 
 #include "e-util/e-util-private.h"
@@ -280,7 +279,6 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 {
    	ExchangeSendOptionsDialogPrivate *priv;
    	ExchangeSendOptionsDialog *sod;
-        GError *error = NULL;
 
 	sod = func_data;
         priv = sod->priv;
@@ -295,12 +293,9 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 	           	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;
 	}
 	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);