summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-01-02 15:43:33 +0000
committerThierry Vignaud <tv@mandriva.org>2008-01-02 15:43:33 +0000
commitc1c57b3a42f3e68e25e087f08899394ebea6e834 (patch)
tree04086602b3372f0174df0e153f5d1cb4fdc73b21
parent0645249d999dc089971e0b73f1f59d4f9f5aff04 (diff)
downloadcontrol-center-c1c57b3a42f3e68e25e087f08899394ebea6e834.tar
control-center-c1c57b3a42f3e68e25e087f08899394ebea6e834.tar.gz
control-center-c1c57b3a42f3e68e25e087f08899394ebea6e834.tar.bz2
control-center-c1c57b3a42f3e68e25e087f08899394ebea6e834.tar.xz
control-center-c1c57b3a42f3e68e25e087f08899394ebea6e834.zip
revert latest commit
-rwxr-xr-xcontrol-center5
1 files 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);