diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-10-19 21:51:17 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-10-19 21:51:17 +0000 |
| commit | b13703010f89373d590ff8e14bc72cb0f2aec49e (patch) | |
| tree | c8a71e44d068c2791ad2c9e611c5f4e2c320264b /libnautilus-extensions/nautilus-link-set.c | |
| parent | 2ca0b1dde36c434bf84a9ce49724821e8e44e627 (diff) | |
| download | nautilus-b13703010f89373d590ff8e14bc72cb0f2aec49e.tar.gz | |
Do some routine housekeeping that will help make the future
switchover to libxml2 easier.
* components/help/converters/gnome-db2html2/gdb3html.h:
* components/help/hyperbola-nav-index.c:
* components/help/hyperbola-nav-search.c:
* libnautilus-extensions/nautilus-directory-async.c:
* libnautilus-extensions/nautilus-directory-metafile.c:
* libnautilus-extensions/nautilus-directory-metafile.h:
* libnautilus-extensions/nautilus-directory-private.h:
* libnautilus-extensions/nautilus-file.c:
* libnautilus-extensions/nautilus-icon-factory.c:
* libnautilus-extensions/nautilus-link-set.c:
* libnautilus-extensions/nautilus-link.c:
* libnautilus-extensions/nautilus-theme.c:
* libnautilus-extensions/nautilus-volume-monitor.c:
* libnautilus-extensions/nautilus-xml-extensions.h:
* librsvg/rsvg.c:
* src/nautilus-bookmark-list.c:
* src/nautilus-bookmark-parsing.c:
* src/nautilus-bookmark-parsing.h:
* src/nautilus-link-set-window.c:
* src/nautilus-property-browser.c:
* src/nautilus-sidebar.c:
* src/nautilus-theme-selector.c:
* src/nautilus-window-menus.c:
Use the <gnome-xml/> prefix on all includes of gnome-xml headers.
This is allowed with the version of libxml1 we use now, and
required for libxml2. Note that we now require the newer libxml1
version that allows this, because Bonobo requires it.
* components/services/install/lib/eazel-install-xml-package-list.c:
(parse_package), (parse_category), (parse_shared),
(parse_memory_transaction_file), (parse_local_xml_package_list),
(generate_xml_package_list), (osd_parse_dependency),
(osd_parse_implementation), (osd_parse_softpkg),
(osd_parse_shared):
* components/services/summary/lib/eazel-summary-shared.c:
(build_services_glist_from_xml), (build_eazel_news_glist_from_xml),
(build_update_news_glist_from_xml), (parse_summary_xml_file):
* components/services/trilobite/libtrilobite/helixcode-utils.c:
(xml_get_value):
* components/services/trilobite/libtrilobite/trilobite-redirect.c:
(trilobite_redirect_parse_xml):
* libnautilus-extensions/nautilus-xml-extensions.c:
(nautilus_xml_get_children):
Use xmlChildrenNode instead of childs, as recommended by the
libxml maintainer for libxml1/libxml2 compatibility.
* src/nautilus-main.c: (main): Use the LIBXML_TEST_VERSION macro
as recommended by the libxml maintainer for libxml1/libxml2
compatibility.
* components/music/nautilus-music-view.c:
Added a lot of FIXMEs. Some other rudimentary cleanup.
Diffstat (limited to 'libnautilus-extensions/nautilus-link-set.c')
| -rw-r--r-- | libnautilus-extensions/nautilus-link-set.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnautilus-extensions/nautilus-link-set.c b/libnautilus-extensions/nautilus-link-set.c index a7087d366..e8a3c1dc4 100644 --- a/libnautilus-extensions/nautilus-link-set.c +++ b/libnautilus-extensions/nautilus-link-set.c @@ -34,14 +34,14 @@ #include "nautilus-preferences.h" #include "nautilus-string.h" #include "nautilus-xml-extensions.h" +#include <gnome-xml/parser.h> +#include <gnome-xml/xmlmemory.h> #include <gtk/gtktogglebutton.h> #include <gtk/gtkwindow.h> #include <libgnome/gnome-util.h> #include <libgnomevfs/gnome-vfs.h> -#include <parser.h> #include <stdlib.h> #include <unistd.h> -#include <xmlmemory.h> /* routine to create a new link file in the specified directory */ static gboolean |