[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC.pm

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.197 by root, Fri Dec 5 14:44:45 2008 UTC vs.
Revision 1.201 by root, Sun Jan 11 03:19:47 2009 UTC

 use Carp ();
 our $VERSION;
 BEGIN {
-   $VERSION = '2.0';
+   $VERSION = '2.02';
    use XSLoader;
    XSLoader::load "Deliantra::Client", $VERSION;
 }
 use utf8;
 use strict qw(vars subs);
+use Socket ();
 use AnyEvent ();
+use AnyEvent::Util ();
 use Pod::POM ();
 use File::Path ();
 use Storable (); # finally
 use Fcntl ();
 use JSON::XS qw(encode_json decode_json);
    s/</&lt;/g;
    $_
 }
-sub socketpipe() {
-   socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC
-      or die "cannot establish bidirectional pipe: $!\n";
-   ($fh1, $fh2)
-}
 sub background(&;&) {
    my ($bg, $cb) = @_;
-   my ($fh_r, $fh_w) = DC::socketpipe;
+   my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
+     or die "unable to create background socketpair: $!";
    my $pid = fork;
    if (defined $pid && !$pid) {
       local $SIG{__DIE__};
 }
 sub read_cfg {
    my ($file) = @_;
-   $::CFG = load_json $file;
+   $::CFG = (load_json $file) || (load_json "$file.bak");
 }
 sub write_cfg {
    my $file = "$Deliantra::VARDIR/client.cf";
    $::CFG->{VERSION} = $::VERSION;
+   $::CFG->{layout}  = DC::UI::get_layout ();
-   open my $fh, ">:utf8", $file
+   open my $fh, ">:utf8", "$file~"
       or return;
    print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
+   close $fh;
+   rename $file, "$file.bak";
+   rename "$file~", $file;
 }
 sub http_proxy {
    my @proxy = win32_proxy_info;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines