From aa013939bf8c7d047125897865fbc5601e620589 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 11 Jul 2003 20:36:25 +0000 Subject: [PATCH] Use g_strfreev() to free mime_types. (#117219, Steve Chaplin) 2003-07-11 Matthias Clasen * gtk/gtkicontheme.c (pixbuf_supports_svg): Use g_strfreev() to free mime_types. (#117219, Steve Chaplin) * queryloaders.c (query_module): Handle absolute filenames properly. (#117170, Jens Elkner) * gdk-pixbuf-io.c: Mention that NULL-terminated arrays returned by gdk_pixbuf_format_get_mime_types() and gdk_pixbuf_format_get_extensions() must be freed with g_strfreev(). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk-pixbuf/ChangeLog | 8 ++++++++ gdk-pixbuf/gdk-pixbuf-io.c | 8 +++++--- gdk-pixbuf/queryloaders.c | 10 +++------- gtk/gtkicontheme.c | 2 +- 9 files changed, 42 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2d4de134..854371bdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-07-11 Matthias Clasen + + * gtk/gtkicontheme.c (pixbuf_supports_svg): Use g_strfreev() to free mime_types. + (#117219, Steve Chaplin) + Tue Jul 8 20:11:04 2003 Owen Taylor * gdk/x11/gdkevents-x11.c (get_real_window) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f2d4de134..854371bdc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-07-11 Matthias Clasen + + * gtk/gtkicontheme.c (pixbuf_supports_svg): Use g_strfreev() to free mime_types. + (#117219, Steve Chaplin) + Tue Jul 8 20:11:04 2003 Owen Taylor * gdk/x11/gdkevents-x11.c (get_real_window) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f2d4de134..854371bdc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-07-11 Matthias Clasen + + * gtk/gtkicontheme.c (pixbuf_supports_svg): Use g_strfreev() to free mime_types. + (#117219, Steve Chaplin) + Tue Jul 8 20:11:04 2003 Owen Taylor * gdk/x11/gdkevents-x11.c (get_real_window) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f2d4de134..854371bdc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-07-11 Matthias Clasen + + * gtk/gtkicontheme.c (pixbuf_supports_svg): Use g_strfreev() to free mime_types. + (#117219, Steve Chaplin) + Tue Jul 8 20:11:04 2003 Owen Taylor * gdk/x11/gdkevents-x11.c (get_real_window) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f2d4de134..854371bdc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-07-11 Matthias Clasen + + * gtk/gtkicontheme.c (pixbuf_supports_svg): Use g_strfreev() to free mime_types. + (#117219, Steve Chaplin) + Tue Jul 8 20:11:04 2003 Owen Taylor * gdk/x11/gdkevents-x11.c (get_real_window) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 334a2dd71..31ae0bb41 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,11 @@ +2003-07-11 Matthias Clasen + + * queryloaders.c (query_module): Handle absolute filenames properly. (#117170, Jens Elkner) + + * gdk-pixbuf-io.c: Mention that NULL-terminated arrays returned by + gdk_pixbuf_format_get_mime_types() and gdk_pixbuf_format_get_extensions() must be + freed with g_strfreev(). + 2003-07-04 Matthias Clasen * gdk-pixbuf-io.c: Document ICO save parameters. diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index afb376eee..5f831f3e4 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -1036,7 +1036,7 @@ gdk_pixbuf_format_get_name (GdkPixbufFormat *format) * * Returns a description of the format. * - * Return value: a description of the format. + * Return value: a description of the format. * * Since: 2.2 */ @@ -1062,7 +1062,8 @@ gdk_pixbuf_format_get_description (GdkPixbufFormat *format) * * Returns the mime types supported by the format. * - * Return value: a %NULL-terminated array of mime types. + * Return value: a %NULL-terminated array of mime types which must be freed with + * g_strfreev() when it is no longer needed. * * Since: 2.2 */ @@ -1081,7 +1082,8 @@ gdk_pixbuf_format_get_mime_types (GdkPixbufFormat *format) * Returns the filename extensions typically used for files in the * given format. * - * Return value: a %NULL-terminated array of filename extensions. + * Return value: a %NULL-terminated array of filename extensions which must be + * freed with g_strfreev() when it is no longer needed. * * Since: 2.2 */ diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c index 0698fab24..15c3bdb98 100644 --- a/gdk-pixbuf/queryloaders.c +++ b/gdk-pixbuf/queryloaders.c @@ -64,14 +64,10 @@ query_module (const char *dir, const char *file) char **ext; const GdkPixbufModulePattern *pattern; - if (g_path_is_absolute (dir)) + if (g_path_is_absolute (file)) + path = g_strdup (file); + else path = g_build_filename (dir, file, NULL); - else { - char *cwd = g_get_current_dir (); - path = g_build_filename (cwd, dir, file, NULL); - g_free (cwd); - } - module = g_module_open (path, 0); if (module && diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 143640d54..d1f7aa698 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -489,7 +489,7 @@ pixbuf_supports_svg () found_svg = TRUE; } - g_free (mime_types); + g_strfreev (mime_types); } g_slist_free (formats);