--- rxvt-unicode/src/perl/tabbed	2006/01/20 13:32:29	1.4
+++ rxvt-unicode/src/perl/tabbed	2006/01/20 14:02:41	1.5
@@ -51,24 +51,13 @@
 sub configure {
    my ($self) = @_;
 
-   $self->{cur}->XMoveResizeWindow (
-      $self->{cur}->parent,
+   my $tab = $self->{cur};
+
+   $tab->XMoveResizeWindow (
+      $tab->parent,
       0, $self->{tabheight},
       $self->width, $self->height - $self->{tabheight}
    );
-}
-
-sub make_current {
-   my ($self, $tab) = @_;
-
-   if (my $cur = $self->{cur}) {
-      $cur->XUnmapWindow ($cur->parent)
-         if $cur->mapped;
-   }
-   
-   $self->{cur} = $tab;
-
-   $self->configure;
 
    my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
 
@@ -77,12 +66,25 @@
 
       if ($atom == $wm_normal_hints) {
          my (@hints) = unpack "l!*", $items;
+
          $hints[ 4] += $self->{tabheight};
          $hints[16] += $self->{tabheight};
-         $items = pack "l!*", @hints;
       }
       $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
    }
+}
+
+sub make_current {
+   my ($self, $tab) = @_;
+
+   if (my $cur = $self->{cur}) {
+      $cur->XUnmapWindow ($cur->parent)
+         if $cur->mapped;
+   }
+   
+   $self->{cur} = $tab;
+
+   $self->configure;
 
    $tab->XMapWindow ($tab->parent);