gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

I now consider navigation links to be 'done' (Fixes bug #2201)

Browse source 
2000-09-03  Ali Abdin  <aliabdin@aucegypt.edu>

        I now consider navigation links to be 'done' (Fixes bug #2201)

        * components/help/converters/gnome-db2html2/gdb3html.c:
        (parse_file): Renamed a variable. Updated the call to sect_footer.
        Cleaned up in a couple misc. spots
        (sect_footer): Renamed the variables to be more descriptive. Modified
        calls to print_footer (function changed + we now pass the full URI).
        Fixed memory leaks by actually freeing the variables.
        (print_footer): Change the function arguments to make it a 'sane'
        function. Also - just print what we recieve.

        * components/help/converters/gnome-db2html2/toc-elements.c:
        (toc_title_start_element),
        (toc_title_end_element):
        Disable the links to sect2/sect3/sect4/sect5 tags as they already get
        'included' with the sect1 tags.

        Ideally we should create anchor tags in the sect1 'pages' and use that
        instead, but this will not work due to mozilla issues
This commit is contained in:
Ali Abdin 2000-09-03 19:08:50 +00:00 committed by Ali Abdin
parent 0e9360399e
commit 6653e9ac90
3 changed files with 93 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ChangeLog
View file

@ -1,3 +1,25 @@
2000-09-03 Ali Abdin <aliabdin@aucegypt.edu>
I now consider navigation links to be 'done' (Fixes bug #2201)
* components/help/converters/gnome-db2html2/gdb3html.c:
(parse_file): Renamed a variable. Updated the call to sect_footer.
Cleaned up in a couple misc. spots
(sect_footer): Renamed the variables to be more descriptive. Modified
calls to print_footer (function changed + we now pass the full URI).
Fixed memory leaks by actually freeing the variables.
(print_footer): Change the function arguments to make it a 'sane'
function. Also - just print what we recieve.
* components/help/converters/gnome-db2html2/toc-elements.c:
(toc_title_start_element),
(toc_title_end_element):
Disable the links to sect2/sect3/sect4/sect5 tags as they already get
'included' with the sect1 tags.
Ideally we should create anchor tags in the sect1 'pages' and use that
instead, but this will not work due to mozilla issues
2000-09-03 Maciej Stachowiak <mjs@eazel.com>
* components/services/install/lib/eazel-install-protocols.c:

72
components/help/converters/gnome-db2html2/gdb3html.c
View file

@ -577,7 +577,7 @@ xml_parse_document (gchar *filename)
}
static void
print_footer (Context *context, const char *prev, const char *next, gboolean with_home)
print_footer (const char *prev, const char *home, const char *next)
{
g_print ("\n<HR ALIGN=\"LEFT\" WIDTH=\"100%%\">\n");
g_print ("<TABLE WIDTH=\"100%%\" BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\">\n");
@ -586,21 +586,21 @@ print_footer (Context *context, const char *prev, const char *next, gboolean wit
if (prev == NULL) {
g_print ("&nbsp;");
} else {
g_print ("<A HREF=\"help:%s?%s\">&#60;&#60;&#60; Previous</A>", context->base_file, prev);
g_print ("<A HREF=\"%s\">&#60;&#60;&#60; Previous</A>", prev);
}
g_print ("</TD>\n<TD WIDTH=\"34%%\" ALIGN=\"CENTER\" VALIGN=\"TOP\">");
if (with_home == FALSE) {
if (home == NULL) {
g_print ("&nbsp;");
} else {
g_print ("<A HREF=\"help:%s\">Home</A>", context->base_file);
g_print ("<A HREF=\"%s\">Home</A>", home);
}
g_print ("</TD>\n<TD WIDTH=\"33%%\" ALIGN=\"RIGHT\" VALIGN=\"TOP\">");
if (next == NULL) {
g_print ("&nbsp;");
} else {
g_print ("<A HREF=\"help:%s?%s\">Next &#62;&#62;&#62;</A>", context->base_file, next);
g_print ("<A HREF=\"%s\">Next &#62;&#62;&#62;</A>", next);
}
g_print ("</TD>\n</TR></TABLE>\n");
@ -610,46 +610,55 @@ print_footer (Context *context, const char *prev, const char *next, gboolean wit
static void
sect_footer (Context *context, const char *section)
{
GList *tmp;
GList *tmp_next;
GList *tmp_prev;
char *tmp_next_data;
char *tmp_prev_data;
GList *temp_list;
GList *next_node;
GList *prev_node;
char *next_uri;
char *prev_uri;
char *home_uri;
if (context->sect1id_stack == NULL) {
return;
}
tmp = context->sect1id_stack;
while (tmp != NULL) {
if (g_strcasecmp ((char *)tmp->data, section) == 0) {
/* Yes this below is correct because we are using a 'stack' */
tmp_next = g_list_previous (tmp);
tmp_prev = g_list_next (tmp);
temp_list = context->sect1id_stack;
while (temp_list != NULL) {
if (g_strcasecmp ((char *)temp_list->data, section) == 0) {
/* Yes the below is correct because we are using a 'stack' */
next_node = g_list_previous (temp_list);
prev_node = g_list_next (temp_list);
if (tmp_next == NULL) {
tmp_next_data = NULL;
if (next_node == NULL) {
next_uri = NULL;
} else {
tmp_next_data = tmp_next->data;
next_uri = g_strdup_printf ("help:%s?%s", context->base_file, (char *) next_node->data);
}
if (tmp_prev == NULL) {
tmp_prev_data = NULL;
if (prev_node == NULL) {
/* link back to the TOC */
prev_uri = g_strdup_printf ("help:%s", context->base_file);
} else {
tmp_prev_data = tmp_prev->data;
prev_uri = g_strdup_printf ("help:%s?%s", context->base_file, (char *)prev_node->data);
}
print_footer (context ,(char *) tmp_prev_data, (char *) tmp_next_data, TRUE);
home_uri = g_strdup_printf ("help:%s", context->base_file);
print_footer (prev_uri, home_uri, next_uri);
g_free (home_uri);
g_free (prev_uri);
g_free (next_uri);
break;
}
tmp = g_list_next (tmp);
temp_list = g_list_next (temp_list);
}
}
static void
parse_file (gchar *filename, gchar *section)
{
GList *tmp;
GList *temp_list;
Context *context = g_new0 (Context, 1);
context->ParserCtxt = xmlNewParserCtxt ();
@ -658,11 +667,10 @@ parse_file (gchar *filename, gchar *section)
context->ParserCtxt->validate = 1;
/* FIXME bugzilla.eazel.com 2399:
* Is the below correct? version needs to be set so as not to
* segfault in starDocument (in SAX.h) */
* segfault in startDocument (in SAX.h) */
context->ParserCtxt->version = xmlStrdup ("1.0");
context->ParserCtxt->myDoc = xml_parse_document (filename);
xmlSubstituteEntitiesDefault (1);
//context->sect1id_stack = NULL;
if (section) {
context->target_section = g_strdup (section);
@ -685,9 +693,13 @@ parse_file (gchar *filename, gchar *section)
if (xmlSAXUserParseFile (&parser, context, context->base_file) < 0) {
g_error ("error");
};
tmp = g_list_last (context->sect1id_stack);
if (tmp != NULL) {
print_footer (context, NULL, tmp->data,FALSE);
temp_list = g_list_last (context->sect1id_stack);
if (temp_list != NULL) {
char *temp_uri;
temp_uri = g_strdup_printf ("help:%s?%s", context->base_file, (char *)temp_list->data);
print_footer (NULL, NULL, temp_uri);
g_free (temp_uri);
}
}
}

29
components/help/converters/gnome-db2html2/toc-elements.c
View file

@ -357,10 +357,12 @@ toc_title_start_element (Context *context,
switch (stack_el->info->index) {
case SECT1:
#ifdef ALL_SECT_LINKS
case SECT2:
case SECT3:
case SECT4:
case SECT5:
#endif
case SECTION:
if (context->sect2 == 0) {
g_print ("<H2>");
@ -388,6 +390,25 @@ toc_title_start_element (Context *context,
}
g_print ("\">");
break;
#ifndef ALL_SECT_LINKS
case SECT2:
case SECT3:
case SECT4:
case SECT5:
if (context->sect2 == 0) {
g_print ("<H2>");
} else if (context->sect3 == 0) {
g_print ("<H3>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
} else {
g_print ("<H4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
}
if (context->sect1 > 0) g_print ("%d", context->sect1);
if (context->sect2 > 0) g_print (".%d", context->sect2);
if (context->sect3 > 0) g_print (".%d", context->sect3);
if (context->sect4 > 0) g_print (".%d", context->sect4);
if (context->sect5 > 0) g_print (".%d", context->sect5);
g_print (".&nbsp;&nbsp;");
#endif
default:
break;
};
@ -424,12 +445,20 @@ toc_title_end_element (Context *context,
g_print ("</A></H2>\n");
break;
case SECT2:
#ifdef ALL_SECT_LINKS
g_print ("</A></H3>\n");
#else
g_print ("</H3>\n");
#endif
break;
case SECT3:
case SECT4:
case SECT5:
#ifdef ALL_SECT_LINKS
g_print ("</A></H4>\n");
#else
g_print ("</H4>\n");
#endif
break;
default:
break;