- perl-gtk2 port

- cleanups

1 files changed, 18 insertions, 18 deletions

diff --git a/print_launcher.pl b/print_launcher.pl
index f5742e39..ae25660e 100755
--- a/print_launcher.pl
+++ b/print_launcher.pl
@@ -3,7 +3,7 @@
 use strict;
 use lib qw(/usr/lib/libDrakX);
 use common;
-use my_gtk qw(:helpers :wrappers :various);;
+use ugtk2 qw(:helpers :wrappers);;
 use interactive;
 use standalone;
 
@@ -16,34 +16,34 @@ use standalone;
 push @::textdomains, 'drakconf';
 
 my $sbindir = "/usr/sbin/";
-my $my_win = my_gtk->new('print_launcher');
+my $my_win = ugtk2->new('print_launcher');
 $my_win->{rwindow}->set_title(N("Printing configuration")) unless $::isEmbedded;
-$my_win->{rwindow}->signal_connect (delete_event => sub {
+$my_win->{rwindow}->signal_connect(delete_event => sub {
     gtkset_mousecursor_normal();
-    my_gtk->exit(0);
-  } );
-my $vbox = new Gtk::VBox(0, 0);
+    ugtk2->exit(0);
+  });
+my $vbox = Gtk2::VBox->new(0, 0);
 $my_win->{window}->add($vbox);
-$vbox->pack_start(new Gtk::Label(N("Printing configuration")), 0, 0, 5);
-$vbox->pack_start(new Gtk::HSeparator, 0, 0, 5);
-my $table = new Gtk::Table (2, 1, 0);
+$vbox->pack_start(Gtk2::Label->new(N("Printing configuration")), 0, 0, 5);
+$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5);
+my $table = Gtk2::Table->new(2, 1, 0);
 $table->set_border_width(5);
 $table->set_row_spacings(5);
 $table->set_col_spacings(5);
-my $hbox = new Gtk::HBox(0, 0);
+my $hbox = Gtk2::HBox->new(0, 0);
 $vbox->pack_start($hbox, 1, 1, 1);
 $hbox->pack_start($table, 0, 0, 5);
-$table->attach (new Gtk::Label(N("Click here to configure the printing system")), 0, 1, 0, 1, 'fill', 'fill', 0, 0);
-my $b1 = gtksignal_connect(new Gtk::Button(N("Configure...")), clicked => sub { system("$sbindir/printerdrake &") } );
-$table->attach ($b1, 1, 2, 0, 1, 'fill', 'fill', 0, 0);
-$vbox->pack_start(new Gtk::HSeparator, 0, 0, 5);
-my $bbox = new Gtk::HButtonBox;
+$table->attach(Gtk2::Label->new(N("Click here to configure the printing system")), 0, 1, 0, 1, 'fill', 'fill', 0, 0);
+my $b1 = gtksignal_connect(Gtk2::Button->new(N("Configure...")), clicked => sub { system("$sbindir/printerdrake &") });
+$table->attach($b1, 1, 2, 0, 1, 'fill', 'fill', 0, 0);
+$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5);
+my $bbox = Gtk2::HButtonBox->new;
 $vbox->pack_start($bbox, 0, 0, 5);
-$bbox->set_layout(-end);
-my $button_ok = gtksignal_connect(new Gtk::Button(N("Done")), clicked => sub { my_gtk->exit(0) });
+$bbox->set_layout('end');
+my $button_ok = gtksignal_connect(Gtk2::Button->new(N("Done")), clicked => sub { ugtk2->exit(0) });
 $button_ok->can_default(1);
 $bbox->add($button_ok);
 
 $my_win->{window}->show_all;
 $my_win->main;
-my_gtk->exit(0);
+ugtk2->exit(0);