summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in2
-rw-r--r--src/yelp-window.c6
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4fb2b14e..3ebc304b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-04-15 Mikael Hallendal <micke@codefactory.se>
+ * src/yelp-window.c: fixed a couple of warnings.
+ (yw_handle_url): send the error correctly to gnome_url_show,
+ thanks rhult :)
+
+ * configure.in: bumped gtkhtml2 requirements.
+
* src/yelp-html.c (yelp_html_do_non_docbook):
- show error dialog if open fails.
diff --git a/configure.in b/configure.in
index 75cf796c..acabd7bb 100644
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ else
fi
AC_DEFINE_UNQUOTED(GNOMELOCALEDIR, "$GNOMELOCALEDIR")
-PKG_CHECK_MODULES(YELP, libgtkhtml-2.0 >= 1.99.3 \
+PKG_CHECK_MODULES(YELP, libgtkhtml-2.0 >= 1.99.5 \
gnome-vfs-2.0 >= 1.1 \
libgnome-2.0 >= 1.112.1 \
libgnomeui-2.0 >= 1.103.0 \
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 42f86d28..40a29fc9 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -110,8 +110,10 @@ static void yw_toolbar_style_changed_cb (GConfClient *client,
GConfEntry *entry,
gpointer data);
+#if 0
static void yw_remove_notify_cb (GtkObject *obj,
gpointer data);
+#endif
enum {
PAGE_TOC_VIEW,
@@ -345,7 +347,7 @@ yw_handle_url (YelpWindow *window, const gchar *url)
&error);
handled = TRUE;
} else {
- gnome_url_show (url, error);
+ gnome_url_show (url, &error);
handled = FALSE;
}
@@ -690,6 +692,7 @@ yw_toolbar_style_changed_cb (GConfClient *client,
gtk_toolbar_set_style(toolbar, style);
}
+#if 0
static void
yw_remove_notify_cb (GtkObject *obj, gpointer data)
{
@@ -701,6 +704,7 @@ yw_remove_notify_cb (GtkObject *obj, gpointer data)
gconf_client_notify_remove(conf_client, notify_id);
}
+#endif
GtkWidget *
yelp_window_new (GNode *doc_tree, GList *index)