Eliminate instance_suffix support; always space pad before IRCIE tag

Ignore-this: e73df61b19cd6bebf06710e1ec46d3e8

darcs-hash:20090608164736-4d648-eb05a3936ae3e47ef25933417953752aae4babde.gz

diff --git a/Definitions.pm b/Definitions.pm
index fb808f7985035b8a46866a1ff87754cdccb89b96..e21447da90158185cb9a69990104519e67ccd079 100644 (file)
--- a/Definitions.pm
+++ b/Definitions.pm
@@ -56,8 +56,6 @@ our $instance_huffman_table1 = [
   ]
 ];
 
-our $instance_suffix = ""; # Oh backtick, how we miss thee
-
 #################################################################
 
 our $MSCC_TYPE_AA = 0;

diff --git a/IrssiInterface.pl b/IrssiInterface.pl
index 05ccd24c75ffbc7a22817ee394b4f9538e08d992..a75f9b0d83b8d10562b119565b571fd491e99cc4 100644 (file)
--- a/IrssiInterface.pl
+++ b/IrssiInterface.pl
@@ -37,7 +37,7 @@ require Instance::MasterCoder;
 require Instance::HuffmanCoder;
 use Instance::Definitions qw( %known_types
                     @debug_code_chars @default_code_chars
-                    $instance_huffman_table1 $instance_suffix
+                    $instance_huffman_table1
                     $MESSAGE_START $MESSAGE_END );
 
 my $mc_dbg = Instance::MasterCoder->new(\@debug_code_chars,   $MESSAGE_START, $MESSAGE_END);
@@ -144,8 +144,6 @@ sub demangle_and_check_routes($$$) {
   }
 
   if ($res and defined $instance_label) {
-    $rest =~ s/^(.*)$instance_suffix$/$1/;
-
     # Find window item given server and name
     my $witem = $srv->window_item_find($channame);
 
@@ -335,7 +333,7 @@ sub generate_outgoing($$) {
                            $known_types{'InstanceLabelHuffman1'},
                            $instlabel)]);
 
-    $text = $text . $instance_suffix . $framedlabel;
+    $text = $text . " ". $framedlabel;
 }
 
 my $suppress_out = 0;