--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/05/27 10:32:35	1.5
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/05/27 20:46:54	1.7
@@ -27,13 +27,14 @@
       my @args = split /\|/, $2;
       @args = (".*") unless @args;
 
-      my $text = CFClient::pod_to_pango $head2->content;
+      $_ = $_ eq ".*" ? "" : " $_"
+         for @args;
 
-      for my $arg (@args) {
-         $arg = $arg eq ".*" ? "" : " $arg";
+      my $text = CFClient::pod_to_pango $head2->content;
 
-         $self->{map_widget}->add_command ("$cmd$arg", $text);
-      }
+      $self->{map_widget}->add_command ("$cmd$_", $text)
+         for sort { (length $a) <=> (length $b) }
+                  @args;
    }
 
    $self->{noface} = new_from_file CFClient::Texture
@@ -337,7 +338,7 @@
       $vbox->add (my $hbox = new CFClient::UI::HBox);
       $hbox->add (new CFClient::UI::Button
          text => "No",
-         connect_activate => sub {
+         on_activate => sub {
             $self->send ("reply n");
             $dialog->destroy;
             $self->{map_widget}->focus_in;
@@ -345,7 +346,7 @@
       );
       $hbox->add (new CFClient::UI::Button
          text => "Yes",
-         connect_activate => sub {
+         on_activate => sub {
             $self->send ("reply y");
             $dialog->destroy;
          },
@@ -356,7 +357,7 @@
    } elsif ($flags & CS_QUERY_SINGLECHAR) {
       $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
       $vbox->add (my $entry = new CFClient::UI::Entry
-         connect_changed => sub {
+         on_changed => sub {
             $self->send ("reply $_[1]");
             $dialog->destroy;
          },
@@ -369,7 +370,7 @@
 
       $vbox->add (my $entry = new CFClient::UI::Entry
          $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
-         connect_activate => sub {
+         on_activate => sub {
             $self->send ("reply $_[1]");
             $dialog->destroy;
          },