diff options
| -rwxr-xr-x | clock.pl | 2 | ||||
| -rwxr-xr-x | menus_launcher.pl | 9 | ||||
| -rwxr-xr-x | print_launcher.pl | 9 |
3 files changed, 9 insertions, 11 deletions
@@ -155,10 +155,10 @@ $is24 = $h_old>12; $old_year += 1900; $calendar->select_month($old_month, $old_year); $calendar->select_day($old_day); -$::isEmbedded and kill 'USR2', $::CCPID; $button_reset->set_sensitive(0); $timer = Gtk->timeout_add(120, sub { time_to_rad(localtime(time)); Repaint($drawing_area) }); Gtk->main; +my_gtk->exit(0); sub cal_changed { !$its_reset and $timer and Gtk->timeout_remove($timer); diff --git a/menus_launcher.pl b/menus_launcher.pl index 011e1dc6..ce94c41f 100755 --- a/menus_launcher.pl +++ b/menus_launcher.pl @@ -2,8 +2,8 @@ use strict; use lib qw(/usr/lib/libDrakX); -use POSIX; use ugtk; +use my_gtk; use common; use interactive; use standalone; @@ -23,7 +23,7 @@ my $bindir = "/usr/bin/"; my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel; $window->signal_connect (delete_event => sub { ugtk::gtkset_mousecursor_normal(); - Gtk->exit(0); + my_gtk->exit(0); } ); my $vbox = new Gtk::VBox(0,0); $window->set_title(N("Menu Configuration Center")); @@ -63,12 +63,11 @@ my $bbox = new Gtk::HButtonBox; $vbox->pack_start($bbox,0,0,5); $bbox->set_layout(-end); my $button_ok = new Gtk::Button N("Done"); -$button_ok->signal_connect (clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) }); +$button_ok->signal_connect (clicked => sub { my_gtk->exit(0) }); $button_ok->can_default(1); $bbox->add($button_ok); $window->show_all; -Gtk->main_iteration while Gtk->events_pending; -$::isEmbedded and kill 'USR2', $::CCPID; Gtk->main; +my_gtk->exit(0); diff --git a/print_launcher.pl b/print_launcher.pl index bd67fa02..0ef2762c 100755 --- a/print_launcher.pl +++ b/print_launcher.pl @@ -4,7 +4,7 @@ use strict; use lib qw(/usr/lib/libDrakX); use common; use ugtk; -use ugtk; +use my_gtk; use interactive; use standalone; init Gtk; @@ -23,7 +23,7 @@ my $sbindir = "/usr/sbin/"; my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel; $window->signal_connect (delete_event => delete_event => sub { ugtk::gtkset_mousecursor_normal(); - Gtk->exit(0); + my_gtk->exit(0); } ); my $vbox = new Gtk::VBox(0,0); $window->set_title(N("Printing configuration")); @@ -46,12 +46,11 @@ my $bbox = new Gtk::HButtonBox; $vbox->pack_start($bbox,0,0,5); $bbox->set_layout(-end); my $button_ok = new Gtk::Button N("Done"); -$button_ok->signal_connect (clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) }); +$button_ok->signal_connect (clicked => sub { my_gtk->exit(0) }); $button_ok->can_default(1); $bbox->add($button_ok); $window->show_all; -Gtk->main_iteration while Gtk->events_pending; -$::isEmbedded and kill 'USR2', $::CCPID; Gtk->main; +my_gtk->exit(0); |