summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-06 18:20:23 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-06 18:20:23 +0000
commit05c9f7b0b35b9752edc8053178634df509a70ee9 (patch)
tree8bf41a780c7edea56975ff445b1e28227c1d6acf
parent5320424408a1f8c45e2e8341cfefcf56ef68c6f4 (diff)
downloadcontrol-center-05c9f7b0b35b9752edc8053178634df509a70ee9.tar
control-center-05c9f7b0b35b9752edc8053178634df509a70ee9.tar.gz
control-center-05c9f7b0b35b9752edc8053178634df509a70ee9.tar.bz2
control-center-05c9f7b0b35b9752edc8053178634df509a70ee9.tar.xz
control-center-05c9f7b0b35b9752edc8053178634df509a70ee9.zip
do not embedd anymore logs
-rwxr-xr-xcontrol-center31
1 files changed, 3 insertions, 28 deletions
diff --git a/control-center b/control-center
index 25c983f5..72a72394 100755
--- a/control-center
+++ b/control-center
@@ -88,9 +88,6 @@ $window_splash->show_all;
gtkflush();
-#-------------------------------------------------------------
-my $still_not_in_a_section = 1;
-
#-------------------------------------------------------------
# Data structures
@@ -285,7 +282,7 @@ my @tree =
# main window :
-my ($timeout, %check_boxes, $exp_frame, $emb_socket, $page_id);
+my ($timeout, %check_boxes, $emb_socket, $page_id);
my $window_global = gtkset_size_request(Gtk2::Window->new('toplevel'), $default_width, $default_heigth);
$window_global->resize($h{WIDTH}, $h{HEIGTH});
@@ -325,9 +322,7 @@ my @menu_items = (
[ join('', @{$options{show_log}}), undef,
sub {
$option_values{show_log} = $check_boxes{show_log}->get_active;
- return if $still_not_in_a_section;
start_logdrake();
- update_exp();
},
undef, '<CheckItem>'
],
@@ -524,7 +519,6 @@ gtkadd($window_global,
'mcc'),
0, my $banner_notebook = gtkset_size_request(Gtk2::Notebook->new, -1, 75),
1, my $notebook_global = gtkset_name(Gtk2::Notebook->new, 'mcc'),
- 0, gtkset_name(my $w_exp = create_scrolled_window(gtkset_shadow_type(gtkset_size_request(gtkset_border_width($exp_frame = Gtk2::Frame->new(N("Logs")), 5), -1, 120), 'etched_in'), [ 'never', 'never' ], 'none'), 'mcc'),
),
0, my $buttons = gtkadd(gtkset_layout(Gtk2::HButtonBox->new, 'end'),
gtksignal_connect(my $previous = Gtk2::Button->new(N("Previous")),
@@ -679,8 +673,6 @@ foreach (keys %check_boxes) {
}
};
-hide_socket_and_clean();
-
# "wait while launching a program" area :
my ($run_pixbuf, $run_counter, $run_counter_add);
@@ -704,7 +696,6 @@ $notebook_global->signal_connect(switch_page => sub {
});
$window_global->show_all;
-$exp_frame->hide;
$emb_frame->hide;
$SIG{USR1} = 'IGNORE';
@@ -746,7 +737,6 @@ sub warn_on_startup {
sub child_just_exited() {
$pending_app = 0;
$left_locked = 0;
- hide_socket_and_clean();
if ($emb_socket) {
$emb_socket->destroy;
undef $emb_socket;
@@ -762,7 +752,6 @@ sub child_just_exited() {
sub hide_socket_and_clean() {
$emb_frame->hide;
$pending_app = 0;
- update_exp();
}
sub create_hidden_socket() {
@@ -783,15 +772,6 @@ sub create_hidden_socket() {
$emb_wait->hide;
}
-sub update_exp() {
- return if $still_not_in_a_section;
- if ($option_values{show_log}) {
- $w_exp->show_all;
- } else {
- $w_exp->hide;
- }
-}
-
#-------------------------------------------------------------
# processes managment
@@ -861,15 +841,12 @@ sub compute_exec_string {
}
start_logdrake();
$box->window->set_cursor($wait_cursor);
- $w_exp->hide if $embedded && $exec =~ /^drakfont|logdrake|mousedrake/;
}
sub start_logdrake {
# (re)start logdrake if needed
- if ($option_values{show_log} && !$pid_exp) { #FIXME && !$exp_socket
- gtkshow(gtkadd($exp_frame, my $exp_socket = Gtk2::Socket->new));
- $w_exp->show;
- my $exec_log = "logdrake --explain=drakxtools --embedded " . $exp_socket->window->XWINDOW;
+ if ($option_values{show_log} && !$pid_exp) {
+ my $exec_log = "logdrake --explain=drakxtools";
$pid_exp = fork_($exec_log, []);
}
@@ -1049,9 +1026,7 @@ sub set_page_raw {
sub set_page {
my ($index) = @_;
start_logdrake();
- update_exp();
set_page_raw($index);
- $still_not_in_a_section = 0;
$help_on_context = $ctx[$index];
show_hide_previous($index);
}