X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fwebcollage;h=4ec6147148cc29e793817ea98c75b5b0f0831467;hp=0815327c85624e79944052a6101177f954605ba2;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hpb=50be9bb40dc60130c99ffa568e6677779904ff70

diff --git a/hacks/webcollage b/hacks/webcollage
index 0815327c..4ec61471 100755
--- a/hacks/webcollage
+++ b/hacks/webcollage
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# webcollage, Copyright (c) 1999-2008 by Jamie Zawinski <jwz@jwz.org>
+# webcollage, Copyright (c) 1999-2011 by Jamie Zawinski <jwz@jwz.org>
 # This program decorates the screen with random images from the web.
 # One satisfied customer described it as "a nonstop pop culture brainbath."
 #
@@ -60,8 +60,8 @@ use bytes;  # Larry can take Unicode and shove it up his ass sideways.
 
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.150 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
-my $copyright = "WebCollage $version, Copyright (c) 1999-2008" .
+my $version = q{ $Revision: 1.152 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $copyright = "WebCollage $version, Copyright (c) 1999-2011" .
     " Jamie Zawinski <jwz\@jwz.org>\n" .
     "            http://www.jwz.org/webcollage/\n";
 
@@ -2219,6 +2219,7 @@ sub pick_from_local_dir {
 
   my $v = ($verbose_exec ? "-v" : "");
   my $pick = `xscreensaver-getimage-file $v "$dir"`;
+  $pick = "$dir/$pick" unless ($pick =~ m@^/@s);       # relative path
 
   LOG ($verbose_load, "picked file $pick ($id)");
   return ($id, $pick);
@@ -2709,13 +2710,13 @@ sub url_only_output() {
 #
 ##############################################################################
 
-my $image_ppm   = sprintf ("%s/webcollage-%08x",
+my $image_ppm   = sprintf ("%s/webcollage-%08x.ppm",
                            ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp"),
                            rand(0xFFFFFFFF));
-my $image_tmp1  = sprintf ("%s/webcollage-1-%08x",
+my $image_tmp1  = sprintf ("%s/webcollage-1-%08x.ppm",
                            ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp"),
                            rand(0xFFFFFFFF));
-my $image_tmp2  = sprintf ("%s/webcollage-2-%08x",
+my $image_tmp2  = sprintf ("%s/webcollage-2-%08x.ppm",
                            ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp"),
                            rand(0xFFFFFFFF));