perl-Gtk2 r2121 - in branches/stable-1-20: . t

[tsch svn gnome org]

Author: tsch
Date: Fri Feb  6 13:06:16 2009
New Revision: 2121
URL: http://svn.gnome.org/viewvc/perl-Gtk2?rev=2121&view=rev

Log:
Merge r2120 from trunk.


Modified:
   branches/stable-1-20/   (props changed)
   branches/stable-1-20/ChangeLog
   branches/stable-1-20/t/GdkPixbufLoader.t

Modified: branches/stable-1-20/t/GdkPixbufLoader.t
==============================================================================
--- branches/stable-1-20/t/GdkPixbufLoader.t	(original)
+++ branches/stable-1-20/t/GdkPixbufLoader.t	Fri Feb  6 13:06:16 2009
@@ -40,7 +40,11 @@
 
 # now, let's test!
 
-my $loader = Gtk2::Gdk::PixbufLoader->new;
+# Automatic detection of the image type seems to be broken in some versions of
+# gtk+; see <http://bugzilla.gnome.org/show_bug.cgi?id=570780>.  So we don't
+# use an auto-detecting loader here.
+my $loader = Gtk2::Gdk::PixbufLoader->new_with_mime_type (
+                 'image/x-portable-pixmap');
 isa_ok ($loader, 'Glib::Object');
 isa_ok ($loader, 'Gtk2::Gdk::PixbufLoader');
 $loader->write (make_ppm_data (10, 15));
@@ -89,7 +93,8 @@
 
     # set_size can be used to do load-time scaling.
 
-    $loader = Gtk2::Gdk::PixbufLoader->new;
+    $loader = Gtk2::Gdk::PixbufLoader->new_with_mime_type (
+                  'image/x-portable-pixmap');
     $loader->set_size (48, 32);
     $loader->write (make_ppm_data (96, 64));
     $loader->close;