summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2002-08-26 05:27:42 +0000
committerDaouda Lo <daouda@mandriva.com>2002-08-26 05:27:42 +0000
commit151822a8ed9385ad89a1a00e3494e326df6b3326 (patch)
tree079838682b44cc7879642df6b0322cdc91a4c5a8
parent92e2830f3cf8b0e47837fa7494b7eca8a7285257 (diff)
downloadcontrol-center-151822a8ed9385ad89a1a00e3494e326df6b3326.tar
control-center-151822a8ed9385ad89a1a00e3494e326df6b3326.tar.gz
control-center-151822a8ed9385ad89a1a00e3494e326df6b3326.tar.bz2
control-center-151822a8ed9385ad89a1a00e3494e326df6b3326.tar.xz
control-center-151822a8ed9385ad89a1a00e3494e326df6b3326.zip
- cleanups explanations socket related code
- Be consistent with enable / disable logs from menu
-rwxr-xr-xcontrol-center11
-rw-r--r--drakconf.spec6
2 files changed, 7 insertions, 10 deletions
diff --git a/control-center b/control-center
index 38c2ae8b..06d8325c 100755
--- a/control-center
+++ b/control-center
@@ -341,7 +341,6 @@ foreach (@tree) {
}
my $exp_frame;
-#my $exp_socket;
my $emb_box;
my $emb_wait;
@@ -392,16 +391,14 @@ sub update_exp {
if($logs && !$exp_frame) {
gtkpack__($right_box,
gtkadd($exp_frame = gtkset_shadow_type(gtkset_usize(gtkset_border_width(new Gtk::Frame(_("Logs")), 5), 0, 120), 'etched_out'),
- # $exp_socket = new Gtk::Socket,
)
);
- $rootheight <= 600 and $fixed_title->hide;
- $exp_frame->show_all;
+ $rootheight <= 600 and $fixed_title->hide; $show_log = 1;
+ $exp_frame->show_all;
}
if (!$logs && $exp_frame) {
$exp_frame->destroy();
undef $exp_frame;
-# defined($exp_socket) and $exp_socket->destroy();
$fixed_title->show;
}
}
@@ -652,14 +649,11 @@ sub launch_xapp {
sub clean_socket {
$emb_box->hide;
-# $logs and $exp_frame->hide;
foreach (@pid_launched) {
kill 'TERM', $_ if (defined $_);
}
@pid_launched = ();
$emb_socket and $emb_socket->destroy();
-# $exp_socket and $exp_socket->destroy();
-# $logs and $exp_frame->show;
$pending_app = 0;
}
@@ -668,7 +662,6 @@ sub res_socket {
gtkpack($emb_box, $emb_socket = new Gtk::Socket);
$emb_socket->hide;
$emb_wait->hide;
-# $logs and gtkadd($exp_frame, $exp_socket = new Gtk::Socket);
}
sub quit_global {
diff --git a/drakconf.spec b/drakconf.spec
index 2a0ddcec..30d3f96a 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -6,7 +6,7 @@
Summary: The Mandrake Control Center
Name: drakconf
Version: %version
-Release: 0.11mdk
+Release: 0.12mdk
# get the source from our cvs repository (see
# http://www.linuxmandrake.com/en/cvs.php3)
Source0: %name-%version.tar.bz2
@@ -103,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT
%_datadir/mcc/kde
%changelog
+* Mon Aug 26 2002 Daouda LO <daouda@mandrakesoft.com> 9.0-0.12mdk
+- cleanups explanations socket related code
+- Be consistent with enable / disable logs from menu
+
* Mon Aug 26 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.11mdk
- add back tv cards configuration