diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-08-06 11:27:00 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-08-06 11:27:00 +0000 |
commit | 3c879a460e27a7e5b747c66ba56709bb565df80c (patch) | |
tree | c4c15434707fad0941e580cc5ab0dfc1083d108e | |
parent | 5f057857b0a6e4fb46f70d12f72c491921e3afea (diff) | |
download | control-center-3c879a460e27a7e5b747c66ba56709bb565df80c.tar control-center-3c879a460e27a7e5b747c66ba56709bb565df80c.tar.gz control-center-3c879a460e27a7e5b747c66ba56709bb565df80c.tar.bz2 control-center-3c879a460e27a7e5b747c66ba56709bb565df80c.tar.xz control-center-3c879a460e27a7e5b747c66ba56709bb565df80c.zip |
- inline embedded_mode one-liner
- remove unused $version
-rwxr-xr-x | control-center | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/control-center b/control-center index 43649372..4c501fc9 100755 --- a/control-center +++ b/control-center @@ -41,8 +41,6 @@ use Config; use POSIX; my $in = 'interactive'->vnew('su', 'default'); -#$in->do_pkgs->install('sane-frontends'); - my $_version = "9.0"; my $conffile = "/root/.mcc"; @@ -61,7 +59,7 @@ if ("@ARGV" =~ /--theme (\w+)/) { $theme = $1 } my_gtk::add_icon_path("$mcc_dir/$theme"); my $window_splash = new Gtk::Window -popup; $window_splash->signal_connect (delete_event => \&quit_global); -$window_splash->set_title(_("Mandrake Control Center")); #$_version)); +$window_splash->set_title(_("Mandrake Control Center")); $window_splash->set_policy(0, 0, 1); $window_splash->set_position(1); $window_splash->add( @@ -459,12 +457,12 @@ $darea1->signal_connect(expose_event => sub { open VERS, "/etc/mandrake-release" or die _("cannot open this file for read: %s", $!); while (<VERS>) { push (@revtree,$_) } my @info_tree = split / /, $revtree[0]; - my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname(); + my ($sysname, $nodename, $release, undef, $machine) = POSIX::uname(); my $i = 0; foreach( [_("System:"), "$info_tree[0] $info_tree[1] $info_tree[3] $info_tree[4]"], [_("Hostname:"), $nodename], - [_("Kernel Version:"), "$release"],# $version"], + [_("Kernel Version:"), "$release"], [_("Machine:"), $machine]) { $pix_dbl->draw_string($darea1->style->font, $darea1->style->black_gc, 80, 150+$i, $_->[0]); $pix_dbl->draw_string($darea1->style->font, $darea1->style->black_gc, 81, 150+$i, $_->[0]); @@ -787,10 +785,6 @@ sub display_logs { update_exp(); } -sub embedded_mode { - $embedded = $embedded_check_box->active; -} - sub get_main_menu { my ($window) = @_; my $accel_group = new Gtk::AccelGroup(); @@ -810,7 +804,7 @@ sub get_main_menu { callback => \&display_logs, type => '<CheckItem>' }, { path => _("/Options")._("/_Embedded Mode"), - callback => \&embedded_mode, + callback => sub { $embedded = $embedded_check_box->active }, type => '<ToggleItem>'}, if_(all($mcc_dir) > 1, { path => _("/_Themes"), |