diff options
| author | George Lebl <jirka@5z.com> | 2000-08-20 04:43:01 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2000-08-20 04:43:01 +0000 |
| commit | 8b6aca1a6df97e4461f8dd85dc2b0ad3dd169bd9 (patch) | |
| tree | e37cf9a91fbf86fcd9d02e0059b82248a5afab44 /librsvg | |
| parent | e576f941d2b9d17507b4818dece2151a240fc984 (diff) | |
| download | nautilus-8b6aca1a6df97e4461f8dd85dc2b0ad3dd169bd9.tar.gz | |
use xml memory allocation/deallocation routines for strings which are
Sat Aug 19 23:43:23 2000 George Lebl <jirka@5z.com>
* librsvg/rsvg.c (rsvg_ctx_free_helper) (rsvg_entity_decl):
use xml memory allocation/deallocation routines for strings
which are allocated/deallocated inside libxml to make glib
memory checking not crash
* libnautilus-extentions/nautilus-gnome-extentions.[ch]:
add a function nautilus_gnome_stock_set_icon_or_register which
does the GnomeStock voodoo for setting stock toolbar icons to
arbitrary files
* src/nautilus-window-toolbars.c (set_up_button): Use the
nautilus_gnome_stock_set_icon_or_register function as per Darin's
FIXME which thus got removed.
Diffstat (limited to 'librsvg')
| -rw-r--r-- | librsvg/rsvg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/librsvg/rsvg.c b/librsvg/rsvg.c index 35e252d19..8582e94a1 100644 --- a/librsvg/rsvg.c +++ b/librsvg/rsvg.c @@ -48,6 +48,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include "SAX.h" +#include "xmlmemory.h" #include "rsvg-bpath-util.h" #include "rsvg-defs.h" @@ -173,8 +174,8 @@ rsvg_ctx_free_helper (gpointer key, gpointer value, gpointer user_data) g_free ((xmlChar *)entval->name); g_free ((xmlChar *)entval->ExternalID); g_free ((xmlChar *)entval->SystemID); - g_free (entval->content); - g_free (entval->orig); + xmlFree (entval->content); + xmlFree (entval->orig); g_free (entval); } @@ -1176,7 +1177,7 @@ rsvg_entity_decl (void *data, const xmlChar *name, int type, entity->name = dupname; entity->ExternalID = g_strdup (publicId); entity->SystemID = g_strdup (systemId); - entity->content = g_strdup (content); + entity->content = xmlMemStrdup (content); entity->length = strlen (content); entity->orig = NULL; g_hash_table_insert (entities, dupname, entity); |