--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/07/23 16:48:48	1.66
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/07/24 08:23:28	1.67
@@ -34,7 +34,7 @@
          $_ = $_ eq ".*" ? "" : " $_"
             for @args;
 
-         my $text = CFClient::Pod::as_xml $head2->content;
+         my $text = CFClient::Pod::as_markup $head2->content;
 
          push @cmd_help, ["$cmd$_", $text]
             for sort { (length $a) <=> (length $b) }
@@ -604,7 +604,7 @@
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
 
-   $self->{logview}->add_paragraph ($color[$color], $_)
+   $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
       for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
    $self->{logview}->scroll_to_bottom;
 
@@ -651,7 +651,7 @@
       my %skill_help;
 
       for my $head2 ($pom->head1->[3]->head2) {
-         $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content;
+         $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content;
       }
 
       \%skill_help
@@ -976,7 +976,10 @@
 
    $self->{entry}->grab_focus;
 
-   $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
+   $self->{textview}->add_paragraph ({
+      fg     => [1, 1, 0, 1],
+      markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
+   });
 
    $self->show;
    $self
@@ -1036,7 +1039,7 @@
          chr 0xfffc
       }giex;
       
-      $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
+      $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
       $self->{textview}->scroll_to_bottom;
       $self->update_options;
    } else {
@@ -1049,7 +1052,7 @@
 sub send {
    my ($self, $msg) = @_;
 
-   $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg);
+   $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg });
    $self->{textview}->scroll_to_bottom;
 
    utf8::encode $msg;
@@ -1068,4 +1071,4 @@
    $self->SUPER::destroy;
 }
 
-1;
+1