From 7483aba771482effd795103fda9c294eeb8d0cf6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 2 Aug 2002 10:53:18 +0000 Subject: adapt to new drakxtools standalone.pm which sets $::isEmbedded itself and removing --embedded from @ARGV --- clock.pl | 1 - gecko.pm | 1 - logdrake | 4 +++- menus_launcher.pl | 1 - print_launcher.pl | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/clock.pl b/clock.pl index 4461c9d3..adfa3c80 100755 --- a/clock.pl +++ b/clock.pl @@ -28,7 +28,6 @@ sub translate { $s ? c::dgettext('drakconf', $s) : ''; } -$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; my $in = vnew interactive('su'); my $pixmap; my $radius; diff --git a/gecko.pm b/gecko.pm index 2359cb45..b6959bc7 100755 --- a/gecko.pm +++ b/gecko.pm @@ -20,7 +20,6 @@ Gtk->set_locale; system("LD_PRELOAD=libpthread.so ; export LD_PRELOAD"); -$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; #my $in = vnew interactive('su'); my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel; $window->set_default_size(600, 400); diff --git a/logdrake b/logdrake index 6ba7daa6..fad77921 100755 --- a/logdrake +++ b/logdrake @@ -55,7 +55,6 @@ $::isInstall and die "Not supported during install.\n"; my $in = 'interactive'->vnew('su', 'default'); -$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; if ($::isEmbedded) { print "EMBED\n"; print "parent XID\t$::XID\n"; @@ -508,6 +507,9 @@ sub destroy_window { # log # $Log$ +# Revision 1.34 2002/08/02 10:53:18 prigaux +# adapt to new drakxtools standalone.pm which sets $::isEmbedded itself and removing --embedded from @ARGV +# # Revision 1.33 2002/01/31 12:46:16 pablo # fixed some English typose # diff --git a/menus_launcher.pl b/menus_launcher.pl index b4482b4a..1054508c 100755 --- a/menus_launcher.pl +++ b/menus_launcher.pl @@ -27,7 +27,6 @@ sub translate { } my $_bindir = "/usr/bin/"; -$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel; $window->signal_connect ( delete_event => \&quit_global ); my $vbox = new Gtk::VBox(0,0); diff --git a/print_launcher.pl b/print_launcher.pl index 654f101e..4ce46df2 100755 --- a/print_launcher.pl +++ b/print_launcher.pl @@ -27,7 +27,6 @@ sub translate { } my $_sbindir = "/usr/sbin/"; -$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel; $window->signal_connect ( delete_event => \&quit_global ); my $vbox = new Gtk::VBox(0,0); -- cgit v1.2.1