diff options
author | Olivier Blin <oblin@mandriva.org> | 2005-07-18 10:25:42 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.org> | 2005-07-18 10:25:42 +0000 |
commit | 1e0d4607841c5c6b8668c467ed011622864222ca (patch) | |
tree | 8ef82e6097ea2ec33d5e29fff0201dd2b1a09cca | |
parent | 493459b4317ebec9fd8417c6561f055615ee6615 (diff) | |
download | userdrake-1e0d4607841c5c6b8668c467ed011622864222ca.tar userdrake-1e0d4607841c5c6b8668c467ed011622864222ca.tar.gz userdrake-1e0d4607841c5c6b8668c467ed011622864222ca.tar.bz2 userdrake-1e0d4607841c5c6b8668c467ed011622864222ca.tar.xz userdrake-1e0d4607841c5c6b8668c467ed011622864222ca.zip |
use common::md5file
-rwxr-xr-x | userdrake | 15 |
1 files changed, 2 insertions, 13 deletions
@@ -37,7 +37,6 @@ use USER; use Gtk2::Gdk::Keysyms; use utf8; use log; -use Digest::MD5; $ugtk2::wm_icon = "userdrake"; @@ -238,16 +237,6 @@ sub Refresh { RefreshGroupsFull($filt, $strfilt); GrayDelEdit(); } -sub GetFileMd5 { - my @md5; - foreach my $file (@_) { - open(my $FILE, $file) or do { print STDERR "Can't open '$file': $!"; push @md5, "" }; - binmode($FILE); - push @md5, Digest::MD5->new->addfile($FILE)->hexdigest; - close($FILE); - } - return wantarray() ? @md5 : $md5[0]; -} sub GetFaceIcon { my ($user) = @_; my @icones = any::facesnames(); @@ -268,8 +257,8 @@ sub GetFaceIcon { $us->{o}{icon}->show; }; if (-e $user_icon) { - my $current_md5 = GetFileMd5($user_icon); - eval { $i = find_index { GetFileMd5(any::face2png($_)) =~ /$current_md5/ } @icones }; + my $current_md5 = common::md5file($user_icon); + eval { $i = find_index { common::md5file(any::face2png($_)) =~ /$current_md5/ } @icones }; if (!$@) { #- current icon found in @icones, select it $current_icon = $icones[$i]; } else { #- add and select current icon in @icones |