Annotation of /trunk/dia/patches/dia-0.94-help.patch
Parent Directory
| 
Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
File size: 2323 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
File size: 2323 byte(s)
-import
| 1 | niro | 144 | --- dia-0.94/app/commands.c.help 2004-08-16 03:56:03.000000000 -0400 |
| 2 | +++ dia-0.94/app/commands.c 2004-09-03 10:29:38.315355000 -0400 | ||
| 3 | @@ -524,7 +524,7 @@ | ||
| 4 | const char *dentry; | ||
| 5 | GError *error = NULL; | ||
| 6 | |||
| 7 | - helpdir = dia_get_data_directory("help"); | ||
| 8 | + helpdir = g_strdup ("/usr/share/gnome/help/dia"); | ||
| 9 | if (!helpdir) { | ||
| 10 | message_warning(_("Could not find help directory")); | ||
| 11 | return; | ||
| 12 | @@ -552,11 +552,11 @@ | ||
| 13 | G_DIR_SEPARATOR_S "dia-manual.chm", NULL); | ||
| 14 | if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) { | ||
| 15 | helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry, | ||
| 16 | - G_DIR_SEPARATOR_S "index.html", NULL); | ||
| 17 | + G_DIR_SEPARATOR_S "dia.xml", NULL); | ||
| 18 | } | ||
| 19 | #else | ||
| 20 | helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry, | ||
| 21 | - G_DIR_SEPARATOR_S "index.html", NULL); | ||
| 22 | + G_DIR_SEPARATOR_S "dia.xml", NULL); | ||
| 23 | #endif | ||
| 24 | bestscore = score; | ||
| 25 | } | ||
| 26 | @@ -573,7 +573,7 @@ | ||
| 27 | ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL); | ||
| 28 | #else | ||
| 29 | command = getenv("BROWSER"); | ||
| 30 | - command = g_strdup_printf("%s 'file://%s' &", command ? command : "netscape", helpindex); | ||
| 31 | + command = g_strdup_printf("%s '%s' &", command ? command : "yelp", helpindex); | ||
| 32 | system(command); | ||
| 33 | g_free(command); | ||
| 34 | #endif | ||
| 35 | --- dia-0.94/doc/en/Makefile.am.help 2004-08-16 03:56:07.000000000 -0400 | ||
| 36 | +++ dia-0.94/doc/en/Makefile.am 2004-09-03 09:54:36.957260000 -0400 | ||
| 37 | @@ -2,16 +2,8 @@ | ||
| 38 | docname=dia | ||
| 39 | lang=en | ||
| 40 | omffile= | ||
| 41 | -entities= | ||
| 42 | - | ||
| 43 | -include $(top_srcdir)/xmldocs.make | ||
| 44 | -dist-hook: app-dist-hook | ||
| 45 | - | ||
| 46 | -EXTRA_DIST += \ | ||
| 47 | - dia.1 \ | ||
| 48 | - dia.dbk \ | ||
| 49 | +entities= \ | ||
| 50 | authors.xml \ | ||
| 51 | - dia.xml \ | ||
| 52 | entities.xml \ | ||
| 53 | intro.xml \ | ||
| 54 | license.xml \ | ||
| 55 | @@ -23,7 +15,15 @@ | ||
| 56 | usage-objects-selecting.xml \ | ||
| 57 | usage-objects-special.xml \ | ||
| 58 | usage-objects.xml \ | ||
| 59 | - usage-quickstart.xml \ | ||
| 60 | + usage-quickstart.xml | ||
| 61 | + | ||
| 62 | +include $(top_srcdir)/xmldocs.make | ||
| 63 | +dist-hook: app-dist-hook | ||
| 64 | + | ||
| 65 | +EXTRA_DIST += \ | ||
| 66 | + dia.1 \ | ||
| 67 | + dia.dbk \ | ||
| 68 | + dia.xml \ | ||
| 69 | graphics/line_props.png \ | ||
| 70 | graphics/home_network.png \ | ||
| 71 | graphics/line_icon.png \ | ||
| 72 | --- dia-0.94/doc/en/dia.xml.help 2004-09-03 09:54:36.923294000 -0400 | ||
| 73 | +++ dia-0.94/doc/en/dia.xml 2004-09-03 09:54:36.963253000 -0400 | ||
| 74 | @@ -5,7 +5,7 @@ | ||
| 75 | <!DOCTYPE book | ||
| 76 | |||
| 77 | PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" | ||
| 78 | - | ||
| 79 | +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" | ||
| 80 | [ | ||
| 81 | |||
| 82 | <!ENTITY VERSION "0.94"> |