Bugfix to use 'new_uri_with_extension' instead of just 'new_uri' in some

2000-08-02  Ali Abdin  <aliabdin@aucegypt.edu>
        * components/help/help-method.c:
        (transform_file):
        Bugfix to use 'new_uri_with_extension' instead of just 'new_uri' in
        some places.

        * components/help/converters/gnome-db2html2/sect-elements.c:
        * components/help/converters/gnome-db2html2/gdb3html.h:
        Added a placeholder for the <MENUCHOICE> tag. Also added the
        <GUISUBMENU> tag and made it act just like <GUIMENU> (these two still
        need to be modified to handle the correct behavior).

        * components/help/converters/gnome-db2html2/toc-elements.c:
        (toc_title_start_element):
         Change 'ghelp' to 'help'
This commit is contained in:
Ali Abdin 2000-08-02 13:52:17 +00:00 committed by Ali Abdin
parent 43e215cf1c
commit 8797b6dce9
5 changed files with 24 additions and 4 deletions

View file

@ -1,3 +1,19 @@
2000-08-02 Ali Abdin <aliabdin@aucegypt.edu>
* components/help/help-method.c:
(transform_file):
Bugfix to use 'new_uri_with_extension' instead of just 'new_uri' in
some places.
* components/help/converters/gnome-db2html2/sect-elements.c:
* components/help/converters/gnome-db2html2/gdb3html.h:
Added a placeholder for the <MENUCHOICE> tag. Also added the
<GUISUBMENU> tag and made it act just like <GUIMENU> (these two still
need to be modified to handle the correct behavior).
* components/help/converters/gnome-db2html2/toc-elements.c:
(toc_title_start_element):
Change 'ghelp' to 'help'
2000-08-02 Ramiro Estrugo <ramiro@eazel.com>
* components/services/install/command-line/.cvsignore:

View file

@ -84,7 +84,9 @@ typedef enum ElementIndex {
FUNCPARAMS,
PARAMDEF, /* 75 */
VOID,
UNDEFINED /* 77 */
GUISUBMENU,
MENUCHOICE,
UNDEFINED /* 79 */
} ElementIndex;
typedef struct _ElementInfo ElementInfo;

View file

@ -82,6 +82,8 @@ ElementInfo sect_elements[] = {
{ FUNCPARAMS, "funcparams", (startElementSAXFunc) sect_funcparams_start_element, (endElementSAXFunc) sect_funcparams_end_element, (charactersSAXFunc) sect_write_characters},
{ PARAMDEF, "paramdef", (startElementSAXFunc) sect_paramdef_start_element, NULL, (charactersSAXFunc) sect_write_characters},
{ VOID, "void", (startElementSAXFunc) sect_void_start_element, NULL, NULL },
{ GUISUBMENU, "guisubmenu", (startElementSAXFunc) sect_b_start_element, (endElementSAXFunc) sect_b_end_element, (charactersSAXFunc) sect_write_characters},
{ MENUCHOICE, "menuchoice", NULL, NULL, NULL},
{ UNDEFINED, NULL, NULL, NULL, NULL}
};

View file

@ -363,7 +363,7 @@ toc_title_start_element (Context *context,
if (context->sect4 > 0) g_print (".%d", context->sect4);
if (context->sect5 > 0) g_print (".%d", context->sect5);
g_print (".&nbsp;&nbsp;");
g_print ("<A href=\"ghelp:%s", context->base_file);
g_print ("<A href=\"help:%s", context->base_file);
atrs_ptr = (stack_el->atrs);
while (atrs_ptr && *atrs_ptr) {

View file

@ -225,7 +225,7 @@ transform_file (const char *old_uri,
/* Try with an sgml extension. */
new_uri_with_extension = g_strconcat (new_uri, ".sgml", NULL);
if (convert_file_to_uri (help_uri, new_uri)) {
if (convert_file_to_uri (help_uri, new_uri_with_extension)) {
g_free (new_uri);
return help_uri;
}
@ -233,7 +233,7 @@ transform_file (const char *old_uri,
/* Try with an html extension. */
new_uri_with_extension = g_strconcat (new_uri, ".html", NULL);
if (convert_file_to_uri (help_uri, new_uri)) {
if (convert_file_to_uri (help_uri, new_uri_with_extension)) {
g_free (new_uri);
return help_uri;
}