gtk+ r20241 - trunk/gdk-pixbuf

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu May 29 21:04:52 2008
New Revision: 20241
URL: http://svn.gnome.org/viewvc/gtk+?rev=20241&view=rev

Log:
        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.



Modified:
   trunk/gdk-pixbuf/ChangeLog
   trunk/gdk-pixbuf/gdk-pixbuf-io.c
   trunk/gdk-pixbuf/queryloaders.c

Modified: trunk/gdk-pixbuf/gdk-pixbuf-io.c
==============================================================================
--- trunk/gdk-pixbuf/gdk-pixbuf-io.c	(original)
+++ trunk/gdk-pixbuf/gdk-pixbuf-io.c	Thu May 29 21:04:52 2008
@@ -466,6 +466,10 @@
 				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;

Modified: trunk/gdk-pixbuf/queryloaders.c
==============================================================================
--- trunk/gdk-pixbuf/queryloaders.c	(original)
+++ trunk/gdk-pixbuf/queryloaders.c	Thu May 29 21:04:52 2008
@@ -127,9 +127,9 @@
 	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);
 	}