aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
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 /addressbook
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 'addressbook')
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c14
2 files changed, 8 insertions, 11 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 892a7bce87..f634649050 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/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 Matthew Barnes <mbarnes@redhat.com>
* gui/component/GNOME_Evolution_Addressbook.server.in.in:
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index ebdc6bf22f..a226cfe132 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -28,10 +28,7 @@
#include <time.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-help.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libedataserverui/e-categories-dialog.h>
@@ -45,6 +42,7 @@
#include "addressbook/gui/component/addressbook.h"
#include "addressbook/printing/e-contact-print.h"
#include "addressbook/gui/widgets/eab-gui-util.h"
+#include "e-util/e-util.h"
#include "e-util/e-gui-utils.h"
#include "e-util/e-error.h"
#include "misc/e-dateedit.h"
@@ -3210,14 +3208,8 @@ app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
static void
show_help_cb (GtkWidget *widget, gpointer data)
{
- GError *error = NULL;
-
- gnome_help_display (
- "evolution.xml", "usage-contact-cards", &error);
- if (error != NULL) {
- g_warning ("%s", error->message);
- g_error_free (error);
- }
+ /* FIXME Pass a proper parent window. */
+ e_display_help (NULL, "usage-contact-cards");
}
static GList *