diff options
author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-05-29 21:04:52 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-05-29 21:04:52 +0000 |
commit | 7dcb54906dd4743fe9095c6f997edefe7811b37f (patch) | |
tree | acee6dbf19e68c9be8d18d62d53c9227407b56af /gdk-pixbuf | |
parent | 1025333e81f0c6cb0cc06a90bbc501071ce321f1 (diff) | |
download | gdk-pixbuf-7dcb54906dd4743fe9095c6f997edefe7811b37f.tar.gz |
Bug 535453 - gdk_pixbuf_format_get_license returns NULL for
any of the loaders
* queryloaders.c (write_loader_info): Add the license info
after the description.
* gdk-pixbuf-io.c (gdk_pixbuf_io_init): Read the license info
from the module file. Reported by Andrey Tsyvarev.
svn path=/trunk/; revision=20241
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 4 | ||||
-rw-r--r-- | gdk-pixbuf/queryloaders.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 62c676ff5..f441e7c33 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -466,6 +466,10 @@ gdk_pixbuf_io_init (void) have_error = TRUE; } module->info->description = g_strdup (tmp_buf->str); + + if (scan_string (&p, tmp_buf)) { + module->info->license = g_strdup (tmp_buf->str); + } } else if (!module->info->mime_types) { int n = 1; diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c index 6a3a7c569..bf98b1042 100644 --- a/gdk-pixbuf/queryloaders.c +++ b/gdk-pixbuf/queryloaders.c @@ -127,9 +127,9 @@ write_loader_info (const char *path, GdkPixbufFormat *info) char **ext; g_printf("\"%s\"\n", path); - g_printf ("\"%s\" %u \"%s\" \"%s\"\n", + g_printf ("\"%s\" %u \"%s\" \"%s\" \"%s\"\n", info->name, info->flags, - info->domain ? info->domain : GETTEXT_PACKAGE, info->description); + info->domain ? info->domain : GETTEXT_PACKAGE, info->description, info->license); for (mime = info->mime_types; *mime; mime++) { g_printf ("\"%s\" ", *mime); } |