aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-08-15 03:21:10 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-15 03:21:10 +0800
commit09cfe5d5690a75e8f79c94b052980dd191965054 (patch)
treebbac8fbf0e5d44cbf96c3cff50ccfa9cd4411e84 /plugins
parentd5258efe7aed378df171fecc3055b065e1403c0e (diff)
downloadgsoc2013-evolution-09cfe5d5690a75e8f79c94b052980dd191965054.tar
gsoc2013-evolution-09cfe5d5690a75e8f79c94b052980dd191965054.tar.gz
gsoc2013-evolution-09cfe5d5690a75e8f79c94b052980dd191965054.tar.bz2
gsoc2013-evolution-09cfe5d5690a75e8f79c94b052980dd191965054.tar.lz
gsoc2013-evolution-09cfe5d5690a75e8f79c94b052980dd191965054.tar.xz
gsoc2013-evolution-09cfe5d5690a75e8f79c94b052980dd191965054.tar.zst
gsoc2013-evolution-09cfe5d5690a75e8f79c94b052980dd191965054.zip
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
Diffstat (limited to 'plugins')
-rw-r--r--plugins/email-custom-header/ChangeLog5
-rw-r--r--plugins/email-custom-header/email-custom-header.c12
-rw-r--r--plugins/exchange-operations/ChangeLog5
-rw-r--r--plugins/exchange-operations/exchange-send-options.c13
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);