From c1c57b3a42f3e68e25e087f08899394ebea6e834 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 2 Jan 2008 15:43:33 +0000 Subject: revert latest commit --- control-center | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/control-center b/control-center index a333b6b6..1abca77a 100755 --- a/control-center +++ b/control-center @@ -47,6 +47,8 @@ my $themes_dir = "$mcc_dir/themes/"; my (%tool_pids, %tool_feedback); my ($version, $conffile, $class_install) = (`cat /etc/mandrakelinux-release` =~ /\b(\d+\.{1}.+\))/, "/etc/mcc.conf", "/etc/sysconfig/system"); +my $root_size = join('x', gtkroot()->get_size()); +my ($default_width, $default_heigth) = member($root_size, '640x480', '800x600') ? (720, 523) : (800, 600); require_root_capability() if !$::testing; # just to get root capabilities @@ -1179,9 +1181,6 @@ my ($timeout, %check_boxes, $emb_socket); # set default size: -my $root_size = join('x', gtkroot()->get_size()); -my ($default_width, $default_heigth) = member($root_size, '640x480', '800x600') ? (720, 523) : (800, 600); - my @min_size = $root_size eq '640x480' ? (620, 460) : (680, 500); my $window_global = gtkset_size_request(Gtk2::Window->new('toplevel'), @min_size); -- cgit v1.2.1