summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Duret <yduret@mandriva.com>2001-08-10 01:46:05 +0000
committerYves Duret <yduret@mandriva.com>2001-08-10 01:46:05 +0000
commit864e5f2929f60dc69b3ce68b7a2479ceb204baa7 (patch)
tree77e4b589b3d486df1294492888ffd1161dd4e1af
parente655a68d93bb6200d28cd3b094382543445eab00 (diff)
downloadcontrol-center-864e5f2929f60dc69b3ce68b7a2479ceb204baa7.tar
control-center-864e5f2929f60dc69b3ce68b7a2479ceb204baa7.tar.gz
control-center-864e5f2929f60dc69b3ce68b7a2479ceb204baa7.tar.bz2
control-center-864e5f2929f60dc69b3ce68b7a2479ceb204baa7.tar.xz
control-center-864e5f2929f60dc69b3ce68b7a2479ceb204baa7.zip
corrected vnew usage (thc gc)
-rwxr-xr-xcontrol-center4
-rwxr-xr-xlogdrake16
2 files changed, 14 insertions, 6 deletions
diff --git a/control-center b/control-center
index b6768cb8..61307922 100755
--- a/control-center
+++ b/control-center
@@ -45,6 +45,8 @@ sub _ {
sprintf $T, @_[@p];
}
+my $in = 'interactive'->vnew('su', 'default');
+
!$ENV{DISPLAY} and exec ("$_sbindir/drakxconf; reset");
require Gtk;
@@ -254,7 +256,7 @@ sub about_mdk_cc {
$button->signal_connect_object("clicked",$window_about => 'destroy');
$bbox1->add($button);
- my $label = new Gtk::Label( _("Mandrake Control Center %s \n Copyright (C) 2001 Mandrakesoft SA\n", $_version) );
+ my $label = new Gtk::Label( _("Mandrake Control Center %s \n \n Copyright (C) 2001 Mandrakesoft SA\n", $_version) );
my $style1 = new Gtk::Style;
$style1->font(Gtk::Gdk::Font->fontset_load("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"));
$label->set_style($style1);
diff --git a/logdrake b/logdrake
index 0a01f6b0..10fe3e60 100755
--- a/logdrake
+++ b/logdrake
@@ -53,16 +53,14 @@ if ($::isEmbedded) {
print "mcc pid\t$::CCPID\n";
}
-my $in = vnew interactive('su');
+my $in = 'interactive'->vnew('su', 'default');
local $_ = join '', @ARGV;
/-h/ and die sprintf( _("usage: logdrake [--version]\n"));
/-version/ and die 'version: $Id$ '."\n";
-my $h=`hostname -s`;
-chop($h);
-
+my $h=chomp_(`hostname -s`);
my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel;
$window->signal_connect( delete_event => sub { $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0) });
@@ -162,9 +160,14 @@ gtkadd($window,
),
1, gtkadd(new Gtk::Frame(_("Content of the file")),
createScrolledWindow(my $log_text = new Gtk::Text(undef, undef))
- )
+ ),
+ 0, gtkadd (gtkset_layout(new Gtk::HButtonBox,-end),
+ gtksignal_connect(new Gtk::Button (_("OK")), clicked=>sub{updateInit();updateAutologin();updateAurora();$::isEmbedded ? kill(USR1,$::CCPID) : Gtk->exit(0)}),
+ gtksignal_connect(new Gtk::Button ($::isEmbedded ? _("Cancel") : _("Quit")), clicked => sub {$::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0)})
+ )
)
+
);
$window->realize;
@@ -337,6 +340,9 @@ sub destroy_window {
# log
# $Log$
+# Revision 1.15 2001/08/10 01:46:05 yduret
+# corrected vnew usage (thc gc)
+#
# Revision 1.14 2001/08/06 14:58:12 yduret
# added isFile mode for daminounet
#