mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-09-21 08:42:01 +00:00
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:
parent
43e215cf1c
commit
8797b6dce9
16
ChangeLog
16
ChangeLog
|
@ -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>
|
2000-08-02 Ramiro Estrugo <ramiro@eazel.com>
|
||||||
|
|
||||||
* components/services/install/command-line/.cvsignore:
|
* components/services/install/command-line/.cvsignore:
|
||||||
|
|
|
@ -84,7 +84,9 @@ typedef enum ElementIndex {
|
||||||
FUNCPARAMS,
|
FUNCPARAMS,
|
||||||
PARAMDEF, /* 75 */
|
PARAMDEF, /* 75 */
|
||||||
VOID,
|
VOID,
|
||||||
UNDEFINED /* 77 */
|
GUISUBMENU,
|
||||||
|
MENUCHOICE,
|
||||||
|
UNDEFINED /* 79 */
|
||||||
} ElementIndex;
|
} ElementIndex;
|
||||||
|
|
||||||
typedef struct _ElementInfo ElementInfo;
|
typedef struct _ElementInfo ElementInfo;
|
||||||
|
|
|
@ -82,6 +82,8 @@ ElementInfo sect_elements[] = {
|
||||||
{ FUNCPARAMS, "funcparams", (startElementSAXFunc) sect_funcparams_start_element, (endElementSAXFunc) sect_funcparams_end_element, (charactersSAXFunc) sect_write_characters},
|
{ 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},
|
{ PARAMDEF, "paramdef", (startElementSAXFunc) sect_paramdef_start_element, NULL, (charactersSAXFunc) sect_write_characters},
|
||||||
{ VOID, "void", (startElementSAXFunc) sect_void_start_element, NULL, NULL },
|
{ 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}
|
{ UNDEFINED, NULL, NULL, NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -363,7 +363,7 @@ toc_title_start_element (Context *context,
|
||||||
if (context->sect4 > 0) g_print (".%d", context->sect4);
|
if (context->sect4 > 0) g_print (".%d", context->sect4);
|
||||||
if (context->sect5 > 0) g_print (".%d", context->sect5);
|
if (context->sect5 > 0) g_print (".%d", context->sect5);
|
||||||
g_print (". ");
|
g_print (". ");
|
||||||
g_print ("<A href=\"ghelp:%s", context->base_file);
|
g_print ("<A href=\"help:%s", context->base_file);
|
||||||
|
|
||||||
atrs_ptr = (stack_el->atrs);
|
atrs_ptr = (stack_el->atrs);
|
||||||
while (atrs_ptr && *atrs_ptr) {
|
while (atrs_ptr && *atrs_ptr) {
|
||||||
|
|
|
@ -225,7 +225,7 @@ transform_file (const char *old_uri,
|
||||||
|
|
||||||
/* Try with an sgml extension. */
|
/* Try with an sgml extension. */
|
||||||
new_uri_with_extension = g_strconcat (new_uri, ".sgml", NULL);
|
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);
|
g_free (new_uri);
|
||||||
return help_uri;
|
return help_uri;
|
||||||
}
|
}
|
||||||
|
@ -233,7 +233,7 @@ transform_file (const char *old_uri,
|
||||||
|
|
||||||
/* Try with an html extension. */
|
/* Try with an html extension. */
|
||||||
new_uri_with_extension = g_strconcat (new_uri, ".html", NULL);
|
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);
|
g_free (new_uri);
|
||||||
return help_uri;
|
return help_uri;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue