callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now that we require GTK+ 2.14, use gtk_show_uri() instead of

Browse Source 
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
This commit is contained in:
Matthew Barnes
2009-01-11 01:49:39 +00:00
committed by Matthew Barnes
parent 75a0cef3ca
commit 5b8d789977
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e-util/ChangeLog
View File

@ -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):

20
e-util/e-util.c
View File

@ -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);
}
/**