summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-27 08:34:19 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-27 08:34:19 +0000
commit7401f96c20c17033ff6c5642467527808fe6dfcd (patch)
tree67bb722cea70c0d5ca63cc01ee9dcaf3a375e388
parentc434a72446ef4840c9154982a43c3cfcc9d3101f (diff)
downloadcontrol-center-7401f96c20c17033ff6c5642467527808fe6dfcd.tar
control-center-7401f96c20c17033ff6c5642467527808fe6dfcd.tar.gz
control-center-7401f96c20c17033ff6c5642467527808fe6dfcd.tar.bz2
control-center-7401f96c20c17033ff6c5642467527808fe6dfcd.tar.xz
control-center-7401f96c20c17033ff6c5642467527808fe6dfcd.zip
- explain why is there a wrapper and what's the universes
- untabify menudrake launchers
-rwxr-xr-xmenus_launcher.pl2
-rw-r--r--wrapper8
2 files changed, 7 insertions, 3 deletions
diff --git a/menus_launcher.pl b/menus_launcher.pl
index 3175dea0..7a621690 100755
--- a/menus_launcher.pl
+++ b/menus_launcher.pl
@@ -45,7 +45,7 @@ $combo->set_popdown_strings("root", sort(map {
} &list_passwd()));
$table->attach($combo, 2, 3, 1, 2, 'fill', 'fill', 0, 0);
my $b2 = gtksignal_connect(Gtk2::Button->new(N("Configure...")),
- clicked => sub { my $a = $combo->entry->get_text(); system($a eq "root" ? "$bindir/menudrake --usermenu &" : " su $a -c \"$bindir/menudrake &\"") });
+ clicked => sub { my $a = $combo->entry->get_text(); system($a eq "root" ? "$bindir/menudrake --usermenu &" : " su $a -c \"$bindir/menudrake &\"") });
$table->attach($b2, 1, 2, 1, 2, 'fill', 'fill', 0, 0);
$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5);
my $bbox = Gtk2::HButtonBox->new;
diff --git a/wrapper b/wrapper
index 1a18341b..522d4e12 100644
--- a/wrapper
+++ b/wrapper
@@ -18,13 +18,17 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# The mcc wrapper goals are :
+# - prevent bad gtk bugs if one launch it from the cli and suspend itt
+# - having less overhead for launching drakxconf if cli version must be used
+
if (!$ENV{DISPLAY} || system('/usr/X11R6/bin/xtest')) {
exec ("/usr/sbin/drakxconf; reset");
} else {
unless (my $pid = fork) {
- print "cannot fork\n" unless defined $pid;
- exec ("/usr/sbin/drakconf.real");
+ print "cannot fork\n" unless defined $pid;
+ exec ("/usr/sbin/drakconf.real");
}
}