summaryrefslogtreecommitdiffstats
path: root/samba_wizard
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2005-08-31 08:25:05 +0000
committerAntoine Ginies <aginies@mandriva.com>2005-08-31 08:25:05 +0000
commitc7e6ba892c287a0914bd16e9db23586202719aad (patch)
tree7c7d90c2af634c50bcb8bfdda2cfc81d2b3f787b /samba_wizard
parentc7eb9aeaa92273e5c6f96a7e18f93c7583486a2a (diff)
downloaddrakwizard-c7e6ba892c287a0914bd16e9db23586202719aad.tar
drakwizard-c7e6ba892c287a0914bd16e9db23586202719aad.tar.gz
drakwizard-c7e6ba892c287a0914bd16e9db23586202719aad.tar.bz2
drakwizard-c7e6ba892c287a0914bd16e9db23586202719aad.tar.xz
drakwizard-c7e6ba892c287a0914bd16e9db23586202719aad.zip
fix Wizard icons, and return 0
Diffstat (limited to 'samba_wizard')
-rwxr-xr-xsamba_wizard/Samba.pm6
-rwxr-xr-xsamba_wizard/Sambaprint.pm2
-rwxr-xr-xsamba_wizard/Sambashare.pm2
3 files changed, 5 insertions, 5 deletions
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index f13338c3..ffb08611 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -70,7 +70,7 @@ my $o = {
needed_rpm => [ 'samba-server' ],
defaultimage => "/usr/share/wizards/samba_wizard/images/sambasrv.png"
};
-
+$::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/sambasrv.png";
# we ask glueconf to give us the structure representing /etc/samba/smb.conf
if (!-f "/etc/samba/smb.conf") { cp_af("/usr/share/wizards/samba_wizard/scripts/smb.conf.default", "/etc/samba/smb.conf"); }
my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf', show_commented_info => 1 });
@@ -96,7 +96,7 @@ $o->{pages} = {
pre => sub {
if (-f $wiz_samba_etc) {
# $::isWizard = 1;
- $::in->ask_warn(N("Information"), N("It seems you previously setup a Samba server. This wizard will re-read your old configuration, and show you the Samba server type you choose")) and return;
+ $::in->ask_warn(N("Information"), N("It seems you previously setup a Samba server. This wizard will re-read your old configuration, and show you the Samba server type you choose")) and return 0;
my $data = cat_($wiz_samba_etc);
# detect old Samba type
my ($old_type) = $data =~ /type=(\d)/;
@@ -114,7 +114,7 @@ $o->{pages} = {
return 'member' }
},
data => [
- { label => "", val => \$o->{var}{wiz_type}, type => 'list', list => [ keys %type ], format => sub { $type{$_[0]} } },
+ { label => "", val => \$o->{var}{wiz_type}, type => 'list', list => [ sort keys %type ], format => sub { $type{$_[0]} } },
],
},
pdc => {
diff --git a/samba_wizard/Sambaprint.pm b/samba_wizard/Sambaprint.pm
index 77e71fe8..3b5e9824 100755
--- a/samba_wizard/Sambaprint.pm
+++ b/samba_wizard/Sambaprint.pm
@@ -45,7 +45,7 @@ my $o = {
},
defaultimage => "/usr/share/wizards/samba_wizard/images/IC-sambaprt-48.png"
};
-
+$::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/IC-sambaprt-48.png";
# we ask glueconf to give us the structure representing /etc/samba/smb.conf
my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf', show_commented_info => 1 });
diff --git a/samba_wizard/Sambashare.pm b/samba_wizard/Sambashare.pm
index 66e5176d..bdfc4b01 100755
--- a/samba_wizard/Sambashare.pm
+++ b/samba_wizard/Sambashare.pm
@@ -54,7 +54,7 @@ my $o = {
needed_rpm => [ 'samba-server' ],
defaultimage => "/usr/share/wizards/samba_wizard/images/IC-sambashare-48.png"
};
-
+$::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/IC-sambashare-48.png";
# we ask glueconf to give us the structure representing /etc/samba/smb.conf
my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf', show_commented_info => 1 });