AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 535453 - gdk_pixbuf_format_get_license returns NULL for

Browse Source 
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
This commit is contained in:
Matthias Clasen 2008-05-29 21:04:52 +00:00
parent 1360578f6c
commit 9038f2ce98
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,14 @@
2008-05-29 Matthias Clasen <mclasen@redhat.com>
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.
2008-05-28 Michael Natterer <mitch@imendio.com>
* gdk-pixbuf.h: define GDK_PIXBUF_H_INSIDE around including all

4
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -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;

4
gdk-pixbuf/queryloaders.c
View File

@ -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);
}