diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-01-11 09:49:39 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-11 09:49:39 +0800 |
| commit | 5b8d7899771fd554bb2af73bdcb7905cf07dc8ab (patch) | |
| tree | 7a72c868fcf7ce2cbc40b601a0063a90f1d6e66a /e-util | |
| parent | 75a0cef3ca9ecda7655bf3ade93f1eafdf9fdcc5 (diff) | |
| download | gsoc2013-evolution-5b8d7899771fd554bb2af73bdcb7905cf07dc8ab.tar.gz gsoc2013-evolution-5b8d7899771fd554bb2af73bdcb7905cf07dc8ab.tar.zst gsoc2013-evolution-5b8d7899771fd554bb2af73bdcb7905cf07dc8ab.zip | |
Now that we require GTK+ 2.14, use gtk_show_uri() instead of
2009-01-10 Matthew Barnes <mbarnes@redhat.com>
* e-util/e-util.c (e_display_help):
Now that we require GTK+ 2.14, use gtk_show_uri() instead of
gnome_help_display().
svn path=/trunk/; revision=37034
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/ChangeLog | 6 | ||||
| -rw-r--r-- | e-util/e-util.c | 20 |
2 files changed, 23 insertions, 3 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 92e6f1d567..1d0bfb62ad 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +2009-01-10 Matthew Barnes <mbarnes@redhat.com> + + * e-util.c (e_display_help): + Now that we require GTK+ 2.14, use gtk_show_uri() instead of + gnome_help_display(). + 2009-01-01 Matthew Barnes <mbarnes@redhat.com> * e-config.c (ec_rebuild): diff --git a/e-util/e-util.c b/e-util/e-util.c index 4ab1a39636..0e43f092b2 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -38,7 +38,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libgnome/gnome-help.h> #include <libgnome/gnome-init.h> #ifdef G_OS_WIN32 @@ -106,11 +105,23 @@ void e_display_help (GtkWindow *parent, const gchar *link_id) { + GString *uri; GtkWidget *dialog; + GdkScreen *screen = NULL; GError *error = NULL; + guint32 timestamp; - if (gnome_help_display ("evolution.xml", link_id, &error)) - return; + uri = g_string_new ("ghelp:" PACKAGE); + timestamp = gtk_get_current_event_time (); + + if (parent != NULL) + screen = gtk_widget_get_screen (GTK_WIDGET (parent)); + + if (link_id != NULL) + g_string_append_printf (uri, "?%s", link_id); + + if (gtk_show_uri (screen, uri->str, timestamp, &error)) + goto exit; dialog = gtk_message_dialog_new_with_markup ( parent, GTK_DIALOG_DESTROY_WITH_PARENT, @@ -125,6 +136,9 @@ e_display_help (GtkWindow *parent, gtk_widget_destroy (dialog); g_error_free (error); + +exit: + g_string_free (uri, TRUE); } /** |