gtk+ r20288 - branches/gtk-2-12/gdk-pixbuf

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jun  2 22:22:32 2008
New Revision: 20288
URL: http://svn.gnome.org/viewvc/gtk+?rev=20288&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:
   branches/gtk-2-12/gdk-pixbuf/ChangeLog
   branches/gtk-2-12/gdk-pixbuf/gdk-pixbuf-io.c

Modified: branches/gtk-2-12/gdk-pixbuf/gdk-pixbuf-io.c
==============================================================================
--- branches/gtk-2-12/gdk-pixbuf/gdk-pixbuf-io.c	(original)
+++ branches/gtk-2-12/gdk-pixbuf/gdk-pixbuf-io.c	Mon Jun  2 22:22:32 2008
@@ -433,6 +433,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;