summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-12-18 10:54:27 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-12-18 10:54:27 +0000
commitbc7827b4593d1ab93d01ad2a6ac01b3c32cee89b (patch)
tree6923eed01464e21c7e19f3aeefc36c974776a0d3
parent02bfd2b07e619c2a459fe69378399e00c7a255ac (diff)
downloadcontrol-center-bc7827b4593d1ab93d01ad2a6ac01b3c32cee89b.tar
control-center-bc7827b4593d1ab93d01ad2a6ac01b3c32cee89b.tar.gz
control-center-bc7827b4593d1ab93d01ad2a6ac01b3c32cee89b.tar.bz2
control-center-bc7827b4593d1ab93d01ad2a6ac01b3c32cee89b.tar.xz
control-center-bc7827b4593d1ab93d01ad2a6ac01b3c32cee89b.zip
- split out start_logdrake() out of compute_exec_string()
- start logdrake when one switch from the summary to any category - in the menu entry, start logdrake instantaneously rather than waiting for next tool startup before starting logdrake
-rwxr-xr-xcontrol-center14
1 files changed, 10 insertions, 4 deletions
diff --git a/control-center b/control-center
index b0e58423..b2983dc2 100755
--- a/control-center
+++ b/control-center
@@ -322,6 +322,7 @@ my @menu_items = (
[ join('', @{$options{show_log}}), undef,
sub {
$option_values{show_log} = $check_boxes{show_log}->get_active;
+ start_logdrake() if $done;
update_exp();
},
undef, '<CheckItem>'
@@ -898,15 +899,19 @@ sub compute_exec_string {
# }
# }
# }
+ start_logdrake();
+ $w_exp->hide if $embedded && $exec =~ /^drakfont|logdrake/;
+}
+
+sub start_logdrake {
# (re)start logdrake if needed
if ($option_values{show_log} && !$pid_exp) { #FIXME && !$exp_socket
- my $exp_socket;
- gtkshow(gtkadd($exp_frame, $exp_socket = Gtk2::Socket->new));
+ gtkshow(gtkadd($exp_frame, my $exp_socket = Gtk2::Socket->new));
$w_exp->show;
- my $exec_log = "logdrake --explain=$log_exp --embedded " . $exp_socket->window->XWINDOW;
+ my $exec_log = "logdrake --explain=drakxtools --embedded " . $exp_socket->window->XWINDOW;
$pid_exp = fork_($exec_log, []);
}
- $w_exp->hide if $embedded && $exec =~ /^drakfont|logdrake/;
+
}
sub launch_xapp {
@@ -1069,6 +1074,7 @@ sub about_mdk_cc() {
sub set_page {
my ($index) = @_;
+ start_logdrake();
update_exp();
$notebook_global->set_current_page($index);
$help_on_context = $ctx[$index];