--- rxvt-unicode/src/perl/selection-popup	2006/01/18 10:11:03	1.12
+++ rxvt-unicode/src/perl/selection-popup	2006/01/19 16:22:13	1.15
@@ -5,7 +5,7 @@
 
    my $overlay = $self->overlay (0, 0, $self->strwidth ($msg), 1);
    $overlay->set (0, 0, $msg);
-   my $iow; $iow = urxvt::timer->new->start (urxvt::NOW + 1)->cb (sub {
+   my $iow; $iow = urxvt::timer->new->after (1)->cb (sub {
       undef $overlay;
       undef $iow;
    });
@@ -21,8 +21,6 @@
    ()
 }
 
-our @hook;
-
 sub on_button_press {
    my ($self, $event) = @_;
 
@@ -71,9 +69,9 @@
             and $add_button->("shell quote" => sub { $_ = "\Q$_" });
 
          /^(http|ftp|telnet|irc|news):\//
-            and $add_button->("run $self->{browser}" => sub { urxvt::exec_async $self->{browser}, $_ });
+            and $add_button->("run $self->{browser}" => sub { $self->exec_async ($self->{browser}, $_) });
 
-         for my $hook (@hook) {
+         for my $hook (@{ $self->{term}{selection_popup_hook} || [] }) {
             if (my ($title, $cb) = $hook->($popup)) {
                $add_button->($title, $cb);
             }