--- deliantra/Deliantra-Client/DC.pm	2006/11/16 19:43:04	1.128
+++ deliantra/Deliantra-Client/DC.pm	2006/12/06 00:04:13	1.132
@@ -17,21 +17,12 @@
 use Carp ();
 
 BEGIN {
-   $VERSION = '0.96';
+   $VERSION = '0.97';
 
    use XSLoader;
    XSLoader::load "CFPlus", $VERSION;
 }
 
-BEGIN {
-   $SIG{__DIE__} = sub {
-      return if CFPlus::in_destruct;
-      #CFPlus::fatal $_[0];#d#
-      CFPlus::error Carp::longmess $_[0];#d#
-      die;#d#
-   };
-}
-
 use utf8;
 
 use AnyEvent ();
@@ -276,20 +267,22 @@
 {
    use strict;
 
-   mkdir "$Crossfire::VARDIR/cfplus", 0777;
+   my $HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version";
+
+   mkdir $HOME, 0777;
    my $recover = $BerkeleyDB::db_version >= 4.4 
                  ? eval "DB_REGISTER | DB_RECOVER"
                  : 0;
 
    $DB_ENV = new BerkeleyDB::Env
-                    -Home => "$Crossfire::VARDIR/cfplus",
+                    -Home => $HOME,
                     -Cachesize => 1_000_000,
                     -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
 #                 -ErrPrefix => "DATABASE",
                     -Verbose => 1,
                     -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
                     -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
-                       or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
+                       or die "unable to create/open database home $HOME: $BerkeleyDB::Error";
 
    $DB_STATE = db_table "state";
 }
@@ -444,6 +437,7 @@
                   ]
                )
             ),
+            ["bind <i>apply $self->{name}</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }],
          );
 
          CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);