summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavyd Madeley <davyd@madeley.id.au>2005-01-02 08:58:36 +0000
committerDavyd Madeley <davyd@src.gnome.org>2005-01-02 08:58:36 +0000
commita0652ef8be5eaf4e34ccef34358fd79ef6b5509d (patch)
treea02160b43f1b158a045066805f8db3fe80bb3cc5
parent1661c42cd1dc024a9c5adf68ecc35751d7027b57 (diff)
downloadyelp-a0652ef8be5eaf4e34ccef34358fd79ef6b5509d.tar.gz
Add appropriate copyright information.
2005-01-02 Davyd Madeley <davyd@madeley.id.au> * src/yelp-info-pager.c: * src/yelp-info-parser.c: Add appropriate copyright information. * src/yelp-info-parser.c: Bring children of Top in line with Top in the tree to make the interface more consistent with the docbook pages.
-rw-r--r--ChangeLog9
-rw-r--r--src/yelp-info-pager.c1
-rw-r--r--src/yelp-info-parser.c26
3 files changed, 34 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7afdb88b..ccc42c03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2005-01-02 Davyd Madeley <davyd@madeley.id.au>
+ * src/yelp-info-pager.c:
+ * src/yelp-info-parser.c: Add appropriate copyright information.
+
+ * src/yelp-info-parser.c: Bring children of Top in line with Top in
+ the tree to make the interface more consistent with the docbook
+ pages.
+
+2005-01-02 Davyd Madeley <davyd@madeley.id.au>
+
* src/yelp-info-parser.c:
* src/yelp-info-pager.c: Use page numbers as the section id, not page
names.
diff --git a/src/yelp-info-pager.c b/src/yelp-info-pager.c
index 45b5b467..1193e8ef 100644
--- a/src/yelp-info-pager.c
+++ b/src/yelp-info-pager.c
@@ -18,6 +18,7 @@
* Boston, MA 02111-1307, USA.
*
* Author: Shaun McCance <shaunm@gnome.org>
+ * Davyd Madeley <davyd@madeley.id.au>
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/yelp-info-parser.c b/src/yelp-info-parser.c
index 971a3262..2b1aa6be 100644
--- a/src/yelp-info-parser.c
+++ b/src/yelp-info-parser.c
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2005 Davyd Madeley <davyd@madeley.id.au>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Davyd Madeley <davyd@madeley.id.au>
+ */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -94,6 +115,7 @@ static char
if (items[0])
{
filename = g_strdup_printf (
+ /* FIXME */
"/usr/share/info/%s.gz", items[0]);
str = open_info_file (filename);
@@ -241,7 +263,7 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
iter = g_malloc0 (sizeof (GtkTreeIter));
/* check to see if we need to process our parent and siblings */
- if (up && strcmp (up, "(dir)"))
+ if (up && strcmp (up, "(dir)") && strcmp (up, "Top"))
{
page = node2page (nodes2offsets, offsets2pages, up);
if (!processed_table[page])
@@ -265,7 +287,7 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
}
/* by this point our parent and older sibling should be processed */
- if (!up || !strcmp (up, "(dir)"))
+ if (!up || !strcmp (up, "(dir)") || !strcmp (up, "Top"))
{
g_print ("\t> no parent\n");
if (!prev || !strcmp (prev, "(dir)"))