summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/bootlook.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index fd02a259d..b641ee966 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -49,7 +49,7 @@ my $inmain = 0;
my $lilogrub = chomp_(`detectloader -q`);
my $window = $::isEmbedded ? new Gtk2::Plug($::XID) : new Gtk2::Window("toplevel");
-$window->signal_connect(delete_event => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) });
+$window->signal_connect(delete_event => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk2->exit(0) });
$window->set_title(N("Boot Style Configuration"));
$window->border_width(2);
#$window->realize;
@@ -68,7 +68,7 @@ $window->border_width(2);
# the menus are not shown
# but they provides shiny shortcut like C-q
my @menu_items = ({ path => N("/_File"), type => '<Branch>' },
- { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } },
+ { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk2->exit(0) } },
);
my $menubar = create_factory_menu($window, @menu_items);
######### menus end
@@ -332,8 +332,8 @@ Click on Configure to launch the setup wizard.", $lilogrub),
)
),
gtkadd(gtkset_layout(new Gtk2::HButtonBox, 'end'),
- gtksignal_connect(new Gtk2::Button(N("OK")), clicked => sub { any::runlevel($x_mode ? 5 : 3); updateAutologin(); updateAurora(); $::isEmbedded ? kill('USR1',$::CCPID) : Gtk->exit(0) }),
- gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) })
+ gtksignal_connect(new Gtk2::Button(N("OK")), clicked => sub { any::runlevel($x_mode ? 5 : 3); updateAutologin(); updateAurora(); $::isEmbedded ? kill('USR1',$::CCPID) : Gtk2->exit(0) }),
+ gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk2->exit(0) })
)
)
);
@@ -355,8 +355,8 @@ $no_bootsplash and $thm_frame->hide();
gtkflush();
$::isEmbedded and kill 'USR2', $::CCPID;
$inmain = 1;
-Gtk->main;
-Gtk->exit(0);
+Gtk2->main;
+Gtk2->exit(0);
#-------------------------------------------------------------
# get user names to put in combo