--- rxvt-unicode/src/perl/selection-pastebin	2006/01/17 16:57:07	1.2
+++ rxvt-unicode/src/perl/selection-pastebin	2006/01/18 10:11:03	1.5
@@ -4,19 +4,6 @@
 my $pastebin_cmd;
 my $pastebin_url;
 
-sub on_start {
-   my ($self) = @_;
-   $pastebin_cmd =
-      $self->x_resource ("selection-pastebin-cmd")
-      or "scp -p % ruth:/var/www/www.ta-sa.org/files/txt/";
-
-   $pastebin_url = 
-      $self->x_resource ("selection-pastebin-url")
-      or "http://www.ta-sa.org/files/txt/";
-
-   ()
-}
-
 sub upload_paste {
    my ($self) = @_;
 
@@ -48,6 +35,8 @@
       $msg = "couldn't upload, '$cmd' failed";
    }
 
+   unlink $tmpfile;
+
    my $ov = $timers->{ov} = $self->overlay (-1, 0, length ($msg), 1, urxvt::OVERLAY_RSTYLE, 0);
    $ov->set (0, 0, $msg);
 
@@ -59,11 +48,27 @@
               ->cb (sub { delete $timers->{ov}; delete $timers->{t1}; });
 }
 
+sub on_start {
+   my ($self) = @_;
+   $pastebin_cmd = $self->x_resource ("selection-pastebin.cmd")
+                   || "scp -p % ruth:/var/www/www.ta-sa.org/files/txt/";
+
+   $pastebin_url = $self->x_resource ("selection-pastebin.url")
+                   || "http://www.ta-sa.org/files/txt/%";
+
+   push @urxvt::ext::selection_popup::hook, sub {
+      ("pastebin upload" => sub { $self->upload_paste })
+   };
+
+   ()
+}
+
 sub on_keyboard_command {
    my ($self, $cmd) = @_;
 
-   $cmd eq "selection-pastebin:remote-pastebin"
-      and upload_paste ($self);
+   if ($cmd eq "selection-pastebin:remote-pastebin") {
+      $self->upload_paste;
+   }
 
    ()
 }