Sophie

Sophie

distrib > Mandriva > 2011.0 > i586 > media > main-updates-src > by-pkgid > 9cd8634de8e36116a404116cd5910eb2 > files > 1

drakxtools-13.51-10.2.src.rpm

diff -Naur drakxtools-13.51/perl-install/any.pm drakxtools-13.51.new/perl-install/any.pm
--- drakxtools-13.51/perl-install/any.pm	2011-08-10 17:43:43.054238914 +0400
+++ drakxtools-13.51.new/perl-install/any.pm	2011-08-10 16:03:43.000000000 +0400
@@ -37,6 +37,12 @@
     eval { cp_af(facesdir() . $icon . ".png", $dest) } if $icon;
 }
 
+sub addUserFaceIcon {
+    my ($user, $icon) = @_;
+    my $dest = "$::prefix/home/$user/.face.icon";
+    eval { cp_af(facesdir() . $icon . ".png", $dest) } if $icon;
+}
+
 sub alloc_user_faces {
     my ($users) = @_;
     my @m = my @l = facesnames();
@@ -100,6 +106,7 @@
 	create_user($_, $authentication);
 	run_program::rooted($::prefix, "usermod", "-G", join(",", @{$_->{groups}}), $_->{name}) if !is_empty_array_ref($_->{groups});
 	addKdmIcon($_->{name}, delete $_->{auto_icon} || $_->{icon});
+    addUserFaceIcon($_->{name}, delete $_->{auto_icon} || $_->{icon});
     }
 }
 
diff -Naur drakxtools-13.51/perl-install/interactive/gtk.pm drakxtools-13.51.new/perl-install/interactive/gtk.pm
--- drakxtools-13.51/perl-install/interactive/gtk.pm	2011-06-27 19:02:32.000000000 +0400
+++ drakxtools-13.51.new/perl-install/interactive/gtk.pm	2011-08-10 16:06:57.000000000 +0400
@@ -373,12 +373,17 @@
     my ($w, $real_w, $focus_w, $set);
     if ($e->{type} eq 'iconlist') {
 	$w = Gtk2::Button->new;
+	my $scale = 64;
+	if ($e->{scale}){
+	    $scale = $e->{scale};
+	}
+
 	$set = sub {
 	    gtkdestroy($e->{icon});
 	    my $f = $e->{icon2f}->($_[0]);
 	    $e->{icon} = -e $f ?
-	      gtkcreate_img($f) :
-		Gtk2::WrappedLabel->new(may_apply($e->{format}, $_[0]));
+	      gtkcreate_img($f, $scale) : 
+	    Gtk2::WrappedLabel->new(may_apply($e->{format}, $_[0]));
 	    $w->add(gtkshow($e->{icon}));
 	};
 	$w->signal_connect(clicked => sub {