summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@src.gnome.org>2004-12-31 08:35:29 +0000
committerShaun McCance <shaunm@src.gnome.org>2004-12-31 08:35:29 +0000
commit9406f4b86c14030626187c1f3d5d3613643ec1e4 (patch)
tree74b1a39b6413f1197a4216af8b84dfbff87bd075
parentd024b438c98b634ab3d9fe51bd812286aed48f04 (diff)
downloadyelp-9406f4b86c14030626187c1f3d5d3613643ec1e4.tar.gz
- Put in a NULL check to fix a crahser for Davyd
* src/yelp-toc-pager.c: - Put in a NULL check to fix a crahser for Davyd
-rw-r--r--ChangeLog5
-rw-r--r--src/yelp-toc-pager.c22
2 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index e992c146..2e766cfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-31 Shaun McCance <shaunm@gnome.org>
+
+ * src/yelp-toc-pager.c:
+ - Put in a NULL check to fix a crahser for Davyd
+
2004-12-29 Shaun McCance <shaunm@gnome.org>
* src/yelp-settings.c:
diff --git a/src/yelp-toc-pager.c b/src/yelp-toc-pager.c
index d289337b..885a0a9d 100644
--- a/src/yelp-toc-pager.c
+++ b/src/yelp-toc-pager.c
@@ -667,21 +667,23 @@ process_mandir_pending (YelpTocPager *pager)
gchar *tooltip, *url_full, *url_short;
YelpDocInfo *info;
- tmp = xmlNewChild (tmp, NULL, "doc", NULL);
-
url_full = g_strconcat ("man:", dirname, "/", filename, NULL);
url_short = g_strconcat ("man:", manname, ".", mansect, NULL);
info = yelp_doc_info_get (url_full);
- yelp_doc_info_add_uri (info, url_short, YELP_URI_TYPE_MAN);
- xmlNewNsProp (tmp, NULL, "href", url_full);
- g_free (url_full);
- g_free (url_short);
- xmlNewChild (tmp, NULL, "title", manname);
+ if (info) {
+ yelp_doc_info_add_uri (info, url_short, YELP_URI_TYPE_MAN);
+ tmp = xmlNewChild (tmp, NULL, "doc", NULL);
+ xmlNewNsProp (tmp, NULL, "href", url_full);
- tooltip = g_strdup_printf (_("Read man page for %s"), manname);
- xmlNewChild (tmp, NULL, "tooltip", tooltip);
- g_free (tooltip);
+ xmlNewChild (tmp, NULL, "title", manname);
+ tooltip = g_strdup_printf (_("Read man page for %s"), manname);
+ xmlNewChild (tmp, NULL, "tooltip", tooltip);
+ g_free (tooltip);
+ }
+
+ g_free (url_full);
+ g_free (url_short);
} else {
g_warning ("Could not locate section %s for %s\n",
mansect, manman);