summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2002-08-26 17:16:31 +0000
committerDaouda Lo <daouda@mandriva.com>2002-08-26 17:16:31 +0000
commitd2c9d6b6079019540a00a44251c04aa80b804576 (patch)
treec8a61f1ef46e37246535c5c201c122c618be8d13
parentab1d34db8572bebb9f2eb2e08990c5532a0009d7 (diff)
downloadcontrol-center-d2c9d6b6079019540a00a44251c04aa80b804576.tar
control-center-d2c9d6b6079019540a00a44251c04aa80b804576.tar.gz
control-center-d2c9d6b6079019540a00a44251c04aa80b804576.tar.bz2
control-center-d2c9d6b6079019540a00a44251c04aa80b804576.tar.xz
control-center-d2c9d6b6079019540a00a44251c04aa80b804576.zip
- remove CHLD wait signal handler which prevent non mandrake programs
to be embedded
-rwxr-xr-xcontrol-center8
-rw-r--r--drakconf.spec6
2 files changed, 9 insertions, 5 deletions
diff --git a/control-center b/control-center
index 06d8325c..c1a9f24e 100755
--- a/control-center
+++ b/control-center
@@ -108,7 +108,7 @@ my $exec_hash =
_("Proxy Configuration") => [ "drakproxy", "$_sbindir/drakproxy", 1 ],
_("Security Level") => [ "draksec", "$_sbindir/draksec", 1 ],
_("Programs scheduling") => [ "drakcronat", "/usr/X11R6/bin/drakcronat", -1 ],
- _("Firewall") => [ "tinyfirewall", "$_sbindir/tinyfirewall", -1 ],
+ _("Firewall") => [ "tinyfirewall", "$_sbindir/tinyfirewall", 1 ],
_("Backups") => [ "drakbackup", "$_sbindir/drakbackup", -1 ],
_("Menus") => [ "menudrake", "$_sbindir/menus_launcher.pl", 1, "$_bindir/menudrake" ],
_("Services") => [ "drakxservices", "$_sbindir/drakxservices", 1 ],
@@ -116,8 +116,8 @@ my $exec_hash =
_("Date & Time") => [ "clock", "$_sbindir/clock.pl", 1 ],
_("Logs") => [ "logdrake", "$_sbindir/logdrake", 1 ],
# little workaround to avoid drakconf freeze
- #_("Console") => [ "rxvt", "", 0, ["$_xbindir/rxvt", "rxvt", 1] ],
- _("Console") => [ "rxvt", "$_xbindir/rxvt", -1 ],
+ _("Console") => [ "rxvt", "", 0, ["$_xbindir/rxvt", "rxvt", 1] ],
+# _("Console") => [ "rxvt", "$_xbindir/rxvt", -1 ],
_("Install Software") => [ "rpmdrake", "$_sbindir/rpmdrake", -1 ],
_("Remove Software") => [ "rpmdrake", "$_sbindir/rpmdrake-remove", -1 ],
_("Mandrake Update") => [ "rpmdrake", "$_sbindir/MandrakeUpdate", -1 ],
@@ -514,7 +514,7 @@ $window_global->set_position(1);
$SIG{USR1} = \&sig_usr1;
$SIG{USR2} = \&sig_usr2;
$SIG{TERM} = \&quit_global;
-$SIG{CHLD} = sub { wait() };
+#$SIG{CHLD} = sub { wait() };
Gtk->main;
sub gtkpng_ {
diff --git a/drakconf.spec b/drakconf.spec
index 30d3f96a..1dab8cad 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -6,7 +6,7 @@
Summary: The Mandrake Control Center
Name: drakconf
Version: %version
-Release: 0.12mdk
+Release: 0.13mdk
# 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.13mdk
+- remove CHLD wait signal handler which prevent non perl-Gtk programs
+ (console, menudrake...) to be embedded.
+
* 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